[Python-checkins] r75761 - in python/branches/release26-maint: Doc/library/multiprocessing.rst

[georg.brandl]

Author: georg.brandl
Date: Tue Oct 27 14:22:19 2009
New Revision: 75761

Log:
Merged revisions 68842,68862 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68842 | andrew.kuchling | 2009-01-21 03:16:26 +0100 (Mi, 21 Jan 2009) | 1 line
  
  Markup fixes
........
  r68862 | jesse.noller | 2009-01-22 22:53:22 +0100 (Do, 22 Jan 2009) | 1 line
  
  Issue 4593: apply() documentation is unclear
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/multiprocessing.rst

Modified: python/branches/release26-maint/Doc/library/multiprocessing.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/multiprocessing.rst	(original)
+++ python/branches/release26-maint/Doc/library/multiprocessing.rst	Tue Oct 27 14:22:19 2009
@@ -1539,7 +1539,9 @@
    .. method:: apply(func[, args[, kwds]])
 
       Equivalent of the :func:`apply` builtin function.  It blocks till the
-      result is ready.
+      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]]])