[Python-checkins] r72073 - in python/branches/release26-maint: Doc/Makefile Doc/README.txt Doc/TODO.txt

Tue Apr 28 20:20:25 CEST 2009

Author: georg.brandl
Date: Tue Apr 28 20:20:24 2009
New Revision: 72073
Log:
Merged revisions 71956-71959 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r71956 | georg.brandl | 2009年04月26日 08:05:18 +0200 (So, 26 Apr 2009) | 1 line
 
 Update versions in instructions for manual set-up.
........
 r71957 | georg.brandl | 2009年04月26日 08:05:58 +0200 (So, 26 Apr 2009) | 2 lines
 
 Note that the versions are also in README.txt.
........
 r71958 | georg.brandl | 2009年04月26日 08:06:19 +0200 (So, 26 Apr 2009) | 1 line
 
 Remove outdated TODO file.
........
 r71959 | georg.brandl | 2009年04月26日 08:06:53 +0200 (So, 26 Apr 2009) | 2 lines
 
 Another file where the versions need to be up to date.
........
Removed:
 python/branches/release26-maint/Doc/TODO.txt
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Doc/Makefile
 python/branches/release26-maint/Doc/README.txt
Modified: python/branches/release26-maint/Doc/Makefile
==============================================================================

--- python/branches/release26-maint/Doc/Makefile	(original)
+++ python/branches/release26-maint/Doc/Makefile	Tue Apr 28 20:20:24 2009
@@ -29,6 +29,7 @@
 	@echo " dist to create a \"dist\" directory with archived docs for download"
 
 checkout:
+	# Note: if you update versions here, do the same in make.bat and README.txt
 	@if [ ! -d tools/sphinx ]; then \
 	 echo "Checking out Sphinx..."; \
 	 svn checkout $(SVNROOT)/external/Sphinx-0.6.1/sphinx tools/sphinx; \
Modified: python/branches/release26-maint/Doc/README.txt
==============================================================================
--- python/branches/release26-maint/Doc/README.txt	(original)
+++ python/branches/release26-maint/Doc/README.txt	Tue Apr 28 20:20:24 2009
@@ -74,17 +74,23 @@
 
 You'll need to checkout the Sphinx package to the `tools/` directory::
 
- svn co http://svn.python.org/projects/doctools/trunk/sphinx tools/sphinx
+ svn co http://svn.python.org/projects/external/Sphinx-0.6.1/sphinx tools/sphinx
 
 Then, you need to install Docutils, either by checking it out via ::
 
- svn co http://svn.python.org/projects/external/docutils-0.4/docutils tools/docutils
+ svn co http://svn.python.org/projects/external/docutils-0.5/docutils tools/docutils
 
 or by installing it from http://docutils.sf.net/.
 
+You also need Jinja2, either by checking it out via ::
+
+ svn co http://svn.python.org/projects/external/Jinja-2.1.1/jinja2 tools/jinja2
+
+or by installing it from PyPI.
+
 You can optionally also install Pygments, either as a checkout via :: 
 
- svn co http://svn.python.org/projects/external/Pygments-0.9/pygments tools/pygments
+ svn co http://svn.python.org/projects/external/Pygments-0.11.1/pygments tools/pygments
 
 or from PyPI at http://pypi.python.org/pypi/Pygments.
 
Deleted: python/branches/release26-maint/Doc/TODO.txt
==============================================================================
--- python/branches/release26-maint/Doc/TODO.txt	Tue Apr 28 20:20:24 2009
+++ (empty file)
@@ -1,6 +0,0 @@
-To do
-=====
-
-* split very large files and add toctrees
-* finish "Documenting Python"
-* care about XXX comments
