[Python-checkins] r76814 - in python/branches/release31-maint: Doc/library/copyreg.rst Doc/library/shelve.rst

[benjamin.peterson]

Author: benjamin.peterson
Date: Sun Dec 13 22:06:19 2009
New Revision: 76814

Log:
Merged revisions 76812 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r76812 | benjamin.peterson | 2009-12-13 15:04:16 -0600 (Sun, 13 Dec 2009) | 1 line
  
  remove references to cPickle
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/copyreg.rst
   python/branches/release31-maint/Doc/library/shelve.rst

Modified: python/branches/release31-maint/Doc/library/copyreg.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/copyreg.rst	(original)
+++ python/branches/release31-maint/Doc/library/copyreg.rst	Sun Dec 13 22:06:19 2009
@@ -7,14 +7,12 @@
 
 .. index::
    module: pickle
-   module: cPickle
    module: copy
 
-The :mod:`copyreg` module provides support for the :mod:`pickle` and
-:mod:`cPickle` modules.  The :mod:`copy` module is likely to use this in the
-future as well.  It provides configuration information about object constructors
-which are not classes.  Such constructors may be factory functions or class
-instances.
+The :mod:`copyreg` module provides support for the :mod:`pickle` module.  The
+:mod:`copy` module is likely to use this in the future as well.  It provides
+configuration information about object constructors which are not classes.
+Such constructors may be factory functions or class instances.
 
 
 .. function:: constructor(object)

Modified: python/branches/release31-maint/Doc/library/shelve.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/shelve.rst	(original)
+++ python/branches/release31-maint/Doc/library/shelve.rst	Sun Dec 13 22:06:19 2009
@@ -175,6 +175,3 @@
    Module :mod:`pickle`
       Object serialization used by :mod:`shelve`.
 
-   Module :mod:`cPickle`
-      High-performance version of :mod:`pickle`.
-