summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-01-21 06:02:47 (GMT)
committerBenjamin Peterson <benjamin@python.org>2016-01-21 06:02:47 (GMT)
commitb57eaeadff91fd1711289a43ecf2a13b54efde0a (patch)
tree13db90d8e696ebda98257d957e838e3e7af2ddd0 /Doc
parent7172f507e18212dbc3afe53ce9dbdc696753c94c (diff)
parentc836f717cd73be8bcc9a0d09ba2d048bca9549f6 (diff)
downloadcpython-b57eaeadff91fd1711289a43ecf2a13b54efde0a.zip
cpython-b57eaeadff91fd1711289a43ecf2a13b54efde0a.tar.gz
cpython-b57eaeadff91fd1711289a43ecf2a13b54efde0a.tar.bz2
merge 3.4 (#26172)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/tools/templates/layout.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html
index 5abff1b..8ae6e23 100644
--- a/Doc/tools/templates/layout.html
+++ b/Doc/tools/templates/layout.html
@@ -18,7 +18,7 @@
<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 %}
{% if versionswitcher is defined and not embedded %}<script type="text/javascript" src="{{ pathto('_static/version_switch.js', 1) }}"></script>{% endif %}
- {% if pagename == 'whatsnew/changelog' %}
+ {% if pagename == 'whatsnew/changelog' and not embedded %}
<script type="text/javascript">
$(document).ready(function() {
// add the search form and bind the events