Rework transition plan based on current discussions on python-dev.

Also reword some other random things.

pep-3108.txt

@@ -443,19 +443,31 @@ Transition Plan
 For modules to be removed
 -------------------------
 
-A PendingDeprecationWarning will be set in Python 2.6 for all modules
+For the removal of modules that are continuing to exist in the Python
-slated to be removed in Python 3.0.  This will allow people to know
+2.x series (i.e., not deprecated explicitly in the 2.x series), a
-which modules will not exist but without being overly noisy since
+proper warning will be set that is silenced by default;
-PendingDeprecationWarning is by default silenced.
+PendingDeprecationWarning initially, moving over to a Py3K-specific
+warning later if one comes into existence.
 
 
-For modules to be renamed
+Renaming of modules
--------------------------
+-------------------
 
-Modules will be renamed in Python 2.6.  The original names of the
+For modules that are renamed, stub modules will be created with the
-modules will still work but will raise a PendingDeprecationWarning
+original names and be kept in a package within the stdlib.  The need
-upon import.  The refactoring tool for transitioning to Python 3.0
+to keep them within a package is to prevent naming conflicts
-will refactor imports that use the new names.
+with case-insensitive filesystems. 
+
+These stub modules will import the module code based on the new
+naming.  The same type of warning being raised by modules being
+removed will be raised in the stub modules.
+
+Support in the 2to3 refactoring tool for renames will also be used
+[#2to3]_.  Import statements will be rewritten so that only the import
+statement and none of the rest of the code needs to be touched.  This
+will be accomplished by using the ``as`` keyword in import statments
+to bind in the module namespace to the old name while importing based
+on the new name.
 
 
 Open Issues
@@ -663,12 +675,12 @@ and hides the C implementation.
 Rejected Ideas
 ==============
 
-Modules that were suggested for removal but were saved 
+Modules that were originally suggested for removal 
-------------------------------------------------------
+--------------------------------------------------
 
 * asynchat/asyncore
 
-  + Josiah Carlson has said he will help to maintain the modules.
+  + Josiah Carlson has said he will maintain the modules.
 
 * base64/quopri/uu
 
@@ -683,12 +695,13 @@ Modules that were suggested for removal but were saved
 * nis
 
   + Testimonials from people that new installations of NIS are still
-    occurring out in the world.
+    occurring
 
 * telnetlib
 
   + Really handy for quick-and-dirty remote access.
-  + Some hardware supports telnet for accessing it.
+  + Some hardware supports using telnet for configuration and
+    querying.
 
 
 Introducing a new top-level package
@@ -731,6 +744,9 @@ References
 .. [#py-dev-summary-2004-11-01] Python-Dev Summary: 2004-11-01
     (http://www.python.org/dev/summary/2004-11-01_2004-11-15/#id10)
 
+.. [#2to3] 2to3 refactoring tool
+    (http://svn.python.org/view/sandbox/trunk/2to3/)
+
 .. [#pyopengl] PyOpenGL
     (http://pyopengl.sourceforge.net/)