Issue #9583: Document startup option/environment interaction.

Patch by Todd Rovito.

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 0d12126a4de60d7df2943b89c12f605856148842..cd4d02f9b09478e6d44fdf6d01db6333e278522b 100644 (file)
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -379,7 +379,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
 
@@ -570,4 +573,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 7429f77beb38ae91085be749d6fa256876f48fb3..ba87ecbb79b6c73997a4144dc0227302fec32a59 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -901,6 +901,7 @@ Hugo van Rossum
 Saskia van Rossum
 Donald Wallace Rouse II
 Liam Routt
+Todd Rovito
 Craig Rowland
 Clinton Roy
 Paul Rubin