Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge issue #26355 fix from 3.6

This commit is contained in:
Nick Coghlan 2017-02-09 16:09:03 +01:00
parent 12c5838dae e1857579f8
commit c7a24a7330
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Doc/tools/templates/layout.html
View File

@ -38,6 +38,7 @@
{% endblock %} {% endblock %}
{% 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) }}" />
<link rel="canonical" href="https://docs.python.org/3/{{pagename}}.html" />
{% if builder != "htmlhelp" %} {% if builder != "htmlhelp" %}
{% 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 versionswitcher is defined and not embedded %}<script type="text/javascript" src="{{ pathto('_static/version_switch.js', 1) }}"></script>{% endif %} {% if versionswitcher is defined and not embedded %}<script type="text/javascript" src="{{ pathto('_static/version_switch.js', 1) }}"></script>{% endif %}

1
Misc/ACKS
View File

@ -220,6 +220,7 @@ Alastair Burt
Tarn Weisner Burton Tarn Weisner Burton
Lee Busby Lee Busby
Katherine Busch Katherine Busch
Matthias Bussonnier
Ralph Butler Ralph Butler
Laurent De Buyst Laurent De Buyst
Zach Byrne Zach Byrne

3
Misc/NEWS
View File

@ -686,6 +686,9 @@ C API
Documentation Documentation
------------- -------------
- Issue #26355: Add canonical header link on each page to corresponding major
version of the documentation. Patch by Matthias Bussonnier.
- Issue #29349: Fix Python 2 syntax in code for building the documentation. - Issue #29349: Fix Python 2 syntax in code for building the documentation.
- Issue #23722: The data model reference and the porting section in the - Issue #23722: The data model reference and the porting section in the