diff options
| author | Georg Brandl <georg@python.org> | 2012-10-01 17:27:25 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-10-01 17:27:25 (GMT) |
| commit | ebe32247472e2361236ee6c70c2bcc5461703efa (patch) | |
| tree | 730f3419576b52e4c8b89542166d8564fbd766e0 /Doc/tools | |
| parent | a32e8dfe129143dddf77323bce44702980ee0421 (diff) | |
| parent | 6c4758152fc32d1b78c3caa83eca4e1f5b470c84 (diff) | |
| download | cpython-ebe32247472e2361236ee6c70c2bcc5461703efa.zip cpython-ebe32247472e2361236ee6c70c2bcc5461703efa.tar.gz cpython-ebe32247472e2361236ee6c70c2bcc5461703efa.tar.bz2 | |
merge with 3.3
Diffstat (limited to 'Doc/tools')
| -rw-r--r-- | Doc/tools/sphinxext/layout.html | 2 | ||||
| -rw-r--r-- | Doc/tools/sphinxext/pyspecific.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html index df728aa..4db64f1 100644 --- 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 index 654ef3d..810830d 100644 --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -181,7 +181,7 @@ class MiscNews(Directive): 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 [] |