Merged revisions 74535 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74535 | tarek.ziade | 2009-08-21 16:22:45 +0200 (Fri, 21 Aug 2009) | 9 lines

  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 42f41a7e8316de0e385f9600405ab9c188644d44..36460610f6a7eaa758c7f65e7b6fe9ef869b7695 100644 (file)
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -703,7 +703,8 @@ Notes:
 (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 @@ Notes:
    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 d6000b0fedaad73371afaf0593df9443e55dc8ac..099f73a116790ae825c7ada02619ed0ded4b0dfe 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -122,6 +122,12 @@ directories.
 - Issue 5390: Add uninstall icon independent of whether file
 extensions are installed.
 
+Documentation
+-------------
+
+- Issue #6556: Fixed the Distutils configuration files location explanation
+  for Windows.
+
 Test
 ----