[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

zach.ware python-checkins at python.org
Fri Apr 18 22:45:49 CEST 2014


http://hg.python.org/cpython/rev/761785106b31
changeset:   90406:761785106b31
parent:      90404:f776771ab0ee
parent:      90405:02fec733f760
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Fri Apr 18 15:45:02 2014 -0500
summary:
  Merge with 3.4

files:
  Doc/README.txt |  2 +-
  Doc/make.bat   |  6 +++---
  Misc/ACKS      |  1 +
  3 files changed, 5 insertions(+), 4 deletions(-)


diff --git a/Doc/README.txt b/Doc/README.txt
--- a/Doc/README.txt
+++ b/Doc/README.txt
@@ -81,7 +81,7 @@
 
 Install the Sphinx package and its dependencies from PyPI.
 
-Then, from the ``Docs`` directory, run ::
+Then, from the ``Doc`` directory, run ::
 
    sphinx-build -b<builder> . build/<builder>
 
diff --git a/Doc/make.bat b/Doc/make.bat
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -1,7 +1,8 @@
 @@echo off
 setlocal
 
-if "%PYTHON%" EQU "" set PYTHON=py -2
+if "%SPHINXBUILD%" EQU "" set SPHINXBUILD=sphinx-build
+if "%PYTHON%" EQU "" set PYTHON=py
 if "%HTMLHELP%" EQU "" set HTMLHELP=%ProgramFiles%\HTML Help Workshop\hhc.exe
 if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/sphinxext/patchlevel.py`) do set DISTVERSION=%%v
 
@@ -32,8 +33,7 @@
 if not exist build mkdir build
 if not exist build\%1 mkdir build\%1
 if not exist build\doctrees mkdir build\doctrees
-cmd /C %PYTHON% --version
-cmd /C %PYTHON% tools\sphinx-build.py -b%1 -dbuild\doctrees . build\%*
+cmd /C %SPHINXBUILD% -b%1 -dbuild\doctrees . build\%*
 if "%1" EQU "htmlhelp" "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp
 goto end
 
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1154,6 +1154,7 @@
 Ty Sarna
 Hugh Sasse
 Bob Savage
+Dave Sawyer
 Ben Sayer
 sbt
 Marco Scataglini

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list