diff -r 00f7a0e6d959 src/java.base/share/classes/sun/security/tools/keytool/Main.java
--- a/src/java.base/share/classes/sun/security/tools/keytool/Main.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Main.java	Wed Dec 06 17:31:52 2017 +0100
@@ -528,7 +528,7 @@
             } else if (collator.compare(flags, "--help") == 0 ||
                        collator.compare(flags, "-h") == 0 ||
                        collator.compare(flags, "-?") == 0 ||
-                       // -help: legacy. Undocumented.
+                       // -help: legacy.
                        collator.compare(flags, "-help") == 0) {
                 help = true;
             } else if (collator.compare(flags, "-conf") == 0) {
diff -r 00f7a0e6d959 src/java.base/share/classes/sun/security/tools/keytool/Resources.java
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Resources.java	Wed Dec 06 17:31:52 2017 +0100
@@ -45,7 +45,7 @@
         {"option.1.set.twice", "The %s option is specified multiple times. All except the last one will be ignored."},
         {"multiple.commands.1.2", "Only one command is allowed: both %1$s and %2$s were specified."},
         {"Use.keytool.help.for.all.available.commands",
-                 "Use \"keytool -? -h or --help\" for all available commands"},
+                 "Use \"keytool -?, -h, or --help\" for this help message"},
         {"Key.and.Certificate.Management.Tool",
                  "Key and Certificate Management Tool"},
         {"Commands.", "Commands:"},
diff -r 00f7a0e6d959 src/java.scripting/share/classes/com/sun/tools/script/shell/Main.java
--- a/src/java.scripting/share/classes/com/sun/tools/script/shell/Main.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/java.scripting/share/classes/com/sun/tools/script/shell/Main.java	Wed Dec 06 17:31:52 2017 +0100
@@ -125,7 +125,7 @@
             } else if (arg.equals("-?") ||
                        arg.equals("-h") ||
                        arg.equals("--help") ||
-                       // -help: legacy. Undocumented.
+                       // -help: legacy.
                        arg.equals("-help")) {
                 usage(EXIT_SUCCESS);
             } else if (arg.equals("-e")) {
diff -r 00f7a0e6d959 src/java.scripting/share/classes/com/sun/tools/script/shell/messages.properties
--- a/src/java.scripting/share/classes/com/sun/tools/script/shell/messages.properties	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/java.scripting/share/classes/com/sun/tools/script/shell/messages.properties	Wed Dec 06 17:31:52 2017 +0100
@@ -55,7 +55,7 @@
 \  \-f <script file>     Evaluate given script file \n\
 \  \-f -                 Interactive mode, read script from standard input \n\
 \  \                     If this is used, this should be the last -f option \n\
-\  \-? -h --help         Print this help message and exit \n\
+\  \-? -h --help -help   Print this help message and exit \n\
 \  \-q                   List all scripting engines available and exit \n\
 \  \n\
 If [arguments..] are present and if no -e or -f option is used, then first\n\
diff -r 00f7a0e6d959 src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java
--- a/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java	Wed Dec 06 17:31:52 2017 +0100
@@ -140,7 +140,7 @@
             } else if (args[i].equalsIgnoreCase("-?") ||
                        args[i].equalsIgnoreCase("-h") ||
                        args[i].equalsIgnoreCase("--help") ||
-                       // -help: legacy. Undocumented.
+                       // -help: legacy.
                        args[i].equalsIgnoreCase("-help")) {
                 printHelp();
                 System.exit(0);
diff -r 00f7a0e6d959 src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java
--- a/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java	Wed Dec 06 17:31:52 2017 +0100
@@ -76,7 +76,7 @@
             ((args[0].equalsIgnoreCase("-?")) ||
              (args[0].equalsIgnoreCase("-h")) ||
              (args[0].equalsIgnoreCase("--help")) ||
-             // -help: legacy. Undocumented.
+             // -help: legacy.
              (args[0].equalsIgnoreCase("-help")))) {
             ktab.printHelp();
             System.exit(0);
diff -r 00f7a0e6d959 src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java	Wed Dec 06 17:31:52 2017 +0100
@@ -460,7 +460,7 @@
             } else if (collator.compare(flags, "-?") == 0 ||
                        collator.compare(flags, "-h") == 0 ||
                        collator.compare(flags, "--help") == 0 ||
-                       // -help: legacy. Undocumented.
+                       // -help: legacy.
                        collator.compare(flags, "-help") == 0) {
                 fullusage();
             } else {
diff -r 00f7a0e6d959 src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java
--- a/src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java	Wed Dec 06 17:31:52 2017 +0100
@@ -53,7 +53,7 @@
         if (args[0].equals("-?") ||
             args[0].equals("-h") ||
             args[0].equals("--help") ||
-            // -help: legacy. Undocumented.
+            // -help: legacy.
             args[0].equals("-help")) {
             showUsage = true;
             return;
diff -r 00f7a0e6d959 src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java
--- a/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java	Wed Dec 06 17:31:52 2017 +0100
@@ -66,7 +66,7 @@
             if (arg.equals("-?") ||
                 arg.equals("-h") ||
                 arg.equals("--help") ||
-                // -help: legacy. Undocumented.
+                // -help: legacy.
                 arg.equals("-help")) {
                 usage(0);
             }
@@ -259,7 +259,7 @@
         System.err.println("    -flags               to print VM flags");
         System.err.println("    -sysprops            to print Java system properties");
         System.err.println("    <no option>          to print both VM flags and system properties");
-        System.err.println("    -? | -h | --help     to print this help message");
+        System.err.println("    -? | -h | --help | -help to print this help message");
         System.exit(exit);
     }
 }
