[Python-checkins] cpython (merge 3.3 -> 3.3): null merge

[andrew.svetlov]

http://hg.python.org/cpython/rev/89c0df755a83
changeset:   79799:89c0df755a83
branch:      3.3
parent:      79792:f281d7700339
parent:      79796:f0bb61cbc046
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Wed Oct 17 17:21:36 2012 +0300
summary:
  null merge

files:
  Doc/using/cmdline.rst |  6 ++++--
  Misc/ACKS             |  1 +
  2 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -380,7 +380,10 @@
 Environment variables
 ---------------------
 
-These environment variables influence Python's behavior.
+These environment variables influence Python's behavior, they are processed
+before the command-line switches other than -E.  It is customary that
+command-line switches override environmental variables where there is a
+conflict.
 
 .. envvar:: PYTHONHOME
 
@@ -577,4 +580,3 @@
 
    If set, Python will print memory allocation statistics every time a new
    object arena is created, and on shutdown.
-
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -997,6 +997,7 @@
 Saskia van Rossum
 Donald Wallace Rouse II
 Liam Routt
+Todd Rovito
 Craig Rowland
 Clinton Roy
 Paul Rubin

-- 
Repository URL: http://hg.python.org/cpython