Merge issue #9583: Document startup option/environment interaction.

Patch by Todd Rovito.
This commit is contained in:
Andrew Svetlov 2012-10-17 17:16:45 +03:00
commit 41695b6673
2 changed files with 5 additions and 2 deletions

View File

@ -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.

View File

@ -997,6 +997,7 @@ Hugo van Rossum
Saskia van Rossum
Donald Wallace Rouse II
Liam Routt
Todd Rovito
Craig Rowland
Clinton Roy
Paul Rubin