[Python-checkins] r67145 - in python/branches/release26-maint: Doc/whatsnew/2.3.rst Doc/whatsnew/2.4.rst Doc/whatsnew/2.5.rst Doc/whatsnew/2.6.rst

[georg.brandl]

Author: georg.brandl
Date: Fri Nov  7 09:29:02 2008
New Revision: 67145

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

........
  r66861 | benjamin.peterson | 2008-10-08 23:11:33 +0200 (Wed, 08 Oct 2008) | 1 line
  
  quiet sphinx warnings
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/whatsnew/2.3.rst
   python/branches/release26-maint/Doc/whatsnew/2.4.rst
   python/branches/release26-maint/Doc/whatsnew/2.5.rst
   python/branches/release26-maint/Doc/whatsnew/2.6.rst

Modified: python/branches/release26-maint/Doc/whatsnew/2.3.rst
==============================================================================
--- python/branches/release26-maint/Doc/whatsnew/2.3.rst	(original)
+++ python/branches/release26-maint/Doc/whatsnew/2.3.rst	Fri Nov  7 09:29:02 2008
@@ -2062,7 +2062,7 @@
 .. ======================================================================
 
 
-.. _acks:
+.. _23acks:
 
 Acknowledgements
 ================

Modified: python/branches/release26-maint/Doc/whatsnew/2.4.rst
==============================================================================
--- python/branches/release26-maint/Doc/whatsnew/2.4.rst	(original)
+++ python/branches/release26-maint/Doc/whatsnew/2.4.rst	Fri Nov  7 09:29:02 2008
@@ -1551,7 +1551,7 @@
 .. ======================================================================
 
 
-.. _acks:
+.. _24acks:
 
 Acknowledgements
 ================

Modified: python/branches/release26-maint/Doc/whatsnew/2.5.rst
==============================================================================
--- python/branches/release26-maint/Doc/whatsnew/2.5.rst	(original)
+++ python/branches/release26-maint/Doc/whatsnew/2.5.rst	Fri Nov  7 09:29:02 2008
@@ -1109,7 +1109,7 @@
 .. ======================================================================
 
 
-.. _interactive:
+.. _25interactive:
 
 Interactive Interpreter Changes
 -------------------------------
@@ -1211,7 +1211,7 @@
 .. ======================================================================
 
 
-.. _modules:
+.. _25modules:
 
 New, Improved, and Removed Modules
 ==================================

Modified: python/branches/release26-maint/Doc/whatsnew/2.6.rst
==============================================================================
--- python/branches/release26-maint/Doc/whatsnew/2.6.rst	(original)
+++ python/branches/release26-maint/Doc/whatsnew/2.6.rst	Fri Nov  7 09:29:02 2008
@@ -3274,7 +3274,7 @@
 .. ======================================================================
 
 
-.. _acks:
+.. _26acks:
 
 Acknowledgements
 ================