Move extern schema_init_done outside of #ifdef SLAPD_SCHEMA_NOT_COMPAT

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

diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
index 9904ece2fdc2589a57b72a6e51793ef31a12ff4e..1e9e5266e9345e2c7ecda4094f4d1b262f8956f2 100644 (file)
--- a/doc/man/man5/ldap.conf.5
+++ b/doc/man/man5/ldap.conf.5
@@ -1,9 +1,13 @@
 .TH LDAP.CONF 5 "29 November 1998" "OpenLDAP LDVERSION"
+.\" $OpenLDAP$
+.\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
+.\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .UC 6
 .SH NAME
-ldap.conf \- ldap configuration file
+ldap.conf, .ldaprc \- ldap configuration file
 .SH SYNOPSIS
 ETCDIR/ldap.conf
+\fP.ldaprc\fP
 .SH DESCRIPTION
 The
 .I ldap.conf
@@ -21,7 +25,7 @@ defaults file.
 Additional configuration files can be specified using
 the \fBLDAPCONF\fP and \fBLDAPRC\fP environment variables.
 \fBLDAPCONF\fP may be set the path of a configuration file.  This
-patch can be absolute or relative to current working directory.
+path can be absolute or relative to current working directory.
 The \fBLDAPRC\fP, if defined, should be a basename of a file
 in the current working directory or in the user's home directory.
 .LP
@@ -29,13 +33,24 @@ Environmental variables may also be used to augment the file based defaults.
 The name of the option is the as listed but with a prefix of \fBLDAP\fP.
 For example, to define \fBBASE\fP via the environment, define the variable
 \fBLDAPBASE\fP to desired value.
+.LP
+Some options are user\-only.  Such options are ignored if present
+in the
+.IR ldap.conf
+(or file specified by
+.BR LDAPCONF ).
 .SH OPTIONS
 The different configuration options are:
 .TP 1i
-.TP 1i
 \fBBASE <base>\fP
-Used to specify the default base dn to use when performing ldap operations.
+Used to specify the default base DN to use when performing ldap operations.
 The base must be specified as a Distinguished Name in LDAP format.
+.TP 1i
+\fBBINDDN <dn>\fP
+Used to specify the default bind DN to use when performing ldap operations.
+The bind DN must be specified as a Distinguished Name in LDAP format.
+This is a user\-only option.
+.TP 1i
 \fBHOST <name[:port] ...>\fP
 Used to specify the name(s) of an LDAP server(s) to which 
 .I ldap