From e86f32c40524da20e58c2777669d0d3def96cfb8 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 20 Jan 2012 13:54:29 +0000
Subject: [PATCH] Layout issues observed in PDF

---
 opendj-sdk/opendj3/src/main/docbkx/admin-guide/images/replA-monitor-repl.png |    0 
 opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-privileges-acis.xml      |    8 ++++++--
 opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-samba.xml                |    5 +++--
 opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-groups.xml               |    9 +++++++--
 opendj-sdk/opendj3/src/main/docbkx/admin-guide/images/replA-setup.png        |    0 
 opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-ldap-operations.xml      |    9 +++++----
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-groups.xml b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-groups.xml
index 43e4832..dc82815 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-groups.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-groups.xml
@@ -20,7 +20,7 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011 ForgeRock AS
+  !      Copyright 2011-2012 ForgeRock AS
   !    
 -->
 <chapter xml:id='chap-groups'
@@ -242,7 +242,12 @@
 objectclass: ds-virtual-static-group
 ds-target-group-dn: cn=My Dynamic Group,ou=Groups,dc=example,dc=com
 
-$ ldapmodify --port 1389 --bindDN "cn=Directory Manager" --bindPassword password -a -f virtual.ldif
+$ ldapmodify
+ --port 1389
+ --bindDN "cn=Directory Manager"
+ --bindPassword password
+ --defaultAdd
+ --filename virtual.ldif
 Processing ADD request for cn=Virtual Static,ou=Groups,dc=example,dc=com
 ADD operation successful for DN cn=Virtual Static,ou=Groups,dc=example,dc=com
 $ ldapsearch --port 1389 --baseDN dc=example,dc=com "(cn=Virtual Static)"
diff --git a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-ldap-operations.xml b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-ldap-operations.xml
index f9e7025..0f43bf8 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-ldap-operations.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-ldap-operations.xml
@@ -20,7 +20,7 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011 ForgeRock AS
+  !      Copyright 2011-2012 ForgeRock AS
   !    
 -->
 <chapter xml:id='chap-ldap-operations'
@@ -580,7 +580,7 @@
    <para>With the <command>ldapmodify</command> command, authorized users
    can move entries in the directory.</para>
 
-   <example xml:id="move-entry-example">
+   <example xml:id="move-entry-example"><?dbfo keep-together="auto"?>
     <title>Move: Merging Customer and Employees Under
     <literal>ou=People</literal></title>
     
@@ -776,8 +776,9 @@
       <screen>$ encode-password --storageScheme SSHA512 --interactivePassword
 Please enter the password :
 Please renter the password:
-Encoded Password:  "{SSHA512}U7Kx5oYcLxdsqSrpSkBk425LwL0Z61loNfS0dBVCcEKVhMyTT
-oe3oWikDJ/AJjKEkYBg+q3VUQ5hWgrGVf7MjfDrm5mum6yI"</screen>
+Encoded Password:
+ "{SSHA512}U7Kx5oYcLxdsqSrpSkBk425LwL0Z61loNfS0dBVCcEKVhMyTT
+ oe3oWikDJ/AJjKEkYBg+q3VUQ5hWgrGVf7MjfDrm5mum6yI"</screen>
      </listitem>
      <listitem>
       <para>Stop OpenDJ.</para>
diff --git a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-privileges-acis.xml b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-privileges-acis.xml
index 5d95405..5246db8 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-privileges-acis.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-privileges-acis.xml
@@ -20,7 +20,7 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011 ForgeRock AS
+  !      Copyright 2011-2012 ForgeRock AS
   !    
 -->
 <chapter xml:id='chap-privileges-acis'
@@ -696,7 +696,11 @@
    <step>
     <para>Apply the change as a user with the
     <literal>privilege-change</literal> privilege.</para>
-    <screen>$ ldapmodify --port 1389 --bindDN "cn=Directory Manager" --bindPassword password -f privilege.ldif
+    <screen>$ ldapmodify
+ --port 1389
+ --bindDN "cn=Directory Manager"
+ --bindPassword password
+ --filename privilege.ldif
 Processing MODIFY request for uid=kvaughan,ou=People,dc=example,dc=com
 MODIFY operation successful for DN uid=kvaughan,ou=People,dc=example,dc=com</screen>
     <para>At this point, Kirsten can perform the operations requiring
diff --git a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-samba.xml b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-samba.xml
index 5a0deeb..1fa59ab 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-samba.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-samba.xml
@@ -20,7 +20,7 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011 ForgeRock AS
+  !      Copyright 2011-2012 ForgeRock AS
   !    
 -->
 <chapter xml:id='chap-samba'
@@ -111,7 +111,8 @@
  --bindPassword password
  --filename samba-rights.ldif
 Processing MODIFY request for uid=samba-admin,ou=Special Users,dc=example,dc=com
-MODIFY operation successful for DN uid=samba-admin,ou=Special Users,dc=example,dc=com
+MODIFY operation successful for DN
+ uid=samba-admin,ou=Special Users,dc=example,dc=com
 Processing MODIFY request for dc=example,dc=com
 MODIFY operation successful for DN dc=example,dc=com</screen>
   </step>
diff --git a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/images/replA-monitor-repl.png b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/images/replA-monitor-repl.png
index c9a330e..f85943b 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/images/replA-monitor-repl.png
+++ b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/images/replA-monitor-repl.png
Binary files differ
diff --git a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/images/replA-setup.png b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/images/replA-setup.png
index edbe885..2538374 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/images/replA-setup.png
+++ b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/images/replA-setup.png
Binary files differ

--
Gitblit v1.10.0