diff --git a/reference/ldap/constants.xml b/reference/ldap/constants.xml
index 40c6bcd666..47aa175515 100644
--- a/reference/ldap/constants.xml
+++ b/reference/ldap/constants.xml
@@ -55,7 +55,7 @@
    </term>
    <listitem>
     <simpara>
-     
+     Specifies alternative rules for following aliases at the server.
     </simpara>
    </listitem>
   </varlistentry>
@@ -65,9 +65,17 @@
     (<type>integer</type>)
    </term>
    <listitem>
-    <simpara>
-     
-    </simpara>
+    <para>
+     Specifies the maximum number of entries that can be
+     returned on a search operation.
+    </para>
+    <note>
+     <simpara>
+      The actual size limit for operations is also bounded
+      by the server's configured maximum number of return entries.
+      The lesser of these two settings is the actual size limit.
+     </simpara>
+    </note>
    </listitem>
   </varlistentry>
   <varlistentry>
@@ -77,8 +85,15 @@
    </term>
    <listitem>
     <simpara>
-     
+     Specifies the number of seconds to wait for search results.
     </simpara>
+    <note>
+     <simpara>
+      The actual time limit for operations is also bounded
+      by the server's configured maximum time.
+      The lesser of these two settings is the actual time limit.
+     </simpara>
+    </note>
    </listitem>
   </varlistentry>
 
@@ -102,7 +117,7 @@
    </term>
    <listitem>
     <simpara>
-     
+     Specifies the LDAP protocol to be used (V2 or V3).
     </simpara>
    </listitem>
   </varlistentry>
@@ -124,7 +139,8 @@
    </term>
    <listitem>
     <simpara>
-     
+     Specifies whether to automatically follow referrals returned
+     by the LDAP server.
     </simpara>
    </listitem>
   </varlistentry>
@@ -179,7 +195,7 @@
    </term>
    <listitem>
     <simpara>
-     
+     Specifies a default list of server controls to be sent with each request.
     </simpara>
    </listitem>
   </varlistentry>
@@ -190,7 +206,7 @@
    </term>
    <listitem>
     <simpara>
-     
+     Specifies a default list of client controls to be processed with each request.
     </simpara>
    </listitem>
   </varlistentry>
@@ -201,7 +217,7 @@
    </term>
    <listitem>
     <simpara>
-     
+     Specifies a bitwise level for debug traces.
     </simpara>
    </listitem>
   </varlistentry>