Blob Blame History Raw
diff -up Python-2.6/Doc/conf.py.nowhatsnew Python-2.6/Doc/conf.py
--- Python-2.6/Doc/conf.py.nowhatsnew	2008-11-29 13:12:53.000000000 -0500
+++ Python-2.6/Doc/conf.py	2008-11-29 13:14:20.000000000 -0500
@@ -47,6 +47,7 @@ unused_docs = [
     'whatsnew/2.3',
     'whatsnew/2.4',
     'whatsnew/2.5',
+    'whatsnew/2.6',
     'maclib/scrap',
     'library/xmllib',
     'library/xml.etree',
@@ -129,8 +130,6 @@ latex_documents = [
      'Python Tutorial', _stdauthor, 'manual'),
     ('using/index', 'using.tex',
      'Using Python', _stdauthor, 'manual'),
-    ('whatsnew/' + version, 'whatsnew.tex',
-     'What\'s New in Python', 'A. M. Kuchling', 'howto'),
 ]
 # Collect all HOWTOs individually
 latex_documents.extend(('howto/' + fn[:-4], 'howto-' + fn[:-4] + '.tex',
diff -up Python-2.6/Doc/contents.rst.nowhatsnew Python-2.6/Doc/contents.rst
--- Python-2.6/Doc/contents.rst.nowhatsnew	2008-11-29 13:14:47.000000000 -0500
+++ Python-2.6/Doc/contents.rst	2008-11-29 13:14:55.000000000 -0500
@@ -4,7 +4,6 @@
 
 .. toctree::
 
-   whatsnew/2.6.rst
    tutorial/index.rst
    using/index.rst
    reference/index.rst
diff -up Python-2.6/Doc/Makefile.nowhatsnew Python-2.6/Doc/Makefile
diff -up Python-2.6/Doc/tools/sphinxext/indexcontent.html.nowhatsnew Python-2.6/Doc/tools/sphinxext/indexcontent.html
--- Python-2.6/Doc/tools/sphinxext/indexcontent.html.nowhatsnew	2008-11-29 13:15:22.000000000 -0500
+++ Python-2.6/Doc/tools/sphinxext/indexcontent.html	2008-11-29 13:15:51.000000000 -0500
@@ -3,8 +3,6 @@
   <p><strong>Parts of the documentation:</strong></p>
   <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>
       <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/>