Backport changes to integrate AMK's "What's New in Python X.Y"

document.  This incorporates the integration of several checkins from the
trunk.

diff --git a/Doc/Makefile b/Doc/Makefile
index fe1b9a4100648910bdc19ea1b9c1d224fe0e4dce..cf6d14690675ef8fd191679b747bf1e1d07de683 100644 (file)
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -88,24 +88,28 @@ BUILDINDEX=$(TOOLSDIR)/buildindex.py
 PYTHONDOCS="See <i><a href=\"about.html\">About this document...</a></i> for information on suggesting changes."
 HTMLBASE=  file:`pwd`
 
+# The end of this should reflect the major/minor version numbers of
+# the release:
+WHATSNEW=whatsnew22
+
 # what's what
 MANDVIFILES=   paper-$(PAPER)/api.dvi paper-$(PAPER)/ext.dvi \
                paper-$(PAPER)/lib.dvi paper-$(PAPER)/mac.dvi \
                paper-$(PAPER)/ref.dvi paper-$(PAPER)/tut.dvi
 HOWTODVIFILES= paper-$(PAPER)/doc.dvi paper-$(PAPER)/inst.dvi \
-               paper-$(PAPER)/dist.dvi
+               paper-$(PAPER)/dist.dvi paper-$(PAPER)/$(WHATSNEW).dvi
 
 MANPDFFILES=   paper-$(PAPER)/api.pdf paper-$(PAPER)/ext.pdf \
                paper-$(PAPER)/lib.pdf paper-$(PAPER)/mac.pdf \
                paper-$(PAPER)/ref.pdf paper-$(PAPER)/tut.pdf
 HOWTOPDFFILES= paper-$(PAPER)/doc.pdf paper-$(PAPER)/inst.pdf \
-               paper-$(PAPER)/dist.pdf
+               paper-$(PAPER)/dist.pdf paper-$(PAPER)/$(WHATSNEW).pdf
 
 MANPSFILES=    paper-$(PAPER)/api.ps paper-$(PAPER)/ext.ps \
                paper-$(PAPER)/lib.ps paper-$(PAPER)/mac.ps \
                paper-$(PAPER)/ref.ps paper-$(PAPER)/tut.ps
 HOWTOPSFILES=  paper-$(PAPER)/doc.ps paper-$(PAPER)/inst.ps \
-               paper-$(PAPER)/dist.ps
+               paper-$(PAPER)/dist.ps paper-$(PAPER)/$(WHATSNEW).ps
 
 DVIFILES=      $(MANDVIFILES) $(HOWTODVIFILES)
 PDFFILES=      $(MANPDFFILES) $(HOWTOPDFFILES)
@@ -141,7 +145,8 @@ INDEXFILES=html/api/api.html \
        html/ref/ref.html \
        html/tut/tut.html \
        html/inst/inst.html \
-       html/dist/dist.html
+       html/dist/dist.html \
+       html/whatsnew/$(WHATSNEW).html
 
 ALLHTMLFILES=$(INDEXFILES) html/index.html html/modindex.html html/acks.html
 
@@ -271,6 +276,13 @@ paper-$(PAPER)/tut.dvi: $(TUTFILES)
 paper-$(PAPER)/tut.pdf: $(TUTFILES)
        cd paper-$(PAPER) && $(MKPDF) ../tut/tut.tex
 
+# What's New in Python X.Y
+paper-$(PAPER)/$(WHATSNEW).dvi:
+       cd paper-$(PAPER) && $(MKDVI) ../whatsnew/$(WHATSNEW).tex
+
+paper-$(PAPER)/$(WHATSNEW).pdf:
+       cd paper-$(PAPER) && $(MKPDF) ../whatsnew/$(WHATSNEW).tex
+
 # The remaining part of the Makefile is concerned with various
 # conversions, as described above.  See also the README file.
 
@@ -311,7 +323,8 @@ html/acks.html: ACKS $(TOOLSDIR)/support.py $(TOOLSDIR)/mkackshtml
 BOILERPLATE=texinputs/boilerplate.tex
 html/index.html: $(INDEXFILES)
 html/index.html: html/index.html.in $(BOILERPLATE) tools/rewrite.py
