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

[ezio.melotti]

http://hg.python.org/cpython/rev/9179bd4037ad
changeset:   69454:9179bd4037ad
branch:      3.2
parent:      69448:937385024601
parent:      69453:fb261fa85429
user:        Ezio Melotti
date:        Tue Apr 19 23:23:47 2011 +0300
summary:
  Merge with 3.1.

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
@@ -244,7 +244,7 @@
 Convenience Functions
 ^^^^^^^^^^^^^^^^^^^^^
 
-This module also defines four shortcut functions:
+This module also defines the following shortcut functions:
 
 
 .. function:: call(*popenargs, **kwargs)

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