Index: general.ent
===================================================================
--- general.ent	(revision 36bcf509ad03fe7e99b914f3f3a40159f3b1f566)
+++ general.ent	(revision a8c49b1982de0fd51e7b06763a03c1a1da7bf532)
@@ -366,5 +366,5 @@
 <!ENTITY gnucash-version              "1.8.9"> 
 <!ENTITY gimp-version                 "2.0.6"> 
-<!ENTITY evolution-version            "1.4.6">  
+<!ENTITY evolution-version            "2.0.2">  
 
 <!-- Chapter 34 -->    
Index: gnome/core/libgnomeui.xml
===================================================================
--- gnome/core/libgnomeui.xml	(revision 36bcf509ad03fe7e99b914f3f3a40159f3b1f566)
+++ gnome/core/libgnomeui.xml	(revision a8c49b1982de0fd51e7b06763a03c1a1da7bf532)
@@ -81,4 +81,21 @@
 
 <sect2>
+<title>Configuring <application>libgnomeui</application></title>
+
+<sect3><title>Configuration information</title>
+<para>Some applications cannot properly discover the 
+<application>libglade</application> interface library installed by 
+<application>libgnomeui</application>. Get around this problem by initializing 
+an environment variable which identifies the location of the library. Add the
+following line to the system-wide <filename>/etc/profile</filename> file, or 
+to individual user's <filename>~/.profile</filename> or 
+<filename>~/.bashrc</filename> files:</para>
+
+<screen><userinput>export LIBGLADE_MODULE_PATH=$GNOME_PREFIX/lib/libglade/2.0</userinput></screen>
+</sect3>
+
+</sect2>
+
+<sect2>
 <title>Contents</title>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 36bcf509ad03fe7e99b914f3f3a40159f3b1f566)
+++ introduction/welcome/changelog.xml	(revision a8c49b1982de0fd51e7b06763a03c1a1da7bf532)
@@ -22,4 +22,8 @@
 
 <itemizedlist>
+
+<listitem><para>November 25th, 2004 [randy]: Updated to 
+Evolution-2.0.2; added a note to create an environment variable in the
+libgnomeui instructions.</para></listitem>
 
 <listitem><para>November 24th, 2004 [randy]: Added new package
Index: xsoft/office/evolution.xml
===================================================================
--- xsoft/office/evolution.xml	(revision 36bcf509ad03fe7e99b914f3f3a40159f3b1f566)
+++ xsoft/office/evolution.xml	(revision a8c49b1982de0fd51e7b06763a03c1a1da7bf532)
@@ -5,13 +5,10 @@
   %general-entities;
 
-  <!ENTITY evolution-download-http "http://ftp.gnome.org/pub/GNOME/sources/evolution/1.4/evolution-&evolution-version;.tar.bz2">
-  <!ENTITY evolution-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/evolution/1.4/evolution-&evolution-version;.tar.bz2">
-  <!ENTITY evolution-size          "14 MB">
-  <!ENTITY evolution-buildsize     "290 MB">
-  <!ENTITY evolution-time          "6.34 SBU">
-  <!ENTITY db3117-download         "http://ftp2.nchu.edu.tw/UNIX/Database/BerkeleyDB/db-3.1.17.tar.gz">
-  <!ENTITY db3117-size             "1.95 MB">
-  <!ENTITY db3117-buildsize        "28.2 MB">
-  <!ENTITY db3117-time             "0.22 SBU">
+  <!ENTITY evolution-download-http "http://ftp.gnome.org/pub/GNOME/sources/evolution/2.0/evolution-&evolution-version;.tar.bz2">
+  <!ENTITY evolution-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/evolution/2.0/evolution-&evolution-version;.tar.bz2">
+  <!ENTITY evolution-md5sum        "d3f12240ebb05dc6c984af68b5fe1955">
+  <!ENTITY evolution-size          "15.4 MB">
+  <!ENTITY evolution-buildsize     "229 MB">
+  <!ENTITY evolution-time          "4.70 SBU">
 ]>
 
@@ -28,5 +25,6 @@
 
 <para>The <application>Evolution</application> package contains an integrated 
-mail, calendar and address book suite.</para>
+mail, calendar and address book suite designed for the 
+<application><acronym>GNOME</acronym>-2</application> environment.</para>
 
 <sect3><title>Package information</title>
@@ -36,6 +34,7 @@
 <listitem><para>Download (FTP): <ulink
 url="&evolution-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &evolution-md5sum;</para></listitem>
 <listitem><para>Download size: &evolution-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &evolution-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
@@ -43,28 +42,15 @@
 </sect3>
 
-<sect3><title>Additional downloads</title>
-<para><emphasis>Packages</emphasis></para>
-<itemizedlist spacing='compact'>
-<listitem><para>Required Application: <ulink 
-url="&db3117-download;"/></para></listitem>
-<listitem><para>Download size: &db3117-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&db3117-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&db3117-time;</para></listitem></itemizedlist>
-
-<para><emphasis>Patches</emphasis></para>
-<itemizedlist spacing='compact'>
-<listitem><para>Required Patch: <ulink 
-url="&patch-root;/evolution-&evolution-version;-gcc34-2.patch"/></para>
-</listitem></itemizedlist>
-</sect3>
-
 <sect3><title><application>Evolution</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="openssl"/>, 