diff -r 00f7a0e6d959 src/jdk.jcmd/share/classes/sun/tools/jps/Arguments.java
--- a/src/jdk.jcmd/share/classes/sun/tools/jps/Arguments.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/jdk.jcmd/share/classes/sun/tools/jps/Arguments.java	Wed Dec 06 17:31:52 2017 +0100
@@ -52,12 +52,12 @@
     private HostIdentifier hostId;
 
     public static void printUsage(PrintStream ps) {
-      ps.println("usage: jps [-? -h --help]");
+      ps.println("usage: jps [--help]");
       ps.println("       jps [-q] [-mlvV] [<hostid>]");
       ps.println();
       ps.println("Definitions:");
       ps.println("    <hostid>:      <hostname>[:<port>]");
-      ps.println("    -? -h --help:  Print this help message and exit.");
+      ps.println("    -? -h --help -help: Print this help message and exit.");
     }
 
     public Arguments(String[] args) throws IllegalArgumentException {
@@ -67,7 +67,7 @@
             if ((args[0].compareTo("-?") == 0)
                 || (args[0].compareTo("-h")== 0)
                 || (args[0].compareTo("--help")== 0)
-                // -help: legacy. Undocumented.
+                // -help: legacy.
                 || (args[0].compareTo("-help")== 0)) {
               help = true;
               return;
diff -r 00f7a0e6d959 src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java
--- a/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java	Wed Dec 06 17:31:52 2017 +0100
@@ -59,7 +59,7 @@
             if (arg.equals("-?")     ||
                 arg.equals("-h")     ||
                 arg.equals("--help") ||
-                // -help: legacy. Undocumented.
+                // -help: legacy.
                 arg.equals("-help")) {
                 usage(0);
             }
@@ -175,7 +175,7 @@
         System.err.println("");
         System.err.println("Options:");
         System.err.println("    -l  long listing. Prints additional information about locks");
-        System.err.println("    -? -h --help to print this help message");
+        System.err.println("    -? -h --help -help to print this help message");
         System.exit(exit);
     }
 }
diff -r 00f7a0e6d959 src/jdk.jcmd/share/classes/sun/tools/jstat/Arguments.java
--- a/src/jdk.jcmd/share/classes/sun/tools/jstat/Arguments.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/jdk.jcmd/share/classes/sun/tools/jstat/Arguments.java	Wed Dec 06 17:31:52 2017 +0100
@@ -94,6 +94,7 @@
         ps.println("  <count>       Number of samples to take before terminating.");
         ps.println("  -J<flag>      Pass <flag> directly to the runtime system.");
         ps.println("  -? -h --help  Prints this help message.");
