--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties	Wed Feb 06 09:14:09 2019 -0500
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties	Tue Feb 12 11:54:56 2019 -0500
@@ -46,14 +46,14 @@
 \            -c package.ClassName -j MyJar.jar\n\
 \    Generate an application installer:\n\
 \        jpackage create-installer -i inputdir -o outputdir \\\n\
-\            -n "Installer Name" -c package.ClassName -j MyJar.jar\n\
-\        jpackage create-installer -o outputdir -n "Installer Name" \\\n\
+\            -n <installer-name> -c package.ClassName -j MyJar.jar\n\
+\        jpackage create-installer -o outputdir -n <installer-name>\\\n\
 \            --app-image <app image dir>\n\
 \    Generate a Java runtime installer:\n\
-\        jpackage create-installer --runtime-installer -name <jre-name>\\\n\
-\            --output outputdir\n\
-\        jpackage create-jre-installer --runtime-installer \\\n\
-\            -n <jre-name> -o outputdir --runtime-image <path>\n\
+\        jpackage create-installer --runtime-installer\\\n\
+\            --name <installer-name> --output outputdir\n\
+\        jpackage create-installer --runtime-installer \\\n\
+\            -n <installer-name> -o outputdir --runtime-image <runtime-path>\n\
 \n\
 The following options are valid for all platforms:\n\
 \  @<filename> \n\
@@ -69,31 +69,30 @@
 \  --input -i <input path>\n\
 \          Path of the input directory that contains the files to package\n\
 \          (absolute path or relative to the current directory)\n\
-\  --files -f <input files>\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\
 \  --name -n <application name>\n\
 \          Name of the application\n\
 \  --main-jar -j <main jar file>\n\
-\          The main JAR of the application\n\
+\          The main JAR of the application; containing the main class\n\
 \          (specified as a path relative to the input path)\n\
-\          This JAR should contain the main-class.\n\
 \  --main-class -c <class name>\n\
 \          Qualified name of the application main class to execute\n\
 \  --installer-type <type> \n\
-\          Specifies the type of the installer created in create-image mode\n\
+\          The type of the installer created in create-image mode\n\
 \          Valid values for "type" are "msi", "exe", "rpm", "deb", "dmg",\n\
 \                           "pkg", and "pkg-app-store".\n\
 \          If this option is not specified (in create-installer mode),\n\
 \          all supported types of installable packages for the current\n\
 \          platform will be generated.\n\
 \  --runtime-installer \n\
-\          Generates a platform-specific installer for Java runtime.\n\
+\          Generates a platform-specific installer for a Java runtime.\n\
 \  --app-version <version string>\n\
 \          Version of the application\n\
 \  --arguments -a <main class arguments>\n\
-\          Command line arguments to pass to the main class if no\n\
-\          arguments are specified by the launcher\n\
+\          Command line arguments to pass to the main class if no command\n\
+\          line arguments are given to the launcher\n\
 \  --icon <icon file path>\n\
 \          Path of the icon of the application bundle\n\
 \          (absolute path or relative to the current directory)\n\
@@ -106,7 +105,7 @@
 \  --strip-native-commands\n\
 \          Removes native executables from the custom run-time images\n\
 \  --jvm-args <java vm arguments>\n\
-\          JVM flags and options to pass to the application\n\
+\          Java arguments to pass to the virtual machine\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\
@@ -115,10 +114,11 @@
 \  --secondary-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), "version", "module", "class",\n\
+\          The keys "name" (required), "version", "module", "class",\n\
 \          "icon", "arguments", "jvm-args", "win-menu",\n\
-\          "win-shortcut", and "win-console" can be used to describe\n\
-\          the secondary launcher.\n\
+\          "win-shortcut", and "win-console" can be used.\n\
+\          These options are added to, or used to overwrite, the original\n\
+\          command line options when building the secondary launcher.\n\
 \  --build-root <file path>\n\
 \          Path of a new or empty directory used to create temporary files\n\
 \          (absolute path or relative to the current directory)\n\
@@ -164,9 +164,8 @@
 \  --module-path -p <module path>\n\
 \          Path JLink looks in for modules when packaging the Java Runtime\n\
 \          (absolute path or relative to the current directory)\n\
-\  --add-modules <module list>\n\
-\          A comma (",") separated list of modules to add to JImage creation,\n\
-\          including possible services\n\
+\  --add-modules <module name>[,<module name>...]\n\
+\          A comma (",") separated list of modules to add.\n\
 
 MSG_Help_mac=\nThe following options are valid for Mac OS X platforms:\n\
 \  --mac-sign\n\