Merge issue #26355 fix from Python 3.5

2017-02-09 16:08:17 +01:00 · 2017-02-09 16:08:17 +01:00 · e1857579f8
parent 088507644e e66244521c
commit e1857579f8
3 changed files with 5 additions and 0 deletions
--- a/Doc/tools/templates/layout.html
+++ b/Doc/tools/templates/layout.html
@ -38,6 +38,7 @@
 {% endblock %}
 {% block extrahead %}
    <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 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 %}
--- a/Misc/ACKS
+++ b/Misc/ACKS
@ -220,6 +220,7 @@ Alastair Burt
 Tarn Weisner Burton
 Lee Busby
 Katherine Busch
+Matthias Bussonnier
 Ralph Butler
 Laurent De Buyst
 Zach Byrne
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -180,6 +180,9 @@ C API
 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.

 Tests