backport bug [ 1190204 ] 3.29 site is confusing re site-packages on Windows

diff --git a/Doc/lib/libsite.tex b/Doc/lib/libsite.tex
index cfc17d1bc459b7fadd8a4b42ad97eff356e7be6d..43b8db2420d1e30260408ad050c09d3ca903901a 100644 (file)
--- a/Doc/lib/libsite.tex
+++ b/Doc/lib/libsite.tex
@@ -17,8 +17,8 @@ It starts by constructing up to four directories from a head and a
 tail part.  For the head part, it uses \code{sys.prefix} and
 \code{sys.exec_prefix}; empty heads are skipped.  For
 the tail part, it uses the empty string (on Windows) or
-it uses first \file{lib/python\shortversion/site-packages} and then
-\file{lib/site-python} (on \UNIX and Macintosh).  For each of the distinct
+\file{lib/python\shortversion/site-packages} (on \UNIX{} and Macintosh)
+and then \file{lib/site-python}.  For each of the distinct
 head-tail combinations, it sees if it refers to an existing directory,
 and if so, adds it to \code{sys.path} and also inspects the newly added 
 path for configuration files.

diff --git a/Misc/NEWS b/Misc/NEWS
index 85da3470c882d10267e61752725370a95fd3ea77..55219f54d9d316e9c1d891dba48c9100ac9d37c0 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -120,6 +120,8 @@ Build
 Documentation
 -------------
 
+- Bug #1190204: Clarify which directories are searched by site.py.
+
 - Bug #1193849: Clarify os.path.expanduser() documentation.
 
 - Bug #1243192: re.UNICODE and re.LOCALE affect \d, \D, \s and \S.