diff --git a/CHANGES b/CHANGES index 5e3f098bd8c648f5217e3a36779b9b6c0da2c0a9..0295b0f5c6e5b8695187ae2f35e47af68d134f08 100644 --- a/CHANGES +++ b/CHANGES @@ -62,6 +62,7 @@ OpenLDAP 2.4.14 Engineering admin24 added limits chapter (ITS#5818) slapd-bdb/hdb expansion on dncachesize behavior (ITS#5721) slapo-constraint(5) example fix (ITS#5895) + slap*(8) man pages should mention slapd-config (ITS#5828) OpenLDAP 2.4.13 Release (2008/11/24) Added libldap dereference control support (ITS#5768) diff --git a/doc/man/man8/slapacl.8 b/doc/man/man8/slapacl.8 index 387d84d37d537af7a727b4b1a28bba2c2ebab487..23862182e7b37921ca9d669baee102444d1d54f2 100644 --- a/doc/man/man8/slapacl.8 +++ b/doc/man/man8/slapacl.8 @@ -25,8 +25,10 @@ according to ACLs, as specified in .BR slapd.access (5). It opens the .BR slapd.conf (5) -configuration file, reads in the -.B access +configuration file or the +.BR slapd-config (5) +backend, reads in the +.B access/olcAccess directives, and then parses the .B attr list given on the command-line; if none is given, access to the diff --git a/doc/man/man8/slapauth.8 b/doc/man/man8/slapauth.8 index 8f374d8712cc89eff847a5b5c4ffc89a51b364a8..6b164b161e686f98d9147effca66d1c3c64402b1 100644 --- a/doc/man/man8/slapauth.8 +++ b/doc/man/man8/slapauth.8 @@ -25,10 +25,12 @@ for authentication and authorization purposes, as specified in .BR slapd.conf (5). It opens the .BR slapd.conf (5) -configuration file, reads in the -.B authz-policy +configuration file or the +.BR slapd-config (5) +backend, reads in the +.B authz-policy/olcAuthzPolicy and -.B authz-regexp +.B authz-regexp/olcAuthzRegexp directives, and then parses the .B ID list given on the command-line. diff --git a/doc/man/man8/slapdn.8 b/doc/man/man8/slapdn.8 index 6ea5d762320a69d8de6fff4ee694bf2813bc4aca..97e70ab20fdf2c433dea4928973ebced76ab94eb 100644 --- a/doc/man/man8/slapdn.8 +++ b/doc/man/man8/slapdn.8 @@ -24,7 +24,7 @@ and that loaded via .BR slapd.conf (5). It opens the .BR slapd.conf (5) -configuration file, reads in the schema definitions, and then +configuration file or the slapd-config (5) backend, reads in the schema definitions, and then parses the .B DN list given on the command-line. diff --git a/doc/man/man8/slappasswd.8 b/doc/man/man8/slappasswd.8 index 4a88bf99316b0cbb51e9975b87da8e5ff738aa3b..a88edd5e45bab46f99fdf54898ebfc5d99d7e795 100644 --- a/doc/man/man8/slappasswd.8 +++ b/doc/man/man8/slappasswd.8 @@ -19,11 +19,14 @@ slappasswd \- OpenLDAP password utility .B Slappasswd is used to generate an userPassword value suitable for use with -.BR ldapmodify (1) -or +.BR ldapmodify (1), .BR slapd.conf (5) .I rootpw +configuration directive or the +.BR slapd-config (5) +.I olcRootPW configuration directive. +. .SH OPTIONS .TP .B \-v diff --git a/doc/man/man8/slaptest.8 b/doc/man/man8/slaptest.8 index 30aaaaae6fa221b12c36686572cb2bfaef94a52c..ce31015b2fb852a0922c459a77e9149b0c4afa46 100644 --- a/doc/man/man8/slaptest.8 +++ b/doc/man/man8/slaptest.8 @@ -22,8 +22,10 @@ is used to check the conformance of the configuration file. It opens the .BR slapd.conf (5) -configuration file, and parses it according to the general -and the backend-specific rules, checking its sanity. +configuration file or the +.BR slapd-config (5) +backend, and parses it according to the general and the backend-specific +rules, checking its sanity. .LP .SH OPTIONS .TP