From c9a8258e7a7f87c61f33b323477477278cc3b888 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 30 Jan 2009 20:34:30 +0000
Subject: [PATCH] ITS#5828

---
 CHANGES                   | 1 +
 doc/man/man8/slapacl.8    | 6 ++++--
 doc/man/man8/slapauth.8   | 8 +++++---
 doc/man/man8/slapdn.8     | 2 +-
 doc/man/man8/slappasswd.8 | 7 +++++--
 doc/man/man8/slaptest.8   | 6 ++++--
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5e3f098bd8..0295b0f5c6 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 387d84d37d..23862182e7 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 8f374d8712..6b164b161e 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 6ea5d76232..97e70ab20f 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 4a88bf9931..a88edd5e45 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 30aaaaae6f..ce31015b2f 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
-- 
GitLab