From e2698404a7479796d409f373529a1ad4740ce04d Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Sun, 11 May 2008 23:53:19 +0000
Subject: [PATCH] Re-arrange the commit order to minimize commits.

---
 pep-3108.txt | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pep-3108.txt b/pep-3108.txt
index 9a3f50f1b..e49c5a640 100644
--- a/pep-3108.txt
+++ b/pep-3108.txt
@@ -958,6 +958,13 @@ example of how to approach this.
 Python 2.6
 //////////
 
+#. Update all import statements in the stdlib to use the new name.
+
+#. Rename the module in the documentation (both its own and all
+   references).
+
+#. Commit the changes (this checkin should be allowed to propagate to py3k).
+
 #. Use ``svn move`` to rename the module.
 
 #. Create a stub module in ``Lib/lib-old``::
@@ -972,23 +979,18 @@ Python 2.6
 
 #. Add a test to ``test_py3kwarn``.
 
-#. Add a ``warning`` directive to the module's documentation.
+#. Add stub entries in the documentation for the old names which
+   lists the module as deprecated under that name and points to the
+   new name (see the module removal steps on the required steps).
+   
+#. In the module's documentation (under the new name), add a
+   ``versionchanged`` directive mentioning that the module was
+   renamed in Python 2.6.
 
 #. Add an entry in ``Misc/NEWS``.
 
 #. Commit the changes (**block** in py3k).
 
-#. Update all import statements in the stdlib to use the new name.
-
-#. Rename the module in the documentation (both its own and all
-   references).
-
-#. Commit the changes (this checkin should be allowed to propagate to py3k).
-
-#. Add stub entries in the documentation for the old names which
-   lists the module as deprecated under that name and points to the
-   new name (see the module removal steps on the required steps).
-
 
 Python 3.0
 //////////