[setup - the official Cygwin setup program] branch master, updated. release_2.883-6-gb000ea1

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=b000ea175ccac3236a202c4c066d7c2b3a67e3ec

commit b000ea175ccac3236a202c4c066d7c2b3a67e3ec
Author: Jon Turney <[email protected]>
Date:   Sun Jan 7 19:46:26 2018 +0000

    Improve help text
    
    Various clarifications to option descriptions
    Consistently start option descriptions with a capital letter
    Add an extra line to mention download & install/download/install modes


Diff:
---
 choose.cc   |   10 +++++-----
 download.cc |    2 +-
 main.cc     |    5 +++--
 site.cc     |    4 ++--
 source.cc   |    4 ++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/choose.cc b/choose.cc
index ce9fa57..a676a64 100644
--- a/choose.cc
+++ b/choose.cc
@@ -60,11 +60,11 @@
 #include "Exception.h"
 
 #include "getopt++/BoolOption.h"
-static BoolOption UpgradeAlsoOption (false, 'g', "upgrade-also", "also upgrade installed packages");
-static BoolOption CleanOrphansOption (false, 'o', "delete-orphans", "remove orphaned packages");
-static BoolOption ForceCurrentOption (false, 'f', "force-current", "select the current version for all packages");
-static BoolOption PruneInstallOption (false, 'Y', "prune-install", "prune the installation to only the requested packages");
-static BoolOption MirrorOption (false, 'm', "mirror-mode", "Skip availability check when installing from local directory (requires local directory to be clean mirror!)");
+static BoolOption UpgradeAlsoOption (false, 'g', "upgrade-also", "Also upgrade installed packages");
+static BoolOption CleanOrphansOption (false, 'o', "delete-orphans", "Remove orphaned packages");
+static BoolOption ForceCurrentOption (false, 'f', "force-current", "Select the current version for all packages");
+static BoolOption PruneInstallOption (false, 'Y', "prune-install", "Prune the installation to only the requested packages");
+static BoolOption MirrorOption (false, 'm', "mirror-mode", "Skip package availability check when installing from local directory (requires local directory to be clean mirror!)");
 
 using namespace std;
 
diff --git a/download.cc b/download.cc
index 4a36e64..322a4c1 100644
--- a/download.cc
+++ b/download.cc
@@ -52,7 +52,7 @@ using namespace std;
 
 extern ThreeBarProgressPage Progress;
 
-BoolOption IncludeSource (false, 'I', "include-source", "Automatically include source download");
+BoolOption IncludeSource (false, 'I', "include-source", "Automatically install source for every package installed");
 
 static bool
 validateCachedPackage (const std::string& fullname, packagesource & pkgsource)
diff --git a/main.cc b/main.cc
index 7c1170e..028f8de 100644
--- a/main.cc
+++ b/main.cc
@@ -87,12 +87,12 @@ using namespace std;
 
 HINSTANCE hinstance;
 
-static StringOption Arch ("", 'a', "arch", "architecture to install (x86_64 or x86)", false);
+static StringOption Arch ("", 'a', "arch", "Architecture to install (x86_64 or x86)", false);
 static BoolOption UnattendedOption (false, 'q', "quiet-mode", "Unattended setup mode");
 static BoolOption PackageManagerOption (false, 'M', "package-manager", "Semi-attended chooser-only mode");
 static BoolOption NoAdminOption (false, 'B', "no-admin", "Do not check for and enforce running as Administrator");
 static BoolOption WaitOption (false, 'W', "wait", "When elevating, wait for elevated child process");
-static BoolOption HelpOption (false, 'h', "help", "print help");
+static BoolOption HelpOption (false, 'h', "help", "Print help");
 static StringOption SetupBaseNameOpt ("setup", 'i', "ini-basename", "Use a different basename, e.g. \"foo\", instead of \"setup\"", false);
 BoolOption UnsupportedOption (false, '\0', "allow-unsupported-windows", "Allow old, unsupported Windows versions");
 std::string SetupBaseName;
@@ -294,6 +294,7 @@ WinMain (HINSTANCE h,
 	Log (LOG_PLAIN) << "\nCommand Line Options:\n" << endLog;
 	GetOption::GetInstance ().ParameterUsage (Log (LOG_PLAIN));
 	Log (LOG_PLAIN) << endLog;
+	Log (LOG_PLAIN) << "The default is to both download and install packages, unless either --download or --local-install is specified." << endLog;
 	Logger ().exit (invalid_option ? 1 : 0, false);
 	goto finish_up;
       }
diff --git a/site.cc b/site.cc
index 5e20b3b..b609ecf 100644
--- a/site.cc
+++ b/site.cc
@@ -94,9 +94,9 @@ SiteList cached_site_list;
 /* Stale selected sites to warn about and add to cache */
 SiteList dropped_site_list;
 
-StringArrayOption SiteOption('s', "site", "Download site");
+StringArrayOption SiteOption('s', "site", "Download site URL");
 
-BoolOption OnlySiteOption(false, 'O', "only-site", "Ignore all sites except for -s");
+BoolOption OnlySiteOption(false, 'O', "only-site", "Do not download mirror list.  Only use sites specified with -s.");
 extern BoolOption UnsupportedOption;
 
 SiteSetting::SiteSetting (): saved (false)
diff --git a/source.cc b/source.cc
index 42b565e..10298db 100644
--- a/source.cc
+++ b/source.cc
@@ -33,8 +33,8 @@
 
 #include "getopt++/BoolOption.h"
 
-static BoolOption DownloadOption (false, 'D', "download", "Download from internet");
-static BoolOption LocalOption (false, 'L', "local-install", "Install from local directory");
+static BoolOption DownloadOption (false, 'D', "download", "Download packages from internet only");
+static BoolOption LocalOption (false, 'L', "local-install", "Install packages from local directory only");
 
 static int rb[] =
   { IDC_SOURCE_NETINST, IDC_SOURCE_DOWNLOAD, IDC_SOURCE_LOCALDIR, 0 };