From: Jesse Noller <jnoller@gmail.com>
Date: Thu, 22 Jan 2009 21:56:13 +0000 (+0000)
Subject: merge r68862 to py3k
X-Git-Tag: v3.1a1~429
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b3c89d88cac53325b30f583643d288426d90789;p=thirdparty%2FPython%2Fcpython.git

merge r68862 to py3k
---

diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 50714ef8826d..617885157108 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1522,7 +1522,9 @@ with the :class:`Pool` class.
    .. method:: apply(func[, args[, kwds]])
 
       Call *func* with arguments *args* and keyword arguments *kwds*.  It blocks
-      till the result is ready.
+      till the result is ready. Given this blocks - :meth:`apply_async` is better suited
+      for performing work in parallel. Additionally, the passed
+      in function is only executed in one of the workers of the pool.
 
    .. method:: apply_async(func[, args[, kwds[, callback]]])