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

Fri Nov 23 18:47:07 CET 2012

http://hg.python.org/cpython/rev/a728056347ec
changeset: 80572:a728056347ec
parent: 80568:51caa0820fad
parent: 80571:7359ade2ab0b
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Fri Nov 23 19:46:52 2012 +0200
summary:
 #16530: merge with 3.3.
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
