Index: general.ent
===================================================================
--- general.ent	(revision 74f974b6e7a7da7ca586c26576fcc0368614b7d6)
+++ general.ent	(revision b1d3441470cbb95c51ee830f79787673d1caf6e2)
@@ -1,3 +1,3 @@
-<!ENTITY day          "14">
+<!ENTITY day          "15">
 <!ENTITY month        "01">
 <!ENTITY year         "2005">
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision 74f974b6e7a7da7ca586c26576fcc0368614b7d6)
+++ postlfs/security/cyrus-sasl.xml	(revision b1d3441470cbb95c51ee830f79787673d1caf6e2)
@@ -19,4 +19,6 @@
 <?dbhtml filename="cyrus-sasl.html"?>
 <title>Cyrus <acronym>SASL</acronym>-&cyrus-sasl-version;</title>
+<indexterm zone="cyrus-sasl">
+<primary sortas="a-Cyrus SASL">Cyrus SASL</primary></indexterm>
 
 <sect2>
@@ -34,9 +36,13 @@
 <sect3><title>Package information</title>
 <itemizedlist spacing="compact">
-<listitem><para>Download (HTTP): <ulink url="&cyrus-sasl-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&cyrus-sasl-download-ftp;"/></para></listitem>
+<listitem><para>Download (HTTP): 
+<ulink url="&cyrus-sasl-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&cyrus-sasl-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &cyrus-sasl-size;</para></listitem>
-<listitem><para>Estimated disk space required: &cyrus-sasl-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &cyrus-sasl-time;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&cyrus-sasl-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&cyrus-sasl-time;</para></listitem>
 </itemizedlist>
 </sect3>
@@ -116,8 +122,11 @@
 <acronym>SASL</acronym></application></title>
 
-<sect3><title>Config Files</title>
+<sect3 id="cyrus-sasl-config"><title>Config Files</title>
 <para><filename>/etc/saslauthd.conf</filename> (for <acronym>LDAP</acronym> 
 configuration) and <filename>/usr/lib/sasl2/Appname.conf</filename> (where 
 "Appname" is the application defined name of the application)</para>
+<indexterm zone="cyrus-sasl cyrus-sasl-config">
+<primary sortas="e-etc-saslauthd.conf">/etc/saslauthd.conf</primary>
+</indexterm>
 </sect3>
 
@@ -129,9 +138,12 @@
 </sect3>
 
-<sect3><title>Init Script</title>
+<sect3 id="cyrus-sasl-init"><title>Init Script</title>
 <para>If you need to run the <command>saslauthd</command> daemon at system 
 startup, install the <filename>/etc/rc.d/init.d/cyrus-sasl</filename>
 init script included in the 
 <xref linkend="intro-important-bootscripts"/> package.</para>
+<indexterm zone="cyrus-sasl cyrus-sasl-init">
+<primary sortas="f-cyrus-sasl-init">cyrus-sasl</primary>
+</indexterm>
 
 <screen><userinput><command>make install-cyrus-sasl</command></userinput></screen>
@@ -148,28 +160,57 @@
 <title>Contents</title>
 
-<para>The <application>Cyrus <acronym>SASL</acronym></application> package 
-contains <command>saslauthd</command>, <command>sasldblistusers2</command>, 
-<command>saslpasswd2</command>, <application>Cyrus 
-<acronym>SASL</acronym></application> plugins, the 
-<filename class='libraryfile'>libsasl2</filename> library and optionally the 
-<filename class='libraryfile'>libjavasasl</filename> library and 
-<acronym>SASL</acronym> Java classes.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>saslauthd</title>
-<para><command>saslauthd</command> is the <acronym>SASL</acronym> 
-authentication server.</para></sect3>
-
-<sect3><title>sasldblistusers2</title>
-<para><filename>sasldblistusers2</filename> is used to list the users in the 
-<acronym>SASL</acronym> password database.</para></sect3>
-
-<sect3><title>saslpasswd2</title>
-<para><filename>saslpasswd2</filename> is used to set and delete a user's 
-<acronym>SASL</acronym> password and mechanism specific secrets in the 
-<acronym>SASL</acronym> password database.</para></sect3>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+<seglistitem>
+<seg>saslauthd, sasldblistusers2 and saslpasswd2</seg>
+<seg>libjavasasl.so, libsasl2.so and <acronym>SASL</acronym> plugins/JAVA 
+classes</seg>
+<seg>/usr/lib/sasl2, /usr/share/doc/sasl and /var/lib/sasl</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="saslauthd">
+<term><command>saslauthd</command></term>
+<listitem><para>is the <acronym>SASL</acronym> authentication server.</para>
+<indexterm zone="cyrus-sasl saslauthd">
+<primary sortas="b-saslauthd">saslauthd</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="sasldblistusers2">
+<term><command>sasldblistusers2</command></term>
+<listitem><para>is used to list the users in the <acronym>SASL</acronym> 
+password database.</para>
+<indexterm zone="cyrus-sasl sasldblistusers2">
+<primary sortas="b-sasldblistusers2">sasldblistusers2</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="saslpasswd2">
+<term><command>saslpasswd2</command></term>
+<listitem><para>is used to set and delete a user's <acronym>SASL</acronym> 
+password and mechanism specific secrets in the <acronym>SASL</acronym> 
+password database.</para>
+<indexterm zone="cyrus-sasl saslpasswd2">
+<primary sortas="b-saslpasswd2">saslpasswd2</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="libsasl2">
+<term><filename class='libraryfile'>libsasl2.so</filename></term>
+<listitem><para>is a general purpose authentication library for sever and 
+client applications.</para>
+<indexterm zone="cyrus-sasl libsasl2">
+<primary sortas="c-libsasl2">libsasl2.so</primary></indexterm>
+</listitem>
+</varlistentry>
+
+</variablelist>
 
 </sect2>
Index: template/template.xml
===================================================================
--- template/template.xml	(revision 74f974b6e7a7da7ca586c26576fcc0368614b7d6)
+++ template/template.xml	(revision b1d3441470cbb95c51ee830f79787673d1caf6e2)
@@ -135,7 +135,8 @@
 <seg>PROGRAM1, PROGRAM2 and PROGRAM3</seg>
 <seg>libLIBRARY1, libLIBRARY2 and libLIBRARY3</seg>
-<seg>/etc/TEMPLATE, /var/lib/TEMPLATE, /usr/lib/TEMPLATE, 
-/usr/share/TEMPLATE-&TEMPLATE-version; and 
-and /usr/share/doc/TEMPLATE-&TEMPLATE-version;</seg>
+<seg>/etc/TEMPLATE, /usr/lib/TEMPLATE, 
+/usr/share/TEMPLATE-&TEMPLATE-version;, 
+/usr/share/doc/TEMPLATE-&TEMPLATE-version; and 
+/var/lib/TEMPLATE</seg>
 </seglistitem>
 </segmentedlist>
