summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-04-29 04:13:12 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-04-29 04:13:12 (GMT)
commit025691a5fe041743b7138cc61507f1fe963fffe1 (patch)
treef20816f880879a40ce29362b9f4c052112802c23
parent09db87b63366b4a02b53b4e5bf51149f8153ff35 (diff)
parent17797a7310a0ad64d23be148c0ad9df99a410c92 (diff)
downloadcpython-025691a5fe041743b7138cc61507f1fe963fffe1.zip
cpython-025691a5fe041743b7138cc61507f1fe963fffe1.tar.gz
cpython-025691a5fe041743b7138cc61507f1fe963fffe1.tar.bz2
#11952: merge with 3.2.
-rw-r--r--Doc/library/multiprocessing.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 1a42380..e1f4382 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -26,7 +26,7 @@ Windows.
.. 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