Merged revisions 59376-59406 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59377 | georg.brandl | 2007-12-06 01:24:23 +0100 (Thu, 06 Dec 2007) | 2 lines

  Add another GHOP student to ACKS.
........
  r59378 | raymond.hettinger | 2007-12-06 01:56:53 +0100 (Thu, 06 Dec 2007) | 5 lines

  Fix Issue 1045.
  Factor-out common calling code by simplifying the length_hint API.
  Speed-up the function by caching the PyObject_String for the attribute lookup.
........
  r59380 | georg.brandl | 2007-12-06 02:52:24 +0100 (Thu, 06 Dec 2007) | 2 lines

  Diverse markup fixes.
........
  r59383 | georg.brandl | 2007-12-06 10:45:39 +0100 (Thu, 06 Dec 2007) | 2 lines

  Better re.split examples.
........
  r59386 | christian.heimes | 2007-12-06 14:15:13 +0100 (Thu, 06 Dec 2007) | 2 lines

  Fixed get_config_h_filename for Windows. Without the patch it can't find the pyconfig.h file inside a build tree.
  Added several small unit tests for sysconfig.
........
  r59387 | christian.heimes | 2007-12-06 14:30:11 +0100 (Thu, 06 Dec 2007) | 1 line

  Silence more warnings, _CRT_NONSTDC_NO_DEPRECATE is already defined in pyconfig.h but several projects don't include it.
........
  r59389 | christian.heimes | 2007-12-06 14:55:01 +0100 (Thu, 06 Dec 2007) | 1 line

  Disabled one test that is failing on Unix
........
  r59399 | christian.heimes | 2007-12-06 22:13:06 +0100 (Thu, 06 Dec 2007) | 8 lines

  Several Windows related cleanups:
  * Removed a #define from pyconfig.h. The macro was already defined a few lines higher.
  * Fixed path to tix in the build_tkinter.py script
  * Changed make_buildinfo.c to use versions of unlink and strcat which are considered safe by Windows (as suggested by MvL).
  * Removed two defines from pyproject.vsprops that are no longer required. Both are defined in pyconfig.h and make_buildinfo.c doesn't use the unsafe versions any more (as suggested by MvL).
  * Added some more information about PGO and the property files to PCbuild9/readme.txt.

  Are you fine with the changes, Martin?
........
  r59400 | raymond.hettinger | 2007-12-07 02:53:01 +0100 (Fri, 07 Dec 2007) | 4 lines

  Don't have the docs berate themselves.  Keep a professional tone.
  If a todo is needed, put it in the tracker.
........
  r59402 | georg.brandl | 2007-12-07 10:07:10 +0100 (Fri, 07 Dec 2007) | 3 lines

  Increase unit test coverage of SimpleXMLRPCServer.
  Written for GHOP by Turkay Eren.
........
  r59406 | georg.brandl | 2007-12-07 16:16:57 +0100 (Fri, 07 Dec 2007) | 2 lines

  Update to windows doc from Robert.
........

1 files changed, 12 insertions, 5 deletions

diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index 9f549fa..9a16938 100644
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -73,6 +73,8 @@ key features:
     Popular modules (such as PyWin32) with their respective documentation, tool
     suite for building extensible python applications
 
+Notice that these packages are likely to install *older* versions of Python.
+
 
 
 Configuring Python
@@ -85,10 +87,11 @@ settings in Windows.
 Excursus: Setting environment variables
 ---------------------------------------
 
-Windows has a built-in dialog for changing environment variables: Right-click
-the icon for your machine (usually located on your Desktop and called "My
-Computer") and choose :menuselection:`Properties` there.  Then, open the
-:guilabel:`Advanced` tab and click the :guilabel:`Environment Variables` button.
+Windows has a built-in dialog for changing environment variables (following
+guide applies to XP classical view): Right-click the icon for your machine 
+(usually located on your Desktop and called "My Computer") and choose 
+:menuselection:`Properties` there.  Then, open the :guilabel:`Advanced` tab 
+and click the :guilabel:`Environment Variables` button.
 
 In short, your path is:
 
@@ -107,7 +110,8 @@ command::
     set PYTHONPATH=%PYTHONPATH%;C:\My_python_lib
 
 To make this setting permanent, you could add the corresponding command line to
-your :file:`autoexec.bat`.
+your :file:`autoexec.bat`. :program:`msconfig` is a graphical interface to this
+file.
 
 Viewing environment variables can also be done more straight-forward: The
 command prompt will expand strings wrapped into percent signs automatically::
@@ -124,6 +128,9 @@ Consult :command:`set /?` for details on this behaviour.
    http://support.microsoft.com/kb/310519
       How To Manage Environment Variables in Windows XP
 
+   http://www.chem.gla.ac.uk/~louis/software/faq/q1.html
+      Setting Environment variables, Louis J. Farrugia
+
 
 Finding the Python executable
 -----------------------------