Index: xsoft/office/evolution.xml
===================================================================
--- xsoft/office/evolution.xml	(revision ccc93e782ddcc845cc24fd49d68192c805a2b8e5)
+++ xsoft/office/evolution.xml	(revision db03d899ef9738b0cb286caab7c313ace622ef0c)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!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">
+  <!ENTITY evolution-download-http "http://ftp.gnome.org/pub/GNOME/sources/evolution/2.4/evolution-&evolution-version;.tar.bz2">
+  <!ENTITY evolution-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/evolution/2.4/evolution-&evolution-version;.tar.bz2">
+  <!ENTITY evolution-md5sum        "13235405e08d14a54129e3a65548f58e">
+  <!ENTITY evolution-size          "11.5 MB">
+  <!ENTITY evolution-buildsize     "248 MB">
+  <!ENTITY evolution-time          "7.4 SBU">
 ]>
 
@@ -59,5 +59,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gtkhtml"/>,
+    <para><xref linkend="gtkhtml"/> and
     <xref linkend="evolution-data-server"/></para>
 
@@ -65,6 +65,6 @@
     <para><xref linkend="mozilla"/> or
     <xref linkend="firefox"/> or
-    <xref linkend="thunderbird"/> (NSS and NSPR libs and headers required for
-    SSL and S/MIME support)</para>
+    <xref linkend="thunderbird"/> (for the NSS and NSPR libraries
+    required for SSL and S/MIME support)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -76,12 +76,10 @@
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
-    <ulink
-    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>,
+    <ulink 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="dbus"/>,
     <xref linkend="kdebase"/>,
@@ -99,6 +97,5 @@
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
     --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/lib \
-    --localstatedir=/var/lib --sysconfdir=/etc/gnome \
-    --disable-gtk-doc &amp;&amp;
+    --localstatedir=/var/lib --sysconfdir=/etc/gnome &amp;&amp;
 make</userinput></screen>
 
@@ -108,5 +105,5 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-ln -v -s evolution-2.2 \
+ln -v -s evolution-2.4 \
     `pkg-config --variable=prefix ORBit-2.0`/bin/evolution</userinput></screen>
 
@@ -116,8 +113,10 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--disable-gtk-doc</parameter>: This parameter disables
+    <!-- There doesn't appear to be any need for this
+    <para><parameter>-\-disable-gtk-doc</parameter>: This parameter disables
     building the API documentation if you have
     <application>GTK-Doc</application> installed. Remove this parameter if
     you wish to build and install the documentation.</para>
+    -->
 
     <para><option>--with-openldap</option>: This parameter will compile
@@ -133,7 +132,7 @@
     device.</para>
 
-    <para><command>ln -v -s evolution-2.2 `pkg-config
+    <para><command>ln -v -s evolution-2.4 `pkg-config
     --variable=prefix ORBit-2.0`/bin/evolution</command>: This optional command
-    creates a convenience symlink to the <command>evolution-2.2</command>
+    creates a convenience symlink to the <command>evolution-2.4</command>
     binary.</para>
 
@@ -149,13 +148,13 @@
 
       <seglistitem>
-        <seg>evolution and evolution-2.2</seg>
-        <seg>/usr/lib/evolution/2.2/* (contains support libraries, conduits,
+        <seg>evolution and evolution-2.4</seg>
+        <seg>lib/evolution/2.4/* (contains support libraries, conduits,
         and other components)</seg>
         <seg>/etc/gnome/gconf/gconf.xml.defaults/schemas/apps/evolution,
         /etc/gnome/gconf/gconf.xml.defaults/apps/evolution,
-        $GNOME_PREFIX/include/evolution-2.2,
+        $GNOME_PREFIX/include/evolution-2.4,
         $GNOME_PREFIX/lib/evolution,
-        $GNOME_PREFIX/share/idl/evolution-2.2,
-        $GNOME_PREFIX/share/gnome/help/evolution-2.2,
+        $GNOME_PREFIX/share/idl/evolution-2.4,
+        $GNOME_PREFIX/share/gnome/help/evolution-2.4,
         $GNOME_PREFIX/share/omf/evolution, and
         $GNOME_PREFIX/share/evolution</seg>
@@ -171,5 +170,5 @@
         <term><command>evolution</command></term>
         <listitem>
-          <para>is a symlink to the <command>evolution-2.2</command>
+          <para>is a symlink to the <command>evolution-2.4</command>
           program.</para>
           <indexterm zone="evolution evolution-prog">
@@ -179,10 +178,10 @@
       </varlistentry>
 
-      <varlistentry id="evolution-2.2">
-        <term><command>evolution-2.2</command></term>
+      <varlistentry id="evolution-2.4">
+        <term><command>evolution-2.4</command></term>
         <listitem>
           <para>is an email, calendar and address book suite.</para>
-          <indexterm zone="evolution evolution-2.2">
-            <primary sortas="b-evolution-2.2">evolution-2.2</primary>
+          <indexterm zone="evolution evolution-2.4">
+            <primary sortas="b-evolution-2.4">evolution-2.4</primary>
           </indexterm>
         </listitem>
