Commit e1857579 authored by Nick Coghlan's avatar Nick Coghlan

Merge issue #26355 fix from Python 3.5

parents 08850764 e6624452
...@@ -38,6 +38,7 @@ ...@@ -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 %}
......
...@@ -220,6 +220,7 @@ Alastair Burt ...@@ -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
......
...@@ -180,6 +180,9 @@ C API ...@@ -180,6 +180,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.
Tests Tests
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment