Merge issue #26355 fix from 3.6

ncoghlan · ncoghlan · commit c7a24a7330bc · 2017-02-09T16:09:03.000+01:00
diff --git 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 %}
diff --git 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
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -686,6 +686,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.
 
 - Issue #23722: The data model reference and the porting section in the
