ITS#6118

diff --git a/CHANGES b/CHANGES
index 73adca6930c57dbf3acae765055066c172a9fff1..042b5d4fc5978218f6acf71d09378f8b06950888 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -42,6 +42,7 @@ OpenLDAP 2.4.17 Engineering
                ldap.conf(5) improve sizelimit/timelimit limits (ITS#6127)
                slapd.conf(5) pidfile/argsfile description fix (ITS#5975)
                slapd-config(5) pidfile/argsfile description fix (ITS#5975)
+               slapo-constraint(5) clarify URI example (ITS#6118)
                slapo-unique(5) explicitly note rootdn requirement (ITS#6108)
 
 OpenLDAP 2.4.16 Release (2009/04/05)

diff --git a/doc/man/man5/slapo-constraint.5 b/doc/man/man5/slapo-constraint.5
index 374c1e89c3a4889457d364e7b035600f0a64f949..f993db3ec3c3ab8c95ce159e12c79a90d8c0b83d 100644 (file)
--- a/doc/man/man5/slapo-constraint.5
+++ b/doc/man/man5/slapo-constraint.5
@@ -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.
-Two types of constraint are currently supported -
+Five types of constraint are currently supported -
 .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
-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