Merged revisions 73671 via svnmerge from

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

................
  r73671 | benjamin.peterson | 2009-06-28 22:37:21 -0500 (Sun, 28 Jun 2009) | 9 lines

  Merged revisions 73669 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r73669 | benjamin.peterson | 2009-06-28 22:30:55 -0500 (Sun, 28 Jun 2009) | 1 line

    update to sphinx 0.6.2
  ........
................

diff --git a/Doc/Makefile b/Doc/Makefile
index c9f3ed69e39e6336766a5507e36118557e42e16b..146e1b35595cee0c136cc8e7d4e8768bb3a6e987 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.1/sphinx tools/sphinx; \
+         svn checkout $(SVNROOT)/external/Sphinx-0.6.2/sphinx tools/sphinx; \
        fi
        @if [ ! -d tools/docutils ]; then \
          echo "Checking out Docutils..."; \

diff --git a/Doc/make.bat b/Doc/make.bat
index c51fc8d15760e286c848b93674d025643279935d..0b618e34084022e171e3f69f64c03fdc0f351555 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.1/sphinx tools/sphinx\r
+svn co %SVNROOT%/external/Sphinx-0.6.2/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