--- old/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties	2019-04-19 16:02:14.076788133 -0700
+++ new/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties	2019-04-19 16:02:13.800788141 -0700
@@ -27,27 +27,27 @@
 MSG_Help=Usage: jpackage <mode> <options>\n\
 \n\
 where mode is one of: \n\
-\  create-image\n\
+\  create-app-image\n\
 \          Generates a platform-specific application image.\n\
 \  create-installer\n\
 \          Generates a platform-specific installer for the application.\n\
 \          \n\
 Sample usages:\n\
 --------------\n\
+\    Generate a non-modular application image:\n\
+\        jpackage create-app-image -o outputdir -i inputdir -n name \\\n\
+\            --main-class className --main-jar MyJar.jar\n\
 \    Generate a modular application image:\n\
-\        jpackage create-image -o outputdir -n name \\\n\
-\            -m moduleName/className -p modulePath\n\
+\        jpackage create-app-image -o outputdir -n name \\\n\
+\            -p modulePath -m moduleName/className\n\
 \        To provide your own options to jlink, run jlink separately:\n\
-\            jlink --output app.runtime -m moduleName -p modulePath \\\n\
+\            jlink --output appRuntimeImage -p ModulePath -m moduleName\\\n\
 \                --no-header-files [<additional jlink options>...]\n\
-\            jpackage -o outputdir -n name -m moduleName/className \\\n\
-\                --runtime-image app-runtime\n\
-\    Generate a non-modular application image:\n\
-\        jpackage create-image -o outputdir -i inputdir -n name \\\n\
-\            --main-class className --main-jar MyJar.jar\n\
+\            jpackage create-app-image -o outputdir -n name\\\n\
+\                -m moduleName/className --runtime-image appRuntimeIMage\n\
 \    Generate an application installer:\n\
 \        jpackage create-installer -o outputdir -n name \\\n\
-\            -m moduleName/className -p modulePath\n\
+\            -p modulePath -m moduleName/className\n\
 \        jpackage create-installer -i inputdir -o outputdir -n name \\\n\
 \            --main-class package.ClassName --main-jar MyJar.jar\n\
 \        jpackage create-installer -o outputdir -n <installer-name> \\\n\
@@ -59,6 +59,7 @@
 Generic Options:\n\
 \  @<filename> \n\
 \          Read options and/or mode from a file \n\
+\          This option can be used multiple times.\n\
 \  --app-version <version>\n\
 \          Version of the application and/or installer\n\
 \  --copyright <copyright string>\n\
@@ -95,11 +96,13 @@
 \          if not specified, either just the main module (if --module is\n\
 \          specified), or the default set of modules (if --main-jar is \n\
 \          specified) are used.\n\
+\          This option can be used multiple times.\n\
 \  --module-path -p <module path>...\n\
 \          A {0} separated list of paths\n\
 \          Each path is either a directory of modules or the path to a\n\
 \          modular jar.\n\
 \          (each path is absolute or relative to the current directory)\n\
+\          This option can be used multiple times.\n\
 \  --runtime-image <file path>\n\
 \          Path of the predefined runtime image that will be copied into\n\
 \          the application image\n\
@@ -111,30 +114,36 @@
 \          --add-modules is not specified.\n\
 \n\
 \Options for creating the application image:\n\
-\  --files -f <input file>[{0}<input file>...]\n\
-\          A {0} separated list of files in the input dir to be packaged\n\
-\          If omitted, all files in the input directory will be packaged.\n\
 \  --icon <icon file path>\n\
 \          Path of the icon of the application bundle\n\
 \          (absolute path or relative to the current directory)\n\
 \  --input -i <input path>\n\
 \          Path of the input directory that contains the files to be packaged\n\
 \          (absolute path or relative to the current directory)\n\
+\          All files in the input directory will be packaged into the\n\
+\          application image.\n\
 \n\
 \Options for creating the application launcher(s):\n\
-\  --add-launcher <file path>\n\
-\          Path to a Properties file that contains list of key, value pairs\n\
-\          (absolute path or relative to the current directory)\n\
-\          The keys "name" (required), "module", "add-modules",\n\
-\          "main-jar", "main-class", "arguments", "java-options",\n\
-\          "app-version", "icon", and "win-console" can be used.\n\
+\  --add-launcher <launcher name>=<file path>\n\
+\          Name of launcher, and a path to a Properties file that contains\n\
+\          a list of key, value pairs\n\
+\          (absolute path or relative to the current directory)\n\
+\          The keys "module", "add-modules", "main-jar", "main-class",\n\
+\          "arguments", "java-options", "app-version", "icon", and\n\
+\          "win-console" can be used.\n\
 \          These options are added to, or used to overwrite, the original\n\
-\          command line options when building an additional launcher.\n\
+\          command line options to build an additional alternative launcher.\n\
+\          The main application launcher will be built from the command line\n\
+\          options. Additional alternative launchers can be built using\n\
+\          this option, and this option can be used multiple times to\n\
+\          build multiple additional launchers. \n\
 \  --arguments <main class arguments>\n\
 \          Command line arguments to pass to the main class if no command\n\
 \          line arguments are given to the launcher\n\
+\          This option can be used multiple times.\n\
 \  --java-options <java options>\n\
 \          Options to pass to the Java runtime\n\
+\          This option can be used multiple times.\n\
 \  --main-class <class name>\n\
 \          Qualified name of the application main class to execute\n\
 \          This option can only be used if --main-jar is specified.\n\
@@ -155,16 +164,17 @@
 \          Location of the predefined application image that is used\n\
 \          to build an installable package\n\
 \          (absolute path or relative to the current directory)\n\
-\          See the create-image mode options to create the application image.\n\
+\          See create-app-image mode options to create the application image.\n\
 \  --file-associations <file path>\n\
 \          Path to a Properties file that contains list of key, value pairs\n\
 \          (absolute path or relative to the current directory)\n\
 \          The keys "extension", "mime-type", "icon", and "description"\n\
 \          can be used to describe the association.\n\
+\          This option can be used multiple times.\n\
 \  --identifier <id string>\n\
-\          Machine readable identifier of the application\n\
-\          The format must be a DNS name in reverse order,\n\
-\          such as com.example.myapplication.\n\
+\          An identifier that uniquely identifies the application\n\
+\          Defaults to the main class name.\n\
+\          The value should be a valid DNS name.\n\
 \  --install-dir <file path>\n\
 \          {4}\
 \  --installer-type <type> \n\
@@ -221,7 +231,7 @@
 MSG_Help_mac_launcher=\
 \  --mac-bundle-identifier <ID string>\n\
 \          An identifier that uniquely identifies the application for MacOSX\n\
-\          (and on the Mac App Store)\n\
+\          Defaults to the value of --identifier option.\n\
 \          May only use alphanumeric (A-Z,a-z,0-9), hyphen (-),\n\
 \          and period (.) characters.\n\
 \  --mac-bundle-name <name string>\n\