summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/using/cmdline.rst6
-rw-r--r--Misc/ACKS1
2 files changed, 5 insertions, 2 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 8864b79..dbe6c47 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -380,7 +380,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
@@ -577,4 +580,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 a17cf73..1e16600 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -997,6 +997,7 @@ Hugo van Rossum
Saskia van Rossum
Donald Wallace Rouse II
Liam Routt
+Todd Rovito
Craig Rowland
Clinton Roy
Paul Rubin