Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61097,61103-61104,61110-61112,61114-61115,61117,61120-61122,61126-61136 via svnmerge from

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

........
  r61128 | martin.v.loewis | 2008-02-29 17:59:21 +0100 (Fr, 29 Feb 2008) | 1 line

  Make _hashlib a separate project.
........
  r61132 | georg.brandl | 2008-02-29 19:15:36 +0100 (Fr, 29 Feb 2008) | 2 lines

  Until we got downloadable docs, stop confusing viewers by talking about a nonexisting table.
........
  r61133 | martin.v.loewis | 2008-02-29 19:17:23 +0100 (Fr, 29 Feb 2008) | 1 line

  Build db-4.4.20 with VS9; remove VS2003 build if necessary.
........
  r61135 | georg.brandl | 2008-02-29 19:21:29 +0100 (Fr, 29 Feb 2008) | 2 lines

  #2208: allow for non-standard HHC location.
........
  r61136 | martin.v.loewis | 2008-02-29 19:54:45 +0100 (Fr, 29 Feb 2008) | 1 line

  Port build_ssl.py to 2.4; support HOST_PYTHON variable
........

2 files changed, 9 insertions, 14 deletions

diff --git a/Doc/make.bat b/Doc/make.bat
index a26851f..504e4b5 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -1,8 +1,9 @@
-@echo off

+@@echo off

 setlocal

 

 set SVNROOT=http://svn.python.org/projects

-if "%PYTHON%" EQU "" set PYTHON=python25

+if "%PYTHON%" EQU "" set PYTHON=..\pcbuild\python

+if "%HTMLHELP%" EQU "" set HTMLHELP=%ProgramFiles%\HTML Help Workshop\hhc.exe

 

 if "%1" EQU "" goto help

 if "%1" EQU "html" goto build

@@ -41,7 +42,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% tools\sphinx-build.py -b%1 -dbuild\doctrees . build\%1

-if "%1" EQU "htmlhelp" "%ProgramFiles%\HTML Help Workshop\hhc.exe" build\htmlhelp\pydoc.hhp

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

 goto end

 

 :webrun

diff --git a/Doc/tools/sphinxext/download.html b/Doc/tools/sphinxext/download.html
index f6a593a..a634f09 100644
--- a/Doc/tools/sphinxext/download.html
+++ b/Doc/tools/sphinxext/download.html
@@ -5,6 +5,9 @@
 <h1>Download Python {{ release }} Documentation
   {%- if last_updated %} (last updated on {{ last_updated }}){% endif %}</h1>
 
+<p>Currently, the development documentation isn't packaged for download.</p>
+
+<!--
 <p>To download an archive containing all the documents for this version of
 Python in one of various formats, follow one of links in this table. The numbers
 in the table are the size of the download files in Kilobytes.</p>
@@ -36,18 +39,9 @@ most other archiving utilities support the tar and bzip2 formats as well.</p>
 
 <h2>Problems</h2>
 
-<p><strong>Printing PDFs using Adobe Acrobat Reader 5.0:</strong> Adobe has
-reportedly admitted that there is a bug in Acrobat Reader 5.0 which causes it
-not to print at least some PDF files generated by pdfTeX. This software is used
-to produce the PDF version of the Python documentation, and our documents
-definately trigger this bug in Acrobat Reader. To print the PDF files, use
-Acrobat Reader 4.x, ghostscript, or xpdf.</p>
-
-<p>Reportedly, Acrobat Reader 6.0 can print these documents without this
-problem, but we've not yet had an opportunity to confirm the report. Sadly,
-version 6.0 is not yet available on Unix platforms.</p>
-
 <p>If you have comments or suggestions for the Python documentation, please send
 email to <a href="docs@python.org">docs@python.org</a>.</p>
 
+-->
+
 {% endblock %}