Index: general.ent
===================================================================
--- general.ent	(revision 5cb3ea7713f932eca1ab1526e4b8a289f7446789)
+++ general.ent	(revision 0ef18378494d719cb37a4ea2a3ac87f46cb904d3)
@@ -38,5 +38,5 @@
 <!ENTITY mitkrb-version               "1.3.5"> 
 <!ENTITY cyrus-sasl-version           "2.1.20"> 
-<!ENTITY stunnel-version              "4.05"> 
+<!ENTITY stunnel-version              "4.07"> 
                                   
 <!-- Chapter 5 -->                
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision 5cb3ea7713f932eca1ab1526e4b8a289f7446789)
+++ general/prog/ruby.xml	(revision 0ef18378494d719cb37a4ea2a3ac87f46cb904d3)
@@ -33,5 +33,5 @@
 <listitem><para>Download (HTTP): <ulink url="&ruby-download-http;"/></para></listitem>
 <listitem><para>Download (FTP): <ulink url="&ruby-download-ftp;"/></para></listitem>
-<listitem><para>MD5 Sum: &ruby-md5sum;</para></listitem>
+<listitem><para>Download MD5 sum: &ruby-md5sum;</para></listitem>
 <listitem><para>Download size: &ruby-size;</para></listitem>
 <listitem><para>Estimated disk space required: &ruby-buildsize;</para></listitem>
@@ -85,5 +85,5 @@
 <seglistitem>
 <seg>ruby, irb, erb, rdoc, ri, and testrb.</seg>
-<seg>librudy.so</seg>
+<seg>libruby.so</seg>
 <seg>/usr/lib/ruby and /usr/share/ri</seg></seglistitem>
 </segmentedlist>
@@ -94,5 +94,5 @@
 
 <varlistentry id="ruby">
-<term><command>rudy</command></term>
+<term><command>ruby</command></term>
 <listitem><para>is an interpreted scripting language for quick
 and easy object-oriented programming.</para>
Index: postlfs/security/stunnel.xml
===================================================================
--- postlfs/security/stunnel.xml	(revision 5cb3ea7713f932eca1ab1526e4b8a289f7446789)
+++ postlfs/security/stunnel.xml	(revision 0ef18378494d719cb37a4ea2a3ac87f46cb904d3)
@@ -7,10 +7,10 @@
   <!ENTITY stunnel-download-http "http://www.stunnel.org/download/stunnel/src/stunnel-&stunnel-version;.tar.gz">
   <!ENTITY stunnel-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/stunnel-&stunnel-version;.tar.gz">
-  <!ENTITY stunnel-size          "341 KB">
-  <!ENTITY stunnel-buildsize     "2.9 MB">
-  <!ENTITY stunnel-time          "0.08 SBU">
+  <!ENTITY stunnel-size          "486 KB">
+  <!ENTITY stunnel-buildsize     "3.9 MB">
+  <!ENTITY stunnel-time          "0.11 SBU">
 ]>
 
-<sect1 id="stunnel" xreflabel="Stunnel-&stunnel-version;">
+<sect1 id="stunnel-package" xreflabel="Stunnel-&stunnel-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -19,4 +19,6 @@
 <?dbhtml filename="stunnel.html"?>
 <title>Stunnel-&stunnel-version;</title>
+<indexterm zone="stunnel-package">
+<primary sortas="a-Stunnel">Stunnel</primary></indexterm>
 
 <sect2>
@@ -36,9 +38,14 @@
 <sect3><title>Package information</title>
 <itemizedlist spacing="compact">
-<listitem><para>Download (HTTP): <ulink url="&stunnel-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&stunnel-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &stunnel-size;</para></listitem>
-<listitem><para>Estimated disk space required: &stunnel-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &stunnel-time;</para></listitem></itemizedlist>
+<listitem><para>Download (HTTP): 
+<ulink url="&stunnel-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&stunnel-download-ftp;"/></para></listitem>
+<listitem><para>Download size: 
+&stunnel-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&stunnel-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&stunnel-time;</para></listitem></itemizedlist>
 </sect3>
 
@@ -84,5 +91,6 @@
 commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc \
+    --localstatedir=/var/lib/stunnel &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
@@ -96,4 +104,9 @@
 configuration directory to <filename class='directory'>/etc</filename> instead 
 of <filename class='directory'>/usr/etc</filename>.</para>
+
+<para><parameter>--localstatedir=/var/lib/stunnel</parameter>: This parameter 
+causes the installation process to create 
+<filename class='directory'>/var/lib/stunnel/stunnel</filename> instead of 
+<filename class='directory'>/usr/var/stunnel</filename>.</para>
 
 <para><command>make</command>: This command builds the package and, if you
@@ -113,5 +126,7 @@
 
 <sect3><title>Config files</title>
-<para><filename>/etc/stunnel/stunnel.conf</filename></para>
+<para><filename id="stunnel.conf">/etc/stunnel/stunnel.conf</filename></para>
+<indexterm zone="stunnel-package stunnel.conf">
+<primary sortas="e-stunnel.conf">stunnel.conf</primary></indexterm>
 </sect3>
 
