diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-08-06 14:58:15 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-08-06 14:58:15 (GMT) |
| commit | 7dc76fdeb14e0a2bf1248d78c2439b5a244f8885 (patch) | |
| tree | c1713816362d4310d28e81f27073cfedb7743429 /Doc/using/cmdline.rst | |
| parent | 29f6297605fba9f7313b2aeaf2ddbb06653cfdbb (diff) | |
| parent | 6ef038e78c0c76e77b2561a154182264b7b9907a (diff) | |
| download | cpython-7dc76fdeb14e0a2bf1248d78c2439b5a244f8885.zip cpython-7dc76fdeb14e0a2bf1248d78c2439b5a244f8885.tar.gz cpython-7dc76fdeb14e0a2bf1248d78c2439b5a244f8885.tar.bz2 | |
Merge doc changes from 3.2 (#8617, #10745).
In the install and library docs, I changed the text to refer to
packaging instead of distutils. I also checked that the documented
paths correctly reflect what’s really defined in sysconfig; the main
difference with paths defined in distutils.install is that include
directories don’t end with the distribution name anymore (i.e. distutils
uses include/python3.3/spam, sysconfig include/python3.3), I have no
idea why.
Diffstat (limited to 'Doc/using/cmdline.rst')
| -rw-r--r-- | Doc/using/cmdline.rst | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index 29c5772..f7bd92b 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -229,7 +229,8 @@ Miscellaneous options .. cmdoption:: -s - Don't add user site directory to sys.path + Don't add the :data:`user site-packages directory <site.USER_SITE>` to + :data:`sys.path`. .. seealso:: @@ -470,7 +471,8 @@ These environment variables influence Python's behavior. .. envvar:: PYTHONNOUSERSITE - If this is set, Python won't add the user site directory to sys.path + If this is set, Python won't add the :data:`user site-packages directory + <site.USER_SITE>` to :data:`sys.path`. .. seealso:: @@ -479,7 +481,10 @@ These environment variables influence Python's behavior. .. envvar:: PYTHONUSERBASE - Sets the base directory for the user site directory + Defines the :data:`user base directory <site.USER_BASE>`, which is used to + compute the path of the :data:`user site-packages directory <site.USER_SITE>` + and :ref:`Packaging installation paths <packaging-alt-install-user>` for + ``pysetup run install_dist --user``. .. seealso:: |