Update CR notices and release documents

diff --git a/doc/guide/COPYRIGHT b/doc/guide/COPYRIGHT
index ea66006b56943eccd22f83dbf5be39f00dada3d7..5550e3abe11f6d76e401ff57942166f1d1dca005 100644 (file)
--- a/doc/guide/COPYRIGHT
+++ b/doc/guide/COPYRIGHT
@@ -1,13 +1,13 @@
-Copyright 1998-2001 The OpenLDAP Foundation
+Copyright 1998-2005 The OpenLDAP Foundation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted only as authorized by the OpenLDAP
 Public License.
 
-A copy of this license is available in file LICENSE in the
+A copy of this license is available in the file LICENSE in the
 top-level directory of the distribution or, alternatively, at
-<http://www.OpenLDAP.org/license.html>
+<http://www.OpenLDAP.org/license.html>.
 
 OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 
@@ -20,14 +20,14 @@ at <http://www.umich.edu/~dirsvcs/ldap/>.
 
 This work also contains materials derived from public sources.
 
-Additional information about OpenLDAP software can be obtained at
+Additional information about OpenLDAP can be obtained at
 <http://www.openldap.org/>.
 
 ---
 
-Portions Copyright 1998-2003 Kurt D. Zeilenga.
-Portions Copyright 1998-2003 Net Boolean Incorporated.
-Portions Copyright 2001-2003 IBM Corporation.
+Portions Copyright 1998-2004 Kurt D. Zeilenga.
+Portions Copyright 1998-2004 Net Boolean Incorporated.
+Portions Copyright 2001-2004 IBM Corporation.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,8 @@ All rights reserved.
 
 Redistribution and use in source and binary forms are permitted
 provided that this notice is preserved and that due credit is given
-to the University of Michigan at Ann Arbor. The name of the University
-may not be used to endorse or promote products derived from this
-software without specific prior written permission. This software
-is provided ``as is'' without express or implied warranty.
+to the University of Michigan at Ann Arbor.  The name of the
+University may not be used to endorse or promote products derived
+from this software without specific prior written permission.  This
+software is provided ``as is'' without express or implied warranty.
+

diff --git a/doc/guide/LICENSE b/doc/guide/LICENSE
index df50fee0ac508f87f2712cab1ecbb6e464823d13..05ad7571e448b9d83ead5d4691274d9484574714 100644 (file)
--- a/doc/guide/LICENSE
+++ b/doc/guide/LICENSE
@@ -1,5 +1,5 @@
 The OpenLDAP Public License
-  Version 2.8.1, 25 November 2003
+  Version 2.8, 17 August 2003
 
 Redistribution and use of this software and associated documentation
 ("Software"), with or without modification, are permitted provided
@@ -43,5 +43,5 @@ holders.
 OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 
 Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
-California, USA.  All rights reserved.  Permission to copy and
+California, USA.  All Rights Reserved.  Permission to copy and
 distribute verbatim copies of this document is granted.

diff --git a/doc/guide/admin/abstract.sdf b/doc/guide/admin/abstract.sdf
index 5bc8810d82bafd84f9222c47b65fed48bee2de2c..7a52ad0a680a997717eeb353f1bc6c66cc37940c 100644 (file)
--- a/doc/guide/admin/abstract.sdf
+++ b/doc/guide/admin/abstract.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 # 
 # OpenLDAP Administrator's Guide: Abstract

diff --git a/doc/guide/admin/config.sdf b/doc/guide/admin/config.sdf
index ee82719e4d399823697c7df8e412d178377e6b9d..47fe3f42e00ddcea689f5ec2b1f9fa1b4cafefbd 100644 (file)
--- a/doc/guide/admin/config.sdf
+++ b/doc/guide/admin/config.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 H1: The Big Picture - Configuration Choices
 

diff --git a/doc/guide/admin/dbtools.sdf b/doc/guide/admin/dbtools.sdf
index 672ba0fdb87076915f318b93de004e1b9d4261a4..347caec6108640e313ee68b1327bc9d422fc9cf8 100644 (file)
--- a/doc/guide/admin/dbtools.sdf
+++ b/doc/guide/admin/dbtools.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: Database Creation and Maintenance Tools

