{{ 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.5.rst b/Doc/whatsnew/3.5.rst
index 9b71f6677a1..2ef4e915b6d 100644
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -46,8 +46,7 @@
This article explains the new features in Python 3.5, compared to 3.4.
Python 3.5 was released on September 13, 2015. See the
-`changelog `_ for a full
-list of changes.
+:ref:`changelog ` for a full list of changes.
.. seealso::
diff --git a/Doc/whatsnew/changelog.rst b/Doc/whatsnew/changelog.rst
index 07f90948bd0..67a12f3374f 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 9c00ee55203..cf97628edf1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -362,6 +362,8 @@ Tools/Demos
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 60116df271d..807213f12a7 100644
--- a/PCbuild/python.vcxproj
+++ b/PCbuild/python.vcxproj
@@ -88,7 +88,9 @@
ucrtbaseucrtbased
-
+
@@ -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 a61ace8a959..69f00c0bb43 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 8dd0e21ae39..306fb11dc66 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" />