Index: general.ent
===================================================================
--- general.ent	(revision ac038a3f481439dd73cf22588384032afe39d21b)
+++ general.ent	(revision e740b4322d8f747032df2c41291d50d02a6fa813)
@@ -1,3 +1,3 @@
-<!ENTITY day          "12">
+<!ENTITY day          "15">
 <!ENTITY month        "05">
 <!ENTITY year         "2005">
@@ -401,5 +401,5 @@
 <!ENTITY gnucash-version              "1.8.10">
 <!ENTITY gimp-version                 "2.2.6">
-<!ENTITY evolution-version            "2.0.2">
+<!ENTITY evolution-version            "2.2.2">
 
 <!-- Chapter 34 -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision ac038a3f481439dd73cf22588384032afe39d21b)
+++ introduction/welcome/changelog.xml	(revision e740b4322d8f747032df2c41291d50d02a6fa813)
@@ -24,4 +24,8 @@
 
   <itemizedlist>
+
+    <listitem>
+      <para>May 15th, 2005 [randy]: Updated to Evolution-2.2.2.</para>
+    </listitem>
 
     <listitem>
Index: xsoft/office/evolution.xml
===================================================================
--- xsoft/office/evolution.xml	(revision ac038a3f481439dd73cf22588384032afe39d21b)
+++ xsoft/office/evolution.xml	(revision e740b4322d8f747032df2c41291d50d02a6fa813)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!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">
+  <!ENTITY evolution-download-http "http://ftp.gnome.org/pub/GNOME/sources/evolution/2.2/evolution-&evolution-version;.tar.bz2">
+  <!ENTITY evolution-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/evolution/2.2/evolution-&evolution-version;.tar.bz2">
+  <!ENTITY evolution-md5sum        "9b49942c8bdd1dc21f2d28792b12f400">
+  <!ENTITY evolution-size          "13.8 MB">
+  <!ENTITY evolution-buildsize     "198 MB">
+  <!ENTITY evolution-time          "4.1 SBU">
 ]>
 
@@ -45,16 +45,19 @@
 <sect4><title>Required</title>
 <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 
+<para><xref linkend="mozilla"/> or 
+<xref linkend="firefox"/> or 
+<xref linkend="thunderbird"/> 
+(<acronym>NSS</acronym> and <acronym>NSPR</acronym> 
+libs and headers required for 
 <acronym>SSL</acronym> and S/<acronym>MIME</acronym> support)</para>
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="openldap"/>, 
+<para><xref linkend="gstreamer"/>, 
+<xref linkend="openldap"/>, 
 <xref linkend="sendmail"/> (or other 
 <ulink url="../server/mail.html">MTA</ulink> that links to 
@@ -70,4 +73,5 @@
 <ulink url="http://ftp.gnome.org/pub/GNOME/sources/gnome-spell/1.0/">GNOME 
 Spell</ulink>, 
+<ulink url="http://www.freedesktop.org/Software/dbus">D-BUS</ulink>, 
 <xref linkend="kdebase"/>, 
 <xref linkend="gtk-doc"/> and 
@@ -85,9 +89,10 @@
 
 <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;
+    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/lib \
+    --localstatedir=/var/lib --sysconfdir=/etc/gnome \
+    --disable-gtk-doc &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
-ln -s evolution-2.0 \
+ln -v -s evolution-2.2 \
     `pkg-config --variable=prefix ORBit-2.0`/bin/evolution</command></userinput></screen>
 
@@ -97,22 +102,25 @@
 <title>Command explanations</title>
 
-<para><option>--enable-nntp=yes</option>: This enables the Usenet news 
-client.</para>
+<para><option>--with-openldap</option>: This parameter will compile
+<acronym>LDAP</acronym> support into 
+<application>Evolution</application>.</para>
 
-<para><option>--enable-nss=yes</option>: This switch will compile 
-<acronym>SSL</acronym> support into <application>Evolution</application>.
-</para>
+<para><option>--with-krb5</option>: This parameter will compile 
+<application>Kerberos5</application> support into 
+<application>Evolution</application>.</para>
 
-<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-pilot-conduits</option>: This parameter will build 
+the <application>GNOME Pilot</application> conduits allowing you to 
+syncronize <application>Evolution</application> data on a Palm 
+device.</para>
 
-<para><option>--with-openldap=yes</option>: This flag will compile
-<acronym>LDAP</acronym> support into <application>Evolution</application>.
-</para>
+<para><option>--disable-gtk-doc</option>: This parameter disables 
+building the <acronym>API</acronym> documentation if you have 
+<application>GTK-Doc</application> installed. Remove this parameter if
+you wish to build and install the documentation.</para>
 
-<para><command>ln -s evolution-2.0 `pkg-config 
+<para><command>ln -v -s evolution-2.2 `pkg-config 
 --variable=prefix ORBit-2.0`/bin/evolution</command>: This optional command 
-creates a convenience symlink to the <command>evolution-2.0</command> 
+creates a convenience symlink to the <command>evolution-2.2</command> 
 binary.</para>
 
@@ -130,5 +138,5 @@
 <title>Description</title>
 
-<sect3><title>evolution</title>
+<sect3><title>evolution-2.2</title>
 <para><command>evolution</command> is an email, calendar and
 address book suite.</para></sect3>
@@ -137,3 +145,2 @@
 
 </sect1>
-
