Index: general.ent
===================================================================
--- general.ent	(revision dc39d2257d3aad7936e914f42b44f607bb1037d1)
+++ general.ent	(revision b5e36ddb93501b95509805b31cdef6f4662fae64)
@@ -591,6 +591,5 @@
 <!-- dhcp (chapter 13) -->
 <!-- removed <!ENTITY leafnode-version             "1.11.5"> -->
-<!ENTITY openldap-download-version    "stable-20100719">
-<!ENTITY openldap-version             "2.4.30">
+<!ENTITY openldap-version             "2.4.31">
 <!ENTITY virtuoso-version             "6.1.5">
 <!ENTITY soprano-version              "2.7.5">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision dc39d2257d3aad7936e914f42b44f607bb1037d1)
+++ introduction/welcome/changelog.xml	(revision b5e36ddb93501b95509805b31cdef6f4662fae64)
@@ -43,4 +43,13 @@
 -->
     <listitem>
+      <para>May 11th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - OpenLDAP 2.4.31.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 10th, 2012</para>
       <itemizedlist>
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision dc39d2257d3aad7936e914f42b44f607bb1037d1)
+++ server/other/openldap.xml	(revision b5e36ddb93501b95509805b31cdef6f4662fae64)
@@ -5,8 +5,7 @@
   %general-entities;
 
-<!--  <!ENTITY openldap-download-http "http://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz"> -->
   <!ENTITY openldap-download-http " ">
   <!ENTITY openldap-download-ftp  "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
-  <!ENTITY openldap-md5sum        "4f210937cf87e3467a536dd3fed1b8b4">
+  <!ENTITY openldap-md5sum        "804c6cb5698db30b75ad0ff1c25baefd">
   <!ENTITY openldap-size          "5.2 MB">
   <!ENTITY openldap-buildsize     "152 MB">
@@ -31,26 +30,42 @@
     <title>Introduction to OpenLDAP</title>
 
-    <para>The <application>OpenLDAP</application> package provides an open
-    source implementation of the Lightweight Directory Access Protocol.</para>
+    <para>
+      The <application>OpenLDAP</application> package provides an open
+      source implementation of the Lightweight Directory Access Protocol.
+    </para>
+
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&openldap-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&openldap-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&openldap-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&openldap-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &openldap-md5sum;</para>
+        <para>
+          Download MD5 sum: &openldap-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &openldap-size;</para>
+        <para>
+          Download size: &openldap-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &openldap-buildsize;</para>
+        <para>
+          Estimated disk space required: &openldap-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &openldap-time;</para>
+        <para>
+          Estimated build time: &openldap-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -59,10 +74,16 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/openldap-&openldap-version;-blfs-paths-1.patch"/></para>
-        <para>Required patch: <ulink
-        url="&patch-root;/openldap-&openldap-version;-symbol-versions-1.patch"/></para>
-        <para>Optional patch: <ulink
-        url="&patch-root;/openldap-&openldap-version;-ntlm-1.patch"/></para>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/openldap-&openldap-version;-blfs-paths-1.patch"/>
+        </para>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/openldap-&openldap-version;-symbol-versions-1.patch"/>
+        </para>
+        <para>
+          Optional patch:
+          <ulink url="&patch-root;/openldap-&openldap-version;-ntlm-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -71,18 +92,24 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="db"/></para>
+    <para role="required">
+      <xref linkend="db"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="cyrus-sasl"/>
-    and <xref linkend="openssl"/></para>
+    <para role="recommended">
+      <xref linkend="cyrus-sasl"/> and
+      <xref linkend="openssl"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="icu"/>,
-    <xref linkend="tcpwrappers"/>,
-    <xref linkend="unixodbc"/>,
-    <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
-    <xref linkend="pth"/>, and either
-    <xref linkend="mysql"/> or
-    <xref linkend="postgresql"/></para>
+    <para role="optional">
+      <xref linkend="icu"/>,
+      <xref linkend="mysql"/> or
+      <xref linkend="postgresql"/>,
+      <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
+      <xref linkend="pth"/>,
+      <xref linkend="tcpwrappers"/> and
+      <xref linkend="unixodbc"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -95,8 +122,11 @@
 
     <note>
