Merge remote branch 'origin/mdb.master'

[openldap] / doc / man / man5 / slapo-collect.5

diff --git a/doc/man/man5/slapo-collect.5 b/doc/man/man5/slapo-collect.5
index 304ebc7e7d9d414b922b3441522274bb624ad9de..f8357601a2584486f413554f061478ffd81859d5 100644 (file)
--- a/doc/man/man5/slapo-collect.5
+++ b/doc/man/man5/slapo-collect.5
@@ -1,9 +1,9 @@
 .TH SLAPO-COLLECT 5 "RELEASEDATE" "OpenLDAP LDVERSION"
-.\" Copyright 2003-2008 The OpenLDAP Foundation All Rights Reserved.
+.\" Copyright 2003-2011 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .\" $OpenLDAP$
 .SH NAME
-slapo-collect \- Collective attributes overlay to slapd
+slapo\-collect \- Collective attributes overlay to slapd
 .SH SYNOPSIS
 ETCDIR/slapd.conf
 .SH DESCRIPTION
@@ -13,9 +13,9 @@ In X.500, a collective attribute is "a user attribute whose
 values are the same for each member of an entry collection".
 
 Collective attributes are added to entries returned by a search operation
-when the entry is within the scope of the related collectiveAttributeSubentry.
+when the entry is within the scope of the related ancestor.
 Collective attributes can only be modified when the modification affects
-the related collectiveAttributeSubentry.
+the related ancestor.
 
 .SH CONFIGURATION
 This
@@ -28,8 +28,7 @@ directive.
 .B collectinfo <DN> <attrlist>
 Specify the
 .B DN
-of a collectiveAttributeSubentry and the set
-of related collective attributes, where
+of the ancestor entry and the set of related collective attributes, where
 .B attrlist
 is a comma-separated list of attributes.
 The
@@ -41,7 +40,12 @@ should be within the naming context of the database.
 ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
-.BR slapd.conf (5).
+.BR slapd.conf (5),
+.BR slapd\-config (5),
+The
+.BR slapo\-collect (5)
+overlay supports dynamic configuration via
+.BR back-config .
 .SH ACKNOWLEDGEMENTS
 This module was written in 2003 by Howard Chu.
 This man page was written in 2008 by Pierangelo Masarati.