Index: postlfs/security/mitkrb.xml
===================================================================
--- postlfs/security/mitkrb.xml	(revision 279919691645cc7443aa64c841bd8d0f3fb3d15a)
+++ postlfs/security/mitkrb.xml	(revision fa47d6802816c32a3f2d21d50be0216c2c512d6f)
@@ -6,9 +6,9 @@
 
   <!ENTITY mitkrb-download-http "http://web.mit.edu/kerberos/www/dist/krb5/1.10/krb5-&mitkrb-version;-signed.tar">
-  <!ENTITY mitkrb-download-ftp " ">
-  <!ENTITY mitkrb-md5sum "43d6a2f6f4f96fbf8423732065b49f0f">
-  <!ENTITY mitkrb-size "10 MB">
-  <!ENTITY mitkrb-buildsize "100 MB">
-  <!ENTITY mitkrb-time "1.0 SBU">
+  <!ENTITY mitkrb-download-ftp  " ">
+  <!ENTITY mitkrb-md5sum        "ddacb6ad7399681ad1506f435a2683b6">
+  <!ENTITY mitkrb-size          "11 MB">
+  <!ENTITY mitkrb-buildsize     "110 MB (Additional 20 MB if running the testsuite)">
+  <!ENTITY mitkrb-time          "1.2 SBU (additional 2.0 SBU if running the testsuite)">
 ]>
 
@@ -30,32 +30,46 @@
       <title>Introduction to MIT Kerberos V5</title>
 
-    <para><application>MIT Kerberos V5</application> is a free implementation
-    of Kerberos 5. Kerberos is a network authentication protocol. It
-    centralizes the authentication database and uses kerberized
-    applications to work with servers or services that support Kerberos
-    allowing single logins and encrypted communication over internal
-    networks or the Internet.</para>
-
-    &lfs70_checked;
+    <para>
+      <application>MIT Kerberos V5</application> is a free implementation
+      of Kerberos 5. Kerberos is a network authentication protocol. It
+      centralizes the authentication database and uses kerberized
+      applications to work with servers or services that support Kerberos
+      allowing single logins and encrypted communication over internal
+      networks or the Internet.
+    </para>
+
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&mitkrb-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&mitkrb-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&mitkrb-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&mitkrb-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &mitkrb-md5sum;</para>
+        <para>
+          Download MD5 sum: &mitkrb-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &mitkrb-size;</para>
+        <para>
+          Download size: &mitkrb-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &mitkrb-buildsize;</para>
+        <para>
+          Estimated disk space required: &mitkrb-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &mitkrb-time;</para>
+        <para>
+          Estimated build time: &mitkrb-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -64,18 +78,23 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="keyutils"/>,
-    <xref linkend="openldap"/>, and
-    <xref linkend="dejagnu"/> (required to run the test suite)</para>
+    <para role="optional">
+      <xref linkend="dejagnu"/> (required to run the testsuite),
+      <xref linkend="keyutils"/>,
+      <xref linkend="openldap"/> and
+      <xref linkend="python2"/> (used during the testsuite).
+    </para>
 
     <note>
-      <para>Some sort of time synchronization facility on your system (like
-      <xref linkend="ntp"/>) is required since Kerberos won't authenticate if
-      there is a time difference between a kerberized client and the
-      KDC server.</para>
+      <para>
+        Some sort of time synchronization facility on your system (like
+        <xref linkend="ntp"/>) is required since Kerberos won't authenticate
+        if there is a time difference between a kerberized client and the
+        KDC server.
+      </para>
     </note>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/mitkrb"/></para>
-
+      <ulink url="&blfs-wiki;/mitkrb"/>
+    </para>
   </sect2>
 
@@ -83,18 +102,24 @@
     <title>Installation of MIT Kerberos V5</title>
 
