[Python-checkins] cpython (merge 3.3 -> default): #17364: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/b87e9b8dc9ad
changeset:   82509:b87e9b8dc9ad
parent:      82505:75c0cb169be5
parent:      82508:5e294202f93e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Mar 06 03:23:52 2013 +0200
summary:
  #17364: merge with 3.3.

files:
  Doc/library/multiprocessing.rst |  1 -
  1 files changed, 0 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
@@ -608,7 +608,6 @@
       :exc:`queue.Empty` exception (*timeout* is ignored in that case).
 
    .. method:: get_nowait()
-               get_no_wait()
 
       Equivalent to ``get(False)``.
 

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