Update Python version numbers from 1.6 to 2.0 where appropriate.

Make some references between the distutils documents hyperlinks using
the \citetitle markup.

diff --git a/Doc/dist/dist.tex b/Doc/dist/dist.tex
index 58b88d55b4b2dd37815e4724dd99cc092fa0cf8c..8f171151939bb38e1b63d81da472f336afdb2ece 100644 (file)
--- a/Doc/dist/dist.tex
+++ b/Doc/dist/dist.tex
@@ -21,20 +21,21 @@ In the past, Python module developers have not had much infrastructure
 support for distributing modules, nor have Python users had much support
 for installing and maintaining third-party modules.  With the
 introduction of the Python Distribution Utilities (Distutils for short)
-in Python 1.6, this situation should start to improve.
+in Python 2.0, this situation should start to improve.
 
 This document only covers using the Distutils to distribute your Python
-modules.  Using the Distutils does not tie you to Python 1.6, though:
+modules.  Using the Distutils does not tie you to Python 2.0, though:
 the Distutils work just fine with Python 1.5, and it is reasonable (and
 expected to become commonplace) to expect users of Python 1.5 to
 download and install the Distutils separately before they can install
-your modules.  Python 1.6 users, of course, won't have to add anything
+your modules.  Python 2.0 users, of course, won't have to add anything
 to their Python installation in order to use the Distutils to install
 third-party modules.
 
 This document concentrates on the role of developer/distributor: if
-you're looking for information on installing Python modules, you should
-refer to the ``Installing Python Modules'' manual.
+you're looking for information on installing Python modules, you
+should refer to the \citetitle[../inst/inst.html]{Installing Python
+Modules} manual.
 
 
 \section{Concepts \& Terminology}
@@ -223,7 +224,7 @@ supplied as keyword arguments to \function{setup()}.
 
 Here's a slightly more involved example, which we'll follow for the next
 couple of sections: the Distutils' own setup script.  (Keep in mind that
-although the Distutils are included with Python 1.6, they also have an
+although the Distutils are included with Python 2.0, they also have an
 independent existence so that Python 1.5 users can use them to install
 other module distributions.  The Distutils' own setup script is used to
 install the package into Python 1.5.)

diff --git a/Doc/inst/inst.tex b/Doc/inst/inst.tex
index c4e67aff4a25af5fb7623bcb97d00a55d3f86143..e6baac21e11dcfb49b05723910d3f9bac629639e 100644 (file)
--- a/Doc/inst/inst.tex
+++ b/Doc/inst/inst.tex
@@ -48,7 +48,7 @@ written in Python.
 
 In the past, there has been little support for adding third-party
 modules to an existing Python installation.  With the introduction of
-the Python Distribution Utilities (Distutils for short) in Python 1.6,
+the Python Distribution Utilities (Distutils for short) in Python 2.0,
 this is starting to change.  Not everything will change overnight,
 though, so while this document concentrates on installing module
 distributions that use the Distutils, we will also spend some time
@@ -62,7 +62,7 @@ don't need to know Python to read this document; there will be some
 brief forays into using Python's interactive mode to explore your
 installation, but that's it.  If you're looking for information on how
 to distribute your own Python modules so that others may use them, see
-the ``Distributing Python Modules'' manual.
+the \citetitle[../dist/dist.html]{Distributing Python Modules} manual.
 
 
 \subsection{Best case: trivial installation}
@@ -274,12 +274,12 @@ being installed is pure Python or contains extensions (``non-pure''):
 \begin{tableiv}{l|l|l|c}{textrm}%
   {Platform}{Standard installation location}{Default value}{Notes}
   \lineiv{Unix (pure)}
-          {\filenq{\filevar{prefix}/lib/python1.6/site-packages}}
-          {\filenq{/usr/local/lib/python1.6/site-packages}}
+          {\filenq{\filevar{prefix}/lib/python2.0/site-packages}}
+          {\filenq{/usr/local/lib/python2.0/site-packages}}
           {(1)}
   \lineiv{Unix (non-pure)}
-          {\filenq{\filevar{exec-prefix}/lib/python1.6/site-packages}}
-          {\filenq{/usr/local/lib/python1.6/site-packages}}
+          {\filenq{\filevar{exec-prefix}/lib/python2.0/site-packages}}
+          {\filenq{/usr/local/lib/python2.0/site-packages}}
           {(1)}
   \lineiv{Windows}
           {\filenq{\filevar{prefix}}}
@@ -314,11 +314,12 @@ often the same under Unix.  You can find out what your Python
 installation uses for \filevar{prefix} and \filevar{exec-prefix} by
 running Python in interactive mode and typing a few simple commands.
 Under Unix, just type \code{python} at the shell prompt; under Windows,
-run ``Python 1.6 (interpreter)'' \XXX{right?}; under Mac~OS, \XXX{???}.
-Once the interpreter is started, you type Python code at the \code{>>>}
-prompt.  For example, on my Linux system, I type the three Python
-statements shown below, and get the output as shown, to find out my
-\filevar{prefix} and \filevar{exec-prefix}:
+run ``Python 2.0 (interpreter)'' \XXX{right?}; under Mac~OS, \XXX{???}.
+Once the interpreter is started, you type Python code at the
+\samp{>>> } prompt.  For example, on my Linux system, I type the three
+Python statements shown below, and get the output as shown, to find
+out my \filevar{prefix} and \filevar{exec-prefix}:
+
 \begin{verbatim}
 Python 1.5.2 (#1, Apr 18 1999, 16:03:16)  [GCC pgcc-2.91.60 19981201 (egcs-1.1.1  on linux2
 Copyright 1991-1995 Stichting Mathematisch Centrum, Amsterdam