From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 29 Jun 2009 03:46:42 +0000 (+0000)
Subject: Merged revisions 73671 via svnmerge from
X-Git-Tag: v3.1.1rc1~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e65abb3fb04d9e1f273885b3cfa8da46b7f96018;p=python

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 c9f3ed69e3..146e1b3559 100644
--- 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 c51fc8d157..0b618e3408 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -34,7 +34,7 @@ echo.
 goto end
 
 :checkout
-svn co %SVNROOT%/external/Sphinx-0.6.1/sphinx tools/sphinx
+svn co %SVNROOT%/external/Sphinx-0.6.2/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-0.11.1/pygments tools/pygments