From d8d5cef23a81a84c8bbfe00e18722d080191ff00 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 12 Feb 2021 17:24:16 +0000
Subject: [PATCH] ITS#9450 - Update install.sdf

Drop all references to the FAQ
Add bit about lloadd.conf
regenerate text based INSTALL file
---
 INSTALL                       | 23 +++++++----------------
 doc/guide/release/install.sdf | 22 ++++------------------
 2 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/INSTALL b/INSTALL
index e5ad17c5cd..9515ed2a29 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,12 +9,6 @@ and instructions can be found in The OpenLDAP Administrator's Guide
 It is recommended that you read, or at least skim through, ALL of the
 instructions in this file before attempting to build the software.
 
-It is also recommended you review the Frequently Asked Questions
-(http://www.openldap.org/faq/) pages, in particular the Installation
-section (http://www.openldap.org/faq/index.cgi?file=8) and Platform
-Hints (http://www.openldap.org/faq/index.cgi?file=9) should be
-examined.
-
 Making and Installing the OpenLDAP Distribution
 -----------------------------------------------
 
@@ -55,8 +49,7 @@ Making and Installing the OpenLDAP Distribution
      was trying to do and exactly what failed.  You may need to
      specify additional options and/or 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.
+     system.
 
 4.   Build dependencies:
 
@@ -67,18 +60,18 @@ Making and Installing the OpenLDAP Distribution
         % make
 
      If all goes well, the system will build as configured.  If not,
-     return to step 3 after reviewing the configuration settings.  You
-     may want to consult the Platform Hints subsection of the FAQ if
-     you have not done so already.
+     return to step 3 after reviewing the configuration settings.
 
 6.   Test the standalone system:
 
+     This step requires the standalone LDAP server, slapd(8), with MDB
+     support.
+
         % make test
 
      If all goes well, the system has been built as configured.  If
      not, return to step 2 after reviewing your configuration
-     settings.  You may want to consult the Installation section of
-     the FAQ if you have not done so already.
+     settings.
 
 7.   Install the software.  You may need to become the super-user
      (e.g. root) to do this (depending on where you are installing
@@ -96,12 +89,10 @@ configuration directory (normally /usr/local/etc/openldap).
 
         ldap.conf               client defaults
         slapd.conf              Standalone LDAP daemon
+        lload.conf              LDAP Load Balancer daemon
         schema/*.schema         Schema Definitions
 
 ---
-$OpenLDAP: pkg/openldap-guide/release/install.sdf,v 1.16 2002/02/18
-17:09:26 kurt Exp $
-
 This work is part of OpenLDAP Software <http://www.openldap.org/>.
 
 Copyright 1998-2021 The OpenLDAP Foundation.
diff --git a/doc/guide/release/install.sdf b/doc/guide/release/install.sdf
index a65faf6453..a7b61dbeee 100644
--- a/doc/guide/release/install.sdf
+++ b/doc/guide/release/install.sdf
@@ -14,15 +14,6 @@ It is recommended that you read, or at least skim through, ALL of
 the instructions in this file before attempting to build the
 software.
 
-It is also recommended you review
-the {{Frequently Asked Questions}} ({{URL:http://www.openldap.org/faq/}})
-pages, in particular the
-{{Installation section}} ({{URL:http://www.openldap.org/faq/index.cgi?file=8}})
-and
-{{Platform Hints}} ({{URL:http://www.openldap.org/faq/index.cgi?file=9}})
-should be examined.
-
-
 P2: Making and Installing the OpenLDAP Distribution
 
 ^ Unpack the distribution and change directory:
@@ -64,9 +55,7 @@ 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 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.
+obtain desired results, depending on your operating system.
 
 + Build dependencies:
 
@@ -77,9 +66,7 @@ E:	% make depend
 E:	% make
 
 .If all goes well, the system will build as configured.  If not,
-return to step 3 after reviewing the configuration settings.  You
-may want to consult the {{Platform Hints}} subsection of the {{FAQ}}
-if you have not done so already.
+return to step 3 after reviewing the configuration settings.
 
 + Test the standalone system:
 
@@ -89,9 +76,7 @@ with {{MDB}} support.
 E:	% make test
 
 .If all goes well, the system has been built as configured.  If not,
-return to step 2 after reviewing your configuration settings.  You
-may want to consult the {{Installation}} section of the {{FAQ}}
-if you have not done so already.
+return to step 2 after reviewing your configuration settings.
 
 + Install the software.  You may need to become the
 {{super-user}} (e.g. {{EX:root}}) to do this (depending on where you
@@ -110,5 +95,6 @@ the OpenLDAP configuration directory (normally
 
 >	ldap.conf		client defaults
 >	slapd.conf		Standalone LDAP daemon
+>	lload.conf		LDAP Load Balancer daemon
 >	schema/*.schema		Schema Definitions
 
-- 
GitLab