summaryrefslogtreecommitdiffstats
path: root/Doc/lib
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2000-09-14 20:24:17 (GMT)
committerFred Drake <fdrake@acm.org>2000-09-14 20:24:17 (GMT)
commitd5d04356170c9613c690964a7f9799126a02cb3d (patch)
tree50eb4b23c0a3a5122579a36015a07e4931836c03 /Doc/lib
parent3cdb89d5ec0f923375a7fcf8622da72d2910e98a (diff)
downloadcpython-d5d04356170c9613c690964a7f9799126a02cb3d.zip
cpython-d5d04356170c9613c690964a7f9799126a02cb3d.tar.gz
cpython-d5d04356170c9613c690964a7f9799126a02cb3d.tar.bz2
Use \shortversion in a number of places.
This partially addresses SourceForge bug #114318.
Diffstat (limited to 'Doc/lib')
-rw-r--r--Doc/lib/libsite.tex10
-rw-r--r--Doc/lib/libstdtypes.tex3
2 files changed, 7 insertions, 6 deletions
diff --git a/Doc/lib/libsite.tex b/Doc/lib/libsite.tex
index 2814fe3..b895a73 100644
--- a/Doc/lib/libsite.tex
+++ b/Doc/lib/libsite.tex
@@ -19,7 +19,7 @@ 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 Macintosh or Windows) or
-it uses first \file{lib/python{\var{version}}/site-packages} and then
+it uses first \file{lib/python\shortversion/site-packages} and then
\file{lib/site-python} (on \UNIX{}). For each of the distinct
head-tail combinations, it sees if it refers to an existing directory,
and if so, adds to \code{sys.path}, and also inspected for path
@@ -39,10 +39,10 @@ refers to a directory (rather than a file). No item is added to
For example, suppose \code{sys.prefix} and \code{sys.exec_prefix} are
set to \file{/usr/local}. The Python \version\ library is then
-installed in \file{/usr/local/lib/python\var{version}} (where
-\var{version} is the first three characters of \code{sys.version}).
-Suppose this has a subdirectory
-\file{/usr/local/lib/python\var{version}/site-packages} with three
+installed in \file{/usr/local/lib/python\shortversion} (where only the
+first three characters of \code{sys.version} are used to form the
+installation path name). Suppose this has a subdirectory
+\file{/usr/local/lib/python\shortversion/site-packages} with three
subsubdirectories, \file{foo}, \file{bar} and \file{spam}, and two
path configuration files, \file{foo.pth} and \file{bar.pth}. Assume
\file{foo.pth} contains the following:
diff --git a/Doc/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex
index 3e9cc53..3d5f68f 100644
--- a/Doc/lib/libstdtypes.tex
+++ b/Doc/lib/libstdtypes.tex
@@ -869,7 +869,8 @@ defines \code{\var{m}.a} to be \code{1}, but you can't write
Modules built into the interpreter are written like this:
\code{<module 'sys' (built-in)>}. If loaded from a file, they are
-written as \code{<module 'os' from '/usr/local/lib/python1.5/os.pyc'>}.
+written as \code{<module 'os' from
+'/usr/local/lib/python\shortversion/os.pyc'>}.
\subsubsection{Classes and Class Instances \label{typesobjects}}