summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-07-18 16:28:41 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-07-18 16:28:41 (GMT)
commit61ca207090b8276d35a828c030f54d983d55f23d (patch)
treeddf7b7dd460d8bf58f9c55f3c2b817cc3701da81
parent2434aa24e049e54fb6573d7e5126b410c4569037 (diff)
downloadcpython-61ca207090b8276d35a828c030f54d983d55f23d.zip
cpython-61ca207090b8276d35a828c030f54d983d55f23d.tar.gz
cpython-61ca207090b8276d35a828c030f54d983d55f23d.tar.bz2
Issue #24642: Improves help text displayed in the Windows installer.
-rw-r--r--Tools/msi/bundle/Default.wxl19
1 files changed, 9 insertions, 10 deletions
diff --git a/Tools/msi/bundle/Default.wxl b/Tools/msi/bundle/Default.wxl
index c12fb65..7af907e 100644
--- a/Tools/msi/bundle/Default.wxl
+++ b/Tools/msi/bundle/Default.wxl
@@ -26,20 +26,19 @@ Continue?</String>
<String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
<String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String>
<String Id="HelpHeader">Setup Help</String>
- <String Id="HelpText">/uninstall
- Uninstalls Python without prompting for confirmation.
+ <String Id="HelpText">Visit &lt;a href="http://docs.python.org/[ShortVersion]/using/windows.html"&gt;docs.python.org/[ShortVersion]/using/windows.html&lt;/a&gt; for the full list of options, including the ability to enable and disable specific features.
-/layout [\[]directory[\]]
- Downloads all components for offline installation.
+"/passive" to display progress without requiring user interaction
-/passive
- Displays progress without requiring user interaction.
+"/quiet" to install/uninstall without displaying any UI
-/quiet
- Performs the requested action without displaying any UI.
+"/simple" to prevent user customization
-/log [\[]filename[\]]
- Logs to a specific file. By default, log files are created in %TEMP%.</String>
+"/uninstall" to remove Python (without confirmation)
+
+"/layout [\[]directory[\]]" to pre-download all components
+
+"/log [\[]filename[\]]" to specify log files location</String>
<String Id="InstallLicenseLinkText">[WixBundleName] &lt;a href="#"&gt;license terms&lt;/a&gt;.</String>
<String Id="InstallAcceptCheckbox">I &amp;agree to the license terms and conditions</String>
<String Id="InstallButton">&amp;Install Now</String>