summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2017-02-09 15:08:17 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2017-02-09 15:08:17 (GMT)
commite1857579f8aefee8e3b671af422a5e728f6f6ce0 (patch)
tree59eea53ddfbf85f410ccf4c62e83f7dd3c9c5b37 /Misc
parent088507644e0cc396a24898c6e7ecb85daf2cbe0e (diff)
parente66244521c6e5f37b2964ea5165c6ac9b854b9c7 (diff)
downloadcpython-e1857579f8aefee8e3b671af422a5e728f6f6ce0.zip
cpython-e1857579f8aefee8e3b671af422a5e728f6f6ce0.tar.gz
cpython-e1857579f8aefee8e3b671af422a5e728f6f6ce0.tar.bz2
Merge issue #26355 fix from Python 3.5
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index ad5fc22..a6b3df1 100644
--- 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
index 13907da..a2d4241 100644
--- 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