-      <para>Without this patch, the Exchange 
-      addressbook integration uses simple binds with cleartext 
-      passwords. If you are going to build evolution-data-server
-      with OpenLDAP support, apply this patch:</para>
+      <para>
+        Without the following patch, the <application>Evolution</application>
+        Exchange addressbook integration uses simple binds with cleartext 
+        passwords. If you are going to build 
+        <application>Evolution Data Server</application> with
+        <application>OpenLDAP</application> support, apply the following patch:
+      </para>
 
 <screen><userinput>patch -Np1 -i ../openldap-&openldap-version;-ntlm-1.patch</userinput></screen>
@@ -104,9 +134,11 @@
 
     <note>
-      <para>If you only need to install the client side <command>ldap*</command>
-      binaries, corresponding man pages, libraries and header files (referred to
-      as a <quote>client-only</quote> install), issue the following
-      <command>configure</command> command instead of the other one, and
-      then proceed with the remaining commands (no test suite available):</para>
+      <para>
+        If you only need to install the client side <command>ldap*</command>
+        binaries, corresponding man pages, libraries and header files (referred to
+        as a <quote>client-only</quote> install), issue the following
+        <command>configure</command> command instead of the other one, and
+        then proceed with the remaining commands (no test suite available):
+      </para>
 
 <screen><userinput>patch -Np1 -i ../openldap-&openldap-version;-blfs-paths-1.patch &amp;&amp;
@@ -120,6 +152,8 @@
     </note>
 
-    <para>Install <application>OpenLDAP</application> by
-    running the following commands:</para>
+    <para>
+      Install <application>OpenLDAP</application> by
+      running the following commands:
+    </para>
 
 <screen><userinput>patch -Np1 -i ../openldap-&openldap-version;-blfs-paths-1.patch &amp;&amp;
@@ -143,11 +177,15 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make test</command>. If you've
-    enabled <application>tcp_wrappers</application>, ensure you add 127.0.0.1
-    to the <parameter>slapd</parameter> line in the
-    <filename>/etc/hosts.allow</filename> file if you have a restrictive
-    <filename>/etc/hosts.deny</filename> file.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <command>make test</command>. If you've
+      enabled <application>tcp_wrappers</application>, ensure you add 127.0.0.1
+      to the <parameter>slapd</parameter> line in the
+      <filename>/etc/hosts.allow</filename> file if you have a restrictive
+      <filename>/etc/hosts.deny</filename> file.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
@@ -167,56 +205,78 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>
-
-    <para><parameter>--disable-debug</parameter>: Disable debugging code.</para>
-
-    <para><parameter>--enable-dynamic</parameter>: This forces the
-    <application>OpenLDAP</application> libraries to be dynamically linked
-    to the executable programs.</para>
-
-    <para><parameter>--enable-crypt</parameter>: Enables crypt(3)
-    passwords.</para>
-
-    <para><parameter>--enable-modules</parameter>: Enables dynamic module
-    support.</para>
-
-    <para><parameter>--enable-rlookups</parameter>: This parameter enables
-    reverse lookups of client hostnames.</para>
-
-    <para><parameter>--enable-backends</parameter>: This parameter enables
-    all available backends.</para>
-
-    <para><parameter>--enable-overlays</parameter>: This parameter enables
-    all available overlays.</para>
-
-    <para><parameter>--disable-ndb</parameter>: This parameter disables
-    MySQL NDB Cluster backend which causes configure to fail if
-    MySQL is present.</para>
-
-    <para><parameter>--disable-sql</parameter>: This parameter explicitly
-    disables the sql backend.  Omit this switch if a SQL server is
-    installed and you are going to use a SQL backend (experimental).</para>
-
-    <para><parameter>--enable-spasswd</parameter>: This parameter enables
-    SASL password verification.</para>
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <option>--disable-debug</option>: This parameter disables
+      the debugging code in <application>OpenLDAP</application>.
+    </para>
+
+    <para>
+      <option>--enable-dynamic</option>: This parameter forces the
+      <application>OpenLDAP</application> libraries to be dynamically
+      linked to the executable programs.
+    </para>
+
+    <para>
+      <option>--enable-crypt</option>: This parameter enables using of
+      <command>crypt(3)</command> passwords.
+    </para>
+
+    <para>
+      <option>--enable-modules</option>: This parameter enables dynamic
+      module support.
+    </para>
+
+    <para>
+      <option>--enable-rlookups</option>: This parameter enables
+      reverse lookups of client hostnames.
+    </para>
+
+    <para>
+      <option>--enable-backends</option>: This parameter enables
+      all available backends.
+    </para>
+
+    <para>
+      <option>--enable-overlays</option>: This parameter enables
+      all available overlays.
+    </para>
+
+    <para>
+      <option>--disable-ndb</option>: This parameter disables
+      <application>MySQL</application> NDB Cluster backend 
+      which causes configure to fail if
+      <application>MySQL</application> is present.
+    </para>
+
+    <para>
+      <option>--disable-sql</option>: This parameter explicitly
+      disables the SQL backend.  Omit this switch if a SQL server is
+      installed and you are going to use a SQL backend.
+    </para>
+
+    <para>
+      <option>--enable-spasswd</option>: This parameter enables
+      <application>SASL</application> password verification.
+    </para>
     
