Index: content/databases/db/db-config.xml
===================================================================
--- content/databases/db/db-config.xml	(revision 2dc4196a7ed7232920e9738fa007991ef9e768bf)
+++ content/databases/db/db-config.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -1,12 +1,13 @@
 <sect2>
-<title>Configuring db</title>
+<title>Configuring <application>db</application></title>
 
 <sect3><title>Configuration Information</title>
 
-&library-config;
+<!-- &library-config; -->
 
-<para>If you recompile perl after installing db-&db-version; you will need to
-apply the <userinput>perl-5.8.0-db-4.1.patch</userinput> available at
-<userinput><ulink url="&hfile-root;"/></userinput>.</para>
+<para>If you recompile perl after installing
+<application>db</application>-&db-version; you will need to
+apply the <filename>perl-5.8.0-db-4.1.patch</filename> patch available at
+<ulink url="&hfile-root;"/>.</para>
 
 </sect3>
Index: content/databases/db/db-desc.xml
===================================================================
--- content/databases/db/db-desc.xml	(revision 2dc4196a7ed7232920e9738fa007991ef9e768bf)
+++ content/databases/db/db-desc.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -2,15 +2,15 @@
 <title>Contents</title>
 
-<para>The db package contains
-<userinput>db_archive</userinput>,
-<userinput>db_checkpoint</userinput>,
-<userinput>db_deadlock</userinput>,
-<userinput>db_dump</userinput>,
-<userinput>db_load</userinput>,
-<userinput>db_printlog</userinput>,
-<userinput>db_recover</userinput>,
-<userinput>db_stat</userinput>,
-<userinput>db_upgrade</userinput> and
-<userinput>db_verify</userinput>.
+<para>The <application>db</application> package contains
+<command>db_archive</command>,
+<command>db_checkpoint</command>,
+<command>db_deadlock</command>,
+<command>db_dump</command>,
+<command>db_load</command>,
+<command>db_printlog</command>,
+<command>db_recover</command>,
+<command>db_stat</command>,
+<command>db_upgrade</command> and
+<command>db_verify</command>.
 
 </para>
@@ -21,42 +21,44 @@
 
 <sect3><title>db_archive</title>
-<para>db_archive prints the pathnames of log files that are no longer
-in use.</para></sect3>
+<para><command>db_archive</command> prints the pathnames of log files that are 
+no longer in use.</para></sect3>
 
 
 <sect3><title>db_checkpoint</title>
-<para>db_checkpoint is a daemon process used to monitor and checkpoint
-database logs.</para></sect3>
+<para><command>db_checkpoint</command> is a daemon process used to monitor and 
+checkpoint database logs.</para></sect3>
 
 <sect3><title>db_deadlock</title>
-<para>db_deadlock is used to abort lock requests when deadlocks are
-detected.</para></sect3>
+<para><command>db_deadlock</command> is used to abort lock requests when 
+deadlocks are detected.</para></sect3>
 
 <sect3><title>db_dump</title>
-<para>db_dump converts database files to a flat file format readable
-by db_load.</para></sect3>
+<para><command>db_dump</command> converts database files to a flat file format 
+readable by <command>db_load</command>.</para></sect3>
 
 <sect3><title>db_load</title>
-<para>db_load is used to create database files from flat files created
-with db_dump.</para></sect3>
+<para><command>db_load</command> is used to create database files from flat 
+files created with <command>db_dump</command>.</para></sect3>
 
 <sect3><title>db_printlog</title>
-<para>db_printlog converts database log files to human readable
-text.</para></sect3>
+<para><command>db_printlog</command> converts database log files to human 
+readable text.</para></sect3>
 
 
 <sect3><title>db_recover</title>
-<para>db_recover is used to restore a database to a consistent state
-after a failure.</para></sect3>
+<para><command>db_recover</command> is used to restore a database to a 
+consistent state after a failure.</para></sect3>
 
 <sect3><title>db_stat</title>
-<para>db_stat displays database environment statistics.</para></sect3>
+<para><command>db_stat</command> displays database environment statistics.
+</para></sect3>
 
 <sect3><title>db_upgrade</title>
