summaryrefslogtreecommitdiffstats
path: root/Doc/whatsnew/index.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-10-01 17:09:00 (GMT)
committerGeorg Brandl <georg@python.org>2012-10-01 17:09:00 (GMT)
commita32e8dfe129143dddf77323bce44702980ee0421 (patch)
tree74f93d9e7add5ddfa343ea21b766d26fb3925dbd /Doc/whatsnew/index.rst
parent86dc732f1f80ac97f7efa92ff3a2378b6158abc4 (diff)
parent44d0c2156a292b2e9297b2220941e340d4ec32df (diff)
downloadcpython-a32e8dfe129143dddf77323bce44702980ee0421.zip
cpython-a32e8dfe129143dddf77323bce44702980ee0421.tar.gz
cpython-a32e8dfe129143dddf77323bce44702980ee0421.tar.bz2
merge with 3.3.
Diffstat (limited to 'Doc/whatsnew/index.rst')
-rw-r--r--Doc/whatsnew/index.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/whatsnew/index.rst b/Doc/whatsnew/index.rst
index e23beea..29902e4 100644
--- a/Doc/whatsnew/index.rst
+++ b/Doc/whatsnew/index.rst
@@ -25,10 +25,10 @@ anyone wishing to stay up-to-date after a new release.
2.1.rst
2.0.rst
-The "Python News" is a HTML version of the file :source:`Misc/NEWS` which
-contains *all* nontrivial changes to Python.
+The "Changelog" is a HTML version of the file :source:`Misc/NEWS` which
+contains *all* nontrivial changes to Python for the current version.
.. toctree::
- :maxdepth: 1
+ :maxdepth: 2
- news.rst
+ changelog.rst