Merged revisions 76255 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76255 | benjamin.peterson | 2009-11-13 17:11:54 -0600 (Fri, 13 Nov 2009) | 1 line

  use Sphinx 0.6.3
........

diff --git a/Doc/Makefile b/Doc/Makefile
index 6e91d3667daae4e9ecffc85516ee588598629718..7cfb024e22cc3f6a1cbf897d26a8ad07a681c0e0 100644 (file)
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -32,7 +32,7 @@ help:
 checkout:
        @if [ ! -d tools/sphinx ]; then \
          echo "Checking out Sphinx..."; \
-         svn checkout $(SVNROOT)/external/Sphinx-0.6.2/sphinx tools/sphinx; \
+         svn checkout $(SVNROOT)/external/Sphinx-0.6.3/sphinx tools/sphinx; \
        fi
        @if [ ! -d tools/docutils ]; then \
          echo "Checking out Docutils..."; \

diff --git a/Doc/make.bat b/Doc/make.bat
index 1e6fc56867c1c4a8bc608c2f075f141ac105efb9..a52f160565756c67fd46d632b5ee493e68c7788b 100644 (file)
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -34,7 +34,7 @@ echo.
 goto end\r
 \r
 :checkout\r
-svn co %SVNROOT%/external/Sphinx-0.6.2/sphinx tools/sphinx\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-0.11.1/pygments tools/pygments\r