From 61cfba9be6d79eb9cea135c86330dfcad9ed29d8 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Wed, 04 Apr 2007 07:46:18 +0000
Subject: [PATCH] Fix CLI consistency  issues: 1407 1408 1410 1411 1412 1413 1414 1416 1417 1418 1419 1420 1421

---
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties |   58 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
index d3b29ec..641dd33 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
@@ -35,69 +35,69 @@
 Server.\n\Usage:  {0} {options}\n        where {options} include:\n\
 --cli\n\    Specifies to use the command line setup.  If not specified the \
 graphical\n\    interface will be launched.\n\
--H  or   --help\n    Displays usage information for this program.\n\n\
+-H , --help\n    Display this usage information.\n\n\
 The following options will only be taken into account if the option --cli \n\
 (command line) is specified\n\
--s  or   --silentInstall\n    Perform a silent installation.\n\
--b {baseDN}  or   --baseDN {baseDN}\n\    Specifies the base DN for user \
+-s, --silentInstall\n    Perform a silent installation.\n\
+-b, --baseDN {baseDN}\n\    Specifies the base DN for user \
 information in the Directory Server.\n    Multiple base DNs may be provided by \
 using this option multiple times.\n\
--a  or   --addBaseEntry\n    Indicates whether to create the base entry in the \
+-a, --addBaseEntry\n    Indicates whether to create the base entry in the \
 Directory Server\n    database.\n\
--i {ldifFile}  or   --importLDIF {ldifFile}\n    Specifies the path to an LDIF \
+-l, --ldifFile {ldifFile}\n    Specifies the path to an LDIF \
 file containing data that should be added to\n    the Directory Server \
 database.  Multiple LDIF files may be provided by\n    using this option \
 multiple times.\n\
--d {numEntries}  or   --sampleData {numEntries}\n    Specifies that the \
+-d {numEntries}, --sampleData {numEntries}\n    Specifies that the \
 database should be populated with the specified number\n\    of sample \
 entries.\n\
--p {port}  or   --ldapPort {port}\n    Specifies the port on which the \
+-p, --ldapPort {port}\n    Specifies the port on which the \
 Directory Server should listen for LDAP\n    communication.\n\
--j {jmxPort}  or   --jmxPort {jmxPort}\n    Specifies the port on which the \
+-x, --jmxPort {jmxPort}\n    Specifies the port on which the \
 Directory Server should listen for JMX\n    communication.\n\
--S  or   --skipPortCheck\n    Skip the check to determine whether the \
+-S , --skipPortCheck\n    Skip the check to determine whether the \
 specified LDAP port is usable.\n\
--D {rootDN}  or   --rootUserDN {rootDN}\n    Specifies the DN for the initial \
+-D, --rootUserDN {rootUserDN}\n    Specifies the DN for the initial \
 Administrative User for the Directory Server.\n\
--w {password}  or   --rootUserPassword {password}\n    Specifies the password \
+-w, --rootUserPassword {password}\n    Specifies the password \
 for the initial Administrative User for the Directory Server.\n\
--W {filename}  or   --rootUserPasswordFile {filename}\n    Specifies the path \
+-j , --rootUserPasswordFile {filename}\n    Specifies the path \
 to a file containing the password for the initial Administrative\n\    User \
 for the Directory Server.
 setup-launcher-usage-windows=This utility may be used to setup the Directory \
 Server.\n\Usage:  {0} {options}\n        where {options} include:\n\
 --cli\n\    Specifies to use the command line setup.  If not specified the \
 graphical\n\    interface will be launched.\n\
--H  or   --help\n    Displays usage information for this program.\n\n\
+-H, --help\n    Display this usage information.\n\n\
 The following options will only be taken into account if the option --cli \n\
 (command line) is specified\n\
--s  or   --silentInstall\n    Perform a silent installation.\n\
--b {baseDN}  or   --baseDN {baseDN}\n\    Specifies the base DN for user \
+-s, -silentInstall\n    Perform a silent installation.\n\
+-b {baseDN}, --baseDN {baseDN}\n\    Specifies the base DN for user \
 information in the Directory Server.\n    Multiple base DNs may be provided by \
 using this option multiple times.\n\
