[Python-checkins] CVS: python/dist/src/Doc .cvsignore,1.20.6.1,1.20.6.2 Makefile,1.220.2.1,1.220.2.2 README,1.44,1.44.6.1

Tim Peters tim_one@users.sourceforge.net
Fri, 20 Jul 2001 23:07:44 -0700


Update of /cvsroot/python/python/dist/src/Doc
In directory usw-pr-cvs1:/tmp/cvs-serv27169/descr/dist/src/Doc

Modified Files:
      Tag: descr-branch
	.cvsignore Makefile README 
Log Message:
Merge of trunk delta date2001-07-17b to date2001-07-21.  See PLAN.txt.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/.cvsignore,v
retrieving revision 1.20.6.1
retrieving revision 1.20.6.2
diff -C2 -r1.20.6.1 -r1.20.6.2
*** .cvsignore	2001/07/18 04:13:55	1.20.6.1
--- .cvsignore	2001/07/21 06:07:12	1.20.6.2
***************
*** 2,4 ****
  *.tar.bz2
  *.zip
! html-*.tar
--- 2,4 ----
  *.tar.bz2
  *.zip
! *.tar

Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/Makefile,v
retrieving revision 1.220.2.1
retrieving revision 1.220.2.2
diff -C2 -r1.220.2.1 -r1.220.2.2
*** Makefile	2001/07/18 04:13:55	1.220.2.1
--- Makefile	2001/07/21 06:07:12	1.220.2.2
***************
*** 68,72 ****
  # This is the *documentation* release, and is used to construct the file
  # names of the downloadable tarballs.
! RELEASE=2.2a1
  
  PYTHON=	   python
--- 68,72 ----
  # This is the *documentation* release, and is used to construct the file
  # names of the downloadable tarballs.
! RELEASE=2.2a2
  
  PYTHON=	   python
***************
*** 119,122 ****
--- 119,124 ----
  	html/dist/dist.html
  
+ ALLHTMLFILES=$(INDEXFILES) html/index.html html/modindex.html html/acks.html
+ 
  COMMONPERL= perl/manual.perl perl/python.perl perl/l2hinit.perl
  
***************
*** 260,264 ****
  		lib/modindex.html mac/modindex.html
  
! html:	$(INDEXFILES) html/index.html html/modindex.html html/acks.html
  
  api html/api/api.html: $(APIFILES)
--- 262,266 ----
  		lib/modindex.html mac/modindex.html
  
! html:	$(ALLHTMLFILES)
  
  api html/api/api.html: $(APIFILES)
***************
*** 294,298 ****
  HTMLBASE=  file:`pwd`/html
  
! webcheck: html
  	$(WEBCHECKER) $(HTMLBASE)/api/
  	$(WEBCHECKER) $(HTMLBASE)/doc/
--- 296,300 ----
  HTMLBASE=  file:`pwd`/html
  
! webcheck: $(ALLHTMLFILES)
  	$(WEBCHECKER) $(HTMLBASE)/api/
  	$(WEBCHECKER) $(HTMLBASE)/doc/
***************
*** 305,309 ****
  	$(WEBCHECKER) $(HTMLBASE)/inst/
  
! fastwebcheck: html
  	$(WEBCHECKER) -x $(HTMLBASE)/api/
  	$(WEBCHECKER) -x $(HTMLBASE)/doc/
--- 307,311 ----
  	$(WEBCHECKER) $(HTMLBASE)/inst/
  
! fastwebcheck: $(ALLHTMLFILES)
  	$(WEBCHECKER) -x $(HTMLBASE)/api/
  	$(WEBCHECKER) -x $(HTMLBASE)/doc/
***************
*** 319,323 ****
  # Release packaging targets:
  
! paper-$(PAPER)/README: ps $(TOOLSDIR)/getpagecounts
  	cd paper-$(PAPER) && ../$(TOOLSDIR)/getpagecounts >../$@
  
--- 321,325 ----
  # Release packaging targets:
  
! paper-$(PAPER)/README: $(PSFILES) $(TOOLSDIR)/getpagecounts
  	cd paper-$(PAPER) && ../$(TOOLSDIR)/getpagecounts >../$@
  
***************
*** 339,348 ****
  	rm -f $@
  	$(PYTHON) $(TOOLSDIR)/mksourcepkg --zip $(RELEASE)
  
! pdf-$(PAPER)-$(RELEASE).tgz: pdf
! 	cd paper-$(PAPER) && tar cf - *.pdf | gzip -9 >$@
  
! pdf-$(PAPER)-$(RELEASE).tar.bz2: pdf
! 	cd paper-$(PAPER) && tar cf - *.pdf | bzip2 -9 >$@
  
  pdf-$(PAPER)-$(RELEASE).zip: pdf
--- 341,353 ----
  	rm -f $@
  	$(PYTHON) $(TOOLSDIR)/mksourcepkg --zip $(RELEASE)
+ 
+ pdf-$(PAPER)-$(RELEASE).tar: $(PDFFILES)
+ 	cd paper-$(PAPER) && tar cf ../$@ *.pdf
  
! pdf-$(PAPER)-$(RELEASE).tgz: pdf-$(PAPER)-$(RELEASE).tar
! 	gzip -9 <$? >$@
  
! pdf-$(PAPER)-$(RELEASE).tar.bz2: pdf-$(PAPER)-$(RELEASE).tar
! 	bzip2 -9 <$? >$@
  
  pdf-$(PAPER)-$(RELEASE).zip: pdf
***************
*** 350,360 ****
  	cd paper-$(PAPER) && zip -q -9 ../$@ *.pdf
  