-<para>db_upgrade is used to upgrade database files to a newer version
-of Berkeley DB.</para></sect3>
+<para><command>db_upgrade</command> is used to upgrade database files to a 
+newer version of Berkeley <application>DB</application>.</para></sect3>
 
 <sect3><title>db_verify</title>
-<para>db_verify is used to run consistency checks on database files.</para></sect3>
+<para><command>db_verify</command> is used to run consistency checks on 
+database files.</para></sect3>
 
 </sect2>
Index: content/databases/db/db-exp.xml
===================================================================
--- content/databases/db/db-exp.xml	(revision 2dc4196a7ed7232920e9738fa007991ef9e768bf)
+++ content/databases/db/db-exp.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -2,10 +2,12 @@
 <title>Command explanations</title>
 
-<para><userinput>cd build_unix &amp;&amp; ../dist/configure --prefix=/usr --enable-compat185</userinput> : 
-This replaces the normal ./configure command as db comes with the various 
+<para><command>cd build_unix &amp;&amp; ../dist/configure --prefix=/usr
+--enable-compat185</command> : 
+This replaces the normal <command>./configure</command> command as
+<application>db</application> comes with the various 
 build directories for different platforms.</para>
 
-<para><userinput>make docdir=/usr/share/doc/db-&db-version; 
-install</userinput> : This installs db installing the documentation in
+<para><command>make docdir=/usr/share/doc/db-&db-version; 
+install</command> : This installs the documentation in
 the correct place.</para>
 
Index: content/databases/db/db-inst.xml
===================================================================
--- content/databases/db/db-inst.xml	(revision 2dc4196a7ed7232920e9738fa007991ef9e768bf)
+++ content/databases/db/db-inst.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -1,16 +1,18 @@
 <sect2>
-<title>Installation of db</title>
+<title>Installation of <application>db</application></title>
 
-<para>Install db by running the following commands:</para>
+<para>Install <application>db</application> by running the following commands:</para>
 
-<para><screen><userinput>cd build_unix &amp;&amp;
+<screen><userinput><command>cd build_unix &amp;&amp;
 ../dist/configure --prefix=/usr \
     --enable-compat185 \
     --enable-cxx &amp;&amp;
 make &amp;&amp;
-make docdir=/usr/share/doc/db-&db-version; install</userinput></screen></para>
-
-<note><para>If you wish to enable Java support in db-&db-version;,
-add --enable-java to the configure options. Java support is needed
-if you plan to use system installed db when compiling OpenOffice.</para></note>
+make docdir=/usr/share/doc/db-&db-version; install</command></userinput></screen>
+<note><para>If you wish to enable <application>Java</application>
+support in <application>db</application>-&db-version;, add <command>
+--enable-java</command> to the configure options.
+<application>Java</application> support is needed
+if you plan to use system installed <application>db</application> when 
+compiling <application>OpenOffice</application>.</para></note>
 </sect2>
Index: content/databases/db/db-intro.xml
===================================================================
--- content/databases/db/db-intro.xml	(revision 2dc4196a7ed7232920e9738fa007991ef9e768bf)
+++ content/databases/db/db-intro.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -1,15 +1,22 @@
 <sect2>
-<title>Introduction to db</title>
+<title>Introduction to <application>db</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&db-download-http;"/>
-Download location (FTP):        <ulink url="&db-download-ftp;"/>
-Version used:                   &db-version;
-Package size:                   &db-size;
-Estimated Disk space required:  &db-buildsize;</screen>
+<para>The <application>db</application> package contains programs and
+utilities used by many other applications for database related
+functions.</para>
 
-<para>The db package contains db_archive, db_checkpoint,
-db_deadlock, db_dump, db_load, db_printlog, db_recover, db_stat,
-db_upgrade, db_verify and the db libraries.  These are used by many
-other programs for db related functions.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&db-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&db-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &db-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&db-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&db-time;</para></listitem></itemizedlist>
+</sect3>
+
 
 </sect2>
Index: content/databases/db/db.ent
===================================================================
--- content/databases/db/db.ent	(revision 2dc4196a7ed7232920e9738fa007991ef9e768bf)
+++ content/databases/db/db.ent	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -10,2 +10,3 @@
 <!ENTITY db-download-ftp "">
 <!ENTITY db-size "3 MB">
+<!ENTITY db-time "">
