[Python-checkins] cpython (merge 3.5 -> default): merge 3.5 (#26172)

[benjamin.peterson]

https://hg.python.org/cpython/rev/68ec50003aca
changeset:   100010:68ec50003aca
parent:      100006:6134d9ecab60
parent:      100009:56e68089ad65
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Jan 20 22:03:00 2016 -0800
summary:
  merge 3.5 (#26172)

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


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

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