[Python-checkins] r81334 - in python/branches/release26-maint: Doc/library/language.rst Doc/library/python.rst

[georg.brandl]

Author: georg.brandl
Date: Wed May 19 16:07:38 2010
New Revision: 81334

Log:
Merged revisions 77886 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77886 | benjamin.peterson | 2010-01-31 19:09:34 +0100 (So, 31 Jan 2010) | 1 line
  
  move distutils.rst to different toc
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/language.rst
   python/branches/release26-maint/Doc/library/python.rst

Modified: python/branches/release26-maint/Doc/library/language.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/language.rst	(original)
+++ python/branches/release26-maint/Doc/library/language.rst	Wed May 19 16:07:38 2010
@@ -27,4 +27,3 @@
    compileall.rst
    dis.rst
    pickletools.rst
-   distutils.rst

Modified: python/branches/release26-maint/Doc/library/python.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/python.rst	(original)
+++ python/branches/release26-maint/Doc/library/python.rst	Wed May 19 16:07:38 2010
@@ -27,3 +27,4 @@
    site.rst
    user.rst
    fpectl.rst
+   distutils.rst