From: Walter Dörwald <walter@livinglogic.de>
Date: Thu, 14 Apr 2005 20:23:39 +0000 (+0000)
Subject: Backport relevant part of checkin:
X-Git-Tag: v2.4.2c1~236
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9499857237ac264b57d39870682a3066f9b009dc;p=thirdparty%2FPython%2Fcpython.git

Backport relevant part of checkin:
SF patch #1180062 by George Yoshida:
(Doc/lib/libfunctional.tex: "in an new object" should read "in a new object")
Doc/lib/libsubprocess.tex: argument name is wrong; comma is missing
---

diff --git a/Doc/lib/libsubprocess.tex b/Doc/lib/libsubprocess.tex
index 77bd83e7c296..3a1295838056 100644
--- a/Doc/lib/libsubprocess.tex
+++ b/Doc/lib/libsubprocess.tex
@@ -173,7 +173,7 @@ Wait for child process to terminate.  Returns returncode attribute.
 \begin{methoddesc}{communicate}{input=None}
 Interact with process: Send data to stdin.  Read data from stdout and
 stderr, until end-of-file is reached.  Wait for process to terminate.
-The optional \var{stdin} argument should be a string to be sent to the
+The optional \var{input} argument should be a string to be sent to the
 child process, or \code{None}, if no data should be sent to the child.
 
 communicate() returns a tuple (stdout, stderr).
@@ -358,7 +358,7 @@ executed.}
 \begin{verbatim}
 (child_stdout, child_stdin) = popen2.popen2("somestring", bufsize, mode)
 ==>
-p = Popen(["somestring"], shell=True, bufsize=bufsize
+p = Popen(["somestring"], shell=True, bufsize=bufsize,
           stdin=PIPE, stdout=PIPE, close_fds=True)
 (child_stdout, child_stdin) = (p.stdout, p.stdin)
 \end{verbatim}