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.
........

diff --git a/Doc/Makefile b/Doc/Makefile
index 31670ad296ee14108f96a5f2da9e3ebd6d085018..c4a1a5797c3a821b0372c37620ab6c718c8eaac1 100644 (file)
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -33,19 +33,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 fedf71f626756586caf3a39620bd6c9b8d57e637..7ef31cffbcee93d95181b09680e55601a8d53bcd 100644 (file)
--- 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 9dede6195a78b62ef0112f9b1645aff8955da31a..45d9d6834abe9b0965a2040d5751f4c25cdfdfad 100644 (file)
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -34,10 +34,10 @@ echo.
 goto end\r
 \r
 :checkout\r
-svn co %SVNROOT%/external/Sphinx-0.6.3/sphinx tools/sphinx\r
-svn co %SVNROOT%/external/docutils-0.5/docutils tools/docutils\r
-svn co %SVNROOT%/external/Jinja-2.1.1/jinja2 tools/jinja2\r
-svn co %SVNROOT%/external/Pygments-1.1.1/pygments tools/pygments\r
+svn co %SVNROOT%/external/Sphinx-0.6.5/sphinx tools/sphinx\r
+svn co %SVNROOT%/external/docutils-0.6/docutils tools/docutils\r
+svn co %SVNROOT%/external/Jinja-2.3.1/jinja2 tools/jinja2\r
+svn co %SVNROOT%/external/Pygments-1.3.1/pygments tools/pygments\r
 goto end\r
 \r
 :update\r