Merged revisions 76256 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76256 | benjamin.peterson | 2009-11-13 17:14:24 -0600 (Fri, 13 Nov 2009) | 9 lines

  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 146e1b35595cee0c136cc8e7d4e8768bb3a6e987..519a1c9f42da2366a551e3f83667b8bf13e5531e 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 0b618e34084022e171e3f69f64c03fdc0f351555..aeb8974bbfcaca2320ea4fd1d2f8361dbcd2ae22 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