-    <para><parameter>--enable-slp</parameter>: This parameter enables
-    SLPv2 support. Use this switch if you have installed
-    <ulink url="http://www.openslp.org/">OpenSLP</ulink>.</para>
+    <para>
+      <option>--enable-slp</option>: This parameter enables
+      SLPv2 support. Use this switch if you have installed
+      <ulink url="http://www.openslp.org/">OpenSLP</ulink>.
+    </para>
     
-    <para><parameter>--enable-wrappers</parameter>: This parameter enables
-    tcp wrappers support. Use this switch if you have installed
-    <xref linkend="tcpwrappers"/>.</para>
-
-    <para><option>--disable-bdb --disable-hdb --with-ldbm-api=gdbm</option>:
-    Pass these parameters to the <command>configure</command> command if you
-    wish to use <application>GDBM</application> instead of
-    <application>Berkeley DB</application> as the primary backend
-    database.</para>
+    <para>
+      <option>--enable-wrappers</option>: This parameter enables
+      TCP Wrappers support. Use this switch if you have installed
+      <xref linkend="tcpwrappers"/>.
+    </para>
 
     <note>
-      <para>You can run <command>./configure --help</command> to see if there
-      are other parameters you can pass to the <command>configure</command>
-      command to enable other options or dependency packages.</para>
+      <para>
+        You can run <command>./configure --help</command> to see if there
+        are other parameters you can pass to the <command>configure</command>
+        command to enable other options or dependency packages.
+      </para>
     </note>
 
@@ -240,10 +300,12 @@
       <title>Configuration Information</title>
 
-      <para>Configuring the <command>slapd</command> servers can be complex.
-      Securing the LDAP directory, especially if you are storing non-public
-      data such as password databases, can also be a challenging task. You'll
-      need to modify the <filename>/etc/openldap/slapd.conf</filename> and
-      <filename>/etc/openldap/ldap.conf</filename> files to set up
-      <application>OpenLDAP</application> for your particular needs.</para>
+      <para>
+        Configuring the <command>slapd</command> servers can be complex.
+        Securing the LDAP directory, especially if you are storing non-public
+        data such as password databases, can also be a challenging task. You'll
+        need to modify the <filename>/etc/openldap/slapd.conf</filename> and
+        <filename>/etc/openldap/ldap.conf</filename> files to set up
+        <application>OpenLDAP</application> for your particular needs.
+      </para>
 
       <indexterm zone="openldap openldap-config">