-       $(PYTHON) tools/rewrite.py $(BOILERPLATE) RELEASE=$(RELEASE) \
+       $(PYTHON) tools/rewrite.py $(BOILERPLATE) \
+               RELEASE=$(RELEASE) WHATSNEW=$(WHATSNEW) \
                <$< >$@
 
 html/modindex.html: $(TOOLSDIR)/support.py $(TOOLSDIR)/mkmodindex
@@ -359,6 +372,10 @@ dist: html/dist/dist.html html/dist/dist.css
 html/dist/dist.html: $(DISTFILES) perl/distutils.perl
        $(MKHTML) --dir html/dist --split 4 dist/dist.tex
 
+whatsnew: html/whatsnew/$(WHATSNEW).html
+html/whatsnew/$(WHATSNEW).html: whatsnew/$(WHATSNEW).tex
+       $(MKHTML) --dir html/whatsnew --split 4 whatsnew/$(WHATSNEW).tex
+
 
 # The iSilo format is used by the iSilo document reader for PalmOS devices.
 
@@ -370,7 +387,8 @@ ISILOINDEXFILES=isilo/api/api.html \
        isilo/ref/ref.html \
        isilo/tut/tut.html \
        isilo/inst/inst.html \
-       isilo/dist/dist.html
+       isilo/dist/dist.html \
+       isilo/whatsnew/$(WHATSNEW).html
 
 $(ISILOINDEXFILES): $(COMMONPERL) html/about.dat perl/isilo.perl
 
@@ -382,7 +400,8 @@ isilo:      isilo/python-api-$(RELEASE).pdb \
        isilo/python-ref-$(RELEASE).pdb \
        isilo/python-tut-$(RELEASE).pdb \
        isilo/python-dist-$(RELEASE).pdb \
-       isilo/python-inst-$(RELEASE).pdb
+       isilo/python-inst-$(RELEASE).pdb \
+       isilo/python-whatsnew-$(RELEASE).pdb
 
 isilo/python-api-$(RELEASE).pdb: isilo/api/api.html isilo/api/api.css
        $(MKISILO) "-iPython/C API Reference Manual" \
@@ -420,6 +439,10 @@ isilo/python-inst-$(RELEASE).pdb: isilo/inst/inst.html isilo/inst/inst.css
        $(MKISILO) "-iInstalling Python Modules" \
                isilo/inst/inst.html $@
 
+isilo/python-whatsnew-$(RELEASE).pdb: isilo/whatsnew/$(WHATSNEW).html isilo/whatsnew/$(WHATSNEW).css
+       $(MKISILO) "-iWhat's New in Python X.Y" \
+               isilo/whatsnew/$(WHATSNEW).html $@
+
 isilo/api/api.html: $(APIFILES)
        $(MKISILOHTML) --dir isilo/api api/api.tex
 
@@ -447,6 +470,9 @@ isilo/inst/inst.html: $(INSTFILES) perl/distutils.perl
 isilo/dist/dist.html: $(DISTFILES) perl/distutils.perl
        $(MKISILOHTML) --dir isilo/dist dist/dist.tex
 
+isilo/whatsnew/$(WHATSNEW).html: whatsnew/$(WHATSNEW).tex
+       $(MKISILOHTML) --dir isilo/whatsnew whatsnew/$(WHATSNEW).tex
+
 # These are useful if you need to transport the iSilo-ready HTML to
 # another machine to perform the conversion:
 
@@ -472,6 +498,7 @@ webcheck: $(ALLHTMLFILES)
        $(WEBCHECKER) $(HTMLBASE)/tut/
        $(WEBCHECKER) $(HTMLBASE)/dist/
        $(WEBCHECKER) $(HTMLBASE)/inst/
+       $(WEBCHECKER) $(HTMLBASE)/whatsnew/
 
 fastwebcheck: $(ALLHTMLFILES)
        $(WEBCHECKER) -x $(HTMLBASE)/api/
@@ -483,6 +510,7 @@ fastwebcheck: $(ALLHTMLFILES)
        $(WEBCHECKER) -x $(HTMLBASE)/tut/
        $(WEBCHECKER) -x $(HTMLBASE)/dist/
        $(WEBCHECKER) -x $(HTMLBASE)/inst/
