From 2af41ec852d6cb7fecb9b5230a53bd65ed324a46 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Tue, 21 Feb 2017 15:27:13 -0800 Subject: [PATCH] ITS#8253 - Further clarification around replication information --- doc/guide/admin/replication.sdf | 14 ++++++-------- doc/man/man5/slapo-syncprov.5 | 8 +++----- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/doc/guide/admin/replication.sdf b/doc/guide/admin/replication.sdf index ef5068ceb5..9ebbc3eca0 100644 --- a/doc/guide/admin/replication.sdf +++ b/doc/guide/admin/replication.sdf @@ -515,14 +515,14 @@ H4: Set up the provider slapd The provider is implemented as an overlay, so the overlay itself must first be configured in {{slapd.conf}}(5) before it can be -used. The provider has three primary configuration directives and -one secondary directive for when delta-syncrepl is being used. +used. The provider has two primary configuration directives and +two secondary directives for when delta-syncrepl is being used. Because the LDAP Sync search is subject to access control, proper access control privileges should be set up for the replicated content. -The three primary options to configure are the checkpoint, -sessionlog, and reloadhint behaviors. +The two primary options to configure are the checkpoint and +sessionlog behaviors. The {{EX:contextCSN}} checkpoint is configured by the @@ -549,10 +549,8 @@ The reloadhint option is configured by the > syncprov-reloadhint -directive. This option should be set TRUE when working with releases -newer than 2.3.11 that properly support this flag. It must be set TRUE -when using the accesslog overlay for delta-based syncrepl replication -support. The default is FALSE. +directive. It must be set TRUE when using the accesslog overlay for +delta-based syncrepl replication support. The default is FALSE. The nonpresent option should only be configured if the overlay is being placed on top of a log database, such as when used with diff --git a/doc/man/man5/slapo-syncprov.5 b/doc/man/man5/slapo-syncprov.5 index 68bb543537..8ce5fc6efd 100644 --- a/doc/man/man5/slapo-syncprov.5 +++ b/doc/man/man5/slapo-syncprov.5 @@ -57,11 +57,9 @@ The default is FALSE. .TP .B syncprov\-reloadhint TRUE | FALSE Specify that the overlay should honor the reloadHint flag in the Sync -Control. In OpenLDAP releases 2.3.11 and earlier the syncrepl consumer did -not properly set this flag, so the overlay must ignore it. This option -should be set TRUE when working with newer releases that properly support -this flag. It must be set TRUE when using the accesslog overlay for -delta-based syncrepl replication support. The default is FALSE. +Control. It must be set TRUE when using the accesslog overlay for +delta-based syncrepl replication support. +The default is FALSE. .SH FILES .TP ETCDIR/slapd.conf -- 2.39.5