-<xref linkend="libsoup"/>, 
-<xref linkend="gal"/> and 
-<xref linkend="gtkhtml"/></para>
+<para><xref linkend="gtkhtml"/>, 
+<xref linkend="libgtkhtml"/>, 
+<xref linkend="evolution-data-server"/></para>
+</sect4>
+
+<sect4><title>Recommended</title>
+<para><xref linkend="mozilla"/> (<acronym>NSS</acronym> and 
+<acronym>NSPR</acronym> libs and headers required for 
+<acronym>SSL</acronym> and S/<acronym>MIME</acronym> support)</para>
 </sect4>
 
@@ -74,16 +60,18 @@
 <ulink url="../server/mail.html">MTA</ulink> that links to 
 <command>/usr/sbin/sendmail</command>), 
-<xref linkend="kdebase"/>, 
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 
 <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>, 
-<xref linkend="gtk-doc"/>, 
-<xref linkend="docbook-utils"/>, 
 <ulink 
-url="http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot/2.0/">GNOME-Pilot</ulink> and 
-<ulink 
-url="http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot-conduits/2.0/">GNOME-Pilot-conduits</ulink>
-</para>
+url="http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot-conduits/2.0/">GNOME 
+Pilot conduits</ulink> 
+(requires <xref linkend="pilot-link"/> then <ulink 
+url="http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot/2.0/">GNOME 
+Pilot</ulink>), 
+<ulink url="http://ftp.gnome.org/pub/GNOME/sources/gnome-spell/1.0/">GNOME 
+Spell</ulink>, 
+<xref linkend="kdebase"/>, 
+<xref linkend="gtk-doc"/> and 
+<xref linkend="docbook-utils"/></para>
 </sect4>
-
 </sect3>
 
@@ -93,35 +81,13 @@
 <title>Installation of <application>Evolution</application></title>
 
-<note><para><application>Evolution</application> requires
-<application>Berkeley DB</application>-3.1.17. The details on 
-<quote>why</quote> 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>-3.1.17 in 
-<filename class="directory">/opt</filename>, which can be removed once 
-<application>Evolution</application> is installed.</para></note>
-
-<para>Install <application>Berkeley DB</application>-3.1.17 by
-running the following commands:</para>
-
-<screen><userinput><command>cd build_unix &amp;&amp;
-../dist/configure --prefix=/opt/db-3.1.17 --enable-compat185 &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
 <para>Install <application>Evolution</application> by running the following 
 commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../evolution-&evolution-version;-gcc34-2.patch &amp;&amp;
-./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --localstatedir=/var/lib --with-db3=/opt/db-3.1.17 \
-    --enable-openssl=yes &amp;&amp;
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/lib/libexec \
+    --localstatedir=/var/lib --sysconfdir=/etc/gnome &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen>
-
-<para>Optionally, you may remove <application>Berkeley DB</application>-3.1.17 
-installed above with this command:</para>
-
-<screen><userinput><command>rm -rf /opt/db-3.1.17</command></userinput></screen>
+make install &amp;&amp;
+ln -s evolution-2.0 `pkg-config --variable=prefix ORBit-2.0`/bin/evolution</command></userinput></screen>
 
 </sect2>
@@ -130,22 +96,23 @@
 <title>Command explanations</title>
 
-<para><parameter>--enable-compat185</parameter>: Build support for older
-database files.</para>
+<para><option>--enable-nntp=yes</option>: This enables the Usenet news 
+client.</para>
 
-<para><parameter>--prefix=/opt/db-3.1.17</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>
-
-<para><parameter>--with-db3=/opt/db-3.1.17</parameter>: Specify
-the location where db-3.1.17 is installed.</para>
-
-<para><parameter>--enable-openssl=yes</parameter>: This switch will compile
+<para><option>--enable-nss=yes</option>: This switch will compile 
 <acronym>SSL</acronym> support into <application>Evolution</application>.
 </para>
 
-<para><option>--with-openldap</option>: This flag will compile
+<para><option>--enable-smime=yes</option>: This switch will compile 
+S/<acronym>MIME</acronym> support into <application>Evolution</application> 
+(requires <option>--enable-nss=yes</option> also).</para>
+
+<para><option>--with-openldap=yes</option>: This flag will compile
 <acronym>LDAP</acronym> support into <application>Evolution</application>.
 </para>
+
+<para><command>ln -s evolution-2.0 `pkg-config 
+--variable=prefix ORBit-2.0`/bin/evolution</command>: This optional command 
+creates a convenience symlink to the <command>evolution-2.0</command> 
+binary.</para>
 
 </sect2>
@@ -155,5 +122,6 @@
 
 <para>The <application>Evolution</application> package contains
-<command>evolution</command>.</para>
+<command>evolution-2.0</command>, support libraries, conduits and other 
+components.</para>
 </sect2>
 
@@ -162,5 +130,5 @@
 
 <sect3><title>evolution</title>
-<para><command>evolution</command> contains an email, calendar and
+<para><command>evolution</command> is an email, calendar and
 address book suite.</para></sect3>
 
