--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties	Mon Feb 04 15:00:29 2019 -0500
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties	Wed Feb 06 09:00:28 2019 -0500
@@ -29,40 +29,31 @@
 where mode is one of: \n\
 \  create-image\n\
 \          Generates a platform-specific application image.\n\
-\  create-installer <type>\n\
+\  create-installer\n\
 \          Generates a platform-specific installer for the application.\n\
-\          Valid values for "type" are "msi", "exe", "rpm", "deb", "dmg",\n\
-\                           "pkg", and "pkg-app-store".\n\
-\          If "type" is omitted, all supported types of installable\n\
-\          packages for the current platform will be generated.\n\
-\  create-jre-installer <type>\n\
-\          Generates a platform-specific installer for JRE.\n\
-\          Valid values for "type" are "msi", "exe", "rpm", "deb", "dmg", \n\
-\                           and "pkg".\n\
-\          If "type" is omitted, all supported types of installable\n\
-\          packages for the current platform will be generated.\n\
 \          \n\
 Sample usages:\n\
 --------------\n\
-\    Generate an application image from a non-modular jar file:\n\
+\    Generate a modular application image:\n\
+\        jpackage create-image --output outputdir --name AppName \\\n\
+\            --main-class package.ClassName -module moduleName -p modulePath\n\
+\        jpackage create-image --o outputdir -n AppName \\\n\
+\            -c package.ClassName -m moduleName -p modulePath\n\
+\    Generate a non-modular application image:\n\
 \        jpackage create-image --input inputdir --output outputdir \\\n\
-\            --name AppName --class package.ClassName --main-jar MyJar.jar\n\
+\            --name AppName --main-class package.ClassName --main-jar MyJar.jar\n\
 \        jpackage create-image -i inputdir -o outputdir -n AppName \\\n\
 \            -c package.ClassName -j MyJar.jar\n\
-\    Generate an application image from a modular jar file:\n\
-\        jpackage create-image --output outputdir --name AppName \\\n\
-\            --class package.ClassName -module moduleName -p modulePath\n\
-\        jpackage create-image --o outputdir -n AppName \\\n\
-\            -c package.ClassName -m moduleName -p modulePath\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\
-              --app-image <app image dir>\n\
-\    Generate a JRE installer:\n\
-\        jpackage create-jre-installer -name <jre-name> -output outputdir\n\
-\        jpackage create-jre-installer -n <jre-name> -o outputdir \\\n\
-\             --runtime-image <path>\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\
 \n\
 The following options are valid for all platforms:\n\
 \  @<filename> \n\
@@ -87,8 +78,17 @@
 \          The main JAR of the application\n\
 \          (specified as a path relative to the input path)\n\
 \          This JAR should contain the main-class.\n\
-\  --class -c <class name>\n\
-\          Qualified name of the application class to execute\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\
+\          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\
 \  --app-version <version string>\n\
 \          Version of the application\n\
 \  --arguments -a <main class arguments>\n\
@@ -147,9 +147,9 @@
 \          Category or group of the application\n\
 \  --vendor <vendor string>\n\
 \          Vendor of the application\n\
-\  --force\n\
-\          Allow the deletion of any existing output root directory\n\
-\          when creating an Application image\n\
+\  --overwrite\n\
+\          Allow the recursive deletion of an existing application \n\
+\          output directory when creating an application image\n\
 \  --resource-dir <path>\n\
 \          Path to override jpackage resources\n\
 \          Icons, template files, and other resources of jpackage can be\n\
@@ -165,10 +165,8 @@
 \          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 {0} separated list of modules to add to JImage creation,\n\
+\          A comma (",") separated list of modules to add to JImage creation,\n\
 \          including possible services\n\
-\  --limit-modules <module list>\n\
-\          A {0} separated list of Modules to limit JImage creation to\n\
 
 MSG_Help_mac=\nThe following options are valid for Mac OS X platforms:\n\
 \  --mac-sign\n\