! postscript-$(PAPER)-$(RELEASE).tar.bz2: ps paper-$(PAPER)/README
! 	cd paper-$(PAPER) && tar cf - *.ps README | bzip2 -9 >$@
  
! postscript-$(PAPER)-$(RELEASE).tgz: ps paper-$(PAPER)/README
! 	cd paper-$(PAPER) && tar cf - *.ps README | gzip -9 >$@
  
! postscript-$(PAPER)-$(RELEASE).zip: ps paper-$(PAPER)/README
  	rm -f $@
  	cd paper-$(PAPER) && zip -q -9 ../$@ *.ps README
--- 355,368 ----
  	cd paper-$(PAPER) && zip -q -9 ../$@ *.pdf
  
! postscript-$(PAPER)-$(RELEASE).tar: $(PSFILES) paper-$(PAPER)/README
! 	cd paper-$(PAPER) && tar cf ../$@ *.ps README
  
! postscript-$(PAPER)-$(RELEASE).tar.bz2: postscript-$(PAPER)-$(RELEASE).tar
! 	bzip2 -9 <$< >$@
  
! postscript-$(PAPER)-$(RELEASE).tgz: postscript-$(PAPER)-$(RELEASE).tar
! 	gzip -9 <$< >$@
! 
! postscript-$(PAPER)-$(RELEASE).zip: $(PSFILES) paper-$(PAPER)/README
  	rm -f $@
  	cd paper-$(PAPER) && zip -q -9 ../$@ *.ps README
***************
*** 366,375 ****
  
  html-$(RELEASE).tgz:	html-$(RELEASE).tar
! 	gzip -9 <html-$(RELEASE).tar >$@
  
  html-$(RELEASE).tar.bz2: html-$(RELEASE).tar
! 	bzip2 -9 <html-$(RELEASE).tar >$@
  
! html-$(RELEASE).zip:	html
  	rm -f $@
  	cd $(HTMLDIR) && \
--- 374,383 ----
  
  html-$(RELEASE).tgz:	html-$(RELEASE).tar
! 	gzip -9 <$? >$@
  
  html-$(RELEASE).tar.bz2: html-$(RELEASE).tar
! 	bzip2 -9 <$? >$@
  
! html-$(RELEASE).zip:	$(ALLHTMLFILES)
  	rm -f $@
  	cd $(HTMLDIR) && \
***************
*** 406,411 ****
  distpdf:	tarpdf bzippdf zippdf
  distlatex:	tarlatex bziplatex ziplatex
  
! distfiles:	tarballs zips bzips
  	$(TOOLSDIR)/mksourcepkg --all $(RELEASE)
  
--- 414,422 ----
  distpdf:	tarpdf bzippdf zippdf
  distlatex:	tarlatex bziplatex ziplatex
+ 
+ paperdist:	distpdf distps
+ edist:		disthtml
  
! distfiles:	paperdist edist
  	$(TOOLSDIR)/mksourcepkg --all $(RELEASE)
  

Index: README
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/README,v
retrieving revision 1.44
retrieving revision 1.44.6.1
diff -C2 -r1.44 -r1.44.6.1
*** README	2001/01/25 17:25:28	1.44
--- README	2001/07/21 06:07:12	1.44.6.1
***************
*** 1,4 ****
! Python main documentation -- in LaTeX
! -------------------------------------
  
  This directory contains the LaTeX sources to the Python documentation
--- 1,4 ----
! Python standard documentation -- in LaTeX
! -----------------------------------------
  
  This directory contains the LaTeX sources to the Python documentation
***************
*** 10,19 ****
  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 <http://www.python.org> or
! <ftp://ftp.python.org>).
  
  The following are the LaTeX source files:
  
  	api/*.tex	Python/C API Reference Manual
  	ext/*.tex	Extending and Embedding the Python Interpreter
  	lib/*.tex	Python Library Reference
--- 10,20 ----
  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 <http://www.python.org/> or
! <ftp://ftp.python.org/pub/python/>).
  
  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
***************
*** 31,43 ****
  
  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
  
  
--- 32,49 ----
  
  There's a Makefile to call LaTeX and the other utilities in the right
! 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
  
  
***************
*** 139,147 ****
  	  <http://language.perl.com/info/software.html>.
  
! 	- 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: <http://www.latex2html.org/>.
  
  
--- 145,154 ----
  	  <http://language.perl.com/info/software.html>.
  
! 	- 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:
! 	  <http://www.latex2html.org/>.
  
  
***************
*** 162,168 ****
  -------------------------------
  
! 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
  rather have PDF output.)
  
--- 169,175 ----
  -------------------------------
  
! 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.)
  
***************
*** 172,177 ****
  
  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.
  
  
--- 179,184 ----
  
  The LaTeX documents can be converted to HTML using Nikos Drakos'
! LaTeX2HTML converter.  See the Makefile; after some twiddling, "make"
! should do the trick.
  
  
***************
*** 195,199 ****
--- 202,210 ----
  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
  ================
***************
*** 203,207 ****
  
  ----------------------------------------------------------------------
! Copyright (c) 2000, 2001 Guido van Rossum.
  All rights reserved.
  
--- 214,218 ----
  
  ----------------------------------------------------------------------
! Copyright (c) 2000, 2001 Python Software Foundation.
  All rights reserved.
  
***************
*** 215,219 ****
  All rights reserved.
  
! See the file "LICENSE" for information on usage and
  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  ----------------------------------------------------------------------
--- 226,230 ----
  All rights reserved.
  
! See the file "texinputs/license.tex" for information on usage and
  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  ----------------------------------------------------------------------