ITS#9706 - Fix typos and align slapd configuration documentation

diff --git a/doc/guide/admin/backends.sdf b/doc/guide/admin/backends.sdf
index 27561d20b38ef60d559d4a06894d7961266847fe..cf5e16a83defd20f94ded32918fa4b8837a7434f 100644 (file)
--- a/doc/guide/admin/backends.sdf
+++ b/doc/guide/admin/backends.sdf
@@ -54,7 +54,7 @@ the whole of the {{slapd-ldap(5)}} options.
 For example, the {{SECT: Translucent Proxy}}, which retrieves entries from a 
 remote LDAP server that can be partially overridden by the defined database, has
 only four specific {{translucent-}} directives, but can be configured using any 
-of the normal {{slapd-ldap(5)}} options. See {[slapo-translucent(5)}} for details.
+of the normal {{slapd-ldap(5)}} options. See {{slapo-translucent(5)}} for details.
 
 Other {{SECT: Overlays}} allow you to tag directives in front of a normal 
 {{slapd-ldap(5)}} directive. For example, the {{slapo-chain(5)}} overlay does 

diff --git a/doc/guide/admin/monitoringslapd.sdf b/doc/guide/admin/monitoringslapd.sdf
index dbc5829c5a344b2cdf21811c40b03179098a25b6..98fde002984d23a7d301ec7ae99a876da421e51e 100644 (file)
--- a/doc/guide/admin/monitoringslapd.sdf
+++ b/doc/guide/admin/monitoringslapd.sdf
@@ -20,7 +20,7 @@ returns objects in response to search requests in the {{cn=Monitor}}
 subtree.  Each object contains information about a particular aspect
 of the server.  The information is held in a combination of user
 applications and operational attributes.   This information can be
-access with {{ldapsearch(1)}}, with any general-purpose LDAP browser,
+accessed with {{ldapsearch(1)}}, with any general-purpose LDAP browser,
 or with specialized monitoring tools.  The {{SECT:Accessing Monitoring
 Information}} section provides a brief tutorial on how to use
 {{ldapsearch}}(1) to access monitoring information, while the
@@ -210,9 +210,9 @@ trimmed to show only key information.
 
 H3: Backends
 
-The {{EX:cn=Backends,cn=Monitor}} object, itself, provides a list
-of available backends.  The list of available backends all builtin
-backends, as well as backends loaded by modules.  For example:
+The {{EX:cn=Backends,cn=Monitor}} object provides a list of available
+backends.  The list of available backends includes all builtin backends,
+as well as those backends loaded by modules.  For example:
 
 >      dn: cn=Backends,cn=Monitor          
 >      monitoredInfo: config                 

diff --git a/doc/guide/admin/security.sdf b/doc/guide/admin/security.sdf
index 63bf6a158583e07f14957cc4caa2f31a6efbd43c..672fcc098d14fd3d59bdd5a136d9d8939ae2cfeb 100644 (file)
--- a/doc/guide/admin/security.sdf
+++ b/doc/guide/admin/security.sdf
@@ -290,7 +290,7 @@ Note: This is not the same as using a SASL mechanism to
 authenticate the LDAP session.
 
 Pass-Through authentication works only with plaintext passwords, as 
-used in the "simple bind" and "SASL PLAIN" authentication mechanisms.}}
+used in the "simple bind" and "SASL PLAIN" authentication mechanisms.
 
 Pass-Through authentication is selective: it only affects users whose
 {{userPassword}} attribute has a value marked with the "{SASL}"

diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf
index 02d657386543f6b0ba46fee7cd14170a69c8bb5e..e065f30521f67177f51fb5e15124bbff927a8508 100644 (file)
--- a/doc/guide/admin/slapdconf2.sdf
+++ b/doc/guide/admin/slapdconf2.sdf
@@ -543,6 +543,7 @@ H4: olcSyncrepl
 >              [filter=<filter str>]
 >              [scope=sub|one|base]
 >              [attrs=<attr list>]
+>              [exattrs=<attr list>]
 >              [attrsonly]
 >              [sizelimit=<limit>]
 >              [timelimit=<limit>]
@@ -597,7 +598,7 @@ The content of the syncrepl consumer 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
 specification. The search specification includes {{EX:searchbase}},
-{{EX:scope}}, {{EX:filter}}, {{EX:attrs}}, {{EX:attrsonly}},
+{{EX:scope}}, {{EX:filter}}, {{EX:attrs}}, {{EX:exattrs}}, {{EX:attrsonly}},
 {{EX:sizelimit}}, and {{EX:timelimit}} parameters as in the normal
 search specification. The {{EX:searchbase}} parameter has no
 default value and must always be specified. The {{EX:scope}} defaults
@@ -605,7 +606,8 @@ to {{EX:sub}}, the {{EX:filter}} defaults to {{EX:(objectclass=*)}},
 {{EX:attrs}} defaults to {{EX:"*,+"}} to replicate all user and operational
 attributes, and {{EX:attrsonly}} is unset by default. Both {{EX:sizelimit}}
 and {{EX:timelimit}} default to "unlimited", and only positive integers
-or "unlimited" may be specified.
+or "unlimited" may be specified. The {{EX:exattrs}} option may also be used
+to specify attributes that should be omitted from incoming entries.
 
 The {{TERM[expand]LDAP Sync}} protocol has two operation
 types: {{EX:refreshOnly}} and {{EX:refreshAndPersist}}.