+       $(WEBCHECKER) -x $(HTMLBASE)/whatsnew/
 
 
 # Release packaging targets:
@@ -614,8 +642,10 @@ clobber:
        rm -rf html/index.html html/modindex.html html/acks.html
        rm -rf html/api/ html/doc/ html/ext/ html/lib/ html/mac/
        rm -rf html/ref/ html/tut/ html/inst/ html/dist/
+       rm -rf html/whatsnew/
        rm -rf isilo/api/ isilo/doc/ isilo/ext/ isilo/lib/ isilo/mac/
        rm -rf isilo/ref/ isilo/tut/ isilo/inst/ isilo/dist/
+       rm -rf isilo/whatsnew/
        rm -f isilo/python-*-$(RELEASE).pdb isilo-$(RELEASE).zip
 
 realclean distclean:  clobber

diff --git a/Doc/html/index.html.in b/Doc/html/index.html.in
index 86b28cc569e1b03b569fc17a027ab698f01aacf5..b242c7f37f215dcdb5ca8d6ef5caea4b16f40d4d 100644 (file)
--- a/Doc/html/index.html.in
+++ b/Doc/html/index.html.in
@@ -1,13 +1,17 @@
 <html>
   <head>
     <title>Python @RELEASE@ Documentation - @DATE@</title>
-    <link rel="STYLESHEET" href="lib/lib.css" type="text/css">
+    <meta name="aesop" content="links">
     <meta name="description"
           content="Top-level index to the standard documentation for
                    Python @RELEASE@.">
+    <link rel="STYLESHEET" href="lib/lib.css" type="text/css">
     <style type="text/css">
       a.title { font-weight: bold; font-size: 110%; }
       ul { margin-left: 1em; padding: 0pt; border: 0pt; }
+      ul li { margin-top: 0.2em; }
+      td.left-column { padding-right: 1em; }
+      td.right-column { padding-left: 1em; }
     </style>
   </head>
   <body>
@@ -45,11 +49,25 @@
 
     <table align="center">
       <tbody>
-      <tr><td>
+        <tr>
+          <td class="left-column">
          <ul>
            <li> <a href="tut/tut.html" class="title">Tutorial</a>
              <br>(start here)
-
+         </ul>
+         </td>
+         <td class="right-column">
+         <ul>
+            <li> <a href="whatsnew/@WHATSNEW@.html" class="title"
+                >What's New in Python</a>
+              <br>(changes since the last major release)
+         </ul>
+         </td>
+        </tr>
+        <tr>
+          <td valign="baseline" class="left-column">
+          &nbsp;
+         <ul>
            <li> <a href="modindex.html" class="title">Global Module Index</a>
              <br>(for quick access to all documentation)
 
@@ -63,9 +81,14 @@
            <li> <a href="inst/inst.html" class="title">Installing
                Python Modules</a>
              <br>(for administrators)
+
+           <li> <a href="dist/dist.html" class="title">Distributing
+               Python Modules</a>
+             <br>(for developers and packagers)
          </ul>
          </td>
-         <td>
+         <td valign="baseline" class="right-column">
+          &nbsp;
          <ul>
            <li> <a href="ref/ref.html" class="title">Language Reference</a>
              <br>(for language lawyers)
@@ -79,15 +102,11 @@
 
            <li> <a href="doc/doc.html" class="title">Documenting Python</a>
              <br>(information for documentation authors)
-
-           <li> <a href="dist/dist.html" class="title">Distributing
-               Python Modules</a>
-             <br>(for developers and packagers)
          </ul>
          </td>
-       </tr>
+        </tr>
         <tr>
-          <td>
+          <td valign="baseline" class="left-column">
           &nbsp;
           <ul>
             <li> <a href="http://www.python.org/doc/" class="title"
@@ -95,7 +114,7 @@
               <br>(for everyone)
           </ul>
           </td>
-          <td>
+          <td valign="baseline" class="right-column">
           &nbsp;
           <ul>
             <li> <a href="http://www.python.org/doc/howto/" class="title"