src/java.base/share/classes/sun/security/tools/keytool/Main.java

rev 48074 : 8189102: All tools should support -?, -h and --help
Reviewed-by: kvn, jjg, weijun, alanb, rfield, ksrini

@@ -523,13 +523,15 @@
              */
             Command c = Command.getCommand(flags);
 
             if (c != null) {
                 command = c;
-            } else if (collator.compare(flags, "-help") == 0 ||
+            } else if (collator.compare(flags, "--help") == 0 ||
                     collator.compare(flags, "-h") == 0 ||
-                    collator.compare(flags, "-?") == 0) {
+                       collator.compare(flags, "-?") == 0 ||
+                       // -help: legacy.
+                       collator.compare(flags, "-help") == 0) {
                 help = true;
             } else if (collator.compare(flags, "-conf") == 0) {
                 i++;
             } else if (collator.compare(flags, "-nowarn") == 0) {
                 nowarn = true;

@@ -4599,10 +4601,12 @@
                 if (c == KEYCLONE) break;
                 System.err.printf(" %-20s%s\n", c, rb.getString(c.description));
             }
             System.err.println();
             System.err.println(rb.getString(
+                    "Use.keytool.help.for.all.available.commands"));
+            System.err.println(rb.getString(
                     "Use.keytool.command.name.help.for.usage.of.command.name"));
         }
     }
 
     private void tinyHelp() {