From e66244521c6e5f37b2964ea5165c6ac9b854b9c7 Mon Sep 17 00:00:00 2001
From: Nick Coghlan <ncoghlan@gmail.com>
Date: Thu, 9 Feb 2017 16:03:59 +0100
Subject: [PATCH] Issue #26355: Specify canonical URLs in docs pages

Add canonical header link on each page to corresponding major
version of the documentation.

Patch by Matthias Bussonnier.
---
 Doc/tools/templates/layout.html | 1 +
 Misc/ACKS                       | 1 +
 Misc/NEWS                       | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html
index 5c180e7d016..640d8b30493 100644
--- 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
index 59b7704b73e..3c169d6ef54 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -218,6 +218,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
index 8419915c8ec..fa0e7408369 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -70,6 +70,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.