Index: content/content.ent
===================================================================
--- content/content.ent	(revision b5ca46036b01a26cfea3aa9ba2c51302557ed307)
+++ content/content.ent	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
@@ -5,10 +5,8 @@
 <!ENTITY % db SYSTEM "databases/db/db.ent">
 <!ENTITY % db-3.3 SYSTEM "databases/db-3.3/db-3.3.ent">
-<!ENTITY % db-3.1 SYSTEM "databases/db-3.1/db-3.1.ent">
 <!ENTITY % mysql SYSTEM "databases/mysql/mysql.ent">
 <!ENTITY % postgres SYSTEM "databases/postgres/postgres.ent">
 %db;
 %db-3.3;
-%db-3.1;
 %mysql;
 %postgres;
Index: content/databases/databases.xml
===================================================================
--- content/databases/databases.xml	(revision b5ca46036b01a26cfea3aa9ba2c51302557ed307)
+++ content/databases/databases.xml	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
@@ -5,5 +5,4 @@
 &db;
 &db-3.3;
-&db-3.1;
 &mysql;
 &postgres;
Index: ntent/databases/db-3.1.xml
===================================================================
--- content/databases/db-3.1.xml	(revision b5ca46036b01a26cfea3aa9ba2c51302557ed307)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<sect1 id="db-3.1" xreflabel="db-&db-3.1-version;">
-<?dbhtml filename="db-3.1.html" dir="gnome"?>
-<title>db-&db-3.1-version;</title>
-
-&db-3.1-intro;
-&db-3.1-inst;
-&db-3.1-exp;
-&db-3.1-config;
-&db-3.1-desc;
-
-</sect1>
-
Index: index.xml
===================================================================
--- index.xml	(revision b5ca46036b01a26cfea3aa9ba2c51302557ed307)
+++ index.xml	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "20030414">
-<!ENTITY releasedate "April 14th, 2003">
+<!ENTITY version "20030415">
+<!ENTITY releasedate "April 15th, 2003">
 
 <!ENTITY % book SYSTEM "book/book.ent">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision b5ca46036b01a26cfea3aa9ba2c51302557ed307)
+++ introduction/welcome/changelog.xml	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
@@ -10,4 +10,7 @@
 
 <itemizedlist>
+
+<listitem><para>April 15th, 2003 [tushar]: moved db-3.1 as a sub-section
+of evolution since no other package needs it.</para></listitem>
 
 <listitem><para>April 15th, 2003 [larry]: updated to samba-2.2.8a,
Index: xsoft/office/evolution.xml
===================================================================
--- xsoft/office/evolution.xml	(revision b5ca46036b01a26cfea3aa9ba2c51302557ed307)
+++ xsoft/office/evolution.xml	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
@@ -3,4 +3,7 @@
 <title>evolution-&evolution-version;</title>
 
+&db-3.1-intro;
+&db-3.1-inst;
+&db-3.1-exp;
 &evolution-intro;
 &evolution-inst;
