summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-04-16 18:17:55 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-04-16 18:17:55 (GMT)
commitb729135eeea59cf3a8fb8fb82b1c608d85cd26b3 (patch)
tree06708e9d8d8713bd5ad0c31072f7d4a4839035e9 /Doc
parentad37e68227bf6c885590d84995914d1c4f3aa01a (diff)
downloadcpython-b729135eeea59cf3a8fb8fb82b1c608d85cd26b3.zip
cpython-b729135eeea59cf3a8fb8fb82b1c608d85cd26b3.tar.gz
cpython-b729135eeea59cf3a8fb8fb82b1c608d85cd26b3.tar.bz2
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. ........
Diffstat (limited to 'Doc')
-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 bdce318..5c73174 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