Sync with HEAD

[openldap] / doc / guide / admin / slapdconfig.sdf

diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf
index 78633c8a6e4ab7740f9651f2808ff2e7fb6fd295..e13bbd1507d2a080f5a6955ade429c1f197d28b3 100644 (file)
--- a/doc/guide/admin/slapdconfig.sdf
+++ b/doc/guide/admin/slapdconfig.sdf
@@ -236,6 +236,7 @@ supported backend types listed in Table 5.2.
 Types  Description
 bdb    Berkeley DB transactional backend
 dnssrv DNS SRV backend
+hdb    Hierarchical variant of bdb backend
 ldap   Lightweight Directory Access Protocol (Proxy) backend
 ldbm   Lightweight DBM backend
 meta   Meta Directory backend
@@ -485,7 +486,7 @@ as the search responses to the persistent synchronization search.
 
 If an error occurs during replication, the consumer will attempt to reconnect
 according to the retry parameter which is a list of the <retry interval>
-and <# of retries> pairs. For example, retry="60 5 300 3" lets the consumer
+and <# of retries> pairs. For example, retry="60 10 300 3" lets the consumer
 retry every 60 seconds for the first 10 times and then retry every 300 seconds
 for the next three times before stop retrying. + in <#  of retries> means
 indefinite number of retries until success.
@@ -562,12 +563,14 @@ If specified multiple times, each {{TERM:URL}} is provided.
 >      updateref       ldap://master.example.net
 
 
-H3: BDB Database Directives
+H3: BDB and HDB Database Directives
 
-Directives in this category only apply to a {{TERM:BDB}} database.
-That is, they must follow a "database bdb" line and come before any
+Directives in this category only apply to both the {{TERM:BDB}}
+and the {{TERM:HDB}} database.
+That is, they must follow a "database bdb" or "database hdb" line
+and come before any
 subsequent "backend" or "database" line.  For a complete reference
-of BDB configuration directives, see {{slapd-bdb}}(5).
+of BDB/HDB configuration directives, see {{slapd-bdb}}(5).
 
 
 H4: directory <directory>
@@ -958,7 +961,7 @@ attribute and various {{EX:<who>}} selectors.
 
 >      access to dn.subtree="dc=example,dc=com" attr=homePhone
 >              by self write
->              by dn.children=dc=example,dc=com" search
+>              by dn.children="dc=example,dc=com" search
 >              by peername.regex=IP:10\..+ read
 >      access to dn.subtree="dc=example,dc=com"
 >              by self write