diff options
| author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-10-17 14:21:36 (GMT) |
|---|---|---|
| committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-10-17 14:21:36 (GMT) |
| commit | 72db18c4c0e17d46a466c0fac04a111440c43ca0 (patch) | |
| tree | 64d2d3b38a59cdb3a87efb8fb34bbfd481a2535d | |
| parent | 31605ace0d9247eaadd7377476128f7c1660e7d9 (diff) | |
| parent | 2365f41a0e576ffdc880c9899d0cc5c0eaef97bc (diff) | |
| download | cpython-72db18c4c0e17d46a466c0fac04a111440c43ca0.zip cpython-72db18c4c0e17d46a466c0fac04a111440c43ca0.tar.gz cpython-72db18c4c0e17d46a466c0fac04a111440c43ca0.tar.bz2 | |
null merge
| -rw-r--r-- | Doc/using/cmdline.rst | 6 | ||||
| -rw-r--r-- | Misc/ACKS | 1 |
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. - @@ -997,6 +997,7 @@ Hugo van Rossum Saskia van Rossum Donald Wallace Rouse II Liam Routt +Todd Rovito Craig Rowland Clinton Roy Paul Rubin |