Index: xsoft/office/evolution.xml
===================================================================
--- xsoft/office/evolution.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ xsoft/office/evolution.xml	(revision cdb5140da241e5ff7d893d2ec15ac12f548dfc38)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/2.10/evolution-&evolution-version;.tar.bz2">
-  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/2.10/evolution-&evolution-version;.tar.bz2">
-  <!ENTITY evolution-md5sum        "09cc60b037849b3c9b34961eb7da217f">
-  <!ENTITY evolution-size          "26 MB">
-  <!ENTITY evolution-buildsize     "355 MB">
-  <!ENTITY evolution-time          "10 SBU">
+  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-version;/evolution-&evolution-version;.tar.bz2">
+  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-version;/evolution-&evolution-version;.tar.bz2">
+  <!ENTITY evolution-md5sum        "2af2e699cd8a46b8f7b9baec3184f685">
+  <!ENTITY evolution-size          "28 MB">
+  <!ENTITY evolution-buildsize     "385 MB">
+  <!ENTITY evolution-time          "9.8 SBU">
 ]>
 
@@ -59,7 +59,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtkhtml"/>,
-    <xref linkend="gnome-doc-utils"/>, and
-    <xref linkend="evolution-data-server"/></para>
+    <para role="required"><xref linkend="evolution-data-server"/>,
+    <xref linkend="gnome-desktop"/>,
+    <xref linkend="gtkhtml"/>,
+    <xref linkend="libgnomeui"/>, and
+    <xref linkend="shared-mime-info"/></para>
 
     <bridgehead renderas="sect4">Recommended
@@ -80,5 +82,4 @@
     <xref linkend="hal"/>,
     <xref linkend="dbus-glib"/>,
-    <ulink url="&gnome-download-http;/gnome-spell/1.0/">GNOME Spell</ulink>,
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
@@ -87,11 +88,9 @@
     (requires <xref linkend="pilot-link"/> then
     <ulink url="&gnome-download-http;/gnome-pilot/2.0/">GNOME Pilot</ulink>),
-    <ulink url="http://gstreamer.freedesktop.org/">GStreamer-0.8.x</ulink>,
-    <ulink url="http://www.gnome.org/projects/NetworkManager/">NetworkManager</ulink>
-    (<ulink url="&gnome-download-http;/NetworkManager/">download</ulink>),
+    <xref linkend="gstreamer"/>,
+    <ulink url="http://www.gnome.org/projects/NetworkManager/">NetworkManager</ulink>,
     <xref linkend="libnotify"/>,
+    <xref linkend="libgweather"/>,
     <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>,
-    <!-- <xref linkend="kdebase"/>, -->
-    <xref linkend="intltool"/>,
     <xref linkend="gtk-doc"/>, and
     <xref linkend="docbook-utils"/></para>
@@ -139,5 +138,6 @@
             --enable-nntp \
             --enable-nss \
-            --enable-smime &amp;&amp;
+            --enable-smime \
+            --disable-nm &amp;&amp;
 make</userinput></screen>
 
@@ -146,7 +146,5 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-ln -v -s evolution-2.10 \
-    $(pkg-config --variable=prefix ORBit-2.0)/bin/evolution</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -187,4 +185,8 @@
     in the Mozilla Network Security Services libraries for S/MIME
     support.</para>
+
+    <para><parameter>--disable-nm</parameter>: This parameter is used to disable
+    <application>NetworkManager</application> support. Remove it if you have
+    <application>NetworkManager</application> installed.</para>
 
     <!--
@@ -209,9 +211,4 @@
     device.</para>
 
-    <para><command>ln -v -s evolution-2.10 $(pkg-config
-    --variable=prefix ORBit-2.0)/bin/evolution</command>: This optional command
-    creates a convenience symlink to the <command>evolution-2.10</command>
-    binary.</para>
-
     <para><option>--with-kde-applnk-path=<replaceable>&lt;$KDE_PREFIX/share/applnk&gt;</replaceable></option>:
     Use this parameter if you want the installation process to create a
@@ -225,16 +222,16 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Program</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>evolution and evolution-2.10</seg>
-        <seg>$GNOME_PREFIX/lib/evolution/2.10/* (contains support libraries,
+        <seg>evolution</seg>
+        <seg>$GNOME_PREFIX/lib/evolution/&evolution-version;/* (contains support libraries,
         conduits, and other components)</seg>
-        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
-        include/evolution-2.10,
-        lib/evolution,
-        share/{{,omf/}evolution, {gnome/help,idl}/evolution-2.10}</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/{include/evolution-&evolution-version;/*,
+        lib/evolution/&evolution-version;/{components,plugins},
+        share/{evolution/&evolution-version;/*,gnome/help/evolution/*,
+        idl/evolution-&evolution-version;,omf/evolution}}</seg>
       </seglistitem>
     </segmentedlist>
@@ -248,6 +245,5 @@
         <term><command>evolution</command></term>
         <listitem>
-          <para>is a symlink to the <command>evolution-2.10</command>
-          program.</para>
+          <para>is an email, calendar and address book suite..</para>
           <indexterm zone="evolution evolution-prog">
             <primary sortas="g-evolution">evolution</primary>
@@ -256,14 +252,4 @@
       </varlistentry>
 
-      <varlistentry id="evolution-2.10">
-        <term><command>evolution-2.10</command></term>
-        <listitem>
-          <para>is an email, calendar and address book suite.</para>
-          <indexterm zone="evolution evolution-2.10">
-            <primary sortas="b-evolution-2.10">evolution-2.10</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
