Merged revisions 74533 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74533 | tarek.ziade | 2009-08-21 16:11:26 +0200 (Fri, 21 Aug 2009) | 1 line
Fixed #6556: Corrected doc on how Distutils looks for its user configuration file under Windows
........
diff --git a/Doc/install/index.rst b/Doc/install/index.rst
index 42f41a7..3646061 100644
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -703,7 +703,8 @@
(2)
On Unix, if the :envvar:`HOME` environment variable is not defined, the user's
home directory will be determined with the :func:`getpwuid` function from the
- standard :mod:`pwd` module.
+ standard :mod:`pwd` module. This is done by the :func:`os.path.expanduser`
+ function used by Distutils.
(3)
I.e., in the current directory (usually the location of the setup script).
@@ -718,9 +719,10 @@
1.5.2 installation under Windows.
(5)
- On Windows, if the :envvar:`HOME` environment variable is not defined, no
- personal configuration file will be found or used. (In other words, the
- Distutils make no attempt to guess your home directory on Windows.)
+ On Windows, if the :envvar:`HOME` environment variable is not defined,
+ :envvar:`USERPROFILE` then :envvar:`HOMEDRIVE` and :envvar:`HOMEPATH` will
+ be tried. This is done by the :func:`os.path.expanduser` function used
+ by Distutils.
.. _inst-config-syntax:
diff --git a/Misc/NEWS b/Misc/NEWS
index c971741..aa218c4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -161,6 +161,12 @@
- Issue 5390: Add uninstall icon independent of whether file
extensions are installed.
+Documenation
+------------
+
+- Issue #6556: Fixed the Distutils configuration files location explanation
+ for Windows.
+
Tests
-----