[Python-checkins] CVS: python/dist/src/Doc/lib libsite.tex,1.18,1.19 libstdtypes.tex,1.34,1.35

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Doc/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv21824/lib

Modified Files:
	libsite.tex libstdtypes.tex 
Log Message:

Use \shortversion in a number of places.
This partially addresses SourceForge bug #114318.


Index: libsite.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libsite.tex,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** libsite.tex	2000/09/14 18:25:41	1.18
--- libsite.tex	2000/09/14 20:24:16	1.19
***************
*** 20,24 ****
  \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
  \file{lib/site-python} (on \UNIX{}).  For each of the distinct
  head-tail combinations, it sees if it refers to an existing directory,
--- 20,24 ----
  \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\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,
***************
*** 40,47 ****
  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
  subsubdirectories, \file{foo}, \file{bar} and \file{spam}, and two
  path configuration files, \file{foo.pth} and \file{bar.pth}.  Assume
--- 40,47 ----
  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\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

Index: libstdtypes.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libstdtypes.tex,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** libstdtypes.tex	2000/09/14 17:57:42	1.34
--- libstdtypes.tex	2000/09/14 20:24:17	1.35
***************
*** 870,874 ****
  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'>}.
  
  
--- 870,875 ----
  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/python\shortversion/os.pyc'>}.