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

[eric.araujo]

http://hg.python.org/cpython/rev/4ba743417053
changeset:   75289:4ba743417053
parent:      75287:937b1613d0e6
parent:      75262:39ddcc5c7fb9
user:        Éric Araujo <merwok at netwok.org>
date:        Sun Feb 26 04:01:54 2012 +0100
summary:
  Branch merge

files:
  Doc/tools/sphinxext/layout.html |  2 +-
  1 files changed, 1 insertions(+), 1 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
@@ -6,7 +6,7 @@
 {% endblock %}
 {% block extrahead %}
     <link rel="shortcut icon" type="image/png" href="{{ pathto('_static/py.png', 1) }}" />
-    <script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>
+    {% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}
 {{ super() }}
 {% endblock %}
 {% block footer %}

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