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

[richard.oudkerk]

http://hg.python.org/cpython/rev/efe3c1df3954
changeset:   84318:efe3c1df3954
parent:      84315:9dbfe5384301
parent:      84317:6e2f02b59fcf
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Mon Jun 24 20:39:28 2013 +0100
summary:
  Merge.

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


diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -525,7 +525,7 @@
    :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`
+       infinitesimal delay before the queue's :meth:`~Queue.empty`
        method returns :const:`False` and :meth:`~Queue.get_nowait` can
        return without raising :exc:`Queue.Empty`.
 

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