ITS#4510 update.

Update wording in slapd.conf.5 to match admin guide

diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf
index 1869a052281b5d92c3725ed68ce44defeee30ccb..f1bcd28e6b850c9c3338be2e67aaa66e76117a36 100644 (file)
--- a/doc/guide/admin/slapdconf2.sdf
+++ b/doc/guide/admin/slapdconf2.sdf
@@ -609,6 +609,7 @@ H4: olcSyncrepl
 
 >      olcSyncrepl: rid=<replica ID>
 >              provider=ldap[s]://<hostname>[:port]
+>              [starttls=yes|critical]
 >              [type=refreshOnly|refreshAndPersist]
 >              [interval=dd:hh:mm:ss]
 >              [retry=[<retry interval> <# of retries>]+]
@@ -658,6 +659,12 @@ specification is located at the provider site. {{EX:syncrepl}} and
 {{EX:replica}} directives define two independent replication
 mechanisms. They do not represent the replication peers of each other.
 
+The {{EX:starttls}} parameter specifies use of the StartTLS extended
+operation to establish a TLS session before Binding to the provider. If the
+StartTLS request fails and the {{EX:critical}} argument was used, the
+session will be aborted. Otherwise the syncrepl session continues without
+TLS.
+
 The content of the syncrepl replica is defined using a search
 specification as its result set. The consumer slapd will
 send search requests to the provider slapd according to the search

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 6d106ad00eb059103747c0e36b6aeb6bd99bd9a6..d94393e614c0eb242c9589b075f5664897bf0472 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -1596,9 +1596,10 @@ The
 .B starttls
 parameter specifies use of the StartTLS extended operation
 to establish a TLS session before Binding to the provider. If the
+StartTLS request fails and the
 .B critical
-argument is supplied, the session will be aborted if the StartTLS request
-fails. Otherwise the syncrepl session continues without TLS.
+argument was used, the session will be aborted. Otherwise the syncrepl
+session continues without TLS.
 A
 .B bindmethod
 of