diff -r 242bcad5be74 -r 019063968164 src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java --- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Mon Jun 03 17:09:26 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Mon Jun 03 17:24:47 2013 -0700 @@ -324,8 +324,19 @@ option.startsWith("-xdoclint:")) { return 1; } else if (option.equals("-help")) { + // Uugh: first, this should not be hidden inside optionLength, + // and second, we should not be writing directly to stdout. + // But we have no access to a DocErrorReporter, which would + // allow use of reporter.printNotice System.out.println(getText("doclet.usage")); return 1; + } else if (option.equals("-x")) { + // Uugh: first, this should not be hidden inside optionLength, + // and second, we should not be writing directly to stdout. + // But we have no access to a DocErrorReporter, which would + // allow use of reporter.printNotice + System.out.println(getText("doclet.X.usage")); + return 1; } else if (option.equals("-footer") || option.equals("-header") || option.equals("-packagesheader") ||