From: Georg Brandl <georg@python.org>
Date: Fri, 7 Nov 2008 08:29:02 +0000 (+0000)
Subject: Merged revisions 66861 via svnmerge from
X-Git-Tag: v2.6.1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=939582fd0629deedb95309e564a3d6a3a12dc87c;p=python

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
........
---

diff --git a/Doc/whatsnew/2.3.rst b/Doc/whatsnew/2.3.rst
index f5c53c04a6..da4f24fa8b 100644
--- a/Doc/whatsnew/2.3.rst
+++ b/Doc/whatsnew/2.3.rst
@@ -2062,7 +2062,7 @@ code:
 .. ======================================================================
 
 
-.. _acks:
+.. _23acks:
 
 Acknowledgements
 ================
diff --git a/Doc/whatsnew/2.4.rst b/Doc/whatsnew/2.4.rst
index bf30ac1eb3..59788baba4 100644
--- a/Doc/whatsnew/2.4.rst
+++ b/Doc/whatsnew/2.4.rst
@@ -1551,7 +1551,7 @@ code:
 .. ======================================================================
 
 
-.. _acks:
+.. _24acks:
 
 Acknowledgements
 ================
diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst
index 0b4d954b84..43ba6e5a63 100644
--- a/Doc/whatsnew/2.5.rst
+++ b/Doc/whatsnew/2.5.rst
@@ -1109,7 +1109,7 @@ Here are all of the changes that Python 2.5 makes to the core Python language.
 .. ======================================================================
 
 
-.. _interactive:
+.. _25interactive:
 
 Interactive Interpreter Changes
 -------------------------------
@@ -1211,7 +1211,7 @@ marked in the following list.
 .. ======================================================================
 
 
-.. _modules:
+.. _25modules:
 
 New, Improved, and Removed Modules
 ==================================
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index 4c8c5b2a05..c7a3e20597 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -3274,7 +3274,7 @@ that may require changes to your code:
 .. ======================================================================
 
 
-.. _acks:
+.. _26acks:
 
 Acknowledgements
 ================