# HG changeset patch
# User herrick
# Date 1541774898 18000
# Node ID bab8a5dae6620c4bf5ca7c8c2a7719f8b38abcab
# Parent  8bb1fcdd611fef0376de343fce4c92ccb6716801
help text updates

diff -r 8bb1fcdd611f -r bab8a5dae662 src/jdk.jpackager/share/classes/jdk/jpackager/internal/CLIHelp.java
--- a/src/jdk.jpackager/share/classes/jdk/jpackager/internal/CLIHelp.java	Thu Nov 08 19:15:42 2018 -0500
+++ b/src/jdk.jpackager/share/classes/jdk/jpackager/internal/CLIHelp.java	Fri Nov 09 09:48:18 2018 -0500
@@ -26,6 +26,9 @@
 package jdk.jpackager.internal;
 
 import java.util.ResourceBundle;
+import java.io.File;
+import java.text.MessageFormat;
+
 
 /**
  * CLIHelp
@@ -42,9 +45,11 @@
 
         Platform platform = Platform.getPlatform();
         if (noArgs) {
-            Log.info(I18N.getString("MSG_Help_no_args"));
+            Log.info(MessageFormat.format(
+                     I18N.getString("MSG_Help_no_args"), File.pathSeparator));
         } else {
-            Log.info(I18N.getString("MSG_Help_common"));
+            Log.info(MessageFormat.format(
+                    I18N.getString("MSG_Help_common"), File.pathSeparator));
 
             switch (platform) {
                 case MAC:
diff -r 8bb1fcdd611f -r bab8a5dae662 src/jdk.jpackager/share/classes/jdk/jpackager/internal/resources/CLIHelp.properties
--- a/src/jdk.jpackager/share/classes/jdk/jpackager/internal/resources/CLIHelp.properties	Thu Nov 08 19:15:42 2018 -0500
+++ b/src/jdk.jpackager/share/classes/jdk/jpackager/internal/resources/CLIHelp.properties	Fri Nov 09 09:48:18 2018 -0500
@@ -44,9 +44,9 @@
 \          \n\
 Sample usages:\n\
 --------------\n\
-jpackager create-image --input inputdir --output outputdir --name AppName --class package.ClassName\n\
+jpackager create-image --input inputdir --output outputdir --name AppName --class package.ClassName --main-jar AppName.jar\n\
 or\n\
-jpackager create-image -i inputdir -o outputdir -n AppName -c package.ClassName\n\
+jpackager create-image -o outputdir -n AppName -c package.ClassName -m moduleName -p modulePath\n\
 Generates an application image.\n\
 \n\
 jpackager create-installer -i inputdir -o outputdir -n "App Name" -c package.ClassName\n\
@@ -63,10 +63,10 @@
 \  --output -o <output dir>\n\
 \          Name of the directory where generated output file is placed.\n\
 \  --input -i <input dir>\n\
-\          Name of the base directory that contains the files to package.\n\
+\          Name of the input directory that contains the files to package.\n\
 \  --files -f <input files>\n\
-\          List of files in the base directory. If omitted, all files from "input"\n\
-\          directory will be packaged.\n\
+\          A {0} separated list of files in the input directory 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 name>\n\
@@ -87,7 +87,6 @@
 \  --identifier <id string>\n\
 \          Machine readable identifier of the application. The format\n\
 \          must be a DNS name in reverse order, such as com.example.myapplication.\n\
-\          The identifier is used for composing Single Instance unique id.\n\
 \  --verbose\n\
 \          Enables verbose output.\n\
 \  --strip-native-commands\n\
@@ -112,7 +111,7 @@
 \          Installation directory of the application. Ignored on Windows, use\n\
 \          --win-dir-chooser to provide an ability to choose an installation directory.\n\
 \  --license-file <file name>\n\
-\          The license file, relative to the base directory.\n\
+\          The license file, relative to the input directory.\n\
 \  --copyright <copyright string>\n\
 \          Copyright for the application.\n\
 \  --description <description string>\n\
@@ -130,9 +129,10 @@
 \  --module-path -p <module path>\n\
 \          When packaging the Java Runtime, this is the path JLink looks in for modules.\n\
 \  --add-modules <module list>\n\
-\          List of modules to add to JImage creation, including possible services.\n\
+\          A {0} separated list of modules to add to JImage creation,\n\
+\          including possible services.\n\
 \  --limit-modules <module list>\n\
-\          Modules to limit JImage creation to.\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\
diff -r 8bb1fcdd611f -r bab8a5dae662 src/jdk.jpackager/share/classes/jdk/jpackager/internal/resources/CLIHelpi_ja.properties
--- a/src/jdk.jpackager/share/classes/jdk/jpackager/internal/resources/CLIHelpi_ja.properties	Thu Nov 08 19:15:42 2018 -0500
+++ b/src/jdk.jpackager/share/classes/jdk/jpackager/internal/resources/CLIHelpi_ja.properties	Fri Nov 09 09:48:18 2018 -0500
@@ -44,9 +44,9 @@
 \          \n\
 Sample usages:\n\
 --------------\n\
-jpackager create-image --input inputdir --output outputdir --name AppName --class package.ClassName\n\
+jpackager create-image --input inputdir --output outputdir --name AppName --class package.ClassName --main-jar AppName.jar\n\
 or\n\
-jpackager create-image -i inputdir -o outputdir -n AppName -c package.ClassName\n\
+jpackager create-image -o outputdir -n AppName -c package.ClassName -m moduleName -p modulePath\n\
 Generates an application image.\n\
 \n\
 jpackager create-installer -i inputdir -o outputdir -n "App Name" -c package.ClassName\n\
@@ -63,10 +63,10 @@
 \  --output -o <output dir>\n\
 \          Name of the directory where generated output file is placed.\n\
 \  --input -i <input dir>\n\
-\          Name of the base directory that contains the files to package.\n\
+\          Name of the input directory that contains the files to package.\n\
 \  --files -f <input files>\n\
-\          List of files in the base directory. If omitted, all files from "input"\n\
-\          directory will be packaged.\n\
+\          A {0} separated list of files in the input directory 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 name>\n\
@@ -87,7 +87,6 @@
 \  --identifier <id string>\n\
 \          Machine readable identifier of the application. The format\n\
 \          must be a DNS name in reverse order, such as com.example.myapplication.\n\
-\          The identifier is used for composing Single Instance unique id.\n\
 \  --verbose\n\
 \          Enables verbose output.\n\
 \  --strip-native-commands\n\
@@ -112,7 +111,7 @@
 \          Installation directory of the application. Ignored on Windows, use\n\
 \          --win-dir-chooser to provide an ability to choose an installation directory.\n\
 \  --license-file <file name>\n\
-\          The license file, relative to the base directory.\n\
+\          The license file, relative to the input directory.\n\
 \  --copyright <copyright string>\n\
 \          Copyright for the application.\n\
 \  --description <description string>\n\
@@ -130,9 +129,10 @@
 \  --module-path -p <module path>\n\
 \          When packaging the Java Runtime, this is the path JLink looks in for modules.\n\
 \  --add-modules <module list>\n\
-\          List of modules to add to JImage creation, including possible services.\n\
+\          A {0} separated list of modules to add to JImage creation,\n\
+\          including possible services.\n\
 \  --limit-modules <module list>\n\
-\          Modules to limit JImage creation to.\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\
diff -r 8bb1fcdd611f -r bab8a5dae662 src/jdk.jpackager/share/classes/jdk/jpackager/internal/resources/CLIHelpi_zh_CN.properties
--- a/src/jdk.jpackager/share/classes/jdk/jpackager/internal/resources/CLIHelpi_zh_CN.properties	Thu Nov 08 19:15:42 2018 -0500
+++ b/src/jdk.jpackager/share/classes/jdk/jpackager/internal/resources/CLIHelpi_zh_CN.properties	Fri Nov 09 09:48:18 2018 -0500
@@ -44,9 +44,9 @@
 \          \n\
 Sample usages:\n\
 --------------\n\
-jpackager create-image --input inputdir --output outputdir --name AppName --class package.ClassName\n\
+jpackager create-image --input inputdir --output outputdir --name AppName --class package.ClassName --main-jar AppName.jar\n\
 or\n\
-jpackager create-image -i inputdir -o outputdir -n AppName -c package.ClassName\n\
+jpackager create-image -o outputdir -n AppName -c package.ClassName -m moduleName -p modulePath\n\
 Generates an application image.\n\
 \n\
 jpackager create-installer -i inputdir -o outputdir -n "App Name" -c package.ClassName\n\
@@ -63,10 +63,10 @@
 \  --output -o <output dir>\n\
 \          Name of the directory where generated output file is placed.\n\
 \  --input -i <input dir>\n\
-\          Name of the base directory that contains the files to package.\n\
+\          Name of the input directory that contains the files to package.\n\
 \  --files -f <input files>\n\
-\          List of files in the base directory. If omitted, all files from "input"\n\
-\          directory will be packaged.\n\
+\          A {0} separated list of files in the input directory 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 name>\n\
@@ -87,7 +87,6 @@
 \  --identifier <id string>\n\
 \          Machine readable identifier of the application. The format\n\
 \          must be a DNS name in reverse order, such as com.example.myapplication.\n\
-\          The identifier is used for composing Single Instance unique id.\n\
 \  --verbose\n\
 \          Enables verbose output.\n\
 \  --strip-native-commands\n\
@@ -112,7 +111,7 @@
 \          Installation directory of the application. Ignored on Windows, use\n\
 \          --win-dir-chooser to provide an ability to choose an installation directory.\n\
 \  --license-file <file name>\n\
-\          The license file, relative to the base directory.\n\
+\          The license file, relative to the input directory.\n\
 \  --copyright <copyright string>\n\
 \          Copyright for the application.\n\
 \  --description <description string>\n\
@@ -130,9 +129,10 @@
 \  --module-path -p <module path>\n\
 \          When packaging the Java Runtime, this is the path JLink looks in for modules.\n\
 \  --add-modules <module list>\n\
-\          List of modules to add to JImage creation, including possible services.\n\
+\          A {0} separated list of modules to add to JImage creation,\n\
+\          including possible services.\n\
 \  --limit-modules <module list>\n\
-\          Modules to limit JImage creation to.\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\