From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 13 Nov 2009 23:15:59 +0000 (+0000)
Subject: Merged revisions 76256 via svnmerge from
X-Git-Tag: v3.1.2rc1~345
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2ad2268e21e3ef587f5d547cc6e56472c7ec03f;p=python

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