diff --git a/doc/guide/admin/guide.sdf b/doc/guide/admin/guide.sdf
index a348098179ea14e464a77063251b5871d9646775..dd19e09bad9d8072aac8c933493c4a6319c9a587 100644 (file)
--- a/doc/guide/admin/guide.sdf
+++ b/doc/guide/admin/guide.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 #
 # guide.sdf 

diff --git a/doc/guide/admin/index.sdf b/doc/guide/admin/index.sdf
index 876cbdc2006b1a6a143f7bc6e6197f49829314fb..f31722f0ac269b61b7cc12ca1cce972fb504269a 100644 (file)
--- a/doc/guide/admin/index.sdf
+++ b/doc/guide/admin/index.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 #
 # index.sdf 

diff --git a/doc/guide/admin/install.sdf b/doc/guide/admin/install.sdf
index c35a48dab0ec77cf76f3829c8e5f26cb26cf72ee..b7b38c449a4e0e9155eb1dc104e4756aaef1895b 100644 (file)
--- a/doc/guide/admin/install.sdf
+++ b/doc/guide/admin/install.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: Building and Installing OpenLDAP Software

diff --git a/doc/guide/admin/intro.sdf b/doc/guide/admin/intro.sdf
index 073648b18a9d971b4d217f31eddcbc5c7dc99d9f..5b26dadad61d965cacd2ad6f1d79db16f8d7b7cc 100644 (file)
--- a/doc/guide/admin/intro.sdf
+++ b/doc/guide/admin/intro.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 H1: Introduction to OpenLDAP Directory Services
 

diff --git a/doc/guide/admin/master.sdf b/doc/guide/admin/master.sdf
index 1fd2b6ae6c40d3d4d8cbf5dcef13e60fc61812a0..07281fc50c32a44785fde05b483b3126fa8699b7 100644 (file)
--- a/doc/guide/admin/master.sdf
+++ b/doc/guide/admin/master.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 #
 # master file for the OpenLDAP Administrator's Guide

diff --git a/doc/guide/admin/monitoringslapd.sdf b/doc/guide/admin/monitoringslapd.sdf
index c2bb49656c3f7662c6a448b00decaffbeae7ec57..cb9e3681937cc200ccf337173889a8f69a32f60f 100644 (file)
--- a/doc/guide/admin/monitoringslapd.sdf
+++ b/doc/guide/admin/monitoringslapd.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 H1: Monitoring Slapd
 

diff --git a/doc/guide/admin/preface.sdf b/doc/guide/admin/preface.sdf
index cf667add8389b5bae7e4fb21cd2eee08b7fc2fe6..3b4889cde0431993fdc8665454cdd919b8b40547 100644 (file)
--- a/doc/guide/admin/preface.sdf
+++ b/doc/guide/admin/preface.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 # 
 
@@ -9,7 +9,7 @@ P1: Preface
 # document's copyright
 P2[notoc] Copyright
 
-Copyright 1998-2004, The {{ORG[expand]OLF}}, {{All Rights Reserved}}.
+Copyright 1998-2005, The {{ORG[expand]OLF}}, {{All Rights Reserved}}.
 
 Copyright 1992-1996, Regents of the {{ORG[expand]UM}}, {{All Rights Reserved}}.
 

diff --git a/doc/guide/admin/proxycache.sdf b/doc/guide/admin/proxycache.sdf
index 54a93a5f79d894975beee3b54e302888f5648377..38fd1264ca7ac8f102f87e4847be3e810b12d2f7 100644 (file)
--- a/doc/guide/admin/proxycache.sdf
+++ b/doc/guide/admin/proxycache.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2003-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: The Proxy Cache Engine

diff --git a/doc/guide/admin/quickstart.sdf b/doc/guide/admin/quickstart.sdf
index 6eecc900d6bc7b557dfef9c5aa40e1cc9fcb9973..2a90cafd7a2d986d512ec214fce4c6c9f20d43ab 100644 (file)
--- a/doc/guide/admin/quickstart.sdf
+++ b/doc/guide/admin/quickstart.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: A Quick-Start Guide

diff --git a/doc/guide/admin/referrals.sdf b/doc/guide/admin/referrals.sdf
index 82690e4591f6c52f0d5fd41107dcca2ba234f011..34f6c17710de8c05404777e71f65bb3ddf739fdf 100644 (file)
--- a/doc/guide/admin/referrals.sdf
+++ b/doc/guide/admin/referrals.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: Constructing a Distributed Directory Service

