merge with 3.3

birkenfeld · birkenfeld · commit ebe32247472e · 2012-10-01T19:27:25.000+02:00
diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html
@@ -8,7 +8,7 @@
 {% 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 %}
-    {% if pagename == 'whatsnew/news' %}
+    {% if pagename == 'whatsnew/changelog %}
     <script type="text/javascript">
       function dofilter() {
         var el = document.getElementById('searchbox');
diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
@@ -181,7 +181,7 @@ def run(self):
                                content)
         content = whatsnew_re.sub(r'\1', content)
         # remove first 3 lines as they are the main heading
-        lines = content.splitlines()[3:]
+        lines = ['.. default-role:: obj', ''] + content.splitlines()[3:]
         self.state_machine.insert_input(lines, fname)
         return []
 
