ITS#8563 - Fix missing mentions of back-mdb

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

diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf
index 60fab363c75b8aa754ab53aa8c952cd150c71a1b..3b599ab80c248ccb7eba159429710820de3a8767 100644 (file)
--- a/doc/guide/admin/slapdconf2.sdf
+++ b/doc/guide/admin/slapdconf2.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 2005-2013 The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2005-2017 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: Configuring slapd
@@ -560,7 +560,7 @@ H4: olcSyncrepl
 >              [tls_cacert=<file>]
 >              [tls_cacertdir=<path>]
 >              [tls_reqcert=never|allow|try|demand]
->              [tls_ciphersuite=<ciphers>]
+>              [tls_cipher_suite=<ciphers>]
 >              [tls_crlcheck=none|peer|all]
 >              [logbase=<base DN>]
 >              [logfilter=<filter str>]
@@ -667,10 +667,8 @@ The {{EX:starttls}} parameter specifies use of the StartTLS extended
 operation to establish a TLS session before authenticating to the provider.
 If the {{EX:critical}} argument is supplied, the session will be aborted
 if the StartTLS request fails.  Otherwise the syncrepl session continues
-without TLS.  Note that the main slapd TLS settings are not used by the
-syncrepl engine; by default the TLS parameters from a {{ldap.conf}}(5)
-configuration file will be used.  TLS settings may be specified here,
-in which case any {{ldap.conf}}(5) settings will be completely ignored.
+without TLS.  The tls_reqcert setting defaults to {{EX:"demand"}} and the
+other TLS settings default to the same as the main slapd TLS settings.
 
 Rather than replicating whole entries, the consumer can query logs
 of data modifications.  This mode of operation is referred to as
@@ -683,8 +681,8 @@ conforms to the obsolete {{changelog}} format. If the {{EX:syncdata}}
 parameter is omitted or set to {{EX:"default"}} then the log
 parameters are ignored.
 
-The {{syncrepl}} replication mechanism is supported by the {{bdb}} and
-{{hdb}} backends.
+The {{syncrepl}} replication mechanism is supported by the {{bdb}},
+{{hdb}}, and {{mdb}} backends.
 
 See the {{SECT:LDAP Sync Replication}} chapter of this guide for
 more information on how to use this directive.