Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
+++ server/other/openldap.xml	(revision 9a9a0fecd6db507e49dbffa45b2d2fc3300697a7)
@@ -1,5 +1,5 @@
-<sect1 id="openldap" xreflabel="openldap-&openldap-version;">
+<sect1 id="openldap" xreflabel="OpenLDAP-&openldap-version;">
 <?dbhtml filename="openldap.html" dir="server"?>
-<title>openldap-&openldap-version;</title>
+<title>Open<acronym>LDAP</acronym>-&openldap-version;</title>
 
 &openldap-intro;
Index: server/other/openldap/openldap-config.xml
===================================================================
--- server/other/openldap/openldap-config.xml	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
+++ server/other/openldap/openldap-config.xml	(revision 9a9a0fecd6db507e49dbffa45b2d2fc3300697a7)
@@ -1,11 +1,13 @@
 <sect2>
-<title>Configuring OpenLDAP</title>
-<para>The only configuration needed for ldap is to run <userinput>ldconfig</userinput>.  
-The LDAP server can be started by <userinput>/usr/sbin/slapd</userinput> as described in 
-the man page slapd(8).  </para>
+<title>Configuring Open<acronym>LDAP</acronym></title>
 
-<para>Data can be added to the LDAP database via ldapadd.  Other programs that can
-use the database include ldapsearch, ldapmodify, ldapdelete, and ldappasswd.  For
-more information see the appropriate man page.</para>
+<para>The only configuration needed for Open<acronym>LDAP</acronym> is
+to run <command>ldconfig</command>. The <acronym>LDAP</acronym> server
+can be started by <command>/usr/sbin/slapd</command> as described in 
+the man page slapd(8).</para>
+
+<para>Data can be added to the <acronym>LDAP</acronym> database via
+<command>ldapadd</command>. There are other programs that can use
+the database. For more information see the appropriate man page.</para>
+
 </sect2>
-
Index: server/other/openldap/openldap-desc.xml
===================================================================
--- server/other/openldap/openldap-desc.xml	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
+++ server/other/openldap/openldap-desc.xml	(revision 9a9a0fecd6db507e49dbffa45b2d2fc3300697a7)
@@ -2,7 +2,21 @@
 <title>Contents</title>
 
-<para>The OpenLDAP package contains <userinput>slapd</userinput>,
-<userinput>slurpd</userinput>, <filename>libldap</filename> libraries and
-various utilities, tools, and sample clients.</para>
+<para>The Open<acronym><acronym>LDAP</acronym></acronym> package contains
+<command>ldapadd</command>,
+<command>ldapcompare</command>,
+<command>ldapdelete</command>,
+<command>ldapmodify</command>,
+<command>ldapmodrdn</command>,
+<command>ldappasswd</command>,
+<command>ldapsearch</command>,
+<command>ldapwhoami</command>,
+<command>slapadd</command>,
+<command>slapcat</command>,
+<command>slapd</command>,
+<command>slapindex</command>,
+<command>slappasswd</command>,
+<command>slurpd</command>,
+<filename class="libraryfile">liblber</filename> and
+<filename class="libraryfile">libldap</filename>.</para>
 
 </sect2>
@@ -10,13 +24,67 @@
 <sect2><title>Description</title>
 
