Index: gnome/add/evolution-data-server.xml
===================================================================
--- gnome/add/evolution-data-server.xml	(revision 35dc583b37019554afa6ee5e9e927a359b4a12b9)
+++ gnome/add/evolution-data-server.xml	(revision 18c98af56ede1eb0fa636a0961dcb07ecdac0205)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY evolution-data-server-download-http "http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/1.4/evolution-data-server-&evolution-data-server-version;.tar.bz2">
-  <!ENTITY evolution-data-server-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/1.4/evolution-data-server-&evolution-data-server-version;.tar.bz2">
+  <!ENTITY evolution-data-server-download-http "&gnome-download-http;/evolution-data-server/1.4/evolution-data-server-&evolution-data-server-version;.tar.bz2">
+  <!ENTITY evolution-data-server-download-ftp  "&gnome-download-ftp;/evolution-data-server/1.4/evolution-data-server-&evolution-data-server-version;.tar.bz2">
   <!ENTITY evolution-data-server-md5sum        "1590ec25527b1bcc5046e84ec2d1227f">
   <!ENTITY evolution-data-server-size          "14.1 MB">
   <!ENTITY evolution-data-server-buildsize     "171 MB">
-  <!ENTITY evolution-data-server-time          "3.5 SBU (additional 0.4 SBU to run the test suite)">
+  <!ENTITY evolution-data-server-time          "3.5 SBU (additional 0.6 SBU to run the test suite)">
 ]>
 
@@ -71,11 +71,11 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="openldap"/>,
-    <xref linkend="mozilla"/> or
-    <xref linkend="firefox"/> or
-    <xref linkend="thunderbird"/> (NSS/NSPR libs for SSL and S/MIME support),
-    <xref linkend="sendmail"/>,
+    <xref linkend="nss"/>,
+    <xref linkend="sendmail"/>
+    (or any other <ulink url="../server/mail.html">MTA</ulink>
+    that provides a <command>sendmail</command> command),
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
-    <xref linkend="gtk-doc"/> and
+    <xref linkend="gtk-doc"/>, and
     <xref linkend="docbook-utils"/></para>
 
@@ -89,17 +89,9 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
-    --sysconfdir=/etc/gnome &amp;&amp;
+    --libexecdir=`pkg-config \
+    --variable=prefix ORBit-2.0`/lib/evolution-data-server-1.2 &amp;&amp;
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. If you
-    used <application>Firefox</application> or
-    <application>Thunderbird</application> NSS and NSPR libraries for SSL and
-    S/MIME support, you may need to add the appropriate library directory
-    (e.g.,
-    <filename class='directory'>/usr/lib/firefox-&firefox-version;</filename>)
-    to <filename>/etc/ld.so.conf</filename> and run <command>ldconfig</command>
-    as the <systemitem class="username">root</systemitem> user before running
-    the test suite.</para>
+    <para>To test the results, issue: <command>make -k check</command>.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -113,11 +105,9 @@
 
     <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/sbin</parameter>: This switch puts libexec files in
-    <filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch
-    puts configuration files in <filename class="directory">/etc/gnome</filename>
-    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+    ORBit-2.0`/lib/evolution-data-server-1.2</parameter>: This switch puts
+    libexec files in <filename
+    class="directory">$GNOME_PREFIX/lib/evolution-data-server-1.2</filename>
+    instead of <filename
+    class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
     <note>
@@ -138,6 +128,5 @@
 
       <seglistitem>
-        <seg>camel-index-control-1.2, camel-lock-helper-1.2, and
-        evolution-data-server-1.4</seg>
+        <seg>None</seg>
         <seg>libcamel-1.2.so, libcamel-provider-1.2.so, libebook-1.2.so,
         libecal-1.2.so, libedata-book-1.2.so, libedata-cal-1.2.so,
@@ -145,10 +134,11 @@
         libexchange-storage-1.2.so and numerous provider and extension
         modules.</seg>
-        <seg>$GNOME_PREFIX/include/evolution-data-server-1.4,
-        $GNOME_PREFIX/lib/evolution-data-server-1.2,
-        $GNOME_PREFIX/share/evolution-data-server-1.4,
-        $GNOME_PREFIX/share/idl/evolution-data-server-1.2,
-        $GNOME_PREFIX/share/gtk-doc/html/libe* and
-        $GNOME_PREFIX/share/pixmaps/evolution-data-server-1.4</seg>
+        <seg>The following subdirectories of $GNOME_PREFIX/:
+        include/evolution-data-server-1.4,
+        lib/evolution-data-server-1.2,
+        share/evolution-data-server-1.4,
+        share/idl/evolution-data-server-1.2,
+        share/gtk-doc/html/libe* and
+        share/pixmaps/evolution-data-server-1.4</seg>
       </seglistitem>
     </segmentedlist>
@@ -158,15 +148,4 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="evolution-data-server-1.4">
-        <term><command>evolution-data-server-1.4</command></term>
-        <listitem>
-          <para>is the <application>Evolution</application> database backend
-          server.</para>
-          <indexterm zone="evolution-data-server evolution-data-server-1.4">
-            <primary sortas="b-evolution-data-server-1.4">evolution-data-server-1.4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
 
       <varlistentry id="libe.so">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 35dc583b37019554afa6ee5e9e927a359b4a12b9)
+++ introduction/welcome/changelog.xml	(revision 18c98af56ede1eb0fa636a0961dcb07ecdac0205)
@@ -46,4 +46,8 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Updated Evolution-Data-Server dependencies to reflect
+          the NSS package and modified the libexecdir setting.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to Metacity-2.12.2.</para>
         </listitem>
