[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

[georg.brandl]

http://hg.python.org/cpython/rev/1d523b48efa3
changeset:   89967:1d523b48efa3
parent:      89964:c45b124e9af4
parent:      89966:2a6c33592e40
user:        Georg Brandl <georg at python.org>
date:        Tue Mar 25 10:13:44 2014 +0100
summary:
  merge with 3.4

files:
  Doc/tools/sphinxext/layout.html |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html
--- 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 %}

-- 
Repository URL: http://hg.python.org/cpython