[Python-checkins] r62688 - in doctools/trunk: CHANGES sphinx/htmlhelp.py

[georg.brandl]

Author: georg.brandl
Date: Sun May  4 09:07:48 2008
New Revision: 62688

Log:
Remove hard-coded "documentation" from HTML help output.


Modified:
   doctools/trunk/CHANGES
   doctools/trunk/sphinx/htmlhelp.py

Modified: doctools/trunk/CHANGES
==============================================================================
--- doctools/trunk/CHANGES	(original)
+++ doctools/trunk/CHANGES	Sun May  4 09:07:48 2008
@@ -26,7 +26,8 @@
 
 * sphinx.htmlwriter: Correctly write the TOC file for any structure of the
   master document.  Also encode non-ASCII characters as entities in TOC
-  and index file.
+  and index file.  Remove two remaining instances of hard-coded
+  "documentation".
 
 * Lots of little fixes to the LaTeX output and style.
 

Modified: doctools/trunk/sphinx/htmlhelp.py
==============================================================================
--- doctools/trunk/sphinx/htmlhelp.py	(original)
+++ doctools/trunk/sphinx/htmlhelp.py	Sun May  4 09:07:48 2008
@@ -63,10 +63,10 @@
 Full-text search=Yes
 Index file=%(outname)s.hhk
 Language=0x409
-Title=%(project)s %(version)s Documentation
+Title=%(title)s
 
 [WINDOWS]
-%(outname)s="%(project)s %(version)s Documentation","%(outname)s.hhc","%(outname)s.hhk",\
+%(outname)s="%(title)s","%(outname)s.hhc","%(outname)s.hhk",\
 "index.html","index.html",,,,,0x63520,220,0x10384e,[0,0,1024,768],,,,,,,0
 
 [FILES]
@@ -129,6 +129,7 @@
     f = open(path.join(outdir, outname+'.hhp'), 'w')
     try:
         f.write(project_template % {'outname': outname,
+                                    'title': builder.config.html_title,
                                     'version': builder.config.version,
                                     'project': builder.config.project})
         if not outdir.endswith(os.sep):