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

[ezio.melotti]

http://hg.python.org/cpython/rev/c1b29ce313e0
changeset:   69455:c1b29ce313e0
parent:      69451:5b253226cd36
parent:      69454:9179bd4037ad
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue Apr 19 23:24:32 2011 +0300
summary:
  Merge with 3.2.

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


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -255,7 +255,7 @@
 Convenience Functions
 ^^^^^^^^^^^^^^^^^^^^^
 
-This module also defines four shortcut functions:
+This module also defines the following shortcut functions:
 
 
 .. function:: call(*popenargs, timeout=None, **kwargs)

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