diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html index 8923d9a09dc1..5c180e7d0164 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" %} + {%- 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" %}
  • {{ searchbox() }} {{ reldelim2 }} @@ -36,6 +38,7 @@ {% endblock %} {% block extrahead %} + {% if builder != "htmlhelp" %} {% if not embedded %}{% endif %} {% if versionswitcher is defined and not embedded %}{% endif %} {% if pagename == 'whatsnew/changelog' and not embedded %} @@ -95,6 +98,7 @@ }); {% endif %} + {% endif %} {{ super() }} {% endblock %} {% block footer %} diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst index cabff600e2d2..7e4912d2416b 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 `_. .. note:: diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst index 91c6cc1762e7..de0c3646bdb5 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 `. .. note:: diff --git a/Doc/whatsnew/changelog.rst b/Doc/whatsnew/changelog.rst index 07f90948bd0a..67a12f3374fc 100644 --- a/Doc/whatsnew/changelog.rst +++ b/Doc/whatsnew/changelog.rst @@ -1,3 +1,5 @@ +.. _changelog: + +++++++++ Changelog +++++++++ diff --git a/Misc/NEWS b/Misc/NEWS index 4c1f00c2af4c..16d6d843ccd8 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -103,6 +103,8 @@ Library Windows ------- +- Issue #28251: Improvements to help manuals on Windows. + - Issue #28110: launcher.msi has different product codes between 32-bit and 64-bit diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj index 60116df271d9..807213f12a76 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -88,7 +88,9 @@ ucrtbase ucrtbased - + @@ -99,6 +101,8 @@ @rem This is only meant as a convenience for developing CPython @rem and using it outside of that context is ill-advised. @echo Running $(Configuration)^|$(Platform) interpreter... +@setlocal +@set PYTHONHOME=$(PySourcePath) @"$(OutDir)python$(PyDebugExt).exe" %* <_ExistingContent Condition="Exists('$(PySourcePath)python.bat')">$([System.IO.File]::ReadAllText('$(PySourcePath)python.bat')) diff --git a/Tools/msi/build.bat b/Tools/msi/build.bat index a61ace8a9592..69f00c0bb43f 100644 --- a/Tools/msi/build.bat +++ b/Tools/msi/build.bat @@ -43,6 +43,9 @@ if defined BUILDDOC ( if errorlevel 1 goto :eof ) +rem Build the launcher MSI separately +msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 + set BUILD_CMD="%D%bundle\snapshot.wixproj" if defined BUILDTEST ( set BUILD_CMD=%BUILD_CMD% /p:UseTestMarker=true diff --git a/Tools/msi/doc/doc.wxs b/Tools/msi/doc/doc.wxs index 8dd0e21ae39c..306fb11dc661 100644 --- a/Tools/msi/doc/doc.wxs +++ b/Tools/msi/doc/doc.wxs @@ -7,6 +7,12 @@ + + + + 1 + + @@ -20,10 +26,12 @@ + WorkingDirectory="InstallDirectory" + Show="maximized" />