+<sect3><title>ldapadd</title>
+<para><command>ldapadd</command> opens a connection to an <acronym>LDAP</acronym> server,
+binds and adds entries.</para></sect3>
+
+<sect3><title>ldapcompare</title>
+<para><command>ldapcompare</command> opens a connection to an <acronym>LDAP</acronym>
+server, binds and performs a compare using specified
+parameters.</para></sect3>
+
+<sect3><title>ldapdelete</title>
+<para><command>ldapdelete</command> opens a connection to an <acronym>LDAP</acronym> server,
+binds and deletes one or more entries.</para></sect3>
+
+<sect3><title>ldapmodify</title>
+<para><command>ldapmodify</command> opens a connection to an <acronym>LDAP</acronym>
+server, binds and modifies entries.</para></sect3>
+
+<sect3><title>ldapmodrdn</title>
+<para><command>ldapmodrdn</command> opens a connection to an <acronym>LDAP</acronym>
+server, binds and modifies the <acronym>RDN</acronym> of
+entries.</para></sect3>
+
+<sect3><title>ldappasswd</title>
+<para><command>ldappasswd</command> is a tool to set the password of an
+<acronym>LDAP</acronym> user.</para></sect3>
+
+<sect3><title>ldapsearch</title>
+<para><command>ldapsearch</command> opens a connection to an <acronym>LDAP</acronym>
+server, binds and performs a search using specified
+parameters.</para></sect3>
+
+<sect3><title>ldapwhoami</title>
+<para><command>ldapwhoami</command> open a connection to an <acronym>LDAP</acronym> server,
+binds and performs a whoami operation.</para></sect3>
+
+<sect3><title>slapadd</title>
+<para><command>slapadd</command> is used to add entries specified in
+<acronym>LDAP</acronym> Directory Interchange Format (<acronym>LDIF</acronym>) to a
+slapd database.</para></sect3>
+
+<sect3><title>slapcat</title>
+<para><command>slapcat</command> is used to generate an <acronym>LDAP</acronym>
+<acronym>LDIF</acronym> output
+based upon the contents of a slapd database.</para></sect3>
+
 <sect3><title>slapd</title>
-<para>slapd is the stand-alone LDAP server.</para></sect3>
+<para><command>slapd</command> is the stand-alone <acronym>LDAP</acronym> server.</para></sect3>
+
+<sect3><title>slapindex</title>
+<para><command>slapindex</command> is used to regenerate slapd
+indices based upon the current contents of a database.</para></sect3>
+
+<sect3><title>slappasswd</title>
+<para><command>slappasswd</command> is an Open<acronym>LDAP</acronym> password
+utility.</para></sect3>
+
 <sect3><title>slurpd</title>
-<para>slurpd is the stand-alone LDAP replication server.</para></sect3>
-<sect3><title>LDAP libraries</title>
-<para>LDAP libraries support the LDAP programs and provide functionality for
-other programs interacting with LDAP.</para></sect3>
-<sect3><title>Utilites, Tools, and Sample Clients</title>
-<para>The package also provides numerous support programs.</para></sect3>
+<para><command>slurpd</command> is the stand-alone
+<acronym>LDAP</acronym> replication server.</para></sect3>
+
+<sect3><title>liblber and libldap</title>
+<para>These libraries support the <acronym>LDAP</acronym> programs and provide functionality for
+other programs interacting with <acronym>LDAP</acronym>.</para></sect3>
+
 </sect2>
-
Index: server/other/openldap/openldap-exp.xml
===================================================================
--- server/other/openldap/openldap-exp.xml	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
+++ server/other/openldap/openldap-exp.xml	(revision 9a9a0fecd6db507e49dbffa45b2d2fc3300697a7)
@@ -1,20 +1,19 @@
 <sect2>
-<title>Installation command explanations</title>
+<title>Command explanations</title>
 
-<para><userinput>--prefix=/usr</userinput> : Sets the prefix for almost all the file 
-paths to <filename class="directory">/usr</filename>.</para>
-
-<para><userinput>--sysconfdir=/etc</userinput> : Sets the configuration file directory to 
+<para><command>--sysconfdir=/etc</command> : Sets the configuration file directory to 
 avoid the default of <filename class="directory">/usr/etc</filename>.</para>
 
-<para><userinput>--libexecdir=/usr/sbin</userinput> : Puts the server executables in 
+<para><command>--libexecdir=/usr/sbin</command> : Puts the server executables in 
 <filename class="directory">/usr/sbin</filename> instead of <filename
 class="directory">/usr/libexec</filename>.</para>
 
-<para><userinput>--enable-ldbm</userinput> : Enable the most recent version of the Berkeley DB.</para> 
+<para><command>--enable-ldbm</command> : Build <command>slapd</command>
+with primary database backend using either Berkeley DB or
+<acronym>GNU</acronym> Database Manager.</para> 
 
-<para><userinput>--disable-debug</userinput> : Disable debugging code.</para>  
-<para><userinput>make test:</userinput> Validate correct build of the package.</para>  
+<para><command>--disable-debug</command> : Disable debugging code.</para>  
 
+<para><command>make test</command> : Validate correct build of the package.</para>  
 
 </sect2>
