From: Howard Chu <hyc@openldap.org>
Date: Thu, 9 Jun 2005 19:44:02 +0000 (+0000)
Subject: ITS#3716, add note about -f/-F behavior re: converting formats
X-Git-Tag: OPENLDAP_AC_BP~560
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7b72a9bc99dc5aa3a12848d761e9a49f9f57c5ec;p=openldap

ITS#3716, add note about -f/-F behavior re: converting formats
---

diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
index 0fa5d7d54c..43876d916d 100644
--- a/doc/man/man8/slapd.8
+++ b/doc/man/man8/slapd.8
@@ -135,7 +135,8 @@ config directory format and written to the specified directory.
 If neither option is specified, slapd will attempt to read the
 default config directory before trying to use the default
 config file. If a valid config directory exists then the
-default config file is ignored.
+default config file is ignored. All of the slap tools that
+use the config options observe this same behavior.
 .TP
 .BI \-h " URLlist"
 .B slapd
diff --git a/doc/man/man8/slaptest.8 b/doc/man/man8/slaptest.8
index 50d30a6789..2ba6a75be0 100644
--- a/doc/man/man8/slaptest.8
+++ b/doc/man/man8/slaptest.8
@@ -35,6 +35,18 @@ file.
 .TP
 .BI \-F " confdir"
 specify a config directory.
+If both
+.B -f
+and
+.B -F
+are specified, the config file will be read and converted to
+config directory format and written to the specified directory.
+If neither option is specified, slaptest will attempt to read the
+default config directory before trying to use the default
+config file. If a valid config directory exists then the
+default config file is ignored. If dryrun mode is also specified,
+no conversion will occur. All of the slap tools that
+use the config options observe this same behavior.
 .TP
 .B \-u
 enable dryrun mode (i.e. don't fail if databases cannot be opened,