[Python-checkins] cpython (merge 3.2 -> default): #14289: merge with 3.2

[georg.brandl]

http://hg.python.org/cpython/rev/b4d1e51d91f8
changeset:   75626:b4d1e51d91f8
parent:      75624:3ffa1b88e9f6
parent:      75625:2800530b00d3
user:        Georg Brandl <georg at python.org>
date:        Wed Mar 14 08:18:59 2012 +0100
summary:
  #14289: merge with 3.2

files:
  Doc/tools/sphinxext/download.html |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Doc/tools/sphinxext/download.html b/Doc/tools/sphinxext/download.html
--- a/Doc/tools/sphinxext/download.html
+++ b/Doc/tools/sphinxext/download.html
@@ -39,8 +39,12 @@
   </tr>
 </table>
 
+<p>These archives contain all the content in the documentation.</p>
 
-<p>These archives contain all the content in the documentation.</p>
+<p>HTML Help (<tt>.chm</tt>) files are made available in the "Windows" section
+on the <a href="http://python.org/download/releases/{{ release[:5] }}/">Python
+download page</a>.</p>
+
 
 <h2>Unpacking</h2>
 

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