-    <para><application>MIT Kerberos V5</application> is distributed in a
-    TAR file containing a compressed TAR package and a detached PGP
-    <filename class="extension">ASC</filename> file. You'll need to unpack
-    the distribution tar file, then unpack the compressed tar file before
-    starting the build.</para>
-
-    <para>After unpacking the distribution tarball and if you have
-    <xref linkend="gnupg"/> installed, you can
-    authenticate the package with the following command:</para>
+    <para>
+      <application>MIT Kerberos V5</application> is distributed in a
+      TAR file containing a compressed TAR package and a detached PGP
+      <filename class="extension">ASC</filename> file. You'll need to unpack
+      the distribution tar file, then unpack the compressed tar file before
+      starting the build.
+    </para>
+
+    <para>
+      After unpacking the distribution tarball and if you have
+      <xref linkend="gnupg"/> installed, you can
+      authenticate the package with the following command:
+    </para>
 
 <screen><userinput>gpg - -verify krb5-&mitkrb-version;.tar.gz.asc</userinput></screen>
 
-    <para>Build <application>MIT Kerberos V5</application> by running the
-    following commands:</para>
+    <para>
+      Build <application>MIT Kerberos V5</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>sed -i -e 's/^YYSTYPE yylval/&amp;={0}/' lib/krb5/krb/deltat.c &amp;&amp;
@@ -108,8 +133,12 @@
 make</userinput></screen>
 