@@ -264,33 +326,28 @@
       <itemizedlist spacing='compact'>
         <listitem>
-          <para>The <command>slapd</command> man page</para>
-        </listitem>
-        <listitem>
-          <para>The <filename>slapd.conf</filename> man page</para>
-        </listitem>
-        <listitem>
-          <para>The <ulink
-          url="http://www.openldap.org/doc/admin24/">OpenLDAP 2.4
-          Administrator's Guide</ulink> (also installed locally in
-          <filename class='directory'>
-          /usr/share/doc/openldap-&openldap-version;/guide/admin</filename>)</para>
-        </listitem>
-        <listitem>
-          <para>Documents located at
-          <ulink url="http://www.openldap.org/pub/"/></para>
+          <para>
+            The <command>slapd</command> man page.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            The <filename>slapd.conf</filename> man page.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            The <ulink url="http://www.openldap.org/doc/admin24/">
+            OpenLDAP 2.4 Administrator's Guide</ulink> 
+            (also installed locally in <filename class='directory'>
+            /usr/share/doc/openldap-&openldap-version;/guide/admin</filename>).
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Documents located at
+            <ulink url="http://www.openldap.org/pub/"/>.
+          </para>
         </listitem>
       </itemizedlist>
-
-    </sect3>
-
-    <sect3>
-      <title>Utilizing GDBM</title>
-
-      <para>To utilize <application>GDBM</application> as the database
-      backend, the <quote>database</quote> entry in
-      <filename>/etc/openldap/slapd.conf</filename> must be changed from
-      <quote>bdb</quote> to <quote>ldbm</quote>. You can use both by
-      creating an additional database section in
-      <filename>/etc/openldap/slapd.conf</filename>.</para>
 
     </sect3>
@@ -299,9 +356,11 @@
       <title>Mozilla Address Directory</title>
 
-      <para>By default, LDAPv2 support is disabled in the
-      <filename>slapd.conf</filename> file. Once the database is properly
-      set up and <application>Mozilla</application> is configured to use the
-      directory, you must add <option>allow bind_v2</option> to the
-      <filename>slapd.conf</filename> file.</para>
+      <para>
+        By default, LDAPv2 support is disabled in the
+        <filename>slapd.conf</filename> file. Once the database is properly
+        set up and <application>Mozilla</application> is configured to use the
+        directory, you must add <option>allow bind_v2</option> to the
+        <filename>slapd.conf</filename> file.
+      </para>
 
     </sect3>
@@ -310,8 +369,10 @@
       <title>Boot Script</title>
 
-      <para>To automate the startup of the LDAP server at system bootup,
-      install the <filename>/etc/rc.d/init.d/openldap</filename> init script
-      included in the <xref linkend="bootscripts"/> package
-      using the following command:</para>
+      <para>
+        To automate the startup of the LDAP server at system bootup,
+        install the <filename>/etc/rc.d/init.d/openldap</filename> init script
+        included in the <xref linkend="bootscripts"/> package
+        using the following command:
+      </para>
 
       <indexterm zone="openldap openldap-init">
@@ -322,9 +383,11 @@
 
       <note>
-        <para>The init script starts the daemon without any parameters.
-        You'll need to modify the 
-        <filename>/etc/sysconfig/openldap</filename> to include the 
-        parameters needed for your specific configuration. See the 
-        <command>slapd</command> man page for parameter information.</para>
+        <para>
+          The init script starts the daemon without any parameters.
+          You'll need to modify the 
+          <filename>/etc/sysconfig/openldap</filename> to include the 
+          parameters needed for your specific configuration. See the 
+          <command>slapd</command> man page for parameter information.
+        </para>
       </note>
 
@@ -334,14 +397,19 @@
       <title>Testing the Configuration</title>
 
-      <para>Start the LDAP server using the init script:</para>
+      <para>
+        Start the LDAP server using the init script:
+      </para>
 
 <screen role="root"><userinput>/etc/rc.d/init.d/openldap start</userinput></screen>
 
