[Python-checkins] cpython (merge 3.2 -> 3.3): #16530: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/7359ade2ab0b
changeset:   80571:7359ade2ab0b
branch:      3.3
parent:      80567:421a8a5ffbb2
parent:      80570:1cf1194a443e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 23 19:46:29 2012 +0200
summary:
  #16530: merge with 3.2.

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


diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2925,7 +2925,7 @@
    with :const:`P_NOWAIT` return suitable process handles.
 
 
-.. function:: wait3([options])
+.. function:: wait3(options)
 
    Similar to :func:`waitpid`, except no process id argument is given and a
    3-element tuple containing the child's process id, exit status indication, and

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