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 %} + {% if builder != "htmlhelp" %} {% if not embedded %}{% endif %} {% if versionswitcher is defined and not embedded %}{% endif %} diff --git a/Misc/ACKS b/Misc/ACKS index a2427e1b924..319128c9e9a 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 c6402534ee9..dd6fcd0dcb7 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