langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java

*** 170,180 ****
      void usage() {
          usage(true);
      }
  
      void usage(boolean exit) {
!         usage("main.usage", "-help", null, exit);
      }
  
      @Override
      void Xusage() {
          Xusage(true);
--- 170,180 ----
      void usage() {
          usage(true);
      }
  
      void usage(boolean exit) {
!         usage("main.usage", "-help", "main.usage.foot", exit);
      }
  
      @Override
      void Xusage() {
          Xusage(true);
*** 353,370 ****
  
          if (fileManager instanceof BaseFileManager) {
              ((BaseFileManager) fileManager).handleOptions(fileManagerOpts);
          }
  
!         String platformString = compOpts.get("-release");
  
          if (platformString != null) {
              if (compOpts.isSet("-source")) {
                  usageError("main.release.bootclasspath.conflict", "-source");
              }
!             if (fileManagerOpts.containsKey(BOOTCLASSPATH)) {
!                 usageError("main.release.bootclasspath.conflict", BOOTCLASSPATH.getText());
              }
  
              PlatformDescription platformDescription =
                      PlatformUtils.lookupPlatformDescription(platformString);
  
--- 353,370 ----
  
          if (fileManager instanceof BaseFileManager) {
              ((BaseFileManager) fileManager).handleOptions(fileManagerOpts);
          }
  
!         String platformString = compOpts.get("--release");
  
          if (platformString != null) {
              if (compOpts.isSet("-source")) {
                  usageError("main.release.bootclasspath.conflict", "-source");
              }
!             if (fileManagerOpts.containsKey(BOOT_CLASS_PATH)) {
!                 usageError("main.release.bootclasspath.conflict", BOOT_CLASS_PATH.getPrimaryName());
              }
  
              PlatformDescription platformDescription =
                      PlatformUtils.lookupPlatformDescription(platformString);