+        ps.println("  -help         Prints this help message.");
 
         // undocumented options:
         //   -list [<vmid>]  - list counter names
@@ -151,7 +152,7 @@
         if ((args[0].compareTo("-?") == 0)
                 || (args[0].compareTo("-h") == 0)
                 || (args[0].compareTo("--help") == 0)
-                // -help: legacy. Undocumented.
+                // -help: legacy.
                 || (args[0].compareTo("-help") == 0)) {
             help = true;
             return;
diff -r 00f7a0e6d959 src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties	Wed Dec 06 17:31:52 2017 +0100
@@ -41,7 +41,7 @@
 
 
 main.opt.help=\
-\  -? -h --help                     Print this help message
+\  -? -h --help -help               Print this help message
 
 main.opt.version=\
 \  -version                         Version information
diff -r 00f7a0e6d959 src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties	Wed Dec 06 17:31:52 2017 +0100
@@ -1,6 +1,6 @@
 main.usage.summary=\
 Usage: {0} <options> <path ...>]\n\
-use -h, -?, or --help for a list of possible options
+use --help for a list of possible options
 
 main.usage=\
 Usage: {0} <options> <path ...>]\n\
diff -r 00f7a0e6d959 src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java	Wed Dec 06 17:31:52 2017 +0100
@@ -1010,7 +1010,7 @@
             } else if (token.equals("-?") ||
                        token.equals("-h") ||
                        token.equals("--help") ||
-                       // -help: legacy. Undocumented.
+                       // -help: legacy.
                        token.equals("-help")) {
                 usage();
             } else if (token.equals("-version")) {
diff -r 00f7a0e6d959 src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java	Wed Dec 06 17:31:52 2017 +0100
@@ -426,7 +426,7 @@
              "Usage: {0} <options> <class> <arguments>\n" +
              "\n" +
              "where options include:\n" +
-             "    -? -h --help      print this help message and exit\n" +
+             "    -? -h --help -help print this help message and exit\n" +
              "    -sourcepath <directories separated by \"{1}\">\n" +
              "                      directories in which to look for source files\n" +
              "    -attach <address>\n" +
diff -r 00f7a0e6d959 test/jdk/sun/tools/jps/usage.out
--- a/test/jdk/sun/tools/jps/usage.out	Tue Oct 10 14:39:45 2017 +0200
+++ b/test/jdk/sun/tools/jps/usage.out	Wed Dec 06 17:31:52 2017 +0100
@@ -1,6 +1,6 @@
-usage: jps [-? -h --help]
+usage: jps [--help]
        jps [-q] [-mlvV] [<hostid>]
 
 Definitions:
     <hostid>:      <hostname>[:<port>]
-    -? -h --help:  Print this help message and exit.
+    -? -h --help -help: Print this help message and exit.
diff -r 00f7a0e6d959 test/jdk/sun/tools/jstat/usage.out
--- a/test/jdk/sun/tools/jstat/usage.out	Tue Oct 10 14:39:45 2017 +0200
+++ b/test/jdk/sun/tools/jstat/usage.out	Wed Dec 06 17:31:52 2017 +0100
@@ -19,3 +19,4 @@
   <count>       Number of samples to take before terminating.
   -J<flag>      Pass <flag> directly to the runtime system.
   -? -h --help  Prints this help message.
+  -help         Prints this help message.
diff -r 00f7a0e6d959 test/jdk/tools/launcher/HelpFlagsTest.java
--- a/test/jdk/tools/launcher/HelpFlagsTest.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/test/jdk/tools/launcher/HelpFlagsTest.java	Wed Dec 06 17:31:52 2017 +0100
@@ -144,24 +144,24 @@
         new ToolHelpSpec("javac",       1,   0,   1,   0,         1,    1,     2,       0),   // -?,     --help -help, Documents -help, -h is already taken for "native header output directory".
         new ToolHelpSpec("javadoc",     1,   1,   1,   0,         0,    0,     1,       0),   // -?, -h, --help
         new ToolHelpSpec("javah",       1,   1,   1,   0,         1,    0,     1,       0),   // -?, -h, --help, -help accepted but not documented.
-        new ToolHelpSpec("javap",       1,   1,   1,   0,         1,    0,     2,       0),   // -?, -h, --help, -help accepted but not documented.
+        new ToolHelpSpec("javap",       1,   1,   1,   0,         1,    1,     2,       0),   // -?, -h, --help, -help accepted but not documented.
         new ToolHelpSpec("javaw",       1,   1,   1,   0,         1,    1,     1,       0),   // -?, -h, --help -help, win only
         new ToolHelpSpec("jcmd",        1,   1,   1,   0,         1,    0,     1,       0),   // -?, -h, --help, -help accepted but not documented.
-        new ToolHelpSpec("jdb",         1,   1,   1,   0,         1,    0,     0,       0),   // -?, -h, --help, -help accepted but not documented.
+        new ToolHelpSpec("jdb",         1,   1,   1,   0,         1,    1,     0,       0),   // -?, -h, --help, -help accepted but not documented.
         new ToolHelpSpec("jdeprscan",   1,   1,   1,   0,         0,    0,     1,       0),   // -?, -h, --help
         new ToolHelpSpec("jdeps",       1,   1,   1,   0,         1,    0,     2,       0),   // -?, -h, --help, -help accepted but not documented.
         new ToolHelpSpec("jhsdb",       0,   0,   0,   0,         0,    0,     0,       0),   // none, prints help message anyways.
         new ToolHelpSpec("jimage",      1,   1,   1,   0,         0,    0,     2,       0),   // -?, -h, --help
-        new ToolHelpSpec("jinfo",       1,   1,   1,   0,         1,    0,     1,       0),   // -?, -h, --help, -help accepted but not documented.
+        new ToolHelpSpec("jinfo",       1,   1,   1,   0,         1,    1,     1,       0),   // -?, -h, --help, -help accepted but not documented.
         new ToolHelpSpec("jjs",         0,   1,   1, 100,         0,    0,   100,       0),   //     -h, --help, return code 100
         new ToolHelpSpec("jlink",       1,   1,   1,   0,         0,    0,     2,       0),   // -?, -h, --help
         new ToolHelpSpec("jmap",        1,   1,   1,   0,         1,    0,     1,       0),   // -?, -h, --help, -help accepted but not documented.
         new ToolHelpSpec("jmod",        1,   1,   1,   0,         1,    0,     2,       0),   // -?, -h, --help, -help accepted but not documented.
-        new ToolHelpSpec("jps",         1,   1,   1,   0,         1,    0,     1,       0),   // -?, -h, --help, -help accepted but not documented.
-        new ToolHelpSpec("jrunscript",  1,   1,   1,   0,         1,    0,     7,       0),   // -?, -h, --help, -help accepted but not documented.
+        new ToolHelpSpec("jps",         1,   1,   1,   0,         1,    1,     1,       0),   // -?, -h, --help, -help accepted but not documented.
+        new ToolHelpSpec("jrunscript",  1,   1,   1,   0,         1,    1,     7,       0),   // -?, -h, --help, -help accepted but not documented.
         new ToolHelpSpec("jshell",      1,   1,   1,   0,         1,    0,     1,       0),   // -?, -h, --help, -help accepted but not documented.
-        new ToolHelpSpec("jstack",      1,   1,   1,   0,         1,    0,     1,       0),   // -?, -h, --help, -help accepted but not documented.
-        new ToolHelpSpec("jstat",       1,   1,   1,   0,         1,    0,     1,       0),   // -?, -h, --help, -help accepted but not documented.
+        new ToolHelpSpec("jstack",      1,   1,   1,   0,         1,    1,     1,       0),   // -?, -h, --help, -help accepted but not documented.
+        new ToolHelpSpec("jstat",       1,   1,   1,   0,         1,    1,     1,       0),   // -?, -h, --help, -help accepted but not documented.
         new ToolHelpSpec("jstatd",      1,   1,   1,   0,         0,    0,     1,       0),   // -?, -h, --help
         new ToolHelpSpec("keytool",     1,   1,   1,   0,         1,    0,     1,       0),   // none, prints help message anyways.
         new ToolHelpSpec("pack200",     1,   1,   1,   0,         1,    0,     2,       0),   // -?, -h, --help, -help accepted but not documented.
@@ -174,10 +174,9 @@
 
     // Returns true if the file is not a tool.
     static boolean notATool(String file) {
-        if (isWindows && !file.endsWith(EXE_FILE_EXT)) {
-            return false;
-        }
-        return true;
+        if (isWindows && !file.endsWith(EXE_FILE_EXT))
+            return true;
+        return false;
     }
 
     // Returns true if tool is listed in TOOLS_NOT_TO_TEST.
@@ -322,7 +321,7 @@
     // invalid flags. In general, one would expect this to be != 0,
     // but currently a row of tools exit with 0 in this case.
     // The output should not ask to get help with flag '-help'.
-    static String testInvalidFlag(File f, String flag, int exitcode) {
+    static String testInvalidFlag(File f, String flag, int exitcode, boolean documentsLegacyHelp) {
         String result = "";
         TestResult tr = runToolWithFlag(f, flag);
 
@@ -335,17 +334,19 @@
                      "accepted. But it has exit code " + tr.exitValue + ".\n";
         }
 
-        // Check there is _no_ documentation of -help.
-        boolean foundFlag = false;
-        for (String y : tr.testOutput) {
-            if (!foundFlag && findFlagInLine(y, "-help")) {  // javac
-                foundFlag = true;
-                System.out.println("Found documentation of '-help': '" + y.trim() +"'");
+        if (!documentsLegacyHelp) {        
+            // Check there is _no_ documentation of -help.
+            boolean foundFlag = false;
+            for (String y : tr.testOutput) {
+                if (!foundFlag && findFlagInLine(y, "-help")) {  // javac
+                    foundFlag = true;
+                    System.out.println("Found documentation of '-help': '" + y.trim() +"'");
+                }
             }
-        }
-        if (foundFlag) {
-            result += "failed: " + f.getName() + " does document -help " +
-                "in error message. This legacy flag should not be documented.\n";
+            if (foundFlag) {
+                result += "failed: " + f.getName() + " does document -help " +
+                    "in error message. This legacy flag should not be documented.\n";
+            }
         }
 
         if (!result.isEmpty())
@@ -400,7 +401,7 @@
             // Check that the return code listing in jdkTools[] is
             // correct for an invalid flag.
             if (!tool.dontExecuteWithWrongFlags) {
-                errorMessage += testInvalidFlag(f, "-asdfxgr", tool.exitcodeOfWrongFlag);
+                errorMessage += testInvalidFlag(f, "-asdfxgr", tool.exitcodeOfWrongFlag, tool.documentsLegacyHelp);
             }
 
             // Test for legacy -help flag.
@@ -409,7 +410,7 @@
                     errorMessage += testLegacyFlag(f, tool.exitcodeOfHelp);
                 } else {
                     if (!tool.dontExecuteWithWrongFlags) {
-                        errorMessage += testInvalidFlag(f, "-help", tool.exitcodeOfWrongFlag);
+                        errorMessage += testInvalidFlag(f, "-help", tool.exitcodeOfWrongFlag, false);
                     }
                 }
             }
diff -r 00f7a0e6d959 test/langtools/tools/jdeps/MultiReleaseJar.java
--- a/test/langtools/tools/jdeps/MultiReleaseJar.java	Tue Oct 10 14:39:45 2017 +0200
+++ b/test/langtools/tools/jdeps/MultiReleaseJar.java	Wed Dec 06 17:31:52 2017 +0100
@@ -118,7 +118,7 @@
         checkResult(r, false,
                 "Error: unknown option: -multi-release",
                 "Usage: jdeps <options> <path",
-                "use -h, -?, or --help"
+                "use --help"
         );
 
         r = run("jdeps -v -R -cp Version.jar --multi-release 9 test/Main.class");