summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-10-20 19:13:37 +0200
committerGeorg Brandl <georg@python.org>2013-10-20 19:13:37 +0200
commitbc99b150c0d2162aa7e77a8d51960ad6103deb52 (patch)
tree04be0862df3d3049ffd87165912a329b17335e21
parent8cc3039798fa3cfee23a9f5ada3fbaa9b1c176a1 (diff)
downloadsphinx-bc99b150c0d2162aa7e77a8d51960ad6103deb52.tar.gz
Closes #1296: Fix invalid charset in HTML help generated HTML files for default locale.
-rw-r--r--CHANGES3
-rw-r--r--sphinx/builders/htmlhelp.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index ed4d8fa7..0e9717dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,9 @@ Bugs fixed
* Restore ``versionmodified`` CSS class for versionadded/changed and deprecated
directives.
+* #1296: Fix invalid charset in HTML help generated HTML files for default
+ locale.
+
Release 1.2 beta3 (released Oct 3, 2013)
========================================
diff --git a/sphinx/builders/htmlhelp.py b/sphinx/builders/htmlhelp.py
index 605012f8..e1723ba0 100644
--- a/sphinx/builders/htmlhelp.py
+++ b/sphinx/builders/htmlhelp.py
@@ -173,7 +173,7 @@ class HTMLHelpBuilder(StandaloneHTMLBuilder):
embedded = True
lcid = 0x409
- encoding = 'iso8859_1'
+ encoding = 'cp1252'
def init(self):
StandaloneHTMLBuilder.init(self)