summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2017-02-09 15:09:03 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2017-02-09 15:09:03 (GMT)
commitc7a24a7330bc18b06bdcb76ab2141d5bbf41372c (patch)
treeefdd92f4d7825babfde0600de79426b526f48f35 /Misc
parent12c5838dae390793009d73ba486b6b2be18cfd43 (diff)
parente1857579f8aefee8e3b671af422a5e728f6f6ce0 (diff)
downloadcpython-c7a24a7330bc18b06bdcb76ab2141d5bbf41372c.zip
cpython-c7a24a7330bc18b06bdcb76ab2141d5bbf41372c.tar.gz
cpython-c7a24a7330bc18b06bdcb76ab2141d5bbf41372c.tar.bz2
Merge issue #26355 fix from 3.6
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 a2427e1..319128c 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 c640253..dd6fcd0 100644
--- 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