4 files changed, 10 insertions, 3 deletions
diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html
index 8923d9a..5c180e7 100644
--- a/Doc/tools/templates/layout.html
+++ b/Doc/tools/templates/layout.html
@@ -14,6 +14,7 @@
 {% endblock %}
 {%- macro searchbox() %}
 {# modified from sphinx/themes/basic/searchbox.html #}
+    {%- if builder != "htmlhelp" %}
     <div class="inline-search" style="display: none" role="search">
         <form class="inline-search" action="{{ pathto('search') }}" method="get">
           <input placeholder="{{ _('Quick search') }}" type="text" name="q" />
@@ -23,11 +24,12 @@
         </form>
     </div>
     <script type="text/javascript">$('.inline-search').show(0);</script>
+    {%- endif %}
 {%- endmacro %}
 {% block relbar1 %} {% if builder != 'qthelp' %} {{ relbar() }} {% endif %} {% endblock %}
 {% block relbar2 %} {% if builder != 'qthelp' %} {{ relbar() }} {% endif %} {% endblock %}
 {% block relbaritems %}
-    {%- if pagename != "search" and builder != "singlehtml" %}
+    {%- if pagename != "search" and builder != "singlehtml" and builder != "htmlhelp" %}
     <li class="right">
         {{ searchbox() }}
         {{ reldelim2 }}
@@ -36,6 +38,7 @@
 {% endblock %}
 {% block extrahead %}
     <link rel="shortcut icon" type="image/png" href="{{ pathto('_static/py.png', 1) }}" />
+    {% 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 %}
     {% if pagename == 'whatsnew/changelog' and not embedded %}
@@ -95,6 +98,7 @@
       });
     </script>
     {% endif %}
+    {% endif %}
 {{ super() }}
 {% endblock %}
 {% block footer %}
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index cabff60..7e4912d 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -47,7 +47,8 @@
 
 This article explains the new features in Python 3.6, compared to 3.5.
 
-For full details, see the :source:`Misc/NEWS` file.
+For full details, see the
+`changelog <https://docs.python.org/3.6/whatsnew/changelog.html>`_.
 
 .. note::
 
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index 91c6cc1..de0c364 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -47,7 +47,7 @@
 
 This article explains the new features in Python 3.7, compared to 3.6.
 
-For full details, see the :source:`Misc/NEWS` file.
+For full details, see the :ref:`changelog <changelog>`.
 
 .. note::
 
diff --git a/Doc/whatsnew/changelog.rst b/Doc/whatsnew/changelog.rst
index 07f9094..67a12f3 100644
--- a/Doc/whatsnew/changelog.rst
+++ b/Doc/whatsnew/changelog.rst
@@ -1,3 +1,5 @@
+.. _changelog:
+
 +++++++++
 Changelog
 +++++++++