Help: Short options first, then long, then Windows style

Help/manual/OPTIONS_HELP.txt

@@ -1,12 +1,12 @@
 .. |file| replace:: The help is printed to a named ``<file>`` if given.
 
-.. option:: --help, -help, -usage, -h, -H, /?
+.. option:: -h, -H, --help, -help, -usage, /?
 
  Print usage information and exit.
 
  Usage describes the basic command line interface and its options.
 
-.. option:: --version, -version, /V [<file>]
+.. option:: -version [<file>], --version [<file>], /V [<file>]
 
  Show program name/version banner and exit.
 

Help/manual/cmake.1.rst

@@ -545,7 +545,7 @@ following options:
   Some native build tools always build in parallel.  The use of ``<jobs>``
   value of ``1`` can be used to limit to a single job.
 
-.. option:: --target <tgt>..., -t <tgt>...
+.. option:: -t <tgt>..., --target <tgt>...
 
   Build ``<tgt>`` instead of the default target.  Multiple targets may be
   given, separated by spaces.

Help/manual/cpack.1.rst

@@ -73,7 +73,7 @@ Options
   details.  By default, ``CPackConfig.cmake`` in the current directory will
   be used.
 
-.. option:: --verbose, -V
+.. option:: -V, --verbose
 
   Run ``cpack`` with verbose output.  This can be used to show more details
   from the package generation tools and is suitable for project developers.

Source/CPack/cpack.cxx

@@ -50,7 +50,7 @@ const char* cmDocumentationOptions[][2] = {
   { "-C <Configuration>", "Specify the project configuration" },
   { "-D <var>=<value>", "Set a CPack variable." },
   { "--config <configFile>", "Specify the config file." },
-  { "--verbose,-V", "Enable verbose output" },
+  { "-V,--verbose", "Enable verbose output" },
   { "--trace", "Put underlying cmake scripts in trace mode." },
   { "--trace-expand", "Put underlying cmake scripts in expanded trace mode." },
   { "--debug", "Enable debug output (for CPack developers)" },

Source/cmakemain.cxx

@@ -627,14 +627,14 @@ int do_build(int ac, char const* const* av)
       "                   specifies a default parallel level when this "
       "option\n"
       "                   is not given.\n"
-      "  --target <tgt>..., -t <tgt>... \n"
+      "  -t <tgt>..., --target <tgt>...\n"
       "                 = Build <tgt> instead of default targets.\n"
       "  --config <cfg> = For multi-configuration tools, choose <cfg>.\n"
       "  --clean-first  = Build target 'clean' first, then build.\n"
       "                   (To clean only, use --target 'clean'.)\n"
       "  --resolve-package-references={on|only|off}\n"
       "                 = Restore/resolve package references during build.\n"
-      "  --verbose, -v  = Enable verbose output - if supported - including\n"
+      "  -v, --verbose  = Enable verbose output - if supported - including\n"
       "                   the build commands to be executed. \n"
       "  --             = Pass remaining options to the native tool.\n"
       ;