diff --git a/doc/guide/admin/replication.sdf b/doc/guide/admin/replication.sdf
index f1c05b70c02a67aed4886239bad401de918d71c4..20abd3f4993d8a13998d5f039c740e0aa164e395 100644 (file)
--- a/doc/guide/admin/replication.sdf
+++ b/doc/guide/admin/replication.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 H1: Replication with slurpd
 

diff --git a/doc/guide/admin/runningslapd.sdf b/doc/guide/admin/runningslapd.sdf
index 9059cdd5cf470fd063a670ba37338b85e1b6eea1..0e745c4e3d0a3f3497c5a8cba264e04aa100d454 100644 (file)
--- a/doc/guide/admin/runningslapd.sdf
+++ b/doc/guide/admin/runningslapd.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 H1: Running slapd
 

diff --git a/doc/guide/admin/sasl.sdf b/doc/guide/admin/sasl.sdf
index a8e9d204d2c7712138f8e88b8254755e34f80d40..507ad8892a33428f777f1e8304b3e5212025d8c5 100644 (file)
--- a/doc/guide/admin/sasl.sdf
+++ b/doc/guide/admin/sasl.sdf
@@ -1,4 +1,4 @@
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: Using SASL

diff --git a/doc/guide/admin/schema.sdf b/doc/guide/admin/schema.sdf
index e455da628b2f3a84fee9849ff3368ad9c281ffe2..3cee4c5a9a7f7cfd0f6d06ff6381ed075d83d006 100644 (file)
--- a/doc/guide/admin/schema.sdf
+++ b/doc/guide/admin/schema.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: Schema Specification

diff --git a/doc/guide/admin/security.sdf b/doc/guide/admin/security.sdf
index 554a9f39d6d134f3d0801c8ccd97b43f9bb3e961..78b4138aeee239dcc370dcc038207a2d11615415 100644 (file)
--- a/doc/guide/admin/security.sdf
+++ b/doc/guide/admin/security.sdf
@@ -1,4 +1,4 @@
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: Security Considerations

diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf
index 8ddb72c88893b54c110243d943f7e593b9285ae0..46f970b97db2313123f08b7ac48985c449459d1d 100644 (file)
--- a/doc/guide/admin/slapdconfig.sdf
+++ b/doc/guide/admin/slapdconfig.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: The slapd Configuration File

diff --git a/doc/guide/admin/syncrepl.sdf b/doc/guide/admin/syncrepl.sdf
index 3b0c35f60f0aed9cadb238deca82a5cfb5192efd..0ee92b541b0ac531507c11d2b1096eeb3e3d97f4 100644 (file)
--- a/doc/guide/admin/syncrepl.sdf
+++ b/doc/guide/admin/syncrepl.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2003-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: LDAP Sync Replication

diff --git a/doc/guide/admin/title.sdf b/doc/guide/admin/title.sdf
index 812ed45d3dc43707e76bb4afeac4fcc30adf73cd..297bd56db855ebc93cd356cb96282d5bb43017e0 100644 (file)
--- a/doc/guide/admin/title.sdf
+++ b/doc/guide/admin/title.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999--2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 #
 # Document: OpenLDAP Administrator's Guide

diff --git a/doc/guide/admin/tls.sdf b/doc/guide/admin/tls.sdf
index 182aa1dd8d2b1ba08deb1cc6777cb2821503cb26..06fb70f0489c5ba2fd009b698c1f947ab58cb321 100644 (file)
--- a/doc/guide/admin/tls.sdf
+++ b/doc/guide/admin/tls.sdf
@@ -1,4 +1,4 @@
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: Using TLS

diff --git a/doc/guide/admin/tuning.sdf b/doc/guide/admin/tuning.sdf
index 1aec9149e0b0b2cd22fb0a90f1c2fa08e7bf959f..5a278fe91d49c401354466f6fdbaea9e111cc2db 100644 (file)
--- a/doc/guide/admin/tuning.sdf
+++ b/doc/guide/admin/tuning.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: Performance Tuning

diff --git a/doc/guide/plain.sdf b/doc/guide/plain.sdf
index ae90b35374aca4fa33665a17fa063f8db66b5c64..5b472acb6e5bfcbc4a02873f1b649dec38d1d623 100644 (file)
--- a/doc/guide/plain.sdf
+++ b/doc/guide/plain.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 # template for plain documents
@@ -13,7 +13,7 @@
 !macro HTML_FOOTER
 {{INLINE:<FONT COLOR="#808080" FACE="Arial,Verdana,Helvetica" SIZE="1">}}
 {{INLINE:<B>________________<BR><SMALL>}}