-      <para>Verify access to the LDAP server with the following
-      command:</para>
+      <para>
+        Verify access to the LDAP server with the following command:
+      </para>
 
 <screen><userinput>ldapsearch -x -b '' -s base '(objectclass=*)' namingContexts</userinput></screen>
 
-      <para>The expected result is:</para>
+      <para>
+        The expected result is:
+      </para>
 
 <screen><computeroutput># extended LDIF
@@ -377,10 +445,17 @@
 
       <seglistitem>
-        <seg>ldapadd, ldapcompare, ldapdelete, ldapexop, ldapmodify, ldapmodrdn,
-        ldappasswd, ldapsearch, ldapurl, ldapwhoami, slapacl, slapadd, slapauth,
-        slapcat, slapd, slapdn, slapindex, slappasswd, slapschema and slaptest</seg>
-        <seg>liblber.so, libldap.so,a and libldap_r.so</seg>
-        <seg>/etc/openldap, /usr/lib/openldap
-        and /var/lib/openldap</seg>
+        <seg>
+          ldapadd, ldapcompare, ldapdelete, ldapexop, ldapmodify, ldapmodrdn,
+          ldappasswd, ldapsearch, ldapurl, ldapwhoami, slapacl, slapadd, slapauth,
+          slapcat, slapd, slapdn, slapindex, slappasswd, slapschema and slaptest
+        </seg>
+        <seg>
+          liblber.so, libldap.so,a and libldap_r.so
+        </seg>
+        <seg>
+          /etc/openldap,
+          /usr/lib/openldap and
+          /var/lib/openldap
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -394,6 +469,7 @@
         <term><command>ldapadd</command></term>
         <listitem>
-          <para>opens a connection to an LDAP server, binds and adds
-          entries.</para>
+          <para>
+            opens a connection to an LDAP server, binds and adds entries.
+          </para>
           <indexterm zone="openldap ldapadd">
             <primary sortas="b-ldapadd">ldapadd</primary>
@@ -405,6 +481,8 @@
         <term><command>ldapcompare</command></term>
         <listitem>
-          <para>opens a connection to an LDAP server, binds and performs
-          a compare using specified parameters.</para>
+          <para>
+            opens a connection to an LDAP server, binds and performs
+            a compare using specified parameters.
+          </para>
           <indexterm zone="openldap ldapcompare">
             <primary sortas="b-ldapcompare">ldapcompare</primary>
@@ -416,6 +494,8 @@
         <term><command>ldapdelete</command></term>
         <listitem>
-          <para> opens a connection to an LDAP server, binds and deletes
-          one or more entries.</para>
+          <para>
+            opens a connection to an LDAP server, binds and deletes
+            one or more entries.
+          </para>
           <indexterm zone="openldap ldapdelete">
             <primary sortas="b-ldapdelete">ldapdelete</primary>
@@ -427,7 +507,9 @@
         <term><command>ldapexop</command></term>
         <listitem>
-          <para>issues the LDAP extended operation specified by 
-          oid or one of the  special  keywords  whoami,
-          cancel, or refresh.</para>
+          <para>
+            issues the LDAP extended operation specified by 
+            oid or one of the  special  keywords  whoami,
+            cancel, or refresh.
+          </para>
           <indexterm zone="openldap ldapexop">
             <primary sortas="b-ldapexop">ldapexop</primary>
@@ -439,6 +521,7 @@
         <term><command>ldapmodify</command></term>
         <listitem>
-          <para>opens a connection to an LDAP server, binds and modifies
-          entries.</para>
+          <para>
+            opens a connection to an LDAP server, binds and modifies entries.
+          </para>
           <indexterm zone="openldap ldapmodify">
             <primary sortas="b-ldapmodify">ldapmodify</primary>
@@ -450,6 +533,8 @@
         <term><command>ldapmodrdn</command></term>
         <listitem>
