From 5a168a0da2302f900c64b236862691b49de08869 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Tue, 18 Oct 2011 16:29:09 +0000
Subject: [PATCH] Fix for OPENDJ-319: Replace short options with long options throughout examples in the documentation

---
 opendj3/src/main/docbkx/admin-guide/chap-schema.xml |   45 ++++++++++++++++++++++++++++-----------------
 1 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/opendj3/src/main/docbkx/admin-guide/chap-schema.xml b/opendj3/src/main/docbkx/admin-guide/chap-schema.xml
index fd42280..ed49afe 100644
--- a/opendj3/src/main/docbkx/admin-guide/chap-schema.xml
+++ b/opendj3/src/main/docbkx/admin-guide/chap-schema.xml
@@ -204,10 +204,18 @@
 add: myCustomAttribute
 myCustomAttribute: Testing 1, 2, 3...
 
-$ ldapmodify -p 1389 -D "cn=Directory Manager" -w password -f custom-attr.ldif
+$ ldapmodify
+ --port 1389
+ --bindDN "cn=Directory Manager"
+ --bindPassword password
+ --filename custom-attr.ldif
 Processing MODIFY request for uid=bjensen,ou=People,dc=example,dc=com
 MODIFY operation successful for DN uid=bjensen,ou=People,dc=example,dc=com
-$ ldapsearch -p 1389 -b dc=example,dc=com uid=bjensen myCustomAttribute
+$ ldapsearch
+ --port 1389
+ --baseDN dc=example,dc=com
+ uid=bjensen
+ myCustomAttribute
 dn: uid=bjensen,ou=People,dc=example,dc=com
 myCustomAttribute: Testing 1, 2, 3...
 </screen>
@@ -231,25 +239,27 @@
   than reject entries having this issue.</para>
   
   <screen>$ dsconfig
- -h `hostname`
- -p 4444
- -D "cn=Directory Manager"
- -w password
  set-global-configuration-prop
+ --hostname `hostname`
+ --port 4444
+ --bindDN "cn=Directory Manager"
+ --bindPassword password
  --set single-structural-objectclass-behavior:warn
- -X -n</screen>
+ --trustAll
+ --no-prompt</screen>
 
   <para>You can allow attribute values that do not respect the defined syntax
   with the <command>dsconfig</command> command as well.</para>
   
   <screen>$ dsconfig
-  -h `hostname`
-  -p 4444
-  -D "cn=Directory Manager"
-  -w password
  set-global-configuration-prop
+ --hostname `hostname`
+ --port 4444
+ --bindDN "cn=Directory Manager"
+ --bindPassword password
  --set invalid-attribute-syntax-behavior:warn
- -X -n</screen>
+ --trustAll
+ --no-prompt</screen>
 
   <para>You can even turn off schema checking altogether, although turning
   off schema checking only really makes sense when you are absolutely sure
@@ -258,13 +268,14 @@
   processing.</para>
   
   <screen>$ dsconfig
- -h `hostname`
- -p 4444
- -D "cn=Directory Manager"
- -w password
  set-global-configuration-prop
+ --hostname `hostname`
+ --port 4444
+ --bindDN "cn=Directory Manager"
+ --bindPassword password
  --set check-schema:false
- -X -n</screen>
+ --trustAll
+ --no-prompt</screen>
  </section>
 
  <section xml:id="standard-schema">

--
Gitblit v1.10.0