Update INSTALL and ldapconfig.h.edit to reflect the file is only

for tuning OpenLDAP and generally shouldn't be messed with.

diff --git a/CHANGES b/CHANGES
index 029223224b25faebff7861b6c65e6b61aa6d6441..55b23619f09fe35abd4e3c87275be76c0e4d03d3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,8 @@ Changes included in OpenLDAP 1.2 Release Engineering
        Added ldapsearch -W password prompting
        Added dcObject, uidObject, referral object classes to slapd.oc.conf
        Added ref attribute type to slapd.at.conf
+       Documentation
+               Removed edit ldapconfig.h.edit set from INSTALL
 
 Changes included in OpenLDAP 1.2.6
        CVS Tag: OPENLDAP_REL_ENG_1_2_6

diff --git a/INSTALL b/INSTALL
index 09c33b1ff3b7c0dd09ee3d1e5bbccbbc35b6d8b7..24a4c6c5d3ca18d3d03457fdc043818fd8896759 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -47,13 +47,7 @@ these steps:
        See the 'USING ENVIRONMENT VARIABLES' section for information
        on how to use the variables. 
 
- 3. review the file include/ldapconfig.h.edit to tune
-    the software for your site.  You will likely not have to
-       modify the file.
-
-       % more include/ldapconfig.h.edit
-
- 4. Configure the build system
+ 3. Configure the build system
 
        % [env settings] ./configure [options]
 
@@ -61,11 +55,11 @@ these steps:
        appropriate settings.  Use configure enable/with options and/or
        environment variables to obtain desired results.
 
- 5. Build dependencies
+ 4. Build dependencies
 
        % make depend
 
- 6. Build the system
+ 5. Build the system
 
        % make
 
@@ -75,7 +69,7 @@ these steps:
        You may want to consult the doc/install/hints file for your
        platform.
 
- 7. Test the standalone system
+ 6. Test the standalone system
 
        This step requires the standalone LDAP server (slapd) with
        LDBM support.
@@ -89,7 +83,7 @@ these steps:
        You may want to consult the doc/install/hints file for your
        platform.
 
- 8. install the binaries and man pages.  You may need to be superuser to
+ 7. install the binaries and man pages.  You may need to be superuser to
     do this (depending on where you are installing things):
 
        % su

diff --git a/include/ldapconfig.h.edit b/include/ldapconfig.h.edit
index ae9bea12e62763441ec26363a5e822a4df617103..a299579a99b0c734a12885a29958aa7bcac63687 100644 (file)
--- a/include/ldapconfig.h.edit
+++ b/include/ldapconfig.h.edit
@@ -23,9 +23,11 @@
 #define _LDAP_CONFIG_H
 
 /*
- * config.h for LDAP -- edit this file to customize LDAP client behavior.
- * NO platform-specific definitions should be placed in this file.
- * Note that this IS USED by the LDAP or LBER libraries.
+ * config.h for LDAP -- modify this file to tune OpenLDAP behavior.
+ *
+ * Most settings are set via configure and shouldn't be modified
+ * through this file.
+ *
  */
 
 /*