summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2013-06-24 17:13:54 (GMT)
committerRichard Oudkerk <shibturn@gmail.com>2013-06-24 17:13:54 (GMT)
commit93b736ee15456a81ed6b842109153fa8beb988b9 (patch)
tree1372cd44024f32bfe194778461eee74bb6c308cd /Doc
parent71e7dbd11dbff8343b3f35faf896c16bce480a68 (diff)
parent7b69da72b8e48920697c8bb44165709ec6df6f8c (diff)
downloadcpython-93b736ee15456a81ed6b842109153fa8beb988b9.zip
cpython-93b736ee15456a81ed6b842109153fa8beb988b9.tar.gz
cpython-93b736ee15456a81ed6b842109153fa8beb988b9.tar.bz2
Merge.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/multiprocessing.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 0185d20..c22f74e 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -520,8 +520,9 @@ Note that one can also create a shared queue by using a manager object -- see
When an object is put on a queue, the object is pickled and a
background thread later flushes the pickled data to an underlying
pipe. This has some consequences which are a little surprising,
- but should not cause any pratical difficulties -- you can always
- use a managed queue if they really bother you.
+ but should not cause any practical difficulties -- if they really
+ bother you then you can instead use a queue created with a
+ :ref:`manager <multiprocessing-managers>`.
(1) After putting an object on an empty queue there may be an
infinitessimal delay before the queue's :meth:`~Queue.empty`