Index: general/genlib/ispell.xml
===================================================================
--- general/genlib/ispell.xml	(revision 3f455af4638452853861fda813ef6589c96ec9a4)
+++ general/genlib/ispell.xml	(revision 7d84923570feff01524e604a0327eb779885f590)
@@ -5,70 +5,109 @@
   %general-entities;
 
-<!ENTITY ispell-download-http "http://membled.com/work/patches/ispell/ispell-&ispell-version;.tar.bz2">
-<!ENTITY ispell-download-ftp " ">
-<!ENTITY ispell-md5sum "d5d867e62776524f60b3b5dcc3d8014f">
-<!ENTITY ispell-size "1.2 MB">
-<!ENTITY ispell-buildsize "11 MB">
-<!ENTITY ispell-time "0.03 SBU">
+  <!ENTITY ispell-download-http "http://membled.com/work/patches/ispell/ispell-&ispell-version;.tar.bz2">
+  <!ENTITY ispell-download-ftp " ">
+  <!ENTITY ispell-md5sum "d5d867e62776524f60b3b5dcc3d8014f">
+  <!ENTITY ispell-size "1.2 MB">
+  <!ENTITY ispell-buildsize "11 MB">
+  <!ENTITY ispell-time "0.03 SBU">
 ]>
 
 <sect1 id="ispell" xreflabel="ispell-&ispell-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="ispell.html"?>
-<title>ispell-&ispell-version;</title>
+  <?dbhtml filename="ispell.html"?>
+  
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+  
+  <title>Ispell-&ispell-version;</title>
+  
+  <indexterm zone="ispell">
+    <primary sortas="a-Ispell">Ispell</primary>
+  </indexterm>
+  
+  <sect2 role="package">
+    <title>Introduction to Ispell</title>
 
-<sect2>
-<title>Introduction to <application>ispell</application></title>
+    <para>The <application>ispell</application> package contains a spell
+    checker that can handle international languages.</para>
+    
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&ispell-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&ispell-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &ispell-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &ispell-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &ispell-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &ispell-time;</para>
+      </listitem>
+    </itemizedlist>
+    
+  </sect2>
+  
+  <sect2 role="installation">
+    <title>Installation of Ispell</title>
 
-<para>The <application>ispell</application> package contains a spell
-checker that can handle international languages.</para>
+    <para>The first step is to create <filename>local.h</filename>.</para>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&ispell-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&ispell-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &ispell-md5sum;</para></listitem>
-<listitem><para>Download size: &ispell-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&ispell-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&ispell-time;</para></listitem></itemizedlist>
-</sect3>
+<screen><userinput>sed -e "s:/usr/local:/usr:g" local.h.linux > local.h</userinput></screen>
 
-</sect2>
+    <para>By default, <application>ispell</application> only installs an American
+    English dictionary. To set up other languages, check out the 
+    <filename>config.X</filename> file for the #define entry to append to 
+    <filename>local.h</filename>.</para>
+    
+    <para>Compile and install <application>ispell</application> using the
+    following commands:</para>
 
-<sect2>
-<title>Installation of <application>ispell</application></title>
-
-<para>The first step is to create <filename>local.h</filename>.</para>
-
-<screen><userinput><command>sed -e "s:/usr/local:/usr:g" local.h.linux > local.h</command></userinput></screen>
-
-<para>By default, <application>ispell</application> only installs an American
-English dictionary. To set up other languages, check out the 
-<filename>config.X</filename> file for the #define entry to append to 
-<filename>local.h</filename>.</para>
-
-<para>Compile and install <application>ispell</application> using the
-following commands:</para>
-
-<screen><userinput><command>make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>The <application>ispell</application> package contains the
-<command>ispell</command> program used for spell checking.</para>
-
-</sect2>
-
+<screen><userinput>make &amp;&amp;
+make install</userinput></screen>
+    
+  </sect2>
+  
+  <sect2 role="content">
+    <title>Contents</title>
+    
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+      
+      <seglistitem>
+        <seg>ispell</seg>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+    
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+     
+      <varlistentry id="ispell-prog">
+        <term><command>ispell</command></term>
+        <listitem>
+          <para>is used for spell checking.</para>
+          <indexterm zone="ispell ispell-prog">
+            <primary sortas="b-ispell">ispell</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+    </variablelist>
+    
+  </sect2>
+  
 </sect1>
-
