Index: general/genlib/aspell.xml
===================================================================
--- general/genlib/aspell.xml	(revision ff769b8c6178dd8b799a5e122a2e6a5d69a22a2c)
+++ general/genlib/aspell.xml	(revision 9a9b94f14530726fe2aa10b970e920dabab4ef5e)
@@ -7,8 +7,8 @@
 <!ENTITY aspell-download-http "http://gnu.mirror.mcgill.ca/aspell/aspell-&aspell-version;.tar.gz">
 <!ENTITY aspell-download-ftp  "ftp://ftp.gnu.org/gnu/aspell/aspell-&aspell-version;.tar.gz">
-<!ENTITY aspell-md5sum        "8fa031d0eb37a5538aa6fefa657e707f">
+<!ENTITY aspell-md5sum        "d067596a1d9029d127d85e5040bab0ab">
 <!ENTITY aspell-size          "1.6 MB">
-<!ENTITY aspell-buildsize     "39.3 MB">
-<!ENTITY aspell-time          "0.74 SBU">
+<!ENTITY aspell-buildsize     "41.5 MB (includes the English dictionary)">
+<!ENTITY aspell-time          "0.76 SBU">
 ]>
 
@@ -20,4 +20,6 @@
 <?dbhtml filename="aspell.html"?>
 <title>Aspell-&aspell-version;</title>
+<indexterm zone="aspell">
+<primary sortas="a-Aspell">Aspell</primary></indexterm>
 
 <sect2>
@@ -68,6 +70,9 @@
 
 <screen><userinput><command>./configure --prefix=/usr &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>
@@ -83,6 +88,9 @@
 
 <screen><userinput><command>./configure &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>
 </sect3>
 
@@ -92,66 +100,125 @@
 <title>Contents</title>
 
-<para>The <application>Aspell</application> package contains 
-<command>aspell</command>, 
-<command>aspell-import</command>, 
-<command>precat</command>, 
-<command>preunzip</command>, 
-<command>prezip</command>, 
-<command>prezip-bin</command>, 
-<command>pspell-config</command>, 
-<command>run-with-aspell</command>, 
-<command>word-list-compress</command>, 
-filters, dictionaries, compatibility scripts and the
-<filename class='libraryfile'>libaspell</filename> and 
-<filename class='libraryfile'>libpspell</filename> libraries.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>aspell</title>
-<para><command>aspell</command> is a utility that can function as an 
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+
+<seglistitem>
+<seg>aspell, aspell-import, precat, preunzip, prezip, prezip-bin, pspell-config, 
+run-with-aspell and word-list-compress</seg>
+<seg>libaspell.so and libpspell.so</seg>
+<seg>/usr/include/pspell and /usr/lib/aspell-0.60</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="aspell-prog">
+<term><command>aspell</command></term>
+<listitem><para>is a utility that can function as an 
 <command>ispell -a</command> replacement, as an independent spell checker, as 
 a test utility to test out <application>Aspell</application> features, and as 
-a utility for managing dictionaries.</para></sect3>
-
-<sect3><title>aspell-import</title>
-<para><command>aspell-import</command> imports old personal dictionaries into 
-<application>Aspell</application>.</para></sect3>
-
-<sect3><title>precat</title>
-<para><command>precat</command> decompresses a <command>prezip</command>ped 
-file to stdout.</para></sect3>
-
-<sect3><title>preunzip</title>
-<para><command>preunzip</command> decompresses a <command>prezip</command>ped 
-file.</para></sect3>
-
-<sect3><title>prezip</title>
-<para><command>prezip</command> is a prefix delta compressor, used to compress 
-sorted word lists or other similar text files.</para></sect3>
-
-<sect3><title>prezip-bin</title>
-<para><command>prezip-bin</command> is called by the various wrapper scripts to 
-perform the actual compressing and decompressing.</para></sect3>
-
-<sect3><title>pspell-config</title>
-<para><command>pspell-config</command> displays information about the 
+a utility for managing dictionaries.</para>
+<indexterm zone="aspell aspell-prog">
+<primary sortas="b-aspell">aspell</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="aspell-import">
+<term><command>aspell-import</command></term>
+<listitem><para>imports old personal dictionaries into
+<application>Aspell</application>.</para>
+<indexterm zone="aspell aspell-import">
+<primary sortas="b-aspell-import">aspell-import</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="precat">
+<term><command>precat</command></term>
+<listitem><para>decompresses a <command>prezip</command>ped file to 
+stdout.</para>
+<indexterm zone="aspell precat">
+<primary sortas="b-precat">precat</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="preunzip">
+<term><command>preunzip</command></term>
+<listitem><para>decompresses a <command>prezip</command>ped file.</para>
+<indexterm zone="aspell preunzip">
+<primary sortas="b-preunzip">preunzip</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="prezip">
+<term><command>prezip</command></term>
+<listitem><para>is a prefix delta compressor, used to compress sorted word 
+lists or other similar text files.</para>
+<indexterm zone="aspell prezip">
+<primary sortas="b-prezip">prezip</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="prezip-bin">
+<term><command>prezip-bin</command></term>
+<listitem><para>is called by the various wrapper scripts to perform the 
+actual compressing and decompressing.</para>
+<indexterm zone="aspell prezip-bin">
+<primary sortas="b-prezip-bin">prezip-bin</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="pspell-config">
+<term><command>pspell-config</command></term>
+<listitem><para>displays information about the 
 <filename class='libraryfile'>libpspell</filename> installation, mostly for use 
-in build scripts.</para></sect3>
-
-<sect3><title>run-with-aspell</title>
-<para><command>run-with-aspell</command> is a script to help use 
-<application>Aspell</application> as an <command>ispell</command> 
-replacement.</para></sect3>
-
-<sect3><title>word-list-compress</title>
-<para><command>word-list-compress</command> compresses or decompresses sorted 
-word lists for use with the <application>Aspell</application> spell 
-checker.</para></sect3>
-
-<sect3><title>aspell libraries</title>
-<para>The <filename class='libraryfile'>lib{a,p}spell</filename> libraries 
-are spell checking library interfaces.</para></sect3>
+in build scripts.</para>
+<indexterm zone="aspell pspell-config">
+<primary sortas="b-pspell-config">pspell-config</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="run-with-aspell">
+<term><command>run-with-aspell</command></term>
+<listitem><para>is a script to help use <application>Aspell</application> 
+as an <command>ispell</command> replacement.</para>
+<indexterm zone="aspell run-with-aspell">
+<primary sortas="b-run-with-aspell">run-with-aspell</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="word-list-compress">
+<term><command>word-list-compress</command></term>
+<listitem><para>compresses or decompresses sorted word lists for use with the 
+<application>Aspell</application> spell checker.</para>
+<indexterm zone="aspell word-list-compress">
+<primary sortas="b-word-list-compress">word-list-compress</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="libaspell">
+<term><filename class='libraryfile'>libaspell.so</filename></term>
+<listitem><para>contains spell checking <acronym>API</acronym> 
+functions.</para>
+<indexterm zone="aspell libaspell">
+<primary sortas="c-lib">libaspell.so</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="libpspell">
+<term><filename class='libraryfile'>libpspell.so</filename></term>
+<listitem><para>is an interface to the 
+<filename class='libraryfile'>libaspell</filename> library. All the spell 
+checking funtionality is now in 
+<filename class='libraryfile'>libaspell</filename> but this library is
+included for backwards compatibility.</para>
+<indexterm zone="aspell libpspell">
+<primary sortas="c-libpspell">libpspell.so</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
