summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2016-07-02 14:30:38 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2016-07-02 14:30:38 +0900
commitbd2ad1bc687425768f16f3dd47cd960cee0d162e (patch)
treef56ea90eaa474d223beb5c26fdc434fd65be7ef2
parentb30d4f488284bfeaf3979d2c58a3582c2927ddb0 (diff)
downloadsphinx-git-bd2ad1bc687425768f16f3dd47cd960cee0d162e.tar.gz
Fix #2699: hyperlinks in help HTMLs are broken if `html_file_suffix` is set
-rw-r--r--CHANGES1
-rw-r--r--sphinx/builders/applehelp.py1
-rw-r--r--sphinx/builders/devhelp.py1
-rw-r--r--sphinx/builders/htmlhelp.py1
-rw-r--r--sphinx/builders/qthelp.py1
5 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 69ecd4959..4748a3a29 100644
--- a/CHANGES
+++ b/CHANGES
@@ -42,6 +42,7 @@ Bugs fixed
* #2579: Could not refer a label including both spaces and colons via
`sphinx.ext.intersphinx`
* #2718: Sphinx crashes if the document file is not readable
+* #2699: hyperlinks in help HTMLs are broken if `html_file_suffix` is set
Release 1.4.4 (released Jun 12, 2016)
diff --git a/sphinx/builders/applehelp.py b/sphinx/builders/applehelp.py
index 53a0c99ad..ee5c1ada6 100644
--- a/sphinx/builders/applehelp.py
+++ b/sphinx/builders/applehelp.py
@@ -84,6 +84,7 @@ class AppleHelpBuilder(StandaloneHTMLBuilder):
super(AppleHelpBuilder, self).init()
# the output files for HTML help must be .html only
self.out_suffix = '.html'
+ self.link_suffix = '.html'
if self.config.applehelp_bundle_id is None:
raise SphinxError('You must set applehelp_bundle_id before '
diff --git a/sphinx/builders/devhelp.py b/sphinx/builders/devhelp.py
index 62e2c9843..523941110 100644
--- a/sphinx/builders/devhelp.py
+++ b/sphinx/builders/devhelp.py
@@ -59,6 +59,7 @@ class DevhelpBuilder(StandaloneHTMLBuilder):
def init(self):
StandaloneHTMLBuilder.init(self)
self.out_suffix = '.html'
+ self.link_suffix = '.html'
def handle_finish(self):
self.build_devhelp(self.outdir, self.config.devhelp_basename)
diff --git a/sphinx/builders/htmlhelp.py b/sphinx/builders/htmlhelp.py
index 405e4f01b..f1626321e 100644
--- a/sphinx/builders/htmlhelp.py
+++ b/sphinx/builders/htmlhelp.py
@@ -183,6 +183,7 @@ class HTMLHelpBuilder(StandaloneHTMLBuilder):
StandaloneHTMLBuilder.init(self)
# the output files for HTML help must be .html only
self.out_suffix = '.html'
+ self.link_suffix = '.html'
# determine the correct locale setting
locale = chm_locales.get(self.config.language)
if locale is not None:
diff --git a/sphinx/builders/qthelp.py b/sphinx/builders/qthelp.py
index 0a7e85c92..e02985b94 100644
--- a/sphinx/builders/qthelp.py
+++ b/sphinx/builders/qthelp.py
@@ -111,6 +111,7 @@ class QtHelpBuilder(StandaloneHTMLBuilder):
StandaloneHTMLBuilder.init(self)
# the output files for HTML help must be .html only
self.out_suffix = '.html'
+ self.link_suffix = '.html'
# self.config.html_style = 'traditional.css'
def handle_finish(self):