summaryrefslogtreecommitdiff
path: root/Tools/msi/bundle
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-07-18 09:28:41 -0700
committerSteve Dower <steve.dower@microsoft.com>2015-07-18 09:28:41 -0700
commitafc84d0d4fedc0fec316c95ac51b43369b63ef9a (patch)
treef88143ad71a1d60599e5226ea9fce0c20f5c8285 /Tools/msi/bundle
parent3613aba41b2e155bcae32b2c1a1369cb3cebf10d (diff)
downloadcpython-afc84d0d4fedc0fec316c95ac51b43369b63ef9a.tar.gz
Issue #24642: Improves help text displayed in the Windows installer.
Diffstat (limited to 'Tools/msi/bundle')
-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 c12fb65a2e..7af907e0b5 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>