summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-04-16 18:12:53 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-04-16 18:12:53 (GMT)
commit7203081025147efa18d7f36aa2bc234ba81498c3 (patch)
tree0d1cc66bfce4579ed7f549605f9911b351756fc1
parent2d693588024349dac18a882e0ff1b5721f81c89b (diff)
downloadcpython-7203081025147efa18d7f36aa2bc234ba81498c3.zip
cpython-7203081025147efa18d7f36aa2bc234ba81498c3.tar.gz
cpython-7203081025147efa18d7f36aa2bc234ba81498c3.tar.bz2
Less red ink (warning->note) and add link to def of side-by-side assembly.
-rw-r--r--Doc/library/subprocess.rst10
1 files changed, 6 insertions, 4 deletions
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index eb12bff..685e941 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -102,13 +102,15 @@ This module defines one class called :class:`Popen`:
variables for the new process; these are used instead of inheriting the current
process' environment, which is the default behavior.
- .. warning::
+ .. note::
- When replacing the environment you must provide any variables
- required for the program to execute. On Windows, in order to run
- a side-by-side assembly the specified *env* must include a valid
+ If specified, *env* must provide any variables required
+ for the program to execute. On Windows, in order to run a
+ `side-by-side assembly`_ the specified *env* **must** include a valid
:envvar:`SystemRoot`.
+ .. _side-by-side assembly: http://en.wikipedia.org/wiki/Side-by-Side_Assembly
+
If *universal_newlines* is :const:`True`, the file objects stdout and stderr are
opened as text files, but lines may be terminated by any of ``'\n'``, the Unix
end-of-line convention, ``'\r'``, the old Macintosh convention or ``'\r\n'``, the