Index: basicnet/netprogs/cvs.xml
===================================================================
--- basicnet/netprogs/cvs.xml	(revision ee1c43abcde6b2bba23d76adfce83e975ba75678)
+++ basicnet/netprogs/cvs.xml	(revision 28badf41b0e0cf81b2f1f5e4a8d3e50a908ee6b6)
@@ -54,5 +54,5 @@
 <xref linkend="gs"/> or <xref linkend="espgs"/>,
 <ulink url="../server/mail.html">MTA</ulink> and
-<xref linkend="postlfs-editors-vim"/>
+<xref linkend="vim"/>
 </para></sect4>
 </sect3>
Index: general/sysutils/fcron.xml
===================================================================
--- general/sysutils/fcron.xml	(revision ee1c43abcde6b2bba23d76adfce83e975ba75678)
+++ general/sysutils/fcron.xml	(revision 28badf41b0e0cf81b2f1f5e4a8d3e50a908ee6b6)
@@ -49,5 +49,5 @@
 <xref linkend="docbook-utils"/> and
 <ulink url="../postlfs/editors.html">a text editor</ulink> (default is
-<xref linkend="postlfs-editors-vim"/>)</para>
+<xref linkend="vim"/>)</para>
 </sect4>
 </sect3>
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision ee1c43abcde6b2bba23d76adfce83e975ba75678)
+++ postlfs/editors/vim.xml	(revision 28badf41b0e0cf81b2f1f5e4a8d3e50a908ee6b6)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="postlfs-editors-vim" xreflabel="Vim-&vim-version;">
+<sect1 id="vim" xreflabel="Vim-&vim-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -98,6 +98,9 @@
 ./configure --prefix=/usr \
    --with-features=huge &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
@@ -118,18 +121,62 @@
 <title>Contents</title>
 
-<para>The <application>Vim</application> package contains
-<command>eview</command>, <command>evim</command>,
-<command>ex</command>, <command>gview</command>,
-<command>gvim</command>, <command>gvimdiff</command>,
-<command>rgview</command>, <command>rgvim</command>,
-<command>rview</command>, <command>rvim</command>,
-<command>view</command>, <command>vim</command>,
-<command>vimdiff</command>, <command>vimtutor</command> and
-<command>xxd</command>. Except for <command>vimtutor</command> and
-<command>xxd</command>, all the other commands are symlinks to
-<command>vim</command> and  start <command>vim</command> with different
-options. <command>vimtutor</command> is a tool to  learn the various
-<command>vim</command> commands and <command>xxd</command> is a command used 
-to create hex dumps.</para>
+<para>A list of the reinstalled files, along with their short descriptions
+can be found at <ulink
+url="http://www.linuxfromscratch.org/lfs/view/6.0/chapter06/vimhtml"/>.
+</para>
+
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<seglistitem>
+<seg>gview, gvim, gvimdiff, rgview, rgvim</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="gview">
+<term><filename>gview</filename></term>
+<listitem><para>starts <command>gvim</command> in read-only mode.</para>
+<indexterm zone="vim gview">
+<primary sortas="b-gview">gview</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="gvim">
+<term><filename>gvim</filename></term>
+<listitem><para>is the editor that runs under X and includes a <acronym>GUI</acronym></para>
+<indexterm zone="vim gvim">
+<primary sortas="b-gvim">gvim</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="gvimdiff">
+<term><filename>gvimdiff</filename></term>
+<listitem><para>edits two or three versions of a file with
+<command>gvim</command> and show differences.</para>
+<indexterm zone="vim gvimdiff">
+<primary sortas="b-gvimdiff">gvimdiff</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="rgview">
+<term><filename>rgview</filename></term>
+<listitem><para>is a restricted version of <command>gview</command>.</para>
+<indexterm zone="vim rgview">
+<primary sortas="b-rgview">rgview</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="rgvim">
+<term><filename>rgvim</filename></term>
+<listitem><para>is a restricted version of <command>gvim</command>. </para>
+<indexterm zone="vim gvim">
+<primary sortas="b-gvim">gvim</primary></indexterm>
+</listitem>
+</varlistentry>
+
+</variablelist>
 
 </sect2>
Index: postlfs/security/openssl.xml
===================================================================
--- postlfs/security/openssl.xml	(revision ee1c43abcde6b2bba23d76adfce83e975ba75678)
+++ postlfs/security/openssl.xml	(revision 28badf41b0e0cf81b2f1f5e4a8d3e50a908ee6b6)
@@ -173,5 +173,5 @@
 
 <varlistentry id="libcrypto">
-<term><filename class='libraryfile'>libcrypto</filename></term>
+<term><filename class='libraryfile'>libcrypto.[so,a]</filename></term>
 <listitem><para>implements a wide range of cryptographic algorithms used in 
 various Internet standards. The services provided by  this library are used by 
@@ -188,5 +188,5 @@
 
 <varlistentry id="libssl">
-<term><filename class='libraryfile'>libssl</filename></term>
+<term><filename class='libraryfile'>libssl.[so,a]</filename></term>
 <listitem><para>implements the Secure Sockets Layer (<acronym>SSL</acronym> 
 v2/v3) and Transport Layer Security (<acronym>TLS</acronym> v1) protocols. It 