Index: xsoft/office/evolution/db-3.1-exp.xml
===================================================================
--- xsoft/office/evolution/db-3.1-exp.xml	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
+++ xsoft/office/evolution/db-3.1-exp.xml	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>--enable-compat185</userinput> : Build support for older database files.</para>
+
+<para><userinput>--prefix=/opt/db-&db-3.1-version;</userinput> : This version of the
+Berkeley Database should not be installed in <filename>/usr</filename>,
+as it is only needed for the building of Evolution.</para>
+
+</sect2>
+
Index: xsoft/office/evolution/db-3.1-inst.xml
===================================================================
--- xsoft/office/evolution/db-3.1-inst.xml	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
+++ xsoft/office/evolution/db-3.1-inst.xml	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of db-&db-3.1-version;</title>
+
+<para>Install db-&db-3.1-version; by running the following commands:</para>
+
+<para><screen><userinput>cd build_unix &amp;&amp;
+../dist/configure --prefix=/opt/db-&db-3.1-version; --enable-compat185 &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: xsoft/office/evolution/db-3.1-intro.xml
===================================================================
--- xsoft/office/evolution/db-3.1-intro.xml	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
+++ xsoft/office/evolution/db-3.1-intro.xml	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to db-&db-3.1-version;</title>
+
+<screen>Download location (HTTP):       <ulink url="&db-3.1-download-http;"/>
+Download location (FTP):        <ulink url="&db-3.1-download-ftp;"/>
+Version used:                   &db-3.1-version;
+Package size:                   &db-3.1-size;
+Estimated Disk space required:  &db-3.1-buildsize;</screen>
+
+<para>The db-&db-3.1-version; package contains version &db-3.1-version; 
+of the Berkeley database. Evolution needs exactly this version and not any
+other, the details on "why" are in the README file distibuted with the
+evolution source code. Evolution links to the library statically, hence this
+book installs the db-&db-3.1-version; in /opt, which can be removed once
+Evolution is compiled.</para> 
+
+</sect2>
Index: xsoft/office/evolution/db-3.1.ent
===================================================================
--- xsoft/office/evolution/db-3.1.ent	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
+++ xsoft/office/evolution/db-3.1.ent	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
@@ -0,0 +1,11 @@
+<!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-exp.xml
===================================================================
--- xsoft/office/evolution/evolution-exp.xml	(revision b5ca46036b01a26cfea3aa9ba2c51302557ed307)
+++ xsoft/office/evolution/evolution-exp.xml	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
@@ -4,8 +4,6 @@
 <para><userinput>--prefix=/opt/gnome</userinput> : Install Evolution in the Gnome 1.4 area.</para>
 
-<para><userinput>--with-db3=/tmp/db-3.1</userinput> : db-&db-3.1-version; must be installed prior to building Evolution, but should
-not overwrite an existing installation of the Berkeley Database.
-Installing db-&db-3.1-version; in a temporary directory is all that is needed
-for Evolution to link to the static db-&db-3.1-version; libraries.</para>
+<para><userinput>--with-db3=/opt/db-&db-3.1-version;</userinput> : Specify
+the location where db-&db-3.1-version; is installed.</para>
 
 </sect2>
Index: xsoft/office/evolution/evolution-inst.xml
===================================================================
--- xsoft/office/evolution/evolution-inst.xml	(revision b5ca46036b01a26cfea3aa9ba2c51302557ed307)
+++ xsoft/office/evolution/evolution-inst.xml	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
@@ -4,10 +4,15 @@
 <para>Install evolution 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>
-<para><screen><userinput>./configure --prefix=/opt/gnome --with-db3=/tmp/db-3.1 &amp;&amp;
+-->
+<para><screen><userinput>./configure --prefix=/opt/gnome --with-db3=/opt/db-&db-3.1-version; &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
 
+<para>Optionally, you may remove the installed db-&db-3.1-version;</para>
+<para><screen><userinput>rm -rf /opt/db-&db-3.1-version;</userinput></screen></para>
+
 </sect2>
 
Index: xsoft/office/evolution/evolution-intro.xml
===================================================================
--- xsoft/office/evolution/evolution-intro.xml	(revision b5ca46036b01a26cfea3aa9ba2c51302557ed307)
+++ xsoft/office/evolution/evolution-intro.xml	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
@@ -12,5 +12,5 @@
 
 <screen>evolution depends on:
-<xref linkend="db-3.1"></xref>, <xref linkend="bonobo14"></xref>, <xref linkend="bonobo-conf"></xref>,
+<xref linkend="bonobo14"></xref>, <xref linkend="bonobo-conf"></xref>,
 <xref linkend="gal"></xref>, <xref linkend="libcapplet"></xref>, <xref linkend="gtkhtml"></xref> and 
 <xref linkend="soup"></xref>
Index: xsoft/office/evolution/evolution.ent
===================================================================
--- xsoft/office/evolution/evolution.ent	(revision b5ca46036b01a26cfea3aa9ba2c51302557ed307)
+++ xsoft/office/evolution/evolution.ent	(revision f231636f1ed77e752b46e5b8b6030d3094c9ecf6)
@@ -10,2 +10,11 @@
 <!ENTITY evolution-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/evolution/1.2/evolution-&evolution-version;.tar.bz2">
 <!ENTITY evolution-size "12 MB">
+<!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-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">
