[Python-checkins] r76258 - in python/branches/release31-maint: Doc/Makefile Doc/make.bat

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Nov 14 00:15:59 2009
New Revision: 76258

Log:
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
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/Makefile
   python/branches/release31-maint/Doc/make.bat

Modified: python/branches/release31-maint/Doc/Makefile
==============================================================================
--- python/branches/release31-maint/Doc/Makefile	(original)
+++ python/branches/release31-maint/Doc/Makefile	Sat Nov 14 00:15:59 2009
@@ -32,7 +32,7 @@
 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..."; \

Modified: python/branches/release31-maint/Doc/make.bat
==============================================================================
--- python/branches/release31-maint/Doc/make.bat	(original)
+++ python/branches/release31-maint/Doc/make.bat	Sat Nov 14 00:15:59 2009
@@ -34,7 +34,7 @@
 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