summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-11-07 08:29:02 (GMT)
committerGeorg Brandl <georg@python.org>2008-11-07 08:29:02 (GMT)
commit939582fd0629deedb95309e564a3d6a3a12dc87c (patch)
tree1caefbecc9a712a63036e5975d0e9d493e9b94f1
parentec068d3ae3731792f0fba2ef03c113a050c0bd5f (diff)
downloadcpython-939582fd0629deedb95309e564a3d6a3a12dc87c.zip
cpython-939582fd0629deedb95309e564a3d6a3a12dc87c.tar.gz
cpython-939582fd0629deedb95309e564a3d6a3a12dc87c.tar.bz2
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 ........
-rw-r--r--Doc/whatsnew/2.3.rst2
-rw-r--r--Doc/whatsnew/2.4.rst2
-rw-r--r--Doc/whatsnew/2.5.rst4
-rw-r--r--Doc/whatsnew/2.6.rst2
4 files changed, 5 insertions, 5 deletions
diff --git a/Doc/whatsnew/2.3.rst b/Doc/whatsnew/2.3.rst
index f5c53c0..da4f24f 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 bf30ac1..59788ba 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 0b4d954..43ba6e5 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 4c8c5b2..c7a3e20 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
================