summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-12-04 16:46:56 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-12-04 16:51:37 +0100
commit6691abcdf0db219bfa584d52eb21e891d88f2aeb (patch)
tree9a88775b74f2fd63a210048fb846a143de7d305c /docs
parentc8cf49e5c48eca4936c3729d1a4f963a4666c282 (diff)
[1.6.x] Fixed #21558 -- Support building CHM files.
Thanks MichaƂ Pasternak. Backport of cd9e85ec from master.
Diffstat (limited to 'docs')
-rw-r--r--docs/_theme/djangodocs/layout.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/_theme/djangodocs/layout.html b/docs/_theme/djangodocs/layout.html
index ef91dd77a9..caf990c0b8 100644
--- a/docs/_theme/djangodocs/layout.html
+++ b/docs/_theme/djangodocs/layout.html
@@ -17,6 +17,9 @@
{%- endmacro %}
{% block extrahead %}
+{# When building htmlhelp (CHM format) disable JQuery inclusion, #}
+{# as it causes problems in compiled CHM files. #}
+{% if builder != "htmlhelp" %}
{{ super() }}
<script type="text/javascript" src="{{ pathto('templatebuiltins.js', 1) }}"></script>
<script type="text/javascript">
@@ -51,6 +54,7 @@
});
})(jQuery);
</script>
+{% endif %}
{% endblock %}
{% block document %}