summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2014-10-03 15:56:22 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2014-10-03 15:56:22 (GMT)
commit4d2aba3ab38b7a9de01aaf821570c2e0bd1aa02a (patch)
treeb3070a37044fc4ea1efaa7fd5f1ceb0e075cedfd
parentb55f944fa9867bc761f101b6b9702bb78ecfd447 (diff)
parent7280561b5b2363c50797fbec301fefcd1e5a8040 (diff)
downloadcpython-4d2aba3ab38b7a9de01aaf821570c2e0bd1aa02a.zip
cpython-4d2aba3ab38b7a9de01aaf821570c2e0bd1aa02a.tar.gz
cpython-4d2aba3ab38b7a9de01aaf821570c2e0bd1aa02a.tar.bz2
Merge with 3.4
-rw-r--r--Doc/library/multiprocessing.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 2d09f1c..3b47391 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -842,7 +842,7 @@ Miscellaneous
Return list of all live children of the current process.
- Calling this has the side affect of "joining" any processes which have
+ Calling this has the side effect of "joining" any processes which have
already finished.
.. function:: cpu_count()
@@ -2467,7 +2467,7 @@ Joining processes that use queues
items which have been put on the queue will eventually be removed before the
process is joined. Otherwise you cannot be sure that processes which have
put items on the queue will terminate. Remember also that non-daemonic
- processes will be automatically be joined.
+ processes will be joined automatically.
An example which will deadlock is the following::
@@ -2483,7 +2483,7 @@ Joining processes that use queues
p.join() # this deadlocks
obj = queue.get()
- A fix here would be to swap the last two lines round (or simply remove the
+ A fix here would be to swap the last two lines (or simply remove the
``p.join()`` line).
Explicitly pass resources to child processes