Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

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

diff --git a/doc/man/man5/slapo-constraint.5 b/doc/man/man5/slapo-constraint.5
index 30413be9b8a261d37219b8e5035f740719f818f5..2da18120bf6597f4b0cc80d468530a436bd8e0d9 100644 (file)
--- a/doc/man/man5/slapo-constraint.5
+++ b/doc/man/man5/slapo-constraint.5
@@ -1,10 +1,10 @@
 .TH SLAPO-CONSTRAINT 5 "RELEASEDATE" "OpenLDAP LDVERSION"
 .\" Copyright 2005-2006 Hewlett-Packard Company
 .TH SLAPO-CONSTRAINT 5 "RELEASEDATE" "OpenLDAP LDVERSION"
 .\" Copyright 2005-2006 Hewlett-Packard Company

-.\" Copyright 2006-2008 The OpenLDAP Foundation All Rights Reserved.
+.\" Copyright 2006-2013 The OpenLDAP Foundation All Rights Reserved.

 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .\" $OpenLDAP$
 .SH NAME
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .\" $OpenLDAP$
 .SH NAME

-slapo-constraint \- Attribute Constraint Overlay to slapd
+slapo\-constraint \- Attribute Constraint Overlay to slapd

 .SH SYNOPSIS
 ETCDIR/slapd.conf
 .SH DESCRIPTION
 .SH SYNOPSIS
 ETCDIR/slapd.conf
 .SH DESCRIPTION


@@ -35,7 +35,7 @@ directive.
 .B constraint_attribute <attribute_name>[,...] <type> <value> [<extra> [...]]
 Specifies the constraint which should apply to the comma-separated
 attribute list named as the first parameter.
 .B constraint_attribute <attribute_name>[,...] <type> <value> [<extra> [...]]
 Specifies the constraint which should apply to the comma-separated
 attribute list named as the first parameter.

-Two types of constraint are currently supported -
+Five types of constraint are currently supported -

 .BR regex ,
 .BR size ,
 .BR count ,
 .BR regex ,
 .BR size ,
 .BR count ,


@@ -122,7 +122,11 @@ attribute whose values were not listed in the
 .B title
 attribute of any
 .B titleCatalog
 .B title
 attribute of any
 .B titleCatalog

-entries in the given scope.
+entries in the given scope. (Note that the
+"dc=catalog,dc=example,dc=com" subtree ought to reside
+in a separate database, otherwise the initial set of
+titleCatalog entries could not be populated while the
+constraint is in effect.)

 Finally, it requires the values of the attribute
 .B cn
 to be constructed by pairing values of the attributes
 Finally, it requires the values of the attribute
 .B cn
 to be constructed by pairing values of the attributes


@@ -137,7 +141,8 @@ separated by a space, but only for entries derived from the objectClass
 ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
 ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO

-.BR slapd.conf (5).
+.BR slapd.conf (5),
+.BR slapd\-config (5),

 .SH ACKNOWLEDGEMENTS
 This module was written in 2005 by Neil Dunbar of Hewlett-Packard and subsequently
 extended by Howard Chu and Emmanuel Dreyfus.
 .SH ACKNOWLEDGEMENTS
 This module was written in 2005 by Neil Dunbar of Hewlett-Packard and subsequently
 extended by Howard Chu and Emmanuel Dreyfus.