Merged revisions 71651 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71651 | r.david.murray | 2009-04-16 14:12:53 -0400 (Thu, 16 Apr 2009) | 2 lines
Less red ink (warning->note) and add link to def of side-by-side assembly.
........
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index 8ae01da..ed9a762 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -97,13 +97,15 @@
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