From e78d352385999a9e9300ad289efaecbd9ebd8635 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 8 Oct 2008 18:57:31 +0000
Subject: [PATCH] Backport r66857: make all whatsnew docs accessible.

---
 Doc/conf.py                           |  6 ------
 Doc/contents.rst                      |  2 +-
 Doc/tools/sphinxext/indexcontent.html |  2 +-
 Doc/whatsnew/2.5.rst                  | 12 +++++-------
 Doc/whatsnew/index.rst                | 20 ++++++++++++++++++++
 5 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 Doc/whatsnew/index.rst

diff --git a/Doc/conf.py b/Doc/conf.py
index 41a6b619814..38db324379b 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -41,12 +41,6 @@ today_fmt = '%B %d, %Y'
 
 # List of files that shouldn't be included in the build.
 unused_docs = [
-    'whatsnew/2.0',
-    'whatsnew/2.1',
-    'whatsnew/2.2',
-    'whatsnew/2.3',
-    'whatsnew/2.4',
-    'whatsnew/2.5',
     'maclib/scrap',
     'library/xmllib',
     'library/xml.etree',
diff --git a/Doc/contents.rst b/Doc/contents.rst
index fc9ff0354d3..8b99d0ee119 100644
--- a/Doc/contents.rst
+++ b/Doc/contents.rst
@@ -4,7 +4,7 @@
 
 .. toctree::
 
-   whatsnew/2.6.rst
+   whatsnew/index.rst
    tutorial/index.rst
    using/index.rst
    reference/index.rst
diff --git a/Doc/tools/sphinxext/indexcontent.html b/Doc/tools/sphinxext/indexcontent.html
index c10da385a0a..df32a274cf7 100644
--- a/Doc/tools/sphinxext/indexcontent.html
+++ b/Doc/tools/sphinxext/indexcontent.html
@@ -4,7 +4,7 @@
   <table class="contentstable" align="center"><tr>
     <td width="50%">
       <p class="biglink"><a class="biglink" href="{{ pathto("whatsnew/" + version) }}">What's new in Python {{ version }}?</a><br/>
-         <span class="linkdescr">changes since previous major release</span></p>
+         <span class="linkdescr">or <a href="{{ pathto("whatsnew/index") }}">all "What's new" documents</a> since 2.0</span></p>
       <p class="biglink"><a class="biglink" href="{{ pathto("tutorial/index") }}">Tutorial</a><br/>
          <span class="linkdescr">start here</span></p>
       <p class="biglink"><a class="biglink" href="{{ pathto("using/index") }}">Using Python</a><br/>
diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst
index 925fd0fd310..0b4d954b84e 100644
--- a/Doc/whatsnew/2.5.rst
+++ b/Doc/whatsnew/2.5.rst
@@ -16,9 +16,9 @@ release schedule.
 The changes in Python 2.5 are an interesting mix of language and library
 improvements. The library enhancements will be more important to Python's user
 community, I think, because several widely-useful packages were added.  New
-modules include ElementTree for XML processing (section :ref:`module-etree`),
-the SQLite database module (section :ref:`module-sqlite`), and the :mod:`ctypes`
-module for calling C functions (section :ref:`module-ctypes`).
+modules include ElementTree for XML processing (:mod:`xml.etree`),
+the SQLite database module (:mod:`sqlite`), and the :mod:`ctypes`
+module for calling C functions.
 
 The language changes are of middling significance.  Some pleasant new features
 were added, but most of them aren't features that you'll use every day.
@@ -736,7 +736,7 @@ add a :keyword:`return` statement at the marked location. ::
                # return False
 
 
-.. _module-contextlib:
+.. _contextlibmod:
 
 The contextlib module
 ---------------------
@@ -1273,7 +1273,7 @@ complete list of changes, or look through the SVN logs for all the details.
   (Contributed by Raymond Hettinger.)
 
 * New module: The :mod:`contextlib` module contains helper functions for use
-  with the new ':keyword:`with`' statement.  See section :ref:`module-contextlib`
+  with the new ':keyword:`with`' statement.  See section :ref:`contextlibmod`
   for more about this module.
 
 * New module: The :mod:`cProfile` module is a C implementation of  the existing
@@ -2272,8 +2272,6 @@ code:
 .. ======================================================================
 
 
-.. _acks:
-
 Acknowledgements
 ================
 
diff --git a/Doc/whatsnew/index.rst b/Doc/whatsnew/index.rst
new file mode 100644
index 00000000000..b66fd3a1921
--- /dev/null
+++ b/Doc/whatsnew/index.rst
@@ -0,0 +1,20 @@
+.. _whatsnew-index:
+
+######################
+ What's New in Python
+######################
+
+The "What's New in Python" series of essays takes tours through the most
+important changes between major Python versions.  They are a "must read" for
+anyone wishing to stay up-to-date after a new release.
+
+.. toctree::
+   :maxdepth: 1
+
+   2.6.rst
+   2.5.rst
+   2.4.rst
+   2.3.rst
+   2.2.rst
+   2.1.rst
+   2.0.rst