Streamline version numbers to 2.5.

pep-0101.txt

@@ -37,8 +37,8 @@ How to Make A Release
     steps.
 
     We use the following conventions in the examples below.  Where a
-    release number is given, it is of the form X.YaZ, e.g. 2.1a3 for
-    Python 2.1 alpha 3, where "a" == alpha, "b" == beta, "rc" ==
+    release number is given, it is of the form X.YaZ, e.g. 2.5a3 for
+    Python 2.5 alpha 3, where "a" == alpha, "b" == beta, "rc" ==
     release candidate.
 
     Final releases are named "releaseXY".  The branch tag is
@@ -48,7 +48,7 @@ How to Make A Release
     say X.Y.MaZ.
 
     Note: This document has been updated to reflect the more
-    streamlined procedures used to release Python 2.3 (including the
+    streamlined procedures used to release Python 2.5 (including the
     alphas and betas).
 
   ___ Impose a check-in freeze.  Send a message to
@@ -92,7 +92,7 @@ How to Make A Release
       previous release until now.  You can then troll through the
       news.txt file looking for interesting things to add to NEWS.
 
-  ___ For major releases (e.g. 2.3 final), move any historical "what's
+  ___ For major releases (e.g. 2.5 final), move any historical "what's
       new" entries from Misc/NEWS to Misc/HISTORY.
 
   ___ Check with the IDLE maintainer to be sure that
@@ -136,7 +136,7 @@ How to Make A Release
         to keep it straight from your trunk working directory.  E.g.
 
         % export CVSROOT=cvs.sf.net:/cvsroot/python
-        % cvs -q co -d python-22a3 -r release23-maint python/dist/src
+        % cvs -q co -d python-25a3 -r release25-maint python/dist/src
 
     ___ cd into the branch directory.
 
@@ -151,16 +151,16 @@ How to Make A Release
       release date.  Then update Lib/idlelib/idlever.py to show a matching
       version.
 
-  ___ Change the "%define version" line of Misc/RPM/python-2.3.spec to
+  ___ Change the "%define version" line of Misc/RPM/python-2.5.spec to
       the same string as PY_VERSION was changed to above.  E.g.
 
-       %define version 2.3.1
+       %define version 2.5.1
 
        The following line, "%define libvers", should reflect the
        major/minor number as one would usually see in the
        "/usr/lib/python<libvers>" directory name.  E.g.
 
-       %define libvers 2.3
+       %define libvers 2.5
 
        You also probably want to reset the %define release line
        to '1pydotorg' if it's not already that.
@@ -169,9 +169,9 @@ How to Make A Release
        different than is in the name of the current
        "Misc/RPM/python-*.spec" file, rename the file:
 
-       % mv python-2.3.spec python-2.4.spec
-       % cvs remove python-2.3.spec
-       % cvs add python-2.4.spec
+       % mv python-2.5.spec python-2.6.spec
+       % cvs remove python-2.5.spec
+       % cvs add python-2.6.spec
        % cvs commit
 
   ___ If this is a release candidate, mail Sean <jafo@tummy.com>
@@ -217,7 +217,7 @@ How to Make A Release
 
   ___ For a final release, edit the first paragraph of
       Doc/whatsnew/whatsnewXX.tex to include the actual release date;
-      e.g. "Python 2.3 was released on August 1, 2003."
+      e.g. "Python 2.5 was released on August 1, 2003."
       There's no need to edit this for alpha or beta releases.  Note
       that Andrew often takes care of this.
 
@@ -279,16 +279,16 @@ How to Make A Release
         - the version number to $VERSION in two places: the Title:
           header, and the <h3> at the top of the page
         - the release date, in the <h3> at the top of the page
-        - if the minor release number changed (for example, from 2.3
-          to 2.4), the title and link to the "What's New" document
+        - if the minor release number changed (for example, from 2.5
+          to 2.6), the title and link to the "What's New" document
           (search for "whatsnew")
 
       - in download.ht, change:
         - the version number to $VERSION in two places: the Title:
           header, and the <h3> at the top of the page
         - the release date, in the <h3> at the top of the page
-        - if the minor release number changed (for example, from 2.3
-          to 2.4), the title and link to the "What's New" document
+        - if the minor release number changed (for example, from 2.5
+          to 2.6), the title and link to the "What's New" document
           (search for "whatsnew")
         - replace the large table of downloads with the content of the
           pkglist.html file generated by the documentation build
@@ -344,10 +344,10 @@ How to Make A Release
       runs this command to create the project files for MS HTML
       Workshop:
 
-      % python ..\Doc\tools\prechm.py -v 2.3 python23
+      % python ..\Doc\tools\prechm.py -v 2.5 python25
 
-      HTML Workshop is then fired up on the created python23.hhp file,
-      finally resulting in an python23.chm file. He then copies the
+      HTML Workshop is then fired up on the created python25.hhp file,
+      finally resulting in an python25.chm file. He then copies the
       file into the Doc directories of the build trees (once for
       each target architecture).
 
@@ -356,7 +356,7 @@ How to Make A Release
       and AMD64). He has one checkout tree per target architecture,
       and builds the pcbuild.sln project for the appropriate 
       architecture. He then edits Tools/msi/config.py to update
