summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-03-25 09:13:44 (GMT)
committerGeorg Brandl <georg@python.org>2014-03-25 09:13:44 (GMT)
commitb50f8c9c0d20bb6213401f786059c5c91a15c3ec (patch)
treea00fe1ec1e6c13e7d0ca5a2aeff2774c79e21d70
parentacb6c0491cbe2c708928562e5825c26460e3f2a1 (diff)
parent1afe2af690ce70fa7e27cb26f2478ff2a0066ed1 (diff)
downloadcpython-b50f8c9c0d20bb6213401f786059c5c91a15c3ec.zip
cpython-b50f8c9c0d20bb6213401f786059c5c91a15c3ec.tar.gz
cpython-b50f8c9c0d20bb6213401f786059c5c91a15c3ec.tar.bz2
merge with 3.4
-rw-r--r--Doc/tools/sphinxext/layout.html2
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html
index 16a9212..d3b2801 100644
--- a/Doc/tools/sphinxext/layout.html
+++ b/Doc/tools/sphinxext/layout.html
@@ -12,6 +12,8 @@
{%- endif %}
</li>
{% endblock %}
+{% block relbar1 %} {% if builder != 'qthelp' %} {{ relbar() }} {% endif %} {% endblock %}
+{% block relbar2 %} {% if builder != 'qthelp' %} {{ relbar() }} {% endif %} {% endblock %}
{% block extrahead %}
<link rel="shortcut icon" type="image/png" href="{{ pathto('_static/py.png', 1) }}" />
{% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}