Move extern schema_init_done outside of #ifdef SLAPD_SCHEMA_NOT_COMPAT

[openldap] / doc / man / man5 / slapd.conf.5

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 321cce1099ca88b9969a1b44498d17d1d766c923..a892fa4f27d81291943f365eb26c2f2328325b1b 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -1,6 +1,6 @@
 .TH SLAPD.CONF 5 "5 August 1999" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
-.\" Copyright 1998-1999 The OpenLDAP Foundation All Rights Reserved.
+.\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .SH NAME
 slapd.conf \- configuration file for slapd, the stand-alone LDAP daemon
@@ -351,9 +351,10 @@ or administrative limit restrictions for operations on this database.
 .TP
 .B rootpw <password>
 Specify a password (or hash of the password) for the rootdn.
-This option accepts all password formats known to the server
-including \fB{SHA}\fP, \fB{MD5}\fP, \fB{CRYPT}\fP, and cleartext.  
-Cleartext passwords are not recommended.
+This option accepts all RFC 2307 userPassword formats known to
+the server including \fB{SSHA}\fP, \fB{SHA}\fP, \fB{SMD5}\fP,
+\fB{MD5}\fP, \fB{CRYPT}\fP, and cleartext schemes.  Cleartext
+passwords are not recommended.
 .TP
 .B suffix <dn suffix>
 Specify the DN suffix of queries that will be passed to this 
@@ -397,9 +398,10 @@ synchronized with in memory changes.  Enabling this option may improve
 performance at the expense of data security.
 .TP
 .B directory <directory>
-Specify the directory where the LDBM files containing the database and
-associated indexes live.  The default is
-.B /usr/tmp.
+Specify the directory where the LDBM files containing this database and
+associated indexes live.  A separate directory must be specified for
+each database.  The default is
+.BR LOCALSTATEDIR/openldap-ldbm .
 .TP
 .B
 index { <attrlist> | default } [ pres,eq,approx,sub,none ]