=== Running 'diff -ru c:\depot\main\Apps\ActivePython-2_1\src\Core\ c:\depot\main\contrib\python-2.1\dist\src\'... Binary files c:\depot\main\Apps\ActivePython-2_1\src\Core\/Demo/tix/bitmaps/tix.gif and c:\depot\main\contrib\python-2.1\dist\src\/Demo/tix/bitmaps/tix.gif differ diff -ru c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/ACKS c:\depot\main\contrib\python-2.1\dist\src\/Doc/ACKS --- c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/ACKS Fri Jul 27 11:37:21 2001 +++ c:\depot\main\contrib\python-2.1\dist\src\/Doc/ACKS Tue Jul 24 14:46:57 2001 @@ -19,6 +19,7 @@ A. Amoroso Pehr Anderson Oliver Andrich +Jesús Cea Avión Daniel Barclay Chris Barker Don Bashford @@ -41,6 +42,7 @@ Jeff Epler Michael Ernst Blame Andy Eskilsson +Carey Evans Martijn Faassen Carl Feynman Hernan Martinez Foffani @@ -65,6 +67,7 @@ Albert Hofkamp Gregor Hoffleit Steve Holden +Thomas Holenstein Gerrit Holl Rob Hooft Brian Hooper @@ -106,6 +109,7 @@ Doug Mennella Paolo Milani Skip Montanaro +Paul Moore Ross Moore Sjoerd Mullender Dale Nagata @@ -166,4 +170,5 @@ Thomas Wouters Ka-Ping Yee Moshe Zadka +Milan Zamazal Cheng Zhang diff -ru c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/Makefile.deps c:\depot\main\contrib\python-2.1\dist\src\/Doc/Makefile.deps --- c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/Makefile.deps Fri Jul 27 11:37:21 2001 +++ c:\depot\main\contrib\python-2.1\dist\src\/Doc/Makefile.deps Tue Jul 24 14:46:57 2001 @@ -5,6 +5,7 @@ texinputs/python.ist COMMONTEX= texinputs/copyright.tex \ + texinputs/license.tex \ texinputs/boilerplate.tex MANSTYLES= texinputs/fncychap.sty \ diff -ru c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/README c:\depot\main\contrib\python-2.1\dist\src\/Doc/README --- c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/README Fri Jul 27 11:37:21 2001 +++ c:\depot\main\contrib\python-2.1\dist\src\/Doc/README Tue Jul 24 14:46:57 2001 @@ -1,5 +1,5 @@ -Python main documentation -- in LaTeX -------------------------------------- +Python standard documentation -- in LaTeX +----------------------------------------- This directory contains the LaTeX sources to the Python documentation and tools required to support the formatting process. The documents @@ -9,12 +9,13 @@ documentation yourself, you can ftp a tar file containing HTML, PDF, or PostScript versions of all documents. Additional formats may be available. These should be in the same place where you fetched the -main Python distribution (try or -). +main Python distribution (try or +). The following are the LaTeX source files: api/*.tex Python/C API Reference Manual + doc/*.tex Documenting Python ext/*.tex Extending and Embedding the Python Interpreter lib/*.tex Python Library Reference mac/*.tex Macintosh Library Modules @@ -30,15 +31,20 @@ parameters. There's a Makefile to call LaTeX and the other utilities in the right -order and the right number of times. This will produce DVI files for -each document made; to preview them, use xdvi. PostScript is produced -by the same Makefile target that produces the DVI files. This uses -the dvips tool. Printing depends on local conventions; at our site, -we use lpr. For example: - - make lib # create lib.dvi and lib.ps - xdvi lib # preview lib.dvi - lpr lib.ps # print on default printer +order and the right number of times. By default, it will build the +HTML version of the documnetation, but DVI, PDF, and PostScript can +also be made. To view the generated HTML, point your favorite browser +at the top-level index (html/index.html) after running "make". + +The Makefile can also produce DVI files for each document made; to +preview them, use xdvi. PostScript is produced by the same Makefile +target that produces the DVI files. This uses the dvips tool. +Printing depends on local conventions; at our site, we use lpr. For +example: + + make paper-letter/lib.ps # create lib.dvi and lib.ps + xdvi paper-letter/lib.dvi # preview lib.dvi + lpr paper-letter/lib.ps # print on default printer What if I find a bug? @@ -138,11 +144,12 @@ - Perl 5.004_04 or newer. Find the software at . - - LaTeX2HTML 99.2b8. Older versions are not supported; each - version changes enough that supporting multiple versions is not - likely to work. Many older versions don't work with Perl - 5.6 as well. This also screws up code fragments. ;-( - Releases are available at: . + - LaTeX2HTML 99.2b8 or newer. Older versions are not + supported; each version changes enough that supporting + multiple versions is not likely to work. Many older + versions don't work with Perl 5.6 as well. This also screws + up code fragments. ;-( Releases are available at: + . What if Times fonts are not available? @@ -161,9 +168,9 @@ What if I want to use A4 paper? ------------------------------- -Instead of building the PostScript by giving the command "make", give -the command "make PAPER=a4 ps"; the output will be produced in the -paper-a4/ subdirectory. (You can use "make PAPER=a4 pdf" if you'd +Instead of building the PostScript by giving the command "make ps", +give the command "make PAPER=a4 ps"; the output will be produced in +the paper-a4/ subdirectory. (You can use "make PAPER=a4 pdf" if you'd rather have PDF output.) @@ -171,8 +178,8 @@ ----------------- The LaTeX documents can be converted to HTML using Nikos Drakos' -LaTeX2HTML converter. See the Makefile; after some twiddling, "make -html" should do the trick. +LaTeX2HTML converter. See the Makefile; after some twiddling, "make" +should do the trick. What else is in here? @@ -194,6 +201,10 @@ copying the template to lib.tex and editing according to the instructions in the comments. +Documentation on the authoring Python documentation, including +information about both style and markup, is available in the +"Documenting Python" manual. + Copyright notice ================ @@ -202,7 +213,7 @@ as long as you don't change or remove the copyright notice: ---------------------------------------------------------------------- -Copyright (c) 2000, 2001 Guido van Rossum. +Copyright (c) 2000, 2001 Python Software Foundation. All rights reserved. Copyright (c) 2000 BeOpen.com. @@ -214,6 +225,6 @@ Copyright (c) 1991-1995 Stichting Mathematisch Centrum. All rights reserved. -See the file "LICENSE" for information on usage and +See the file "texinputs/license.tex" for information on usage and redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. ---------------------------------------------------------------------- Binary files c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/icons/blank.gif and c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/icons/blank.gif differ Binary files c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/icons/blank.png and c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/icons/blank.png differ Binary files c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/icons/contents.gif and c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/icons/contents.gif differ Binary files c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/icons/contents.png and c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/icons/contents.png differ Binary files c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/icons/index.gif and c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/icons/index.gif differ Binary files c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/icons/index.png and c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/icons/index.png differ Binary files c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/icons/modules.gif and c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/icons/modules.gif differ Binary files c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/icons/modules.png and c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/icons/modules.png differ Binary files c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/icons/next.gif and c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/icons/next.gif differ Binary files c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/icons/next.png and c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/icons/next.png differ Binary files c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/icons/previous.gif and c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/icons/previous.gif differ Binary files c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/icons/previous.png and c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/icons/previous.png differ Binary files c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/icons/up.gif and c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/icons/up.gif differ Binary files c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/icons/up.png and c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/icons/up.png differ diff -ru c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/index.html.in c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/index.html.in --- c:\depot\main\Apps\ActivePython-2_1\src\Core\/Doc/html/index.html.in Fri Jul 27 11:37:21 2001 +++ c:\depot\main\contrib\python-2.1\dist\src\/Doc/html/index.html.in Tue Jul 24 14:46:57 2001 @@ -10,24 +10,24 @@ ul { margin-left: 1em; padding: 0pt; border: 0pt; } - +