Add "Using Python on Windows" document, by Robert Lehmann.

georg.brandl · georg.brandl · commit 826424725d4f · 2007-12-01T23:12:45.000Z
Written for GHOP. git-svn-id: http://svn.python.org/projects/python/trunk@59266 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Doc/distutils/extending.rst b/Doc/distutils/extending.rst
@@ -1,4 +1,4 @@
-.. _extending:
+.. _extending-distutils:
 
 *******************
 Extending Distutils
diff --git a/Doc/library/windows.rst b/Doc/library/windows.rst
@@ -1,3 +1,4 @@
+.. _mswin-specific-services:
 
 ****************************
 MS Windows Specific Services
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
@@ -1,5 +1,7 @@
 .. highlightlang:: none
 
+.. _using-on-general:
+
 Command line and environment
 ============================
 
@@ -12,6 +14,8 @@ settings.
    :ref:`implementations` for further resources.
 
 
+.. _using-on-cmdline:
+
 Command line
 ------------
 
@@ -304,39 +308,21 @@ Miscellaneous options
 
 .. cmdoption:: -3
 
-   Warn about Python 3.x incompatibilities.
+   Warn about Python 3.x incompatibilities. Among these are:
 
-   .. versionadded:: 2.6
+   * :meth:`dict.has_key`
+   * :func:`apply`
+   * :func:`callable`
+   * :func:`coerce`
+   * :func:`execfile`
+   * :func:`reduce`
+   * :func:`reload`
 
+   .. versionadded:: 2.6
 
-Related files -- UNIX
----------------------
 
-These are subject to difference depending on local installation conventions;
-:envvar:`prefix` (``${prefix}``) and :envvar:`exec_prefix` (``${exec_prefix}``)
-are installation-dependent and should be interpreted as for GNU software; they
-may be the same.
-
-For example, on most Linux systems, the default for both is :file:`/usr`.
-
-+-----------------------------------------------+------------------------------------------+
-| File/directory                                | Meaning                                  |
-+===============================================+==========================================+
-| :file:`{exec_prefix}/bin/python`              | Recommended location of the interpreter. |
-+-----------------------------------------------+------------------------------------------+
-| :file:`{prefix}/lib/python{version}`,         | Recommended locations of the directories |
-| :file:`{exec_prefix}/lib/python{version}`     | containing the standard modules.         |
-+-----------------------------------------------+------------------------------------------+
-| :file:`{prefix}/include/python{version}`,     | Recommended locations of the directories |
-| :file:`{exec_prefix}/include/python{version}` | containing the include files needed for  |
-|                                               | developing Python extensions and         |
-|                                               | embedding the interpreter.               |
-+-----------------------------------------------+------------------------------------------+
-| :file:`~/.pythonrc.py`                        | User-specific initialization file loaded |
-|                                               | by the user module; not used by default  |
-|                                               | or by most applications.                 |
-+-----------------------------------------------+------------------------------------------+
 
+.. _using-on-envvars:
 
 Environment variables
 ---------------------
diff --git a/Doc/using/index.rst b/Doc/using/index.rst
@@ -13,5 +13,6 @@ interpreter and things that make working with Python easier.
 .. toctree::
 
    cmdline.rst
+   windows.rst
    mac.rst
 
diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.. _extending:`
	`1`	`+.. _extending-distutils:`
`2`	`2`
`3`	`3`	`*******************`
`4`	`4`	`Extending Distutils`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+.. _mswin-specific-services:`
`1`	`2`
`2`	`3`	`****************************`
`3`	`4`	`MS Windows Specific Services`