[Python-checkins] cpython (merge 3.5 -> 3.6): Merge issue #26355 fix from Python 3.5

[nick.coghlan]

https://hg.python.org/cpython/rev/80970cf56048
changeset:   106474:80970cf56048
branch:      3.6
parent:      106464:975e03b0aea6
parent:      106473:c63b09833141
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Thu Feb 09 16:08:17 2017 +0100
summary:
  Merge issue #26355 fix from Python 3.5

files:
  Doc/tools/templates/layout.html |  1 +
  Misc/ACKS                       |  1 +
  Misc/NEWS                       |  3 +++
  3 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html
--- 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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -220,6 +220,7 @@
 Tarn Weisner Burton
 Lee Busby
 Katherine Busch
+Matthias Bussonnier
 Ralph Butler
 Laurent De Buyst
 Zach Byrne
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -180,6 +180,9 @@
 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

-- 
Repository URL: https://hg.python.org/cpython