Commit 0dccbe13 authored by Andrew Svetlov's avatar Andrew Svetlov

null merge

parents 1eff0fc3 abfc7df1
...@@ -379,7 +379,10 @@ Options you shouldn't use ...@@ -379,7 +379,10 @@ Options you shouldn't use
Environment variables 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 .. envvar:: PYTHONHOME
...@@ -570,4 +573,3 @@ if Python was configured with the ``--with-pydebug`` build option. ...@@ -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 If set, Python will print memory allocation statistics every time a new
object arena is created, and on shutdown. object arena is created, and on shutdown.
...@@ -901,6 +901,7 @@ Hugo van Rossum ...@@ -901,6 +901,7 @@ Hugo van Rossum
Saskia van Rossum Saskia van Rossum
Donald Wallace Rouse II Donald Wallace Rouse II
Liam Routt Liam Routt
Todd Rovito
Craig Rowland Craig Rowland
Clinton Roy Clinton Roy
Paul Rubin Paul Rubin
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment