Issue #9583: Document startup option/environment interaction.

Patch by Todd Rovito.

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 2537c485718afa3e2334c1faac17762711164833..f99060bd57f5816e60e1bccb0ae787d95a7b4c14 100644 (file)
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -442,7 +442,10 @@ Options you shouldn't use
 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
 
@@ -638,4 +641,3 @@ if Python was configured with the ``--with-pydebug`` build option.
 
    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
index 63ef470be896b7193c9ad68cd8e8ef3062e0a40d..ecd52e0bf60ac6607603cc830cca1cebb1d9d388 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -832,6 +832,7 @@ Hugo van Rossum
 Saskia van Rossum
 Donald Wallace Rouse II
 Liam Routt
+Todd Rovito
 Craig Rowland
 Clinton Roy
 Paul Rubin