-      full_current_version, and runs msi.py with ActivePython 2.3.
+      full_current_version, and runs msi.py with ActivePython 2.5.
       For that to work, the following prerequisites must be met:
 
       - PC/icons.mak must have been run with nmake.
@@ -380,7 +380,7 @@ How to Make A Release
 
   ___ Time to build the source tarball.  If you created a branch, be
       sure to cd to your working directory for the branch.  E.g.
-      % cd .../python-22a3
+      % cd .../python-25a3
 
   ___ Do a "cvs update" in this directory.  Do NOT include the -A flag
       if you're working on a branch, but do include it if you're
@@ -393,13 +393,13 @@ How to Make A Release
 
   ___ If you've seen updates to existing files, update the cvs tag:
 
-      % cvs tag -F r22a3
+      % cvs tag -F r25a3
 
       If you created a maintenance branch and you've changed any files
       since you branched, tag the tree -- in the branch -- now with
       something like
 
-      % cvs tag r23
+      % cvs tag r25
 
       This is the tag you will use below.
 
@@ -410,18 +410,18 @@ How to Make A Release
 
       % cd ~
       % export CVSROOT=cvs.sf.net:/cvsroot/python
-      % cvs export -rr23c2 -d Python-2.3c2 python/dist/src
+      % cvs export -rr25c2 -d Python-2.5c2 python/dist/src
 
   ___ Generate the tarball.  Note that we're not using the `z' option
       on the tar command because 1) that's only supported by GNU tar
       as far as we know, and 2) we're going to max out the compression
       level, which isn't a supported option.
 
-      % tar cf - Python-2.3c2 | gzip -9 > Python-2.3c2.tgz
+      % tar cf - Python-2.5c2 | gzip -9 > Python-2.5c2.tgz
 
   ___ Calculate the MD5 checksum of the tgz file you just created
 
-      % md5sum Python-2.3c2.tgz
+      % md5sum Python-2.5c2.tgz
 
       Note that if you don't have the md5sum program, there is a
       Python replacement in the Tools/scripts/md5sum.py file.
@@ -432,8 +432,8 @@ How to Make A Release
       steps to take:
 
       % cd /tmp
-      % tar zxvf ~/Python-2.3c2.tgz
-      % cd Python-2.3c2
+      % tar zxvf ~/Python-2.5c2.tgz
+      % cd Python-2.5c2
       % ls
       (Do things look reasonable?)
       % ./configure
@@ -609,7 +609,7 @@ How to Make A Release
 
     ___ Run a diff against your branch by doing this in the common
         parent directory containing both python-clean and python-XYaZ:
-        % diff -r python-clean python-22a2 | grep ^diff | grep -v CVS \
+        % diff -r python-clean python-25a2 | grep ^diff | grep -v CVS \
             > /tmp/diffcmd.sh
 
     ___ Edit diffcmd.sh to get rid of files that you know don't have