Index: content/content.ent
===================================================================
--- content/content.ent	(revision 171f4ef6e1738c7d4908bd4869d55d4d6c2e7bc3)
+++ content/content.ent	(revision adf16b0783ba351328816e2abcb3b55e93a5cf82)
@@ -4,8 +4,10 @@
 <!ENTITY content-databases SYSTEM "databases/databases.xml">
 <!ENTITY % db SYSTEM "databases/db/db.ent">
+<!ENTITY % db-3.1 SYSTEM "databases/db-3.1/db-3.1.ent">
 <!ENTITY % db-3.3 SYSTEM "databases/db-3.3/db-3.3.ent">
 <!ENTITY % mysql SYSTEM "databases/mysql/mysql.ent">
 <!ENTITY % postgres SYSTEM "databases/postgres/postgres.ent">
 %db;
+%db-3.1;
 %db-3.3;
 %mysql;
Index: content/databases/databases.xml
===================================================================
--- content/databases/databases.xml	(revision 171f4ef6e1738c7d4908bd4869d55d4d6c2e7bc3)
+++ content/databases/databases.xml	(revision adf16b0783ba351328816e2abcb3b55e93a5cf82)
@@ -10,4 +10,5 @@
 
 &db;
+&db-3.1;
 &db-3.3;
 &mysql;
Index: content/databases/db-3.1.xml
===================================================================
--- content/databases/db-3.1.xml	(revision adf16b0783ba351328816e2abcb3b55e93a5cf82)
+++ content/databases/db-3.1.xml	(revision adf16b0783ba351328816e2abcb3b55e93a5cf82)
@@ -0,0 +1,9 @@
+<sect1 id="db-3.1" xreflabel="Berkeley DB-&db-3.1-version;">
+<?dbhtml filename="db-3.1.html" dir="content"?>
+<title>Berkeley DB-&db-3.1-version;</title>
+
+&db-3.1-intro;
+&db-3.1-inst;
+&db-3.1-exp;
+
+</sect1>
Index: oft/office/evolution/db-3.1-exp.xml
===================================================================
--- xsoft/office/evolution/db-3.1-exp.xml	(revision 171f4ef6e1738c7d4908bd4869d55d4d6c2e7bc3)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><option>--enable-compat185</option>: Build support for older database files.</para>
-
-<para><parameter>--prefix=/opt/db-&db-3.1-version;</parameter>: This version of the
-Berkeley Database should not be installed in <filename class="directory">/usr</filename>,
-as it is only needed for the building of
-<application>Evolution</application>.</para>
-
-</sect2>
-
Index: oft/office/evolution/db-3.1-inst.xml
===================================================================
--- xsoft/office/evolution/db-3.1-inst.xml	(revision 171f4ef6e1738c7d4908bd4869d55d4d6c2e7bc3)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<sect2>
-<title>Installation of <application>Berkeley DB</application>-&db-3.1-version;</title>
-
-<para>Install <application>Berkeley DB</application>-&db-3.1-version; by running the following commands:</para>
-
-<screen><userinput><command>cd build_unix &amp;&amp;
-../dist/configure --prefix=/opt/db-&db-3.1-version; --enable-compat185 &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
Index: oft/office/evolution/db-3.1-intro.xml
===================================================================
--- xsoft/office/evolution/db-3.1-intro.xml	(revision 171f4ef6e1738c7d4908bd4869d55d4d6c2e7bc3)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<para><application>Evolution</application> requires
-<application>Berkeley DB</application>-&db-3.1-version;. The details on 
-"why" are in the <filename>README</filename> file distibuted with the
-<application>Evolution</application> source code. <application>Evolution
-</application> links to the library statically, hence this book installs 
-the <application>Berkeley DB</application>-&db-3.1-version; in <filename
-class="directory">/opt</filename>, which can be removed once 
-<application>Evolution</application> is installed.</para>
-
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&db-3.1-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&db-3.1-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &db-3.1-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&db-3.1-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&db-3.1-time;</para></listitem></itemizedlist>
-</sect3>
-
-
Index: oft/office/evolution/db-3.1.ent
===================================================================
--- xsoft/office/evolution/db-3.1.ent	(revision 171f4ef6e1738c7d4908bd4869d55d4d6c2e7bc3)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<!ENTITY db-3.1 SYSTEM "../db-3.1.xml">
-<!ENTITY db-3.1-intro SYSTEM "db-3.1-intro.xml">
-<!ENTITY db-3.1-inst SYSTEM "db-3.1-inst.xml">
-<!ENTITY db-3.1-exp SYSTEM "db-3.1-exp.xml">
-<!ENTITY db-3.1-desc SYSTEM "db-3.1-desc.xml">
-<!ENTITY db-3.1-config SYSTEM "db-3.1-config.xml">
-<!ENTITY db-3.1-buildsize "18 MB">
-<!ENTITY db-3.1-version "3.1.17">
-<!ENTITY db-3.1-download-http "http://www.sleepycat.com/update/snapshot/db-3.1.17.tar.gz">
-<!ENTITY db-3.1-download-ftp "">
-<!ENTITY db-3.1-size "2 MB">
Index: xsoft/office/evolution/evolution-inst.xml
===================================================================
--- xsoft/office/evolution/evolution-inst.xml	(revision 171f4ef6e1738c7d4908bd4869d55d4d6c2e7bc3)
+++ xsoft/office/evolution/evolution-inst.xml	(revision adf16b0783ba351328816e2abcb3b55e93a5cf82)
@@ -2,18 +2,11 @@
 <title>Installation of <application>Evolution</application></title>
 
