Index: general/genlib/gmp.xml
===================================================================
--- general/genlib/gmp.xml	(revision ff769b8c6178dd8b799a5e122a2e6a5d69a22a2c)
+++ general/genlib/gmp.xml	(revision d0455a2002fe0c226867e2dd629027679088b96d)
@@ -5,110 +5,124 @@
   %general-entities;
 
-<!ENTITY gmp-download-http "http://ftp.gnu.org/gnu/gmp/gmp-&gmp-version;.tar.bz2">
-<!ENTITY gmp-download-ftp "ftp://ftp.gnu.org/gnu/gmp/gmp-&gmp-version;.tar.bz2">
-<!ENTITY gmp-md5sum "0aa7d3b3f5b5ec5951e7dddd6f65e891">
-<!ENTITY gmp-size "1.6 MB">
-<!ENTITY gmp-buildsize "60.8 MB">
-<!ENTITY gmp-time "0.88 SBU (additional 0.81 SBU to run the testsuite)">
+  <!ENTITY gmp-download-http "http://ftp.gnu.org/gnu/gmp/gmp-&gmp-version;.tar.bz2">
+  <!ENTITY gmp-download-ftp "ftp://ftp.gnu.org/gnu/gmp/gmp-&gmp-version;.tar.bz2">
+  <!ENTITY gmp-md5sum "0aa7d3b3f5b5ec5951e7dddd6f65e891">
+  <!ENTITY gmp-size "1.6 MB">
+  <!ENTITY gmp-buildsize "60.8 MB">
+  <!ENTITY gmp-time "0.88 SBU (additional 0.81 SBU to run the testsuite)">
 ]>
 
 <sect1 id="gmp" xreflabel="GMP-&gmp-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="gmp.html"?>
-<title>GMP-&gmp-version;</title>
-<indexterm zone="gmp">
-<primary sortas="a-GMP">GMP</primary></indexterm>
+  <?dbhtml filename="gmp.html"?>
+  
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+  
+  <title>GMP-&gmp-version;</title>
+  
+  <indexterm zone="gmp">
+    <primary sortas="a-GMP">GMP</primary>
+  </indexterm>
 
-<sect2>
-<title>Introduction to <application><acronym>GMP</acronym></application></title>
+  <sect2 role="package">
+    <title>Introduction to GMP</title>
+    
+    <para>The <application>GMP</application> package
+    contains math libraries. These have useful functions for arbitrary precision
+    arithmetic.</para>
+    
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gmp-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gmp-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gmp-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gmp-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gmp-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gmp-time;</para>
+      </listitem>
+    </itemizedlist>
+    
+  </sect2>
+  
+  <sect2 role="installation">
+    <title>Installation of GMP</title>
 
-<para>The <application><acronym>GMP</acronym></application> package
-contains math libraries. These have useful functions for arbitrary precision
-arithmetic.</para>
+    <para>Install <application>GMP</application> by running 
+    the following commands:</para>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&gmp-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&gmp-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &gmp-md5sum;</para></listitem>
-<listitem><para>Download size: &gmp-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&gmp-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&gmp-time;</para></listitem></itemizedlist>
-</sect3>
+<screen><userinput>./configure --prefix=/usr --enable-cxx \
+    --enable-mpbsd --enable-mpfr &amp;&amp;
+make</userinput></screen>
+    
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    
+<screen role="root"><userinput>make install</userinput></screen>
+    
+  </sect2>
+  
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-</sect2>
+    <para><parameter>--enable-cxx</parameter>: This parameter
+    enables C++ support by building the 
+    <filename class="libraryfile">libgmpxx</filename> libraries.</para>
+    
+    <para><parameter>--enable-mpbsd</parameter>: This parameter
+    enables building the Berkeley MP compatibility 
+    (<filename class="libraryfile">libmp</filename>) libraries.</para>
+    
+    <para><parameter>--enable-mpfr</parameter>: This parameter
+    enables building the Multiple Precision Floating-Point Reliable 
+    (<filename class="libraryfile">libmpfr.a</filename>) library.</para>
+    
+  </sect2>
+  
+  <sect2 role="content">
+    <title>Contents</title>
 
-<sect2>
-<title>Installation of <application><acronym>GMP</acronym></application></title>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+      
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libgmp.[so,a], libgmpxx.[so,a], libmp.[so,a], and libmpfr.a</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+    
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      
+      <varlistentry id="libgmp">
+        <term><filename class='libraryfile'>libgmp.[so,a]</filename></term>
+        <listitem>
+          <para>contains functions to operate on signed integers, rational 
+          numbers, and floating point numbers.</para>
+          <indexterm zone="gmp libgmp">
+            <primary sortas="c-libgmp">libgmp.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    
+    </variablelist>
 
-<para>Install <application><acronym>GMP</acronym></application> by running 
-the following commands:
-</para>
-
-<screen><userinput><command>./configure --prefix=/usr --enable-cxx \
-    --enable-mpbsd --enable-mpfr &amp;&amp;
-make</command></userinput></screen>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><parameter>--enable-cxx</parameter>: This parameter
-enables C++ support by building the 
-<filename class="libraryfile">libgmpxx</filename> libraries.</para>
-
-<para><parameter>--enable-mpbsd</parameter>: This parameter
-enables building the Berkeley MP compatibility 
-(<filename class="libraryfile">libmp</filename>) libraries.</para>
-
-<para><parameter>--enable-mpfr</parameter>: This parameter
-enables building the Multiple Precision 
-Floating-Point Reliable (<filename class="libraryfile">libmpfr.a</filename>) 
-library.</para>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-
-<seglistitem>
-<seg>None</seg>
-<seg>libgmp.[so,a], libgmpxx.[so,a], libmp.[so,a] and libmpfr.a</seg>
-<seg>None</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="libgmp">
-<term><filename class='libraryfile'>libgmp.[so,a]</filename></term>
-<listitem><para>contains functions to operate on signed integers, rational 
-numbers, and floating point numbers.</para>
-<indexterm zone="gmp libgmp">
-<primary sortas="c-libgmp">libgmp.[so,a]</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
 
 </sect1>
