summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-01-18 05:49:30 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-01-18 05:49:30 (GMT)
commit3c16c1d821f307bca3a72f34c1a7dc2b56cb8eff (patch)
tree5bd6083774182e51a572e4a8980301b8cb7b03db /Doc
parent9308c420d3a801e0f3605605cf30be8c383d9d67 (diff)
parentaf69fe2311c184a64e1dbfae75646d5d6c268d32 (diff)
downloadcpython-3c16c1d821f307bca3a72f34c1a7dc2b56cb8eff.zip
cpython-3c16c1d821f307bca3a72f34c1a7dc2b56cb8eff.tar.gz
cpython-3c16c1d821f307bca3a72f34c1a7dc2b56cb8eff.tar.bz2
merge 3.3
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/subprocess.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index 9f15753..95a85ce 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -729,7 +729,7 @@ The following attributes are also available:
output from the child process. If the *universal_newlines* argument was
``True``, the stream is a text stream, otherwise it is a byte stream. If the
*stdout* argument was not :data:`PIPE`, this attribute is ``None``.
-
+
.. attribute:: Popen.stderr