From 6488969e44faf5491270c50ae1c2b6f5911a6676 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 28 Apr 2009 18:20:24 +0000 Subject: 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. ........ --- Doc/Makefile | 1 + Doc/README.txt | 12 +++++++++--- Doc/TODO.txt | 6 ------ 3 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 Doc/TODO.txt diff --git a/Doc/Makefile b/Doc/Makefile index 317fcb0..46abe51 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -29,6 +29,7 @@ help: @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; \ diff --git a/Doc/README.txt b/Doc/README.txt index 4527930..c8f0114 100644 --- a/Doc/README.txt +++ b/Doc/README.txt @@ -74,17 +74,23 @@ Without make 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. diff --git a/Doc/TODO.txt b/Doc/TODO.txt deleted file mode 100644 index c8d3501..0000000 --- a/Doc/TODO.txt +++ /dev/null @@ -1,6 +0,0 @@ -To do -===== - -* split very large files and add toctrees -* finish "Documenting Python" -* care about XXX comments -- cgit v0.12