-          <para>opens a connection to an LDAP server, binds and modifies
-          the RDN of entries.</para>
+          <para>
+            opens a connection to an LDAP server, binds and modifies
+            the RDN of entries.
+          </para>
           <indexterm zone="openldap ldapmodrdn">
             <primary sortas="b-ldapmodrdn">ldapmodrdn</primary>
@@ -461,5 +546,7 @@
         <term><command>ldappasswd</command></term>
         <listitem>
-          <para>is a tool to set the password of an LDAP user.</para>
+          <para>
+            is a tool used to set the password of an LDAP user.
+          </para>
           <indexterm zone="openldap ldappasswd">
             <primary sortas="b-ldappasswd">ldappasswd</primary>
@@ -471,6 +558,8 @@
         <term><command>ldapsearch</command></term>
         <listitem>
-          <para>opens a connection to an LDAP server, binds and performs
-          a search using specified parameters.</para>
+          <para>
+            opens a connection to an LDAP server, binds and performs
+            a search using specified parameters.
+          </para>
           <indexterm zone="openldap ldapsearch">
             <primary sortas="b-ldapsearch">ldapsearch</primary>
@@ -482,6 +571,8 @@
         <term><command>ldapurl</command></term>
         <listitem>
-          <para>is a command that allows to either compose or 
-          decompose LDAP URIs.</para>
+          <para>
+            is a command that allows to either compose or 
+            decompose LDAP URIs.
+          </para>
           <indexterm zone="openldap ldapurl">
             <primary sortas="b-ldapurl">ldapurl</primary>
@@ -493,6 +584,8 @@
         <term><command>ldapwhoami</command></term>
         <listitem>
-          <para>opens a connection to an LDAP server, binds and displays
-          whoami information.</para>
+          <para>
+            opens a connection to an LDAP server, binds and displays
+            whoami information.
+          </para>
           <indexterm zone="openldap ldapwhoami">
             <primary sortas="b-ldapwhoami">ldapwhoami</primary>
@@ -504,7 +597,9 @@
         <term><command>slapacl</command></term>
         <listitem>
-          <para>is used to check the behavior of slapd by verifying 
-          access to directory data according to the access control 
-          list directives defined in its configuration.</para>
+          <para>
+            is used to check the behavior of slapd by verifying 
+            access to directory data according to the access control 
+            list directives defined in its configuration.
+          </para>
           <indexterm zone="openldap slapacl">
             <primary sortas="b-slapacl">slapacl</primary>
@@ -516,6 +611,8 @@
         <term><command>slapadd</command></term>
         <listitem>
-          <para>is used to add entries specified in LDAP Directory Interchange
-          Format (LDIF) to an LDAP database.</para>
+          <para>
+            is used to add entries specified in LDAP Directory Interchange
+            Format (LDIF) to an LDAP database.
+          </para>
           <indexterm zone="openldap slapadd">
             <primary sortas="b-slapadd">slapadd</primary>
@@ -527,7 +624,9 @@
         <term><command>slapauth</command></term>
         <listitem>
-          <para>is used to check the behavior of the slapd 
-          in mapping identities for authentication  and
-          authorization purposes, as specified in slapd.conf.</para>
+          <para>
+            is used to check the behavior of the slapd 
+            in mapping identities for authentication and
+            authorization purposes, as specified in slapd.conf.
+          </para>
           <indexterm zone="openldap slapauth">
             <primary sortas="b-slapauth">slapauth</primary>
@@ -539,6 +638,8 @@
         <term><command>slapcat</command></term>
         <listitem>
-          <para>is used to generate an LDAP LDIF output based upon the
-          contents of a slapd database.</para>
+          <para>
+            is used to generate an LDAP LDIF output based upon the
+            contents of a slapd database.
+          </para>
           <indexterm zone="openldap slapcat">
             <primary sortas="b-slapcat">slapcat</primary>
@@ -550,5 +651,7 @@
         <term><command>slapd</command></term>
         <listitem>
