mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge with 3.3

Browse source
This commit is contained in:
Georg Brandl 2012-10-01 19:27:25 +02:00
commit ebe3224747
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/tools/sphinxext/layout.html
View file

@ -8,7 +8,7 @@
{% block extrahead %} {% block extrahead %}
<link rel="shortcut icon" type="image/png" href="{{ pathto('_static/py.png', 1) }}" /> <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 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"> <script type="text/javascript">
function dofilter() { function dofilter() {
var el = document.getElementById('searchbox'); var el = document.getElementById('searchbox');

2
Doc/tools/sphinxext/pyspecific.py
View file

@ -181,7 +181,7 @@ class MiscNews(Directive):
content) content)
content = whatsnew_re.sub(r'\1', content) content = whatsnew_re.sub(r'\1', content)
# remove first 3 lines as they are the main heading # 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) self.state_machine.insert_input(lines, fname)
return [] return []