Index: general/genlib/gdbm.xml
===================================================================
--- general/genlib/gdbm.xml	(revision e3353b3afc1255db2b6abc277b5515e1630762e1)
+++ general/genlib/gdbm.xml	(revision ce1d4c88ef877fc14614c2377ac4cde8c8fcc120)
@@ -4,116 +4,129 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
-<!ENTITY gdbm-download-http "http://ftp.gnu.org/gnu/gdbm/gdbm-&gdbm-version;.tar.gz">
-<!ENTITY gdbm-download-ftp "ftp://ftp.gnu.org/gnu/gdbm/gdbm-&gdbm-version;.tar.gz">
-<!ENTITY gdbm-md5sum "1d1b1d5c0245b1c00aff92da751e9aa1">
-<!ENTITY gdbm-size "223 KB">
-<!ENTITY gdbm-buildsize "2.75 MB">
-<!ENTITY gdbm-time "0.08 SBU">
+  
+  <!ENTITY gdbm-download-http "http://ftp.gnu.org/gnu/gdbm/gdbm-&gdbm-version;.tar.gz">
+  <!ENTITY gdbm-download-ftp "ftp://ftp.gnu.org/gnu/gdbm/gdbm-&gdbm-version;.tar.gz">
+  <!ENTITY gdbm-md5sum "1d1b1d5c0245b1c00aff92da751e9aa1">
+  <!ENTITY gdbm-size "223 KB">
+  <!ENTITY gdbm-buildsize "2.75 MB">
+  <!ENTITY gdbm-time "0.08 SBU">
 ]>
 
 <sect1 id="gdbm" xreflabel="GDBM-&gdbm-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="gdbm.html"?>
-<title>GDBM-&gdbm-version;</title>
-<indexterm zone="gdbm">
-<primary sortas="a-GDBM">GDBM</primary></indexterm>
+  <?dbhtml filename="gdbm.html"?>
+  
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+  
+  <title>GDBM-&gdbm-version;</title>
+  
+  <indexterm zone="gdbm">
+    <primary sortas="a-GDBM">GDBM</primary>
+  </indexterm>
 
-<sect2>
-<title>Introduction to 
-<application><acronym>GDBM</acronym></application></title>
+  <sect2 role="package">
+    <title>Introduction to GDBM</title>
 
-<para>The <application><acronym>GDBM</acronym></application> package
-contains the <acronym>GNU</acronym> Database Manager. This
-is a disk file format database which stores key/data-pairs in single
-files. The actual data of any record being stored is indexed by a unique
-key, which can be retrieved in less time than if it was stored in a text
-file.</para>
+    <para>The <application>GDBM</application> package contains the 
+    GNU Database Manager. This is a disk file format database which stores 
+    key/data-pairs in single files. The actual data of any record being stored 
+    is indexed by a unique key, which can be retrieved in less time than if it 
+    was stored in a text file.</para>
+    
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gdbm-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gdbm-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gdbm-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gdbm-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gdbm-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gdbm-time;</para>
+      </listitem>
+    </itemizedlist>
+    
+  </sect2>
+  
+  <sect2 role="installation">
+    <title>Installation of GDBM</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&gdbm-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&gdbm-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &gdbm-md5sum;</para></listitem>
-<listitem><para>Download size: &gdbm-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&gdbm-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&gdbm-time;</para></listitem></itemizedlist>
-</sect3>
+    <para>Install <application>GDBM</application> by running 
+    the following commands:
+    </para>
 
-</sect2>
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
 
-<sect2>
-<title>Installation of 
-<application><acronym>GDBM</acronym></application></title>
+    <para>This package does not come with a test suite.</para>
+    
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<para>Install <application><acronym>GDBM</acronym></application> by running 
-the following commands:
-</para>
+<screen role="root"><userinput>make BINOWN=root BINGRP=root install</userinput></screen>
 
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make</command></userinput></screen>
+    <para>In addition, you may need to install the <application>DBM</application>
+    and <application>NDBM</application> compatibility headers and library since 
+    some applications look for these older dbm routines.</para>
 
-<para>This package does not come with a test suite.</para>
+<screen role="root"><userinput>make BINOWN=root BINGRP=root install-compat</userinput></screen>
+    
+  </sect2>
+  
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-<para>Now, as the root user:</para>
+    <para><command>make BINOWN=root BINGRP=root install</command>: This
+    command overrides the <varname>BINOWN</varname> and
+    <varname>BINGRP</varname> variables in the <filename>Makefile</filename>
+    changing ownership of the installed files to root instead of the bin
+    user.</para>
+    
+  </sect2>
+  
+  <sect2 role="content">
+    <title>Contents</title>
 
-<screen><userinput role='root'><command>make BINOWN=root BINGRP=root install</command></userinput></screen>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+      
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libgdbm.[so,a] and libgdbm_compat.[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="libgdbm">
+        <term><filename class='libraryfile'>libgdbm.[so,a]</filename></term>
+        <listitem>
+          <para>contains functions that perform database routines using 
+          extendible hashing.</para>
+          <indexterm zone="gdbm libgdbm">
+            <primary sortas="c-libgdbm">libgdbm.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    
+    </variablelist>
 
-<para>In addition, you may need to install the <application>DBM</application>
-and <application>NDBM</application> compatibility headers and library since 
-some applications look for these older dbm routines.</para>
-
-<screen><userinput role='root'><command>make BINOWN=root BINGRP=root install-compat</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><command>make BINOWN=root BINGRP=root install</command>: This
-command overrides the <varname>BINOWN</varname> and
-<varname>BINGRP</varname> variables in the <filename>Makefile</filename>
-changing ownership of the installed files to root instead of the bin
-user.</para>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-
-<seglistitem>
-<seg>None</seg>
-<seg>libgdbm.[so,a] and libgdbm_compat.[so,a]</seg>
-<seg>None</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="libgdbm">
-<term><filename class='libraryfile'>libgdbm.[so,a]</filename></term>
-<listitem><para>contains functions that perform database routines using 
-extendible hashing.</para>
-<indexterm zone="gdbm libgdbm">
-<primary sortas="c-libgdbm">libgdbm.[so,a]</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
 
 </sect1>