-          <para>is the stand-alone LDAP server.</para>
+          <para>
+            is the standalone LDAP server.
+          </para>
           <indexterm zone="openldap slapd">
             <primary sortas="b-slapd">slapd</primary>
@@ -560,6 +663,7 @@
         <term><command>slapdn</command></term>
         <listitem>
-          <para>checks a list of string-represented DNs based on schema
-          syntax.</para>
+          <para>
+            checks a list of string-represented DNs based on schema syntax.
+          </para>
           <indexterm zone="openldap slapdn">
             <primary sortas="b-slapdn">slapdn</primary>
@@ -571,6 +675,8 @@
         <term><command>slapindex</command></term>
         <listitem>
-          <para>is used to regenerate slapd indexes based upon the current
-          contents of a database.</para>
+          <para>
+            is used to regenerate slapd indexes based upon the current
+            contents of a database.
+          </para>
           <indexterm zone="openldap slapindex">
             <primary sortas="b-slapindex">slapindex</primary>
@@ -582,6 +688,7 @@
         <term><command>slappasswd</command></term>
         <listitem>
-          <para>is an <application>OpenLDAP</application> password
-          utility.</para>
+          <para>
+            is an <application>OpenLDAP</application> password utility.
+          </para>
           <indexterm zone="openldap slappasswd">
             <primary sortas="b-slappasswd">slappasswd</primary>
@@ -593,6 +700,8 @@
         <term><command>slapschema</command></term>
         <listitem>
-          <para>is used to check schema compliance of the contents 
-          of a slapd database.</para>
+          <para>
+            is used to check schema compliance of the contents 
+            of a slapd database.
+          </para>
           <indexterm zone="openldap slapschema">
             <primary sortas="b-slapschema">slapschema</primary>
@@ -604,6 +713,7 @@
         <term><command>slaptest</command></term>
         <listitem>
-          <para>checks the sanity of the <filename>slapd.conf</filename>
-          file.</para>
+          <para>
+            checks the sanity of the <filename>slapd.conf</filename> file.
+          </para>
           <indexterm zone="openldap slaptest">
             <primary sortas="b-slaptest">slaptest</primary>
@@ -615,10 +725,12 @@
         <term><filename class='libraryfile'>liblber.so</filename></term>
         <listitem>
-          <para>is a set of lightweight Basic Encoding Rules routines. These
-          routines are used by the LDAP library routines to encode and decode
-          LDAP protocol elements using the (slightly simplified) Basic
-          Encoding Rules defined by LDAP. They are not normally used directly
-          by an LDAP application program except in the handling of controls
-          and extended operations.</para>
+          <para>
+            is a set of lightweight Basic Encoding Rules routines. These
+            routines are used by the LDAP library routines to encode and decode
+            LDAP protocol elements using the (slightly simplified) Basic
+            Encoding Rules defined by LDAP. They are not normally used directly
+            by an LDAP application program except in the handling of controls
+            and extended operations.
+          </para>
           <indexterm zone="openldap liblber">
             <primary sortas="c-liblber">liblber.so</primary>
@@ -630,6 +742,8 @@
         <term><filename class='libraryfile'>libldap.so</filename></term>
         <listitem>
-          <para>supports the LDAP programs and provide functionality for
-          other programs interacting with LDAP.</para>
+          <para>
+            supports the LDAP programs and provide functionality for
+            other programs interacting with LDAP.
+          </para>
           <indexterm zone="openldap libldap">
             <primary sortas="c-libldap">libldap.so</primary>
@@ -641,6 +755,8 @@
         <term><filename class='libraryfile'>libldap_r.so</filename></term>
         <listitem>
-          <para>contains the functions required by the LDAP programs to
-          produce the results from LDAP requests.</para>
+          <para>
+            contains the functions required by the LDAP programs to
+            produce the results from LDAP requests.
+          </para>
           <indexterm zone="openldap libldap_r">
             <primary sortas="c-libldap_r">libldap_r.so</primary>