Index: server/other/openldap/openldap-inst.xml
===================================================================
--- server/other/openldap/openldap-inst.xml	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
+++ server/other/openldap/openldap-inst.xml	(revision 9a9a0fecd6db507e49dbffa45b2d2fc3300697a7)
@@ -2,12 +2,14 @@
 <title>Installation of <application>Open<acronym>LDAP</acronym></application></title>
 
-<para>Install <application>Open<acronym>LDAP</acronym></application> by running the following commands:</para>
+<para>Install <application>Open<acronym>LDAP</acronym></application> by
+running the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc --disable-debug \
-   --libexecdir=/usr/sbin --enable-ldbm &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --libexecdir=/usr/sbin \
+    --sysconfdir=/etc --localstatedir=/var \
+    --disable-debug --enable-ldbm &amp;&amp;
 make depend &amp;&amp;
 make &amp;&amp;
 make test &amp;&amp;
 make install</command></userinput></screen>
+
 </sect2>
-
Index: server/other/openldap/openldap-intro.xml
===================================================================
--- server/other/openldap/openldap-intro.xml	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
+++ server/other/openldap/openldap-intro.xml	(revision 9a9a0fecd6db507e49dbffa45b2d2fc3300697a7)
@@ -1,16 +1,28 @@
 <sect2>
-<title>Introduction to OpenLDAP</title>
+<title>Introduction to <application>Open<acronym>LDAP</acronym></application></title>
 
-<screen>Download location (HTTP):       <ulink url="&openldap-download-http;"/>
-Download location (FTP):        <ulink url="&openldap-download-ftp;"/>
-Version used:                   &openldap-version;
-Package size:                   &openldap-size;
-Estimated Disk space required:  &openldap-buildsize;</screen>
+<para>The <application>Open<acronym>LDAP</acronym></application> package
+provides an open source implementation of the Lightweight Directory
+Access Protocol.</para>
 
-<para>The OpenLDAP package provides an open source implementation of the
-Lightweight Directory Access Protocol.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&openldap-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&openldap-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &openldap-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &openldap-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &openldap-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>OpenLDAP depends on:
-<xref linkend="db"/></screen>
+<sect3><title><application>Open<acronym>LDAP</acronym></application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="db"/> or <xref linkend="gdbm"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="openssl"/>, <xref linkend="readline"/>,
+<ulink url="http://asg.web.cmu.edu/sasl/">Cyrus SASL</ulink> and
+<ulink url="http://www.pdc.kth.se/heimdal/">Heimdal</ulink>
+</para></sect4>
+</sect3>
 
 </sect2>
Index: server/other/openldap/openldap.ent
===================================================================
--- server/other/openldap/openldap.ent	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
+++ server/other/openldap/openldap.ent	(revision 9a9a0fecd6db507e49dbffa45b2d2fc3300697a7)
@@ -1,12 +1,12 @@
-<!ENTITY openldap            SYSTEM "../openldap.xml">
-<!ENTITY openldap-intro      SYSTEM "openldap-intro.xml">
-<!ENTITY openldap-inst       SYSTEM "openldap-inst.xml">
-<!ENTITY openldap-exp        SYSTEM "openldap-exp.xml">
-<!ENTITY openldap-config-exp SYSTEM "openldap-config-exp.xml">
-<!ENTITY openldap-desc       SYSTEM "openldap-desc.xml">
-<!ENTITY openldap-config     SYSTEM "openldap-config.xml">
-<!ENTITY openldap-buildsize     "102 MB">
-<!ENTITY openldap-version       "2.1.17">
-<!ENTITY openldap-size          "2.0 MB">
+<!ENTITY openldap SYSTEM "../openldap.xml">
+<!ENTITY openldap-intro SYSTEM "openldap-intro.xml">
+<!ENTITY openldap-inst SYSTEM "openldap-inst.xml">
+<!ENTITY openldap-exp SYSTEM "openldap-exp.xml">
+<!ENTITY openldap-desc SYSTEM "openldap-desc.xml">
+<!ENTITY openldap-config SYSTEM "openldap-config.xml">
+<!ENTITY openldap-buildsize "126 MB">
+<!ENTITY openldap-version "2.1.22">
 <!ENTITY openldap-download-http "">
-<!ENTITY openldap-download-ftp "ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
+<!ENTITY openldap-download-ftp "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
+<!ENTITY openldap-size "2.0 MB">
+<!ENTITY openldap-time "3.90 SBU">
