[Python-checkins] cpython (merge 3.1 -> 3.2): #11952: merge with 3.1.

[ezio.melotti]

http://hg.python.org/cpython/rev/56c187b81d2b
changeset:   69681:56c187b81d2b
branch:      3.2
parent:      69676:89ebde7cd8ea
parent:      69680:1d3c5df88589
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Apr 29 07:12:42 2011 +0300
summary:
  #11952: merge with 3.1.

files:
  Doc/library/multiprocessing.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -26,7 +26,7 @@
 
 .. note::
 
-    Functionality within this package requires that the ``__main__`` method be
+    Functionality within this package requires that the ``__main__`` module be
     importable by the children. This is covered in :ref:`multiprocessing-programming`
     however it is worth pointing out here. This means that some examples, such
     as the :class:`multiprocessing.Pool` examples will not work in the

-- 
Repository URL: http://hg.python.org/cpython