diff -r 410fd33a2c81 -r 9f59eeb3cc0f src/jdk.packager/share/classes/jdk/packager/internal/resources/CLIHelp.properties
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/CLIHelp.properties	Mon Oct 01 08:44:14 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/CLIHelp.properties	Mon Oct 01 09:04:49 2018 -0400
@@ -28,6 +28,10 @@
 Generates a Server JRE installer.\n\
 \n\
 The following options are valid for all platforms:\n\
+\  --help -i \n\
+\          Shows the usage text, followed by a list and description of each valid option for the current platform and the given mode.\n\
+\          If no mode is given, shows the usage text, followed by a list and description of each valid option for the current platform.\n\
+\          When this option is used, all other options are ignored.\n\
 \  --output -o\n\
 \          Name of the directory where generated output file is placed.\n\
 \  --input -i\n\
@@ -66,9 +70,6 @@
 \          Removes native executables from the custom run-time images.\n\
 \  --jvm-args\n\
 \          JVM flags and options to pass to the application.\n\
-\  --user-jvm-args\n\
-\          JVM options the user may override along and their default values\n\
-\          (see UserJvmOptionsService API for more details).\n\
 \  --file-associations\n\
 \          Properties file that contains list of key=value parameters that\n\
 \          describe a file association. "extension", "mime-type", "icon",\n\