Index: general/genlib/expat.xml
===================================================================
--- general/genlib/expat.xml	(revision b280fcc0c0893cfc10f7be0ccdd5bf1b2779a929)
+++ general/genlib/expat.xml	(revision fc7e79c71f9ebfcc4a2e540a052a92f5fada9c93)
@@ -5,106 +5,123 @@
   %general-entities;
 
-<!ENTITY expat-download-http "http://prdownloads.sourceforge.net/expat/expat-&expat-version;.tar.gz">
-<!ENTITY expat-download-ftp " ">
-<!ENTITY expat-md5sum "aff487543845a82fe262e6e2922b4c8e">
-<!ENTITY expat-size "314 KB">
-<!ENTITY expat-buildsize "4.2 MB">
-<!ENTITY expat-time "0.08 SBU">
+  <!ENTITY expat-download-http "http://prdownloads.sourceforge.net/expat/expat-&expat-version;.tar.gz">
+  <!ENTITY expat-download-ftp " ">
+  <!ENTITY expat-md5sum "aff487543845a82fe262e6e2922b4c8e">
+  <!ENTITY expat-size "314 KB">
+  <!ENTITY expat-buildsize "4.2 MB">
+  <!ENTITY expat-time "0.08 SBU">
 ]>
 
 <sect1 id="expat" xreflabel="expat-&expat-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="expat.html"?>
-<title>expat-&expat-version;</title>
-<indexterm zone="expat">
-<primary sortas="a-Expat">Expat</primary></indexterm>
+  <?dbhtml filename="expat.html"?>
+  
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+  
+  <title>Expat-&expat-version;</title>
+  
+  <indexterm zone="expat">
+    <primary sortas="a-Expat">Expat</primary>
+  </indexterm>
 
-<sect2>
-<title>Introduction to <application>expat</application></title>
+  <sect2 role="package">
+    <title>Introduction to Expat</title>
 
-<para>The <application>expat</application> package contains a stream oriented 
-C library for parsing <acronym>XML</acronym>.</para>
+    <para>The <application>expat</application> package contains a stream oriented 
+    C library for parsing XML.</para>
+    
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&expat-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&expat-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &expat-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &expat-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &expat-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &expat-time;</para>
+      </listitem>
+    </itemizedlist>
+    
+    <bridgehead renderas="sect3">Expat Dependencies</bridgehead>
+    
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><ulink url="http://check.sourceforge.net/">Check</ulink> 
+    (for running the test suite)</para>
+    
+  </sect2>
+  
+  <sect2 role="installation">
+    <title>Installation of Expat</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&expat-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&expat-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &expat-md5sum;</para></listitem>
-<listitem><para>Download size: &expat-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&expat-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&expat-time;</para></listitem></itemizedlist></sect3>
+    <para>Install <application>expat</application> by running the following 
+    commands:</para>
 
-<sect3><title><application>expat</application> dependencies</title>
-<sect4><title>Optional</title>
-<para><ulink url="http://check.sourceforge.net/">Check</ulink> 
-(for running the test suite)</para>
-</sect4>
-</sect3>
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
 
-</sect2>
+    <para>To test the results, issue: <command>make check</command>.</para>
+    
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    
+<screen role="root"><userinput>make install</userinput></screen>
+    
+  </sect2>
+  
+  <sect2 role="content">
+    <title>Contents</title>
 
-<sect2>
-<title>Installation of <application>expat</application></title>
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+      
+      <seglistitem>
+        <seg>xmlwf</seg>
+        <seg>libexpat.[so,a]</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+    
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      
+      <varlistentry id="xmlwf">
+        <term><command>xmlwf</command></term>
+        <listitem>
+          <para>is a non-validating utility to check whether or not 
+          XML documents are well formed.</para>
+          <indexterm zone="expat xmlwf">
+            <primary sortas="b-xmlwf">xmlwf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="libexpat">
+        <term><filename class='libraryfile'>libexpat.[so,a]</filename></term>
+        <listitem>
+          <para>contains API functions for parsing XML.</para>
+          <indexterm zone="expat libexpat">
+            <primary sortas="c-libexpat">libexpat.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    
+    </variablelist>
 
-<para>Install <application>expat</application> by running the following 
-commands:</para>
-
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make</command></userinput></screen>
-
-<para>To test the results, issue: <command>make check</command>.</para>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Program</segtitle>
-<segtitle>Installed Library</segtitle>
-<segtitle>Installed Directories</segtitle>
-
-<seglistitem>
-<seg>xmlwf</seg>
-<seg>libexpat.[so,a]</seg>
-<seg>None</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="xmlwf">
-<term><command>xmlwf</command></term>
-<listitem><para>is a non-validating utility to check whether or not 
-<acronym>XML</acronym> documents are well formed.</para>
-<indexterm zone="expat xmlwf">
-<primary sortas="b-xmlwf">xmlwf</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="libexpat">
-<term><filename class='libraryfile'>libexpat.[so,a]</filename></term>
-<listitem><para>contains <acronym>API</acronym> functions for parsing 
-<acronym>XML</acronym>.</para>
-<indexterm zone="expat libexpat">
-<primary sortas="c-libexpat">libexpat.[so,a]</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
 
 </sect1>
