summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-04-29 04:12:42 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-04-29 04:12:42 (GMT)
commit17797a7310a0ad64d23be148c0ad9df99a410c92 (patch)
tree82e73fb0c801a222d853fc62ea6e99cd06eef2ea
parent390ea0f25dadf429d4bea630ba6d2ec06c6c2e10 (diff)
parent2ee88355fc37a32ba5c4b4e5e2e25f52a1d86912 (diff)
downloadcpython-17797a7310a0ad64d23be148c0ad9df99a410c92.zip
cpython-17797a7310a0ad64d23be148c0ad9df99a410c92.tar.gz
cpython-17797a7310a0ad64d23be148c0ad9df99a410c92.tar.bz2
#11952: merge with 3.1.
-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 166f2f4..92d5272 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