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
........

diff --git a/Doc/library/copyreg.rst b/Doc/library/copyreg.rst
index f6dbaaf7457bb15cc5ce522bb0910b698ff332da..a2d316e95229cdcde980ab45d94aa16ed584a6af 100644 (file)
--- a/Doc/library/copyreg.rst
+++ b/Doc/library/copyreg.rst
@@ -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)

diff --git a/Doc/library/shelve.rst b/Doc/library/shelve.rst
index e3862903f6076ecff3f68452911489c8c3a67076..f7f7bf94e928b1d5fe59efada3958b503e347965 100644 (file)
--- a/Doc/library/shelve.rst
+++ b/Doc/library/shelve.rst
@@ -175,6 +175,3 @@ object)::
    Module :mod:`pickle`
       Object serialization used by :mod:`shelve`.
 
-   Module :mod:`cPickle`
-      High-performance version of :mod:`pickle`.
-