From fdc0aa686807ac2146e4a33e10b5156d4f3194ce Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Wed, 23 Nov 2011 15:04:59 +0000
Subject: [PATCH] Updates based on doc review comments from Sachiko Wallace

---
 opendj3/src/main/docbkx/admin-guide/chap-pta.xml              |    9 ++++-----
 opendj3/src/main/docbkx/dev-guide/chap-understanding-ldap.xml |   15 ++++++++++++++-
 opendj3/src/main/docbkx/admin-guide/chap-resource-limits.xml  |   18 ++++++++++--------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/opendj3/src/main/docbkx/admin-guide/chap-pta.xml b/opendj3/src/main/docbkx/admin-guide/chap-pta.xml
index 0f69522..f38b756 100644
--- a/opendj3/src/main/docbkx/admin-guide/chap-pta.xml
+++ b/opendj3/src/main/docbkx/admin-guide/chap-pta.xml
@@ -185,11 +185,10 @@
  --set trust-manager-provider:JKS
  --trustAll
  --no-prompt</screen>
-    <para>The policy shown here maps identities under
-    <literal>dc=example,dc=com</literal> to identities under
-    <literal>dc=PTA Server,dc=com</literal>, where users have the same
-    <literal>uid</literal> values on both servers. The policy here also
-    uses SSL between OpenDJ and the authentication server.</para>
+    <para>The policy shown here maps identities having this password policy
+    to identities under <literal>dc=PTA Server,dc=com</literal>. Users must
+    have the same <literal>uid</literal> values on both servers. The policy
+    here also uses SSL between OpenDJ and the authentication server.</para>
    </step>
    <step>
     <para>Check that your policy has been added to the list.</para>
diff --git a/opendj3/src/main/docbkx/admin-guide/chap-resource-limits.xml b/opendj3/src/main/docbkx/admin-guide/chap-resource-limits.xml
index c46f058..f73508b 100644
--- a/opendj3/src/main/docbkx/admin-guide/chap-resource-limits.xml
+++ b/opendj3/src/main/docbkx/admin-guide/chap-resource-limits.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ! CCPL HEADER START
   !
@@ -52,24 +51,27 @@
     search.</para>
     <para>The default lookthrough limit, set by using the global server
     property <literal>lookthrough-limit</literal>, is 5000.</para>
-    <para>The equivalent attribute for user entries is
-    <literal>ds-rlim-lookthrough-limit</literal>.</para>
+    <para>You can override the limit for a particular user by changing the
+    operational attribute, <literal>ds-rlim-lookthrough-limit</literal>, on
+    the user's entry.</para>
    </listitem>
    <listitem>
     <para>The <firstterm>size limit</firstterm> sets the maximum number of
     entries returned for a search.</para>
     <para>The default size limit, set by using the global server property
     <literal>size-limit</literal>, is 1000.</para>
-    <para>The equivalent attribute for user entries is
-    <literal>ds-rlim-size-limit</literal>.</para>
+    <para>You can override the limit for a particular user by changing the
+    operational attribute, <literal>ds-rlim-size-limit</literal>, on
+    the user's entry.</para>
    </listitem>
    <listitem>
     <para>The <firstterm>time limit</firstterm> defines the maximum processing
     time OpenDJ devotes to a search operation.</para>
     <para>The default time limit, set by using the global server property
     <literal>time-limit</literal>, is 1 minute.</para>
-    <para>The equivalent attribute for user entries is
-    <literal>ds-rlim-time-limit</literal>.</para>
+    <para>You can override the limit for a particular user by changing the
+    operational attribute, <literal>ds-rlim-time-limit</literal>, on
+    the user's entry.</para>
    </listitem>
    <listitem>
     <para>The maximum number of persistent searches can be set using the
@@ -81,7 +83,7 @@
    <title>To Set Search Limits For a User</title>
    <step>
     <para>Change the user entry to set the limits to override.</para>
-    <screen>$ cat limit.ldif 
+    <screen>$ cat limit.ldif
 dn: uid=bjensen,ou=People,dc=example,dc=com
 changetype: modify
 add: ds-rlim-size-limit
diff --git a/opendj3/src/main/docbkx/dev-guide/chap-understanding-ldap.xml b/opendj3/src/main/docbkx/dev-guide/chap-understanding-ldap.xml
index 39467fa..83269e3 100644
--- a/opendj3/src/main/docbkx/dev-guide/chap-understanding-ldap.xml
+++ b/opendj3/src/main/docbkx/dev-guide/chap-understanding-ldap.xml
@@ -140,7 +140,20 @@
   <para>The entry also has a unique identifier, show at the top of the entry, 
   <literal>dn: uid=bjensen,ou=People,dc=example,dc=com</literal>. DN stands
   for distinguished name. No two entries in the directory have the same
-  distinguished name.</para>
+  distinguished name.<footnote><para>Sometimes your distinguished names
+  include characters that you must escape. The following example shows an entry
+  that includes escaped characters in the DN.</para>
+  <screen>$ ldapsearch --port 1389 --baseDN dc=example,dc=com "(uid=escape)"
+dn: cn=\" # \+ \, \; \&lt; = \&gt; \\ DN Escape Characters,dc=example,dc=com
+objectClass: person
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: top
+givenName: " # + , ; &lt; = &gt; \
+uid: escape
+cn: " # + , ; &lt; = &gt; \ DN Escape Characters
+sn: DN Escape Characters
+mail: escape@example.com</screen></footnote></para>
   
   <para>LDAP entries are arranged hierarchically in the directory. The
   hierarchical organization resembles a file system on a PC or a web server,

--
Gitblit v1.10.0