summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2012-10-07 02:27:31 (GMT)
committerR David Murray <rdmurray@bitdance.com>2012-10-07 02:27:31 (GMT)
commitfb4dc080eb52e28f0b1cb5fbd95292108e71d8c6 (patch)
tree1163985561fb1d5b1ebf38bd788e169ad59a25d9 /Doc/library
parent7ecc5ba7be9448badd6030eeb56692846dd11c5b (diff)
parentace51622941d792e3bf610e039735fe6136920bb (diff)
downloadcpython-fb4dc080eb52e28f0b1cb5fbd95292108e71d8c6.zip
cpython-fb4dc080eb52e28f0b1cb5fbd95292108e71d8c6.tar.gz
cpython-fb4dc080eb52e28f0b1cb5fbd95292108e71d8c6.tar.bz2
Merge: starmap/starmap_async for whatsnew, and fix multiprocessing Pool markup.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/multiprocessing.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 6c29e3f..82c8610 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -29,7 +29,7 @@ Windows.
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
+ as the :class:`multiprocessing.pool.Pool` examples will not work in the
interactive interpreter. For example::
>>> from multiprocessing import Pool
@@ -1638,7 +1638,7 @@ Process Pools
One can create a pool of processes which will carry out tasks submitted to it
with the :class:`Pool` class.
-.. class:: multiprocessing.Pool([processes[, initializer[, initargs[, maxtasksperchild]]]])
+.. class:: Pool([processes[, initializer[, initargs[, maxtasksperchild]]]])
A process pool object which controls a pool of worker processes to which jobs
can be submitted. It supports asynchronous results with timeouts and