@@ -152,8 +167,11 @@
 instructions.</para>
 
-<para>To automatically start the <command>stunnel</command> daemon when the system
-is rebooted, install the <filename>/etc/rc.d/init.d/stunnel</filename> 
+<para>To automatically start the <command>stunnel</command> daemon when the 
+system is rebooted, install the 
+<filename id="stunnel.init">/etc/rc.d/init.d/stunnel</filename> 
 bootscript from the <xref linkend="intro-important-bootscripts"/> 
 package.</para>
+<indexterm zone="stunnel-package stunnel.init">
+<primary sortas="f-stunnel.init">stunnel</primary></indexterm>
 
 <screen><userinput><command>make install-stunnel</command></userinput></screen>
@@ -164,17 +182,50 @@
 <sect2>
 <title>Contents</title>
-
-<para>The <application>Stunnel</application> package contains 
-<command>stunnel</command> and 
-<filename class='libraryfile'>libstunnel</filename>.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>stunnel</title>
-<para><command>stunnel</command> is a program designed to work as an 
-<acronym>SSL</acronym> encryption wrapper between remote clients and local 
-(<command>[x]inetd</command>-startable) or remote servers.</para></sect3>
+<segmentedlist>
+<segtitle>Installed Program</segtitle>
+<segtitle>Installed Script</segtitle>
+<segtitle>Installed Library</segtitle>
+<segtitle>Installed Directories</segtitle>
+<seglistitem>
+<seg>stunnel</seg>
+<seg>stunnel3</seg>
+<seg>libstunnel.so</seg>
+<seg>/etc/stunnel, /var/lib/stunnel and 
+/usr/share/doc/stunnel</seg></seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="stunnel">
+<term><command>stunnel</command></term>
+<listitem><para> is a program designed to work as an <acronym>SSL</acronym> 
+encryption wrapper between remote clients and local
+(<command>[x]inetd</command>-startable) or remote servers.</para>
+<indexterm zone="stunnel-package stunnel">
+<primary sortas="b-stunnel">stunnel</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="stunnel3">
+<term><command>stunnel3</command></term>
+<listitem><para>is a <application>Perl</application> wrapper script to use 
+<command>stunnel</command> 3.x syntax with <command>stunnel</command> 
+>=4.05.</para>
+<indexterm zone="stunnel-package stunnel3">
+<primary sortas="d-stunnel3">stunnel3</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="libstunnel.so">
+<term><filename class='libraryfile'>libstunnel.so</filename></term>
+<listitem><para> contains the <acronym>API</acronym> functions required by 
+<application>Stunnel</application>.</para>
+<indexterm zone="stunnel-package libstunnel.so">
+<primary sortas="c-libstunnel.so">libstunnel.so</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
Index: server/other/samba3.xml
===================================================================
--- server/other/samba3.xml	(revision 5cb3ea7713f932eca1ab1526e4b8a289f7446789)
+++ server/other/samba3.xml	(revision 0ef18378494d719cb37a4ea2a3ac87f46cb904d3)
@@ -61,5 +61,5 @@
 <xref linkend="xinetd"/>, 
 <ulink url="http://valgrind.kde.org/">Valgrind</ulink> and 
-<xref linkend="stunnel"/> (used to encrypt access to SWAT)</para>
+<xref linkend="stunnel-package"/> (used to encrypt access to SWAT)</para>
 </sect4>
 </sect3>
Index: stylesheets/xhtml/lfs-index.xsl
===================================================================
--- stylesheets/xhtml/lfs-index.xsl	(revision 5cb3ea7713f932eca1ab1526e4b8a289f7446789)
+++ stylesheets/xhtml/lfs-index.xsl	(revision 0ef18378494d719cb37a4ea2a3ac87f46cb904d3)
@@ -43,7 +43,7 @@
         <xsl:if test="contains(concat(&lowercase;, &uppercase;), $key)">
           <h2>
-          	<xsl:choose>
-            	<xsl:when test="$divtitle = 'A'">
-              	<xsl:text>Packages</xsl:text>
+             <xsl:choose>
+             <xsl:when test="$divtitle = 'A'">
+                <xsl:text>Packages</xsl:text>
              </xsl:when>
              <xsl:when test="$divtitle = 'B'">
@@ -56,10 +56,16 @@
               	<xsl:text>Scripts</xsl:text>
              </xsl:when>
-              <xsl:when test="$divtitle = 'E'">
-                  <xsl:text>Others</xsl:text>
-              </xsl:when>
+             <xsl:when test="$divtitle = 'E'">
+              	<xsl:text>Configuration Files</xsl:text>
+             </xsl:when>
+             <xsl:when test="$divtitle = 'F'">
+                 <xsl:text>Bootscripts</xsl:text>
+             </xsl:when>
+             <xsl:when test="$divtitle = 'G'">
+                 <xsl:text>Others</xsl:text>
+             </xsl:when>
              <xsl:otherwise>
-          		<xsl:value-of select="$divtitle"/>
-						</xsl:otherwise>
+          	 <xsl:value-of select="$divtitle"/>
+             </xsl:otherwise>
            </xsl:choose>
           </h2>
