From: Howard Chu <hyc@openldap.org>
Date: Sat, 11 Jun 2005 04:59:58 +0000 (+0000)
Subject: ITS#3767 fix syncrepl retry example
X-Git-Tag: OPENLDAP_AC_BP~546
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=35f308ee346a087faca198c8379ea0a48603d2b4;p=openldap

ITS#3767 fix syncrepl retry example
---

diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf
index c067bad397..ed0db7f142 100644
--- a/doc/guide/admin/slapdconf2.sdf
+++ b/doc/guide/admin/slapdconf2.sdf
@@ -149,7 +149,8 @@ an example of its use.
 H3: cn=config
 
 Directives contained in this entry generally apply to the server as a whole.
-Most of them are system or connection oriented, not database related.
+Most of them are system or connection oriented, not database related. This
+entry must have the {{EX:olcGlobal}} objectClass.
 
 
 H4: olcIdleTimeout: <integer>
@@ -243,6 +244,7 @@ An include entry holds the pathname of one include file. Include files
 are part of the old style slapd.conf configuration system and must be in
 slapd.conf format. Include files were commonly used to load schema
 specifications. While they are still supported, their use is deprecated.
+Include entries must have the {{EX:olcIncludeFile}} objectClass.
 
 
 H4: olcInclude: <filename>
@@ -274,7 +276,8 @@ The cn=schema entry holds all of the schema definitions that are hard-coded
 in slapd. As such, the values in this entry are generated by slapd so no
 schema values need to be provided in the config file. The entry must still
 be defined though, to serve as a base for the user-defined schema to add
-in underneath.
+in underneath. Schema entries must have the {{EX:olcSchemaConfig}}
+objectClass.
 
 
 H4: olcAttributeTypes: <{{REF:RFC2252}} Attribute Type Description>
@@ -314,7 +317,8 @@ H3: Backend-specific Directives
 
 Backend directives apply to all database instances of the
 same type and, depending on the directive, may be overridden
-by database directives.
+by database directives. Backend entries must have the
+{{EX:olcBackendConfig}} objectClass.
 
 H4: olcBackend: <type>
 
@@ -357,6 +361,7 @@ H4: Sample Entry
 H3: Database-specific Directives
 
 Directives in this section are supported by every type of database.
+Database entries must have the {{EX:olcDatabaseConfig}} objectClass.
 
 H4: olcDatabase: [{<index>}]<type>
 
@@ -626,7 +631,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.
@@ -726,10 +731,9 @@ H3: BDB Database Directives
 
 Directives in this category only apply to a {{TERM:BDB}} database.
 They are used in an olcDatabase entry in addition to the generic
-database directives defined above. Their use requires the database
-entry to also use the {{EX:olcBdbConfig}} objectClass.
-For a complete reference
-of BDB configuration directives, see {{slapd-bdb}}(5).
+database directives defined above.  For a complete reference
+of BDB configuration directives, see {{slapd-bdb}}(5). BDB database
+entries must have the {{EX:olcBdbConfig}} objectClass.
 
 
 H4: olcDbDirectory: <directory>
diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf
index 50fbcbd6b8..9c6611dcc7 100644
--- a/doc/guide/admin/slapdconfig.sdf
+++ b/doc/guide/admin/slapdconfig.sdf
@@ -485,7 +485,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.