Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 01df453

Browse files
freddrakefreddrake
committed
Update Python version numbers from 1.6 to 2.0 where appropriate.
Make some references between the distutils documents hyperlinks using the \citetitle markup.
1 parent 0e8c518 commit 01df453

2 files changed

Lines changed: 19 additions & 17 deletions

File tree

‎Doc/dist/dist.tex‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,21 @@ \section{Introduction}
2121
support for distributing modules, nor have Python users had much support
2222
for installing and maintaining third-party modules. With the
2323
introduction of the Python Distribution Utilities (Distutils for short)
24-
in Python 1.6, this situation should start to improve.
24+
in Python 2.0, this situation should start to improve.
2525

2626
This document only covers using the Distutils to distribute your Python
27-
modules. Using the Distutils does not tie you to Python 1.6, though:
27+
modules. Using the Distutils does not tie you to Python 2.0, though:
2828
the Distutils work just fine with Python 1.5, and it is reasonable (and
2929
expected to become commonplace) to expect users of Python 1.5 to
3030
download and install the Distutils separately before they can install
31-
your modules. Python 1.6 users, of course, won't have to add anything
31+
your modules. Python 2.0 users, of course, won't have to add anything
3232
to their Python installation in order to use the Distutils to install
3333
third-party modules.
3434

3535
This document concentrates on the role of developer/distributor: if
36-
you're looking for information on installing Python modules, you should
37-
refer to the ``Installing Python Modules'' manual.
36+
you're looking for information on installing Python modules, you
37+
should refer to the \citetitle[../inst/inst.html]{Installing Python
38+
Modules} manual.
3839

3940

4041
\section{Concepts \& Terminology}
@@ -223,7 +224,7 @@ \section{Writing the Setup Script}
223224

224225
Here's a slightly more involved example, which we'll follow for the next
225226
couple of sections: the Distutils' own setup script. (Keep in mind that
226-
although the Distutils are included with Python 1.6, they also have an
227+
although the Distutils are included with Python 2.0, they also have an
227228
independent existence so that Python 1.5 users can use them to install
228229
other module distributions. The Distutils' own setup script is used to
229230
install the package into Python 1.5.)

‎Doc/inst/inst.tex‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ \section{Introduction}
4848

4949
In the past, there has been little support for adding third-party
5050
modules to an existing Python installation. With the introduction of
51-
the Python Distribution Utilities (Distutils for short) in Python 1.6,
51+
the Python Distribution Utilities (Distutils for short) in Python 2.0,
5252
this is starting to change. Not everything will change overnight,
5353
though, so while this document concentrates on installing module
5454
distributions that use the Distutils, we will also spend some time
@@ -62,7 +62,7 @@ \section{Introduction}
6262
brief forays into using Python's interactive mode to explore your
6363
installation, but that's it. If you're looking for information on how
6464
to distribute your own Python modules so that others may use them, see
65-
the ``Distributing Python Modules'' manual.
65+
the \citetitle[../dist/dist.html]{Distributing Python Modules} manual.
6666

6767

6868
\subsection{Best case: trivial installation}
@@ -274,12 +274,12 @@ \subsection{How installation works}
274274
\begin{tableiv}{l|l|l|c}{textrm}%
275275
{Platform}{Standard installation location}{Default value}{Notes}
276276
\lineiv{Unix (pure)}
277-
{\filenq{\filevar{prefix}/lib/python1.6/site-packages}}
278-
{\filenq{/usr/local/lib/python1.6/site-packages}}
277+
{\filenq{\filevar{prefix}/lib/python2.0/site-packages}}
278+
{\filenq{/usr/local/lib/python2.0/site-packages}}
279279
{(1)}
280280
\lineiv{Unix (non-pure)}
281-
{\filenq{\filevar{exec-prefix}/lib/python1.6/site-packages}}
282-
{\filenq{/usr/local/lib/python1.6/site-packages}}
281+
{\filenq{\filevar{exec-prefix}/lib/python2.0/site-packages}}
282+
{\filenq{/usr/local/lib/python2.0/site-packages}}
283283
{(1)}
284284
\lineiv{Windows}
285285
{\filenq{\filevar{prefix}}}
@@ -314,11 +314,12 @@ \subsection{How installation works}
314314
installation uses for \filevar{prefix} and \filevar{exec-prefix} by
315315
running Python in interactive mode and typing a few simple commands.
316316
Under Unix, just type \code{python} at the shell prompt; under Windows,
317-
run ``Python 1.6 (interpreter)'' \XXX{right?}; under Mac~OS, \XXX{???}.
318-
Once the interpreter is started, you type Python code at the \code{>>>}
319-
prompt. For example, on my Linux system, I type the three Python
320-
statements shown below, and get the output as shown, to find out my
321-
\filevar{prefix} and \filevar{exec-prefix}:
317+
run ``Python 2.0 (interpreter)'' \XXX{right?}; under Mac~OS, \XXX{???}.
318+
Once the interpreter is started, you type Python code at the
319+
\samp{>>> } prompt. For example, on my Linux system, I type the three
320+
Python statements shown below, and get the output as shown, to find
321+
out my \filevar{prefix} and \filevar{exec-prefix}:
322+
322323
\begin{verbatim}
323324
Python 1.5.2 (#1, Apr 18 1999, 16:03:16) [GCC pgcc-2.91.60 19981201 (egcs-1.1.1 on linux2
324325
Copyright 1991-1995 Stichting Mathematisch Centrum, Amsterdam

0 commit comments

Comments
 (0)