-&db-3.1-intro;
-</sect2>
+<note><para><xref linkend="db-3.1"></xref> must be installed
+temporarily in order to install
+<application>Evolution</application>.</para></note>
 
-&db-3.1-inst;
-&db-3.1-exp;
-
-<sect2><title>Return to Installation of <application>Evolution</application></title>
 <para>Install <application>Evolution</application> by running the following 
 commands:</para>
 
-<!--
-<note><para><xref linkend="db-3.1"></xref> must be installed
-temporarily in order to install Evolution.</para></note>
--->
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --with-db3=/opt/db-&db-3.1-version; --enable-openssl &amp;&amp;
 make &amp;&amp;
@@ -22,6 +15,6 @@
 <para>Optionally, you may remove <application>Berkeley
 DB</application>-&db-3.1-version; installed above with this command:</para>
+
 <screen><userinput><command>rm -rf /opt/db-&db-3.1-version;</command></userinput></screen>
 
 </sect2>
-
Index: xsoft/office/evolution/evolution-intro.xml
===================================================================
--- xsoft/office/evolution/evolution-intro.xml	(revision 171f4ef6e1738c7d4908bd4869d55d4d6c2e7bc3)
+++ xsoft/office/evolution/evolution-intro.xml	(revision adf16b0783ba351328816e2abcb3b55e93a5cf82)
@@ -20,9 +20,8 @@
 <sect3><title><application>Evolution</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="openssl"/>, db-&db-3.1-version;, <xref linkend="libgnomeprintui"/> and  <xref linkend="gtkhtml2"/></para></sect4>
+<para><xref linkend="openssl"/>, <xref linkend="db-3.1"/>, <xref linkend="libgnomeprintui"/> and  <xref linkend="gtkhtml2"/></para></sect4>
 <sect4><title>Optional</title>
 <para><xref linkend="openldap"/> and <xref linkend="gtk-doc"/></para></sect4>
 </sect3>
 
-
 </sect2>
Index: xsoft/office/evolution/evolution.ent
===================================================================
--- xsoft/office/evolution/evolution.ent	(revision 171f4ef6e1738c7d4908bd4869d55d4d6c2e7bc3)
+++ xsoft/office/evolution/evolution.ent	(revision adf16b0783ba351328816e2abcb3b55e93a5cf82)
@@ -10,13 +10,2 @@
 <!ENTITY evolution-buildsize "387 MB">
 <!ENTITY evolution-time "10.84 SBU">
-
-<!ENTITY db-3.1 SYSTEM "../db-3.1.xml">
-<!ENTITY db-3.1-intro SYSTEM "db-3.1-intro.xml">
-<!ENTITY db-3.1-inst SYSTEM "db-3.1-inst.xml">
-<!ENTITY db-3.1-exp SYSTEM "db-3.1-exp.xml">
-<!ENTITY db-3.1-version "3.1.17">
-<!ENTITY db-3.1-download-http "http://www.sleepycat.com/update/snapshot/db-3.1.17.tar.gz">
-<!ENTITY db-3.1-download-ftp "">
-<!ENTITY db-3.1-size "1.9 MB">
-<!ENTITY db-3.1-buildsize "19.0 MB">
-<!ENTITY db-3.1-time "0.26 SBU">
