Index: content/databases/db-3.3.xml
===================================================================
--- content/databases/db-3.3.xml	(revision 5c9782381293ff57e9f13ce7a65e054b387e462f)
+++ content/databases/db-3.3.xml	(revision d08f57c75ee55dad53d1e13665521a280a9685c0)
@@ -6,5 +6,4 @@
 &db-3.3-inst;
 &db-3.3-exp;
-&db-3.3-config;
 &db-3.3-desc;
 
Index: content/databases/db-3.3/db-3.3-config.xml
===================================================================
--- content/databases/db-3.3/db-3.3-config.xml	(revision 5c9782381293ff57e9f13ce7a65e054b387e462f)
+++ content/databases/db-3.3/db-3.3-config.xml	(revision d08f57c75ee55dad53d1e13665521a280a9685c0)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring db-&db-3.3-version;</title>
+<title>Configuring <application>db</application></title>
 
 &library-config;
Index: content/databases/db-3.3/db-3.3-desc.xml
===================================================================
--- content/databases/db-3.3/db-3.3-desc.xml	(revision 5c9782381293ff57e9f13ce7a65e054b387e462f)
+++ content/databases/db-3.3/db-3.3-desc.xml	(revision d08f57c75ee55dad53d1e13665521a280a9685c0)
@@ -2,15 +2,15 @@
 <title>Contents</title>
 
-<para>The db-&db-3.3-version; 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-3.3/db-3.3-exp.xml
===================================================================
--- content/databases/db-3.3/db-3.3-exp.xml	(revision 5c9782381293ff57e9f13ce7a65e054b387e462f)
+++ content/databases/db-3.3/db-3.3-exp.xml	(revision d08f57c75ee55dad53d1e13665521a280a9685c0)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>sed 's/^DB185/DB/' /usr/include/db_185.h > /usr/include/db_185.h.new</userinput> : Change the DB185 database pointer to DB.</para>
+<para><command>sed 's/^DB185/DB/' /usr/include/db_185.h > /usr/include/db_185.h.new</command> : Change the DB185 database pointer to DB.</para>
 
 </sect2>
Index: content/databases/db-3.3/db-3.3-inst.xml
===================================================================
--- content/databases/db-3.3/db-3.3-inst.xml	(revision 5c9782381293ff57e9f13ce7a65e054b387e462f)
+++ content/databases/db-3.3/db-3.3-inst.xml	(revision d08f57c75ee55dad53d1e13665521a280a9685c0)
@@ -1,8 +1,9 @@
 <sect2>
-<title>Installation of db-&db-3.3-version;</title>
+<title>Installation of <application>db</application></title>
 
-<para>Install db-&db-3.3-version; 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=/opt/db-3.3 --enable-compat185 &amp;&amp;
 make &amp;&amp;
@@ -14,5 +15,5 @@
 sed 's/^DB185/DB/' db_185.h > db_185.h.new &amp;&amp;
 mv db_185.h.new db_185.h &amp;&amp;
-ln -nsf /opt/db-3.3/include /usr/include/db3</userinput></screen></para>
+ln -nsf /opt/db-3.3/include /usr/include/db3</command></userinput></screen>
 
 </sect2>
Index: content/databases/db-3.3/db-3.3-intro.xml
===================================================================
--- content/databases/db-3.3/db-3.3-intro.xml	(revision 5c9782381293ff57e9f13ce7a65e054b387e462f)
+++ content/databases/db-3.3/db-3.3-intro.xml	(revision d08f57c75ee55dad53d1e13665521a280a9685c0)
@@ -2,12 +2,20 @@
 <title>Introduction to db-&db-3.3-version;</title>
 
-<screen>Download location (HTTP):       <ulink url="&db-3.3-download-http;"/>
-Download location (FTP):        <ulink url="&db-3.3-download-ftp;"/>
-Version used:                   &db-3.3-version;
-Package size:                   &db-3.3-size;
-Estimated Disk space required:  &db-3.3-buildsize;</screen>
+<para>The <application>db</application> package contains version 
+&db-3.3-version; of the Berkeley Database.</para>
 
-<para>The db-&db-3.3-version; package contains version &db-3.3-version; of 
-the Berkeley Database.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&db-3.3-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&db-3.3-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &db-3.3-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&db-3.3-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&db-3.3-time;</para></listitem></itemizedlist>
+</sect3>
+
 
 </sect2>
Index: content/databases/db-3.3/db-3.3.ent
===================================================================
--- content/databases/db-3.3/db-3.3.ent	(revision 5c9782381293ff57e9f13ce7a65e054b387e462f)
+++ content/databases/db-3.3/db-3.3.ent	(revision d08f57c75ee55dad53d1e13665521a280a9685c0)
@@ -5,7 +5,8 @@
 <!ENTITY db-3.3-desc SYSTEM "db-3.3-desc.xml">
 <!ENTITY db-3.3-config SYSTEM "db-3.3-config.xml">
-<!ENTITY db-3.3-buildsize "19 MB">
+<!ENTITY db-3.3-buildsize "20.3 MB">
 <!ENTITY db-3.3-version "3.3.11">
 <!ENTITY db-3.3-download-http "http://www.sleepycat.com/update/snapshot/db-3.3.11.tar.gz">
 <!ENTITY db-3.3-download-ftp "">
 <!ENTITY db-3.3-size "2.3 MB">
+<!ENTITY db-3.3-time "0.80 SBU">
