[Python-checkins] cpython (merge 3.3 -> default): Merge.

[richard.oudkerk]

http://hg.python.org/cpython/rev/9dbfe5384301
changeset:   84315:9dbfe5384301
parent:      84312:4f08d4647f75
parent:      84314:347647a1f798
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Mon Jun 24 18:13:54 2013 +0100
summary:
  Merge.

files:
  Doc/library/multiprocessing.rst |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -520,8 +520,9 @@
    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`

-- 
Repository URL: http://hg.python.org/cpython