-[[c]]  Copyright 2003,
+[[c]]  Copyright 2005,
 {{INLINE:<A HREF="/foundation/">OpenLDAP Foundation</A>}},
 {{EMAIL: info@OpenLDAP.org}}
 {{INLINE:</SMALL><BR></B></FONT>}}

diff --git a/doc/guide/preamble.sdf b/doc/guide/preamble.sdf
index 9abf9b60a08e5a5b007235cc4fb58de005efaa56..8eb8cd7c165d8c7885e741b7a4cc71c42e667889 100644 (file)
--- a/doc/guide/preamble.sdf
+++ b/doc/guide/preamble.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
  
 #

diff --git a/doc/guide/release/copyright.sdf b/doc/guide/release/copyright.sdf
index 8ecca93d937951ad45efcf99c8cc4d84ac46fe77..87ded2740ebabdac85c939b868198ed9f6a5064e 100644 (file)
--- a/doc/guide/release/copyright.sdf
+++ b/doc/guide/release/copyright.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 !if OPT_PP_HTML
@@ -13,7 +13,7 @@ H1: OpenLDAP Software Copyright Notices
 H2: OpenLDAP Copyright Notice
 
 !block nofill
-[[copyright]] 1998-2003 The OpenLDAP Foundation.
+[[copyright]] 1998-2005 The OpenLDAP Foundation.
 {{All rights reserved.}}
 !endblock
 
@@ -43,9 +43,9 @@ Additional information about OpenLDAP software can be obtained at
 H2: Additional Copyright Notice
 
 !block nofill
-Portions [[copyright]] 1998-2003 Kurt D. Zeilenga.
-Portions [[copyright]] 1998-2003 Net Boolean Incorporated.
-Portions [[copyright]] 2001-2003 IBM Corporation.
+Portions [[copyright]] 1998-2005 Kurt D. Zeilenga.
+Portions [[copyright]] 1998-2005 Net Boolean Incorporated.
+Portions [[copyright]] 2001-2005 IBM Corporation.
 {{All rights reserved.}}
 !endblock
 

diff --git a/doc/guide/release/install.sdf b/doc/guide/release/install.sdf
index bddbe95de438b617df5eaacd3e7bf812f783972b..ad8c2a42dcae05432fae7ac188bb165029f28499 100644 (file)
--- a/doc/guide/release/install.sdf
+++ b/doc/guide/release/install.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2003, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 P1: Making and Installing the OpenLDAP Distribution
@@ -55,10 +55,14 @@ determining compiler/linker options including:
 
 E:     % [env settings] ./configure [options]
 
-.If all goes well, the {{EX:configure}} script will automatically
-detect the appropriate settings.  However, you may need to
-specify options and/or environment variables to obtain desired
-results.
+.If all goes well, the {{EX:configure}} script will automatically detect
+the appropriate settings.  If the {{EX:configure}} script fails, you should
+read the {{FILE:config.log}} file that it generated to see what it was trying
+to do and exactly what failed.  You may need to specify additional
+options and/or environment variables besides those listed above to
+obtain desired results, depending on your operating system. The
+{{Platform Hints}} section of the {{FAQ}} provides help for operating system
+related problems.
 
 + Build dependencies
 
@@ -76,7 +80,7 @@ if you have not done so already.
 + Test the standalone system
 
 .This step requires the standalone LDAP server, {{slapd}}(8),
-with {{BDB}} or {{LDBM}} support.
+with {{HDB}}, {{BDB}}, and/or {{LDBM}} support.
 
 E:     % make test
 
@@ -98,13 +102,9 @@ for the individual applications for configuration and use information.
 You may also want to edit the configuration files used by the
 various components.  These configuration files are located in
 the OpenLDAP configuration directory (normally
-{{F:/usr/local/etc/openldap}}).
+{{FILE:/usr/local/etc/openldap}}).
 
 >      ldap.conf               client defaults
 >      slapd.conf              Standalone LDAP daemon
 >      schema/*.schema         Schema Definitions
 
-
-End of OpenLDAP INSTALL file.
-
-{{S:$OpenLDAP$}}