--a  or   --addBaseEntry\n    Indicates whether to create the base entry in the \
+-a, --addBaseEntry\n    Indicates whether to create the base entry in the \
 Directory Server\n    database.\n\
--i {ldifFile}  or   --importLDIF {ldifFile}\n    Specifies the path to an LDIF \
+-l, --ldifFile {ldifFile}\n    Specifies the path to an LDIF \
 file containing data that should be added to\n    the Directory Server \
 database.  Multiple LDIF files may be provided by\n    using this option \
 multiple times.\n\
--d {numEntries}  or   --sampleData {numEntries}\n    Specifies that the \
+-d, --sampleData {numEntries}\n    Specifies that the \
 database should be populated with the specified number\n\    of sample \
 entries.\n\
--p {port}  or   --ldapPort {port}\n    Specifies the port on which the \
+-p, --ldapPort {port}\n    Specifies the port on which the \
 Directory Server should listen for LDAP\n    communication.\n\
--j {jmxPort}  or   --jmxPort {jmxPort}\n    Specifies the port on which the \
+-x, --jmxPort {jmxPort}\n    Specifies the port on which the \
 Directory Server should listen for JMX\n    communication.\n\
--S  or   --skipPortCheck\n    Skip the check to determine whether the \
+-S, --skipPortCheck\n    Skip the check to determine whether the \
 specified LDAP port is usable.\n\
--D {rootDN}  or   --rootUserDN {rootDN}\n    Specifies the DN for the initial \
+-D, --rootUserDN {rootUserDN}\n    Specifies the DN for the initial \
 Administrative User for the Directory Server.\n\
--w {password}  or   --rootUserPassword {password}\n    Specifies the password \
+-w, --rootUserPassword {password}\n    Specifies the password \
 for the initial Administrative User for the Directory Server.\n\
--W {filename}  or   --rootUserPasswordFile {filename}\n    Specifies the path \
+-j, --rootUserPasswordFile {filename}\n    Specifies the path \
 to a file containing the password for the initial Administrative\n\    User \
 for the Directory Server.\n\
--n or --noWindowsService\n    Do not enable OpenDS to run as a Windows \
+-n, --noWindowsService\n    Do not enable OpenDS to run as a Windows \
 Service.
 setup-launcher-launching-gui=Launching graphical setup...
 setup-launcher-gui-launched-failed=\n\nThe graphical Setup launch failed.\n\n\
@@ -111,10 +111,10 @@
 Usage:  {0} {options}\n        where {options} include:\n\
 --cli\n\    Specifies to use the command line uninstall.  If not specified the \
 graphical\n\    interface will be launched.\n\
--H  or   --help\n    Displays usage information for this program.\n\n\
+-H, --help\n    Display this usage information.\n\n\
 The following options will only be taken into account if the option --cli \n\
 (command line) is specified\n\
--s  or   --silentUninstall\n    Perform a silent uninstall.
+-s, --silentUninstall\n    Perform a silent uninstall.
 uninstall-launcher-launching-gui=Launching graphical uninstall...
 uninstall-launcher-launching-cli=Launching command line uninstall...
 uninstall-launcher-gui-launched-failed=\n\nThe graphical Uninstall launch \
@@ -162,10 +162,10 @@
 Usage:  {0} {options}\n        where {options} include:\n\
 --cli\n\    Specifies to use the command line upgrade.  If not specified the \
 graphical\n\    interface will be launched.\n\
--H  or   --help\n    Displays usage information for this program.\n\n\
+-H, --help\n    Displays usage information for this program.\n\n\
 The following options will only be taken into account if the option --cli \n\
 (command line) is specified\n\
--s  or   --silentUpgrade\n    Perform a silent upgrade.
+-s, --silentUpgrade\n    Perform a silent upgrade.
 upgrade-launcher-launching-gui=Launching graphical upgrade...
 upgrade-launcher-launching-cli=Launching command line upgrade...
 upgrade-launcher-gui-launched-failed=\n\nThe graphical upgrade launch \

--
Gitblit v1.10.0