Implemented PEP 370
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 355e9ed..a6ab7ad 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -21,7 +21,7 @@
When invoking Python, you may specify any of these options::
- python [-dEiOQStuUvxX3?] [-c command | -m module-name | script | - ] [args]
+ python [-dEiOQsStuUvxX3?] [-c command | -m module-name | script | - ] [args]
The most common use case is, of course, a simple invocation of a script::
@@ -240,6 +240,17 @@
:pep:`238` -- Changing the division operator
+.. cmdoption:: -s
+
+ Don't add user site directory to sys.path
+
+ .. versionadded:: 2.6
+
+ .. seealso::
+
+ :pep:`370` -- Per user site-packages directory
+
+
.. cmdoption:: -S
Disable the import of the module :mod:`site` and the site-dependent
@@ -471,6 +482,28 @@
.. versionadded:: 2.6
+.. envvar:: PYTHONNOUSERSITE
+
+ If this is set, Python won't add the user site directory to sys.path
+
+ .. versionadded:: 2.6
+
+ .. seealso::
+
+ :pep:`370` -- Per user site-packages directory
+
+
+.. envvar:: PYTHONUSERBASE
+
+ Sets the base directory for the user site directory
+
+ .. versionadded:: 2.6
+
+ .. seealso::
+
+ :pep:`370` -- Per user site-packages directory
+
+
.. envvar:: PYTHONEXECUTABLE
If this environment variable is set, ``sys.argv[0]`` will be set to its