changeset: 82655:e45db319e590 branch: 3.3 parent: 82652:9941a9bbfeb6 parent: 82654:9b45873e5a68 user: Terry Jan Reedy date: Wed Mar 13 21:35:07 2013 -0400 files: Doc/make.bat description: Merge with 3.2: Issue #17386 diff -r 9941a9bbfeb6 -r e45db319e590 Doc/make.bat --- a/Doc/make.bat Wed Mar 13 13:42:47 2013 -0700 +++ b/Doc/make.bat Wed Mar 13 21:35:07 2013 -0400 @@ -2,7 +2,7 @@ setlocal set SVNROOT=http://svn.python.org/projects -if "%PYTHON%" EQU "" set PYTHON=..\pcbuild\python +if "%PYTHON%" EQU "" set PYTHON=py -2 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