From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 19 Apr 2011 20:24:32 +0000 (+0300)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2553
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4571ee0b781e569612d04572050792faa66f02af;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2.
---

4571ee0b781e569612d04572050792faa66f02af
diff --cc Doc/library/subprocess.rst
index 3faf60fa75b3,567773845687..ab5668caf516
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@@ -255,10 -244,10 +255,10 @@@ This module defines one class called :c
  Convenience Functions
  ^^^^^^^^^^^^^^^^^^^^^
  
- This module also defines four shortcut functions:
+ This module also defines the following shortcut functions:
  
  
 -.. function:: call(*popenargs, **kwargs)
 +.. function:: call(*popenargs, timeout=None, **kwargs)
  
     Run command with arguments.  Wait for command to complete, then return the
     :attr:`returncode` attribute.