[Python-checkins] r71652 - in python/branches/py3k: Doc/library/subprocess.rst

Thu Apr 16 20:15:34 CEST 2009

Author: r.david.murray
Date: Thu Apr 16 20:15:32 2009
New Revision: 71652
Log:
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 (2009年4月16日) | 2 lines
 
 Less red ink (warning->note) and add link to def of side-by-side assembly.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Doc/library/subprocess.rst
Modified: python/branches/py3k/Doc/library/subprocess.rst
==============================================================================

--- python/branches/py3k/Doc/library/subprocess.rst	(original)
+++ python/branches/py3k/Doc/library/subprocess.rst	Thu Apr 16 20:15:32 2009
@@ -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
