From 2095a28e3b117ddc7b565bc7fbe410af70cb48f4 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 31 Oct 2016 14:00:38 +0000
Subject: [PATCH] OPENDJ-2772 Align SDK client tool with server's
---
opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
index 9b3c352..bffb2ff 100644
--- a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
+++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
@@ -124,8 +124,6 @@
the server. Use -w - to ensure that the command prompts for the password, \
rather than entering the password as a command argument
INFO_DESCRIPTION_BINDPASSWORDFILE=Bind password file
-INFO_DESCRIPTION_ENCODING=Use the specified character set for \
- command-line input
INFO_DESCRIPTION_VERBOSE=Use verbose mode
INFO_DESCRIPTION_KEYSTOREPATH=Certificate key store path
INFO_DESCRIPTION_TRUSTSTOREPATH=Certificate trust store path
@@ -144,7 +142,8 @@
INFO_DESCRIPTION_RESTART=Attempt to automatically restart the \
server once it has stopped
INFO_SEARCH_DESCRIPTION_SEARCH_SCOPE=Search scope ('base', 'one', 'sub', \
- or 'subordinate')
+ or 'subordinates'). Note: 'subordinates' is an LDAP extension \
+ that might not work with all LDAP servers
ERR_LDAPAUTH_UNSUPPORTED_SASL_MECHANISM=The requested SASL mechanism \
"%s" is not supported by this client
ERR_LDAPAUTH_SASL_AUTHID_REQUIRED=The "authid" SASL property is \
@@ -196,7 +195,6 @@
INFO_PROP_FILE_PATH_PLACEHOLDER={propertiesFilePath}
INFO_NUM_ENTRIES_PLACEHOLDER={numEntries}
INFO_LDAP_CONTROL_PLACEHOLDER={controloid[:criticality[:value|::b64value|:<filePath]]}
-INFO_ENCODING_PLACEHOLDER={encoding}
INFO_SEARCH_SCOPE_PLACEHOLDER={searchScope}
INFO_KEYSTORE_PWD_FILE_PLACEHOLDER={keyStorePasswordFile}
INFO_PATH_PLACEHOLDER={path}
@@ -210,6 +208,8 @@
INFO_DESCRIPTION_ADMIN_PORT=Directory server administration port number
INFO_DESCRIPTION_ADMIN_BINDDN=Administrator user bind DN
INFO_ERROR_EMPTY_RESPONSE=ERROR: a response must be provided in order to continue
+INFO_DESCRIPTION_WRAP_COLUMN=Maximum length of an output line (0 for no wrapping)
+INFO_WRAP_COLUMN_PLACEHOLDER={wrapColumn}
#
# MakeLDIF tool
#
--
Gitblit v1.10.0