]> granicus.if.org Git - python/commitdiff
Issue #24642: Improves help text displayed in the Windows installer.
authorSteve Dower <steve.dower@microsoft.com>
Sat, 18 Jul 2015 16:28:41 +0000 (09:28 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Sat, 18 Jul 2015 16:28:41 +0000 (09:28 -0700)
Tools/msi/bundle/Default.wxl

index c12fb65a2e15ee3eb5829bef3a260c28808a6534..7af907e0b52f2482c70ff0c646f30db18d01e000 100644 (file)
@@ -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>