ITS#5975

diff --git a/CHANGES b/CHANGES
index f3681dc6729e24aff5e7eda4d86e1fb86a1032a1..e1116db6b80c2c8ee592bffe2150a336d4ccbfb3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,8 @@ OpenLDAP 2.4.17 Engineering
                Added test057-memberof-refint (ITS#5395)
        Documentation
                admin24 fixed example regex (ITS#6052)
+               slapd.conf(5) pidfile/argsfile description fix (ITS#5975)
+               slapd-config(5) pidfile/argsfile description fix (ITS#5975)
 
 OpenLDAP 2.4.16 Release (2009/04/05)
        Fixed libldap GnuTLS with x509v1 CA certs (ITS#5992)

diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
index 1d73cab33b4436b7737ba3121cdd308d7048a711..bde39220f33f34600507790b37c546e69cf40b7c 100644 (file)
--- a/doc/man/man5/slapd-config.5
+++ b/doc/man/man5/slapd-config.5
@@ -142,10 +142,9 @@ allows unauthenticated (anonymous) proxy authorization control to be processed
 (subject to access controls, authorization and other administrative limits).
 .TP
 .B olcArgsFile: <filename>
-The ( absolute ) name of a file that will hold the 
+The (absolute) name of a file that will hold the 
 .B slapd
-server's command line options
-if started without the debugging command line option.
+server's command line (program name and options).
 .TP
 .B olcAttributeOptions: <option-name>...
 Define tagging attribute options or option tag/range prefixes.
@@ -629,11 +628,10 @@ versions of crypt(3) to use an MD5 algorithm and provides
 provides 31 characters of salt.
 .TP
 .B olcPidFile: <filename>
-The ( absolute ) name of a file that will hold the 
+The (absolute) name of a file that will hold the 
 .B slapd
-server's process ID ( see
-.BR getpid (2)
-) if started without the debugging command line option.
+server's process ID (see
+.BR getpid (2)).
 .TP
 .B olcPluginLogFile: <filename>
 The ( absolute ) name of a file that will contain log

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index e7d46774bd1e327734b3376da3112a584fb56ccf..4229c7a02238e66996d0a579b34cfff3bd577aab 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -108,10 +108,9 @@ allows unauthenticated (anonymous) proxy authorization control to be processed
 (subject to access controls, authorization and other administrative limits).
 .TP
 .B argsfile <filename>
-The ( absolute ) name of a file that will hold the 
+The (absolute) name of a file that will hold the 
 .B slapd
-server's command line options
-if started without the debugging command line option.
+server's command line (program name and options).
 .TP
 .B attributeoptions [option-name]...
 Define tagging attribute options or option tag/range prefixes.
@@ -763,11 +762,10 @@ versions of crypt(3) to use an MD5 algorithm and provides
 provides 31 characters of salt.
 .TP
 .B pidfile <filename>
-The ( absolute ) name of a file that will hold the 
+The (absolute) name of a file that will hold the 
 .B slapd
-server's process ID ( see
-.BR getpid (2)
-) if started without the debugging command line option.
+server's process ID (see
+.BR getpid (2)).
 .TP
 .B referral <url>
 Specify the referral to pass back when