From 0c812842e7b72c4a50d36883b678ae23b16d407e Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 13 Mar 2010 10:57:09 +0000 Subject: Merged revisions 78911 via svnmerge from svn+ssh://svn.python.org/python/branches/py3k MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ................ r78911 | georg.brandl | 2010-03-13 11:56:09 +0100 (Sa, 13 Mär 2010) | 9 lines Merged revisions 78910 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78910 | georg.brandl | 2010-03-13 11:54:12 +0100 (Sa, 13 Mär 2010) | 1 line Bump externals versions for doc build. ........ ................ --- Doc/Makefile | 8 ++++---- Doc/README.txt | 12 +++++++----- Doc/make.bat | 8 ++++---- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Doc/Makefile b/Doc/Makefile index cc47e40..77b3bac 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -32,19 +32,19 @@ help: checkout: @if [ ! -d tools/sphinx ]; then \ echo "Checking out Sphinx..."; \ - svn checkout $(SVNROOT)/external/Sphinx-0.6.3/sphinx tools/sphinx; \ + svn checkout $(SVNROOT)/external/Sphinx-0.6.5/sphinx tools/sphinx; \ fi @if [ ! -d tools/docutils ]; then \ echo "Checking out Docutils..."; \ - svn checkout $(SVNROOT)/external/docutils-0.5/docutils tools/docutils; \ + svn checkout $(SVNROOT)/external/docutils-0.6/docutils tools/docutils; \ fi @if [ ! -d tools/jinja2 ]; then \ echo "Checking out Jinja..."; \ - svn checkout $(SVNROOT)/external/Jinja-2.1.1/jinja2 tools/jinja2; \ + svn checkout $(SVNROOT)/external/Jinja-2.3.1/jinja2 tools/jinja2; \ fi @if [ ! -d tools/pygments ]; then \ echo "Checking out Pygments..."; \ - svn checkout $(SVNROOT)/external/Pygments-1.1.1/pygments tools/pygments; \ + svn checkout $(SVNROOT)/external/Pygments-1.3.1/pygments tools/pygments; \ fi update: clean checkout diff --git a/Doc/README.txt b/Doc/README.txt index fedf71f..7ef31cf 100644 --- a/Doc/README.txt +++ b/Doc/README.txt @@ -77,25 +77,27 @@ A "make update" updates the Subversion checkouts in `tools/`. Without make ------------ -You'll need to checkout the Sphinx package to the `tools/` directory:: +You'll need to install the Sphinx package, either by checking it out via :: - svn co http://svn.python.org/projects/external/Sphinx-0.6.1/sphinx tools/sphinx + svn co http://svn.python.org/projects/external/Sphinx-0.6.5/sphinx tools/sphinx + +or by installing it from PyPI. Then, you need to install Docutils, either by checking it out via :: - svn co http://svn.python.org/projects/external/docutils-0.5/docutils tools/docutils + svn co http://svn.python.org/projects/external/docutils-0.6/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 + svn co http://svn.python.org/projects/external/Jinja-2.3.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-1.1.1/pygments tools/pygments + svn co http://svn.python.org/projects/external/Pygments-1.3.1/pygments tools/pygments or from PyPI at http://pypi.python.org/pypi/Pygments. diff --git a/Doc/make.bat b/Doc/make.bat index 9dede61..45d9d68 100644 --- a/Doc/make.bat +++ b/Doc/make.bat @@ -34,10 +34,10 @@ echo. goto end :checkout -svn co %SVNROOT%/external/Sphinx-0.6.3/sphinx tools/sphinx -svn co %SVNROOT%/external/docutils-0.5/docutils tools/docutils -svn co %SVNROOT%/external/Jinja-2.1.1/jinja2 tools/jinja2 -svn co %SVNROOT%/external/Pygments-1.1.1/pygments tools/pygments +svn co %SVNROOT%/external/Sphinx-0.6.5/sphinx tools/sphinx +svn co %SVNROOT%/external/docutils-0.6/docutils tools/docutils +svn co %SVNROOT%/external/Jinja-2.3.1/jinja2 tools/jinja2 +svn co %SVNROOT%/external/Pygments-1.3.1/pygments tools/pygments goto end :update -- cgit v0.12