-    <para>The regression test suite is designed to be run after the
-    installation has been completed.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      The regression test suite is designed to be run after the
+      installation has been completed.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
@@ -135,15 +164,9 @@
 cp -Rv ../doc/* /usr/share/doc/krb5-&mitkrb-version;</userinput></screen>
 
-<!-- Remove this for now as portmap cannot be built until upstream fixes it
-
-    <para>To test the installation, you must have
-    <xref linkend="dejagnu"/> installed and issue: <command>make
-    check</command>. The RPC layer tests will require a portmap daemon
-    (see <xref linkend="portmap"/>) running and configured to listen on the
-    regular network interface (not localhost). See the <quote>Testing the
-    Build</quote> section of the <filename>krb5-install.html</filename> file
-    in the <filename class='directory'>../doc</filename> directory for complete
-    information on running the regression tests.</para>
--->
+    <para>
+      To test the installation, you must have <xref linkend="dejagnu"/>
+      installed and issue: <command>make check</command>.
+    </para>
+
   </sect2>
 
@@ -151,28 +174,45 @@
     <title>Command Explanations</title>
 
-    <para><userinput>sed ... lib/krb5/krb/deltat.c</userinput>: This change
-    fixes a problem identified by gcc-4.7.</para>
-
-    <para><parameter>--enable-dns-for-realm</parameter>: This parameter allows
-    realms to be resolved using the DNS server.</para>
-
-    <para><parameter>--with-system-et</parameter>: This parameter causes the
-    build to use the system-installed versions of the error-table support
-    software.</para>
-
-    <para><parameter>--with-system-ss</parameter>: This parameter causes the
-    build to use the system-installed versions of the subsystem command-line
-    interface software.</para>
-
-    <para><parameter>--localstatedir=/var/lib</parameter>: This parameter is
-    used so that the Kerberos variable run-time data is located in
-    <filename class='directory'>/var/lib</filename> instead of
-    <filename class='directory'>/usr/var</filename>.</para>
-
-    <para><command>mv -v /usr/bin/ksu /bin</command>: Moves the
-    <command>ksu</command> program to the
-    <filename class="directory">/bin</filename> directory so that it is
-    available when the <filename class="directory">/usr</filename>
-    filesystem is not mounted.</para>
+    <para>
+      <command>sed ... lib/krb5/krb/deltat.c</command>: This sed
+      fixes a problem when building with GCC 4.7.
+    </para>
+
+    <para>
+      <option>--enable-dns-for-realm</option>: This parameter allows
+      realms to be resolved using the DNS server.
+    </para>
+
+    <para>
+      <option>--with-system-et</option>: This switch causes the build
+      to use the system-installed versions of the error-table support
+      software.
+    </para>
+
+    <para>
+      <option>--with-system-ss</option>: This switch causes the build
+      to use the system-installed versions of the subsystem command-line
+      interface software.
+    </para>
+
+    <para>
+      <parameter>--localstatedir=/var/lib</parameter>: This parameter is
+      used so that the Kerberos variable run-time data is located in
+      <filename class="directory">/var/lib</filename> instead of
+      <filename class="directory">/usr/var</filename>.
+    </para>
+
+    <para>
+      <command>mv -v /usr/bin/ksu /bin</command>: Moves the
+      <command>ksu</command> program to the
+      <filename class="directory">/bin</filename> directory so that it is
+      available when the <filename class="directory">/usr</filename>
+      filesystem is not mounted.
+    </para>
+
+    <para>
+      <option>--with-ldap</option>: Use this switch if you want to compile
+      <application>OpenLDAP</application> database backend module.
+    </para>
 
   </sect2>
@@ -184,6 +224,8 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/krb5.conf</filename> and
-      <filename>/var/lib/krb5kdc/kdc.conf</filename></para>
+      <para>
+        <filename>/etc/krb5.conf</filename> and
+        <filename>/var/lib/krb5kdc/kdc.conf</filename>
+      </para>
 
       <indexterm zone="mitkrb krb5-config">
@@ -204,16 +246,20 @@
 
         <tip>
-          <para>You should consider installing some sort of password checking
-          dictionary so that you can configure the installation to only
-          accept strong passwords. A suitable dictionary to use is shown in
-          the <xref linkend="cracklib"/> instructions. Note that only one
-          file can be used, but you can concatenate many files into one. The
-          configuration file shown below assumes you have installed a
-          dictionary to <filename>/usr/share/dict/words</filename>.</para>
+          <para>
+            You should consider installing some sort of password checking
+            dictionary so that you can configure the installation to only
+            accept strong passwords. A suitable dictionary to use is shown in
+            the <xref linkend="cracklib"/> instructions. Note that only one
+            file can be used, but you can concatenate many files into one. The
+            configuration file shown below assumes you have installed a
+            dictionary to <filename>/usr/share/dict/words</filename>.
+          </para>
         </tip>
 
-        <para>Create the Kerberos configuration file with the following
-        commands issued by the <systemitem class="username">root</systemitem>
-        user:</para>
+        <para>
+          Create the Kerberos configuration file with the following
+          commands issued by the <systemitem class="username">root</systemitem>
+          user:
+        </para>
 
 <screen role="root"><userinput>cat &gt; /etc/krb5.conf &lt;&lt; "EOF"
@@ -242,31 +288,44 @@
 EOF</userinput></screen>
 
-        <para>You will need to substitute your domain and proper hostname
-        for the occurrences of the <replaceable>&lt;belgarath&gt;</replaceable> and
-        <replaceable>&lt;lfs.org&gt;</replaceable> names.</para>
-
-        <para><option>default_realm</option> should be the name of your
-        domain changed to ALL CAPS. This isn't required, but both
-        <application>Heimdal</application> and MIT recommend it.</para>
-
-        <para><option>encrypt = true</option> provides encryption of all
-        traffic between kerberized clients and servers. It's not necessary
-        and can be left off. If you leave it off, you can encrypt all traffic
-        from the client to the server using a switch on the client program
-        instead.</para>
-
-        <para>The <option>[realms]</option> parameters tell the client
-        programs where to look for the KDC authentication services.</para>
-
-        <para>The <option>[domain_realm]</option> section maps a domain to
-        a realm.</para>
-
-        <para>Create the KDC database:</para>
+        <para>
+          You will need to substitute your domain and proper hostname for the
+          occurrences of the <replaceable>&lt;belgarath&gt;</replaceable> and
+          <replaceable>&lt;lfs.org&gt;</replaceable> names.
+        </para>
+
+        <para>
+          <option>default_realm</option> should be the name of your
+          domain changed to ALL CAPS. This isn't required, but both
+          <application>Heimdal</application> and MIT recommend it.
+        </para>
+
+        <para>
+          <option>encrypt = true</option> provides encryption of all traffic
+          between kerberized clients and servers. It's not necessary and can
+          be left off. If you leave it off, you can encrypt all traffic from
+          the client to the server using a switch on the client program
+          instead.
+        </para>
+
+        <para>
+          The <option>[realms]</option> parameters tell the client programs
+          where to look for the KDC authentication services.
+        </para>
+
+        <para>
+          The <option>[domain_realm]</option> section maps a domain to a realm.
+        </para>
+
+        <para>
+          Create the KDC database:
+       </para>
 
 <screen role="root"><userinput>kdb5_util create -r <replaceable>&lt;LFS.ORG&gt;</replaceable> -s</userinput></screen>
 
-        <para>Now you should populate the database with principles
-        (users). For now, just use your regular login name or
-        <systemitem class="username">root</systemitem>.</para>
+        <para>
+          Now you should populate the database with principles
+          (users). For now, just use your regular login name or
+          <systemitem class="username">root</systemitem>.
+        </para>
 
 <screen role="root"><userinput>kadmin.local
@@ -274,42 +333,58 @@
 <prompt>kadmin:</prompt> addprinc -policy dict-only <replaceable>&lt;loginname&gt;</replaceable></userinput></screen>
 
-        <para>The KDC server and any machine running kerberized
-        server daemons must have a host key installed:</para>
-
-<screen role='root'><userinput><prompt>kadmin:</prompt> addprinc -randkey host/<replaceable>&lt;belgarath.lfs.org&gt;</replaceable></userinput></screen>
-
-        <para>After choosing the defaults when prompted, you will have to
-        export the data to a keytab file:</para>
-
-<screen role='root'><userinput><prompt>kadmin:</prompt> ktadd host/<replaceable>&lt;belgarath.lfs.org&gt;</replaceable></userinput></screen>
-
-        <para>This should have created a file in
-        <filename class="directory">/etc</filename> named
-        <filename>krb5.keytab</filename> (Kerberos 5). This file should
-        have 600 (<systemitem class="username">root</systemitem> rw only)
-        permissions. Keeping the keytab files from public access is crucial
-        to the overall security of the Kerberos installation.</para>
-
-        <para>Exit the <command>kadmin</command> program (use
-        <command>quit</command> or <command>exit</command>) and return
-        back to the shell prompt. Start the KDC daemon manually, just to
-        test out the installation:</para>
-
-<screen role='root'><userinput>/usr/sbin/krb5kdc</userinput></screen>
-
-        <para>Attempt to get a ticket with the following command:</para>
+        <para>
+          The KDC server and any machine running kerberized
+          server daemons must have a host key installed:
+        </para>
+
+<screen role="root"><userinput><prompt>kadmin:</prompt> addprinc -randkey host/<replaceable>&lt;belgarath.lfs.org&gt;</replaceable></userinput></screen>
+
+        <para>
+          After choosing the defaults when prompted, you will have to
+          export the data to a keytab file:
+        </para>
+
+<screen role="root"><userinput><prompt>kadmin:</prompt> ktadd host/<replaceable>&lt;belgarath.lfs.org&gt;</replaceable></userinput></screen>
+
+        <para>
+          This should have created a file in
+          <filename class="directory">/etc</filename> named
+          <filename>krb5.keytab</filename> (Kerberos 5). This file should
+          have 600 (<systemitem class="username">root</systemitem> rw only)
+          permissions. Keeping the keytab files from public access is crucial
+          to the overall security of the Kerberos installation.
+        </para>
+
+        <para>
+          Exit the <command>kadmin</command> program (use
+          <command>quit</command> or <command>exit</command>) and return
+          back to the shell prompt. Start the KDC daemon manually, just to
+          test out the installation:
+        </para>
+
+<screen role="root"><userinput>/usr/sbin/krb5kdc</userinput></screen>
+
+        <para>
+          Attempt to get a ticket with the following command:
+        </para>
 
 <screen><userinput>kinit <replaceable>&lt;loginname&gt;</replaceable></userinput></screen>
 
-        <para>You will be prompted for the password you created. After you
-        get your ticket, you can list it with the following command:</para>
+        <para>
+          You will be prompted for the password you created. After you
+          get your ticket, you can list it with the following command:
+        </para>
 
 <screen><userinput>klist</userinput></screen>
 
-        <para>Information about the ticket should be displayed on the
-        screen.</para>
-
-        <para>To test the functionality of the keytab file, issue the
-        following command:</para>
+        <para>
+          Information about the ticket should be displayed on the
+          screen.
+        </para>
+
+        <para>
+          To test the functionality of the keytab file, issue the
+          following command:
+        </para>
 
 <screen><userinput>ktutil
@@ -317,14 +392,19 @@
 <prompt>ktutil:</prompt> l</userinput></screen>
 
-        <para>This should dump a list of the host principal, along with
-        the encryption methods used to access the principal.</para>
-
-        <para>At this point, if everything has been successful so far, you
-        can feel fairly confident in the installation and configuration of
-        the package.</para>
-
-        <para>Install the <filename>/etc/rc.d/init.d/kerberos</filename> init
-        script included in the <xref linkend="bootscripts"/>
-        package.</para>
+        <para>
+          This should dump a list of the host principal, along with
+          the encryption methods used to access the principal.
+        </para>
+
+        <para>
+          At this point, if everything has been successful so far, you
+          can feel fairly confident in the installation and configuration of
+          the package.
+        </para>
+
+        <para>
+          Install the <filename>/etc/rc.d/init.d/kerberos</filename> init
+          script included in the <xref linkend="bootscripts"/> package.
+        </para>
 
 <screen role="root"><userinput>make install-kerberos</userinput></screen>
@@ -335,8 +415,10 @@
         <title>Additional Information</title>
 
-        <para>For additional information consult <ulink
-        url="http://web.mit.edu/kerberos/www/krb5-1.10/#documentation">
-        Documentation for krb-&mitkrb-version;</ulink> on which the above
-        instructions are based.</para>
+        <para>
+          For additional information consult <ulink
+          url="http://web.mit.edu/kerberos/www/krb5-1.10/#documentation">
+          Documentation for krb-&mitkrb-version;</ulink> on which the above
+          instructions are based.
+        </para>
 
       </sect4>
@@ -347,4 +429,5 @@
 
   <sect2 role="content">
+
     <title>Contents</title>
     <para></para>
@@ -356,16 +439,24 @@
 
       <seglistitem>
-        <seg>gss-client, gss-server, k5srvutil, kadmin, kadmin.local, 
-        kadmind, kdb5_ldap_util, kdb5_util, kdestroy, kinit, klist, 
-        kpasswd, kprop, kpropd, krb5-config, krb5kdc, krb5-send-pr, 
-        ksu, kswitch, ktutil, kvno, sclient, sim_client, sim_server, 
-        sserver, uuclient, and uuserver</seg>
-        <seg>libgssapi_krb5.so, libgssrpc.so, libk5crypto.so, 
-        libkadm5clnt.so, libkadm5srv.so, libkdb5.so, libkdb_ldap.so, 
-        libkrb5.so, libkrb5support.so, libverto-k5ev.so and 
-        libverto.so</seg>
-        <seg>/usr/include/{gssapi,gssrpc,kadm5,krb5}, /usr/lib/krb5, 
-        /usr/share/{doc/krb5-&mitkrb-version;,examples/krb5,gnats}
-        and /var/lib/krb5kdc</seg>
+        <seg>
+          gss-client, gss-server, k5srvutil, kadmin, kadmin.local, 
+          kadmind, kdb5_ldap_util, kdb5_util, kdestroy, kinit, klist, 
+          kpasswd, kprop, kpropd, krb5-config, krb5kdc, krb5-send-pr, 
+          ksu, kswitch, ktutil, kvno, sclient, sim_client, sim_server, 
+          sserver, uuclient and uuserver
+        </seg>
+        <seg>
+          libgssapi_krb5.so, libgssrpc.so, libk5crypto.so, 
+          libkadm5clnt.so, libkadm5srv.so, libkdb5.so, libkdb_ldap.so, 
+          libkrb5.so, libkrb5support.so, libverto-k5ev.so and 
+          libverto.so
+        </seg>
+        <seg>
+          /usr/include/{gssapi,gssrpc,kadm5,krb5},
+          /usr/lib/krb5, 
+          /usr/share/doc/krb5-&mitkrb-version;,
+          /usr/share/examples/krb5 and
+          /var/lib/krb5kdc
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -379,5 +470,7 @@
         <term><command>k5srvutil</command></term>
         <listitem>
-          <para>is a host keytable manipulation utility.</para>
+          <para>
+            is a host keytable manipulation utility.
+          </para>
           <indexterm zone="mitkrb k5srvutil">
             <primary sortas="b-k5srvutil">k5srvutil</primary>
@@ -386,10 +479,12 @@
       </varlistentry>
 
-      <varlistentry id="kadmin-mitkrb">
+      <varlistentry id="kadmin">
         <term><command>kadmin</command></term>
         <listitem>
-          <para>is an utility used to make modifications
-          to the Kerberos database.</para>
-          <indexterm zone="mitkrb kadmin-mitkrb">
+          <para>
+            is an utility used to make modifications
+            to the Kerberos database.
+          </para>
+          <indexterm zone="mitkrb kadmin">
             <primary sortas="b-kadmin">kadmin</primary>
           </indexterm>
@@ -397,10 +492,12 @@
       </varlistentry>
 
-      <varlistentry id="kadmind-mitkrb">
+      <varlistentry id="kadmind">
         <term><command>kadmind</command></term>
         <listitem>
-          <para>is a server for administrative access
-          to a Kerberos database.</para>
-          <indexterm zone="mitkrb kadmind-mitkrb">
+          <para>
+            is a server for administrative access
+            to a Kerberos database.
+          </para>
+          <indexterm zone="mitkrb kadmind">
             <primary sortas="b-kadmind">kadmind</primary>
           </indexterm>
@@ -411,5 +508,7 @@
         <term><command>kdb5_util</command></term>
         <listitem>
-          <para>is the KDC database utility.</para>
+          <para>
+            is the KDC database utility.
+          </para>
           <indexterm zone="mitkrb kdb5_util">
             <primary sortas="b-kdb5_util">kdb5_util</primary>
@@ -418,9 +517,11 @@
       </varlistentry>
 
-      <varlistentry id="kdestroy-mitkrb">
+      <varlistentry id="kdestroy">
         <term><command>kdestroy</command></term>
         <listitem>
-          <para>removes the current set of tickets.</para>
-          <indexterm zone="mitkrb kdestroy-mitkrb">
+          <para>
+            removes the current set of tickets.
+          </para>
+          <indexterm zone="mitkrb kdestroy">
             <primary sortas="b-kdestroy">kdestroy</primary>
           </indexterm>
@@ -428,11 +529,13 @@
       </varlistentry>
 
-      <varlistentry id="kinit-mitkrb">
+      <varlistentry id="kinit">
         <term><command>kinit</command></term>
         <listitem>
-          <para>is used to authenticate to the Kerberos server as a
-          principal and acquire a ticket granting ticket that can
-          later be used to obtain tickets for other services.</para>
-          <indexterm zone="mitkrb kinit-mitkrb">
+          <para>
+            is used to authenticate to the Kerberos server as a
+            principal and acquire a ticket granting ticket that can
+            later be used to obtain tickets for other services.
+          </para>
+          <indexterm zone="mitkrb kinit">
             <primary sortas="b-kinit">kinit</primary>
           </indexterm>
@@ -440,10 +543,12 @@
       </varlistentry>
 
-      <varlistentry id="klist-mitkrb">
+      <varlistentry id="klist">
         <term><command>klist</command></term>
         <listitem>
-          <para>reads and displays the current tickets in
-          the credential cache.</para>
-          <indexterm zone="mitkrb klist-mitkrb">
+          <para>
+            reads and displays the current tickets in
+            the credential cache.
+          </para>
+          <indexterm zone="mitkrb klist">
             <primary sortas="b-klist">klist</primary>
           </indexterm>
@@ -451,9 +556,11 @@
       </varlistentry>
 
-      <varlistentry id="kpasswd-mitkrb">
+      <varlistentry id="kpasswd">
         <term><command>kpasswd</command></term>
         <listitem>
-          <para>is a program for changing Kerberos 5 passwords.</para>
-          <indexterm zone="mitkrb kpasswd-mitkrb">
+          <para>
+            is a program for changing Kerberos 5 passwords.
+          </para>
+          <indexterm zone="mitkrb kpasswd">
             <primary sortas="b-kpasswd">kpasswd</primary>
           </indexterm>
@@ -464,6 +571,8 @@
         <term><command>kprop</command></term>
         <listitem>
-          <para>takes a principal database in a specified format and
-          converts it into a stream of database records.</para>
+          <para>
+            takes a principal database in a specified format and
+            converts it into a stream of database records.
+          </para>
           <indexterm zone="mitkrb kprop">
             <primary sortas="b-kprop">kprop</primary>
@@ -475,6 +584,8 @@
         <term><command>kpropd</command></term>
         <listitem>
-          <para>receives a database sent by <command>kprop</command>
-          and writes it as a local database.</para>
+          <para>
+            receives a database sent by <command>kprop</command>
+            and writes it as a local database.
+          </para>
           <indexterm zone="mitkrb kpropd">
             <primary sortas="b-kpropd">kpropd</primary>
@@ -486,6 +597,8 @@
         <term><command>krb5-config</command></term>
         <listitem>
-          <para>gives information on how to link programs against
-          libraries.</para>
+          <para>
+            gives information on how to link programs against
+            libraries.
+          </para>
           <indexterm zone="mitkrb krb5-config-prog2">
             <primary sortas="b-krb5-config">krb5-config</primary>
@@ -497,5 +610,7 @@
         <term><command>krb5kdc</command></term>
         <listitem>
-          <para>is a Kerberos 5 server.</para>
+          <para>
+            is the <application>Kerberos 5</application> server.
+          </para>
           <indexterm zone="mitkrb krb5kdc">
             <primary sortas="b-krb5kdc">krb5kdc</primary>
@@ -507,9 +622,11 @@
         <term><command>ksu</command></term>
         <listitem>
-          <para>is the super user program using Kerberos protocol.
-          Requires a properly configured
-          <filename class="directory">/etc/shells</filename> and
-          <filename>~/.k5login</filename> containing principals
-          authorized to become super users.</para>
+          <para>
+            is the super user program using Kerberos protocol.
+            Requires a properly configured
+            <filename>/etc/shells</filename> and
+            <filename>~/.k5login</filename> containing principals
+            authorized to become super users.
+          </para>
           <indexterm zone="mitkrb ksu">
             <primary sortas="b-ksu">ksu</primary>
@@ -521,7 +638,9 @@
         <term><command>kswitch</command></term>
         <listitem>
-          <para>makes the specified credential cache the 
-          primary cache for the collection, if a cache 
-          collection is available.</para>
+          <para>
+            makes the specified credential cache the 
+            primary cache for the collection, if a cache 
+            collection is available.
+          </para>
           <indexterm zone="mitkrb kswitch">
             <primary sortas="b-kswitch">kswitch</primary>
@@ -530,9 +649,11 @@
       </varlistentry>
 
-      <varlistentry id="ktutil-mitkrb">
+      <varlistentry id="ktutil">
         <term><command>ktutil</command></term>
         <listitem>
-          <para>is a program for managing Kerberos keytabs.</para>
-          <indexterm zone="mitkrb ktutil-mitkrb">
+          <para>
+            is a program for managing Kerberos keytabs.
+          </para>
+          <indexterm zone="mitkrb ktutil">
             <primary sortas="b-ktutil">ktutil</primary>
           </indexterm>
@@ -543,5 +664,7 @@
         <term><command>kvno</command></term>
         <listitem>
-          <para>prints keyversion numbers of Kerberos principals.</para>
+          <para>
+            prints keyversion numbers of Kerberos principals.
+          </para>
           <indexterm zone="mitkrb kvno">
             <primary sortas="b-kvno">kvno</primary>
@@ -553,7 +676,9 @@
         <term><command>sclient</command></term>
         <listitem>
-          <para>used to contact a sample server and authenticate to it
-          using Kerberos version 5 tickets, then display the server's 
-          response.</para>
+          <para>
+            used to contact a sample server and authenticate to it
+            using Kerberos 5 tickets, then display the server's
+            response.
+          </para>
           <indexterm zone="mitkrb sclient">
             <primary sortas="b-sclient">sclient</primary>
@@ -565,5 +690,7 @@
         <term><command>sserver</command></term>
         <listitem>
-          <para>sample Kerberos version 5 server.</para>
+          <para>
+            is the sample Kerberos 5 server.
+          </para>
           <indexterm zone="mitkrb sserver">
             <primary sortas="b-sserver">sserver</primary>
@@ -572,13 +699,16 @@
       </varlistentry>
 
-      <varlistentry id="libgssapi_krb5-mitkrb">
+      <varlistentry id="libgssapi_krb5">
         <term><filename class='libraryfile'>libgssapi_krb5.so</filename></term>
         <listitem>
-          <para>contain the Generic Security Service Application
-          Programming Interface (GSSAPI) functions which provides security
-          services to callers in a generic fashion, supportable with a range of
-          underlying mechanisms and technologies and hence allowing source-level
-          portability of applications to different environments.</para>
-          <indexterm zone="mitkrb libgssapi_krb5-mitkrb">
+          <para>
+            contain the Generic Security Service Application Programming
+            Interface (GSSAPI) functions which provides security services
+            to callers in a generic fashion, supportable with a range of
+            underlying mechanisms and technologies and hence allowing
+            source-level portability of applications to different
+            environments.
+          </para>
+          <indexterm zone="mitkrb libgssapi_krb5">
             <primary sortas="c-libgssapi_krb5">libgssapi_krb5.so</primary>
           </indexterm>
@@ -586,10 +716,12 @@
       </varlistentry>
 
-      <varlistentry id="libkadm5clnt-mitkrb">
+      <varlistentry id="libkadm5clnt">
         <term><filename class='libraryfile'>libkadm5clnt.so</filename></term>
         <listitem>
-          <para>contains the administrative authentication and password
-          checking functions required by Kerberos 5 client-side programs.</para>
-          <indexterm zone="mitkrb libkadm5clnt-mitkrb">
+          <para>
+            contains the administrative authentication and password checking
+            functions required by Kerberos 5 client-side programs.
+          </para>
+          <indexterm zone="mitkrb libkadm5clnt">
             <primary sortas="c-libkadm5clnt">libkadm5clnt.so</primary>
           </indexterm>
@@ -597,10 +729,12 @@
       </varlistentry>
 
-      <varlistentry id="libkadm5srv-mitkrb">
+      <varlistentry id="libkadm5srv">
         <term><filename class='libraryfile'>libkadm5srv.so</filename></term>
         <listitem>
-          <para>contain the administrative authentication and password
-          checking functions required by Kerberos 5 servers.</para>
-          <indexterm zone="mitkrb libkadm5srv-mitkrb">
+          <para>
+            contain the administrative authentication and password
+            checking functions required by Kerberos 5 servers.
+          </para>
+          <indexterm zone="mitkrb libkadm5srv">
             <primary sortas="c-libkadm5srv">libkadm5srv.so</primary>
           </indexterm>
@@ -611,6 +745,8 @@
         <term><filename class='libraryfile'>libkdb5.so</filename></term>
         <listitem>
-          <para>is a Kerberos 5 authentication/authorization database
-          access library.</para>
+          <para>
+            is a Kerberos 5 authentication/authorization database
+            access library.
+          </para>
           <indexterm zone="mitkrb libkdb5">
             <primary sortas="c-libkdb5">libkdb5.so</primary>
@@ -619,9 +755,11 @@
       </varlistentry>
 
-      <varlistentry id="libkrb5-mitkrb">
+      <varlistentry id="libkrb5">
         <term><filename class='libraryfile'>libkrb5.so</filename></term>
         <listitem>
-          <para>is an all-purpose Kerberos 5 library.</para>
-          <indexterm zone="mitkrb libkrb5-mitkrb">
+          <para>
+            is an all-purpose <application>Kerberos 5</application> library.
+          </para>
+          <indexterm zone="mitkrb libkrb5">
             <primary sortas="c-libkrb5">libkrb5.so</primary>
           </indexterm>
