Index: general/genlib/gdbm/gdbm-config.xml
===================================================================
--- general/genlib/gdbm/gdbm-config.xml	(revision 0710da49ca64d9b51d5e1a295907fdea7b3f38b5)
+++ general/genlib/gdbm/gdbm-config.xml	(revision acaf298679ad053cbe202c4692110d78d29e8b07)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring gdbm</title>
+<title>Configuring <application>gdbm</application></title>
 
 <sect3><title>Configuration Information</title>
Index: general/genlib/gdbm/gdbm-desc.xml
===================================================================
--- general/genlib/gdbm/gdbm-desc.xml	(revision 0710da49ca64d9b51d5e1a295907fdea7b3f38b5)
+++ general/genlib/gdbm/gdbm-desc.xml	(revision acaf298679ad053cbe202c4692110d78d29e8b07)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The gdbm package contains <filename>libgdbm</filename> libraries.</para>
+<para>The <application>gdbm</application> package contains <filename>libgdbm</filename> libraries.</para>
 
 </sect2>
@@ -9,6 +9,6 @@
 
 <sect3><title>gdbm libraries</title>
-<para>gdbm libraries contain functions that perform database routines
-using extendible hashing.</para></sect3>
+<para><filename>libgdbm</filename> libraries contain functions that perform 
+database routines using extendible hashing.</para></sect3>
 
 
Index: general/genlib/gdbm/gdbm-exp.xml
===================================================================
--- general/genlib/gdbm/gdbm-exp.xml	(revision 0710da49ca64d9b51d5e1a295907fdea7b3f38b5)
+++ general/genlib/gdbm/gdbm-exp.xml	(revision acaf298679ad053cbe202c4692110d78d29e8b07)
@@ -2,10 +2,8 @@
 <title>Command explanations</title>
 
-<para><userinput>--infoprefix=/usr/share/info
---mandir=/usr/share/man</userinput> : These switches set the
-documentation directory to <filename>/usr/share</filename> instead of
-<filename>/usr</filename>.</para>
+<para><command>--infodir=/usr/share/info --mandir=/usr/share/man</command> : These switches set the documentation directory to <filename>/usr/share
+</filename> instead of <filename>/usr</filename>.</para>
 
-<para><userinput>BINOWN=root BINGRP=root</userinput> : This command
+<para><command>BINOWN=root BINGRP=root</command> : This command
 changes the file ownership to root instead of the bin user.</para>
 
Index: general/genlib/gdbm/gdbm-inst.xml
===================================================================
--- general/genlib/gdbm/gdbm-inst.xml	(revision 0710da49ca64d9b51d5e1a295907fdea7b3f38b5)
+++ general/genlib/gdbm/gdbm-inst.xml	(revision acaf298679ad053cbe202c4692110d78d29e8b07)
@@ -1,10 +1,11 @@
 <sect2>
-<title>Installation of gdbm</title>
+<title>Installation of <application>gdbm</application></title>
 
-<para>Install gdbm by running the following commands:</para>
+<para>Install <application>gdbm</application> by running the following commands:
+</para>
 
-<para><screen><userinput>./configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man &amp;&amp;
 make &amp;&amp;
-make BINOWN=root BINGRP=root install</userinput></screen></para>
+make BINOWN=root BINGRP=root install</command></userinput></screen>
 
 <para>In addition, you may need to install the compatibility
@@ -12,5 +13,5 @@
 Install the compatibility headers by running the following command:</para>
 
-<para><screen><userinput>make BINOWN=root BINGRP=root install-compat</userinput></screen></para>
+<screen><userinput><command>make BINOWN=root BINGRP=root install-compat</command></userinput></screen>
 
 </sect2>
Index: general/genlib/gdbm/gdbm-intro.xml
===================================================================
--- general/genlib/gdbm/gdbm-intro.xml	(revision 0710da49ca64d9b51d5e1a295907fdea7b3f38b5)
+++ general/genlib/gdbm/gdbm-intro.xml	(revision acaf298679ad053cbe202c4692110d78d29e8b07)
@@ -1,13 +1,20 @@
 <sect2>
-<title>Introduction to gdbm</title>
+<title>Introduction to <application>gdbm</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&gdbm-download-http;"/>
-Download location (FTP):        <ulink url="&gdbm-download-ftp;"/>
-Version used:                   &gdbm-version;
-Package size:                   &gdbm-size;
-Estimated Disk space required:  &gdbm-buildsize;</screen>
+<para>The <application>gdbm</application> package contains a dbm library. This 
+is useful for database routines that use extendible hashing.</para>
 
-<para>The gdbm package contains a dbm library. This is useful for
-database routines that use extendible hashing.</para>
+<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 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>
 
 
Index: general/genlib/gdbm/gdbm.ent
===================================================================
--- general/genlib/gdbm/gdbm.ent	(revision 0710da49ca64d9b51d5e1a295907fdea7b3f38b5)
+++ general/genlib/gdbm/gdbm.ent	(revision acaf298679ad053cbe202c4692110d78d29e8b07)
@@ -5,8 +5,8 @@
 <!ENTITY gdbm-desc SYSTEM "gdbm-desc.xml">
 <!ENTITY gdbm-config SYSTEM "gdbm-config.xml">
-<!ENTITY gdbm-buildsize "1.7 MB">
+<!ENTITY gdbm-buildsize "4.1 MB">
 <!ENTITY gdbm-version "1.8.3">
 <!ENTITY gdbm-download-http "http://www.ibiblio.org/pub/gnu/gdbm/gdbm-1.8.3.tar.gz">
 <!ENTITY gdbm-download-ftp "ftp://ftp.gnu.org/gnu/gdbm/gdbm-1.8.3.tar.gz">
 <!ENTITY gdbm-size "228 KB">
-<!ENTITY gdbm-time "0.15 SBU">
+<!ENTITY gdbm-time "0.08 SBU">
Index: general/genlib/gmp.xml
===================================================================
--- general/genlib/gmp.xml	(revision 0710da49ca64d9b51d5e1a295907fdea7b3f38b5)
+++ general/genlib/gmp.xml	(revision acaf298679ad053cbe202c4692110d78d29e8b07)
@@ -5,4 +5,5 @@
 &gmp-intro;
 &gmp-inst;
+&gmp-exp;
 &gmp-desc;
 
Index: general/genlib/gmp/gmp-exp.xml
===================================================================
--- general/genlib/gmp/gmp-exp.xml	(revision acaf298679ad053cbe202c4692110d78d29e8b07)
+++ general/genlib/gmp/gmp-exp.xml	(revision acaf298679ad053cbe202c4692110d78d29e8b07)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><command>--infodir=/usr/share/info --mandir=/usr/share/man</command> : These switches set the documentation directory to <filename>/usr/share
+</filename> instead of <filename>/usr</filename>.</para>
+
+</sect2>
+
Index: general/genlib/gmp/gmp-inst.xml
===================================================================
--- general/genlib/gmp/gmp-inst.xml	(revision 0710da49ca64d9b51d5e1a295907fdea7b3f38b5)
+++ general/genlib/gmp/gmp-inst.xml	(revision acaf298679ad053cbe202c4692110d78d29e8b07)
@@ -5,5 +5,5 @@
 </para>
 
-<screen><userinput><command>./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --infodir=/usr/share/info  --mandir=/usr/share/man &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
