From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 13 Oct 2014 22:53:13 +0000 (+0200)
Subject: Merge 3.4 (asyncio doc)
X-Git-Tag: v3.5.0a1~665
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=395c73436e279f53930ce66d682600d327f4e3c8;p=python

Merge 3.4 (asyncio doc)
---

395c73436e279f53930ce66d682600d327f4e3c8
diff --cc Doc/library/subprocess.rst
index 6e495b3430,36cbf3c5f3..49a82bd92a
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@@ -634,8 -634,7 +634,8 @@@ Instances of the :class:`Popen` class h
     ``None``, if no data should be sent to the child.  The type of *input*
     must be bytes or, if *universal_newlines* was ``True``, a string.
  
-    :meth:`communicate` returns a tuple ``(stdoutdata, stderrdata)``.
+    :meth:`communicate` returns a tuple ``(stdout_data, stderr_data)``.
 +   The data will be bytes or, if *universal_newlines* was ``True``, strings.
  
     Note that if you want to send data to the process's stdin, you need to create
     the Popen object with ``stdin=PIPE``.  Similarly, to get anything other than