Merged revisions 68288-68291,68325-68326,68338,68388,68393,68423 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

................
  r68288 | benjamin.peterson | 2009-01-03 18:39:07 -0600 (Sat, 03 Jan 2009) | 1 line

  only check the actual compile() call for a SyntaxError
................
  r68289 | georg.brandl | 2009-01-04 02:26:10 -0600 (Sun, 04 Jan 2009) | 2 lines

  Test commit.
................
  r68290 | georg.brandl | 2009-01-04 04:23:49 -0600 (Sun, 04 Jan 2009) | 4 lines

  Add "suspicious" builder which finds leftover markup in the HTML files.

  Patch by Gabriel Genellina.
................
  r68291 | georg.brandl | 2009-01-04 04:24:09 -0600 (Sun, 04 Jan 2009) | 2 lines

  Fix two issues found by the suspicious builder.
................
  r68325 | benjamin.peterson | 2009-01-04 16:00:18 -0600 (Sun, 04 Jan 2009) | 1 line

  use Jinja 2.1.1
................
  r68326 | georg.brandl | 2009-01-04 16:03:10 -0600 (Sun, 04 Jan 2009) | 2 lines

  Update make.bat.
................
  r68338 | neal.norwitz | 2009-01-04 21:57:25 -0600 (Sun, 04 Jan 2009) | 1 line

  Make sure to checkout any new packages
................
  r68388 | benjamin.peterson | 2009-01-07 21:39:46 -0600 (Wed, 07 Jan 2009) | 1 line

  string exceptions are gone
................
  r68393 | benjamin.peterson | 2009-01-07 22:01:00 -0600 (Wed, 07 Jan 2009) | 1 line

  use new sphinx modules
................
  r68423 | benjamin.peterson | 2009-01-08 20:13:34 -0600 (Thu, 08 Jan 2009) | 29 lines

  Merged revisions 68306-68308,68340,68368,68422 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r68306 | benjamin.peterson | 2009-01-04 12:27:19 -0600 (Sun, 04 Jan 2009) | 1 line

    fix_urllib: add mappings for the url parsing functions
  ........
    r68307 | benjamin.peterson | 2009-01-04 12:30:01 -0600 (Sun, 04 Jan 2009) | 1 line

    remove duplicated function
  ........
    r68308 | benjamin.peterson | 2009-01-04 12:50:34 -0600 (Sun, 04 Jan 2009) | 1 line

    turtle is no longer renamed
  ........
    r68340 | georg.brandl | 2009-01-05 02:11:39 -0600 (Mon, 05 Jan 2009) | 2 lines

    Fix undefined locals in parse_tokens().
  ........
    r68368 | benjamin.peterson | 2009-01-06 17:56:10 -0600 (Tue, 06 Jan 2009) | 1 line

    fix typo (thanks to Robert Lehmann)
  ........
    r68422 | benjamin.peterson | 2009-01-08 20:01:03 -0600 (Thu, 08 Jan 2009) | 1 line

    run the imports fixers after fix_import, so fix_import doesn't try to make stdlib renames into relative imports #4876
  ........
................

1 files changed, 20 insertions, 18 deletions

diff --git a/Doc/make.bat b/Doc/make.bat
index d3379c1..33d354c 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -8,34 +8,41 @@ if "%HTMLHELP%" EQU "" set HTMLHELP=%ProgramFiles%\HTML Help Workshop\hhc.exe
 if "%1" EQU "" goto help

 if "%1" EQU "html" goto build

 if "%1" EQU "htmlhelp" goto build

-if "%1" EQU "web" goto build

-if "%1" EQU "webrun" goto webrun

+if "%1" EQU "latex" goto build

+if "%1" EQU "text" goto build

+if "%1" EQU "suspicious" goto build

+if "%1" EQU "linkcheck" goto build

+if "%1" EQU "changes" goto build

 if "%1" EQU "checkout" goto checkout

 if "%1" EQU "update" goto update

 

 :help

+set this=%~n0

 echo HELP

 echo.

-echo builddoc checkout

-echo builddoc update

-echo builddoc html

-echo builddoc htmlhelp

-echo builddoc web

-echo builddoc webrun

+echo %this% checkout

+echo %this% update

+echo %this% html

+echo %this% htmlhelp

+echo %this% latex

+echo %this% text

+echo %this% suspicious

+echo %this% linkcheck

+echo %this% changes

 echo.

 goto end

 

 :checkout

 svn co %SVNROOT%/doctools/trunk/sphinx tools/sphinx

-svn co %SVNROOT%/external/docutils-0.4/docutils tools/docutils

-svn co %SVNROOT%/external/Jinja-1.1/jinja tools/jinja

-svn co %SVNROOT%/external/Pygments-0.9/pygments tools/pygments

+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

 goto end

 

 :update

 svn update tools/sphinx

 svn update tools/docutils

-svn update tools/jinja

+svn update tools/jinja2

 svn update tools/pygments

 goto end

 

@@ -43,13 +50,8 @@ goto end
 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% tools\sphinx-build.py -b%1 -dbuild\doctrees . build\%1

+cmd /C %PYTHON% tools\sphinx-build.py -b%1 -dbuild\doctrees . build\%*

 if "%1" EQU "htmlhelp" "%HTMLHELP%" build\htmlhelp\pydoc.hhp

 goto end

 

-:webrun

-set PYTHONPATH=tools

-%PYTHON% -m sphinx.web build\web

-goto end

-

 :end