Index: xsoft/office/evolution.xml
===================================================================
--- xsoft/office/evolution.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
+++ xsoft/office/evolution.xml	(revision 09b9dccbed4c58dbcd780ca350ed93c37cfb8ecc)
@@ -66,7 +66,15 @@
     <xref linkend="evolution-data-server"/></para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="nss"/> (required for SSL and
-    S/MIME support)</para>
+    <bridgehead renderas="sect4">Recommended
+    (For SSL and S/MIME support)</bridgehead>
+    <para role="recommended"><xref linkend="nss"/></para>
+
+    <para>The <application>NSS</application> package is not
+    required if you have <xref linkend="firefox"/>,
+    <xref linkend="thunderbird"/> or <xref linkend="seamonkey"/> installed.
+    These packages contain internal copies of <application>NSS</application>
+    (or they used a system-installed copy). If any of the three packages
+    are installed, one way or another you will already have
+    NSS/NSPR libraries on your system.</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -75,12 +83,12 @@
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
-    <ulink url="&gnome-download-http;/gnome-pilot-conduits/2.0/">
-    GNOME Pilot conduits</ulink> (requires <xref linkend="pilot-link"/> then
-    <ulink url="&gnome-download-http;/gnome-pilot/2.0/">
-    GNOME Pilot</ulink>),
+    <ulink url="&gnome-download-http;/gnome-pilot-conduits/2.0/">GNOME
+    Pilot conduits</ulink> (requires
+    <xref linkend="pilot-link"/> then
+    <ulink url="&gnome-download-http;/gnome-pilot/2.0/">GNOME Pilot</ulink>),
     <ulink url="&gnome-download-http;/gnome-spell/1.0/">
     GNOME Spell</ulink>,
     <xref linkend="dbus"/>,
-    <xref linkend="kdebase"/>,
+    <!-- <xref linkend="kdebase"/>, -->
     <xref linkend="gtk-doc"/>, and
     <xref linkend="docbook-utils"/></para>
@@ -96,9 +104,27 @@
     <para>Install <application>Evolution</application> by running the following
     commands:</para>
+
+    <note>
+      <para>The instructions below assume you have the NSS/NSPR libraries
+      installed on your system. If you elected not to install
+      <application>NSS</application> (or one of the other packages mentioned
+      above), you'll need to remove the following four parameter settings from
+      the <command>configure</command> command below:</para>
+
+      <literallayout><parameter>            --enable-nss
+            --enable-smime
+            --with-nspr-includes=/usr/include/nspr
+            --with-nss-includes=/usr/include/nss</parameter></literallayout>
+    </note>
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
             --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/lib \
             --localstatedir=/var/lib \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --sysconfdir=&gnome-etc-dir; \
+            --enable-nntp \
+            --enable-nss \
+            --enable-smime \
+            --with-nspr-includes=/usr/include/nspr \
+            --with-nss-includes=/usr/include/nss &amp;&amp;
 make</userinput></screen>
 
@@ -122,4 +148,21 @@
     you wish to build and install the documentation.</para>
     -->
+
+    <para><parameter>--enable-nntp</parameter>: This parameter is used to build
+    the Usenet news (NNTP) backend.</para>
+
+    <para><parameter>--enable-nss</parameter>: This parameter is used to pull
+    in the Mozilla Network Security Services libraries for SSL support.</para>
+
+    <para><parameter>--enable-smime</parameter>: This parameter is used to pull
+    in the Mozilla Network Security Services libraries for S/MIME
+    support.</para>
+
+    <para><parameter>--with-{nspr,nss}-includes</parameter>: This parameter is
+    used to identify where the Mozilla Network Security Services interface
+    headers are located. By default, <application>Evolution</application> uses
+    <filename>mozilla-{nss,nspr}.pc</filename> files to locate the headers
+    and chances are you will not have <application>Mozilla</application>
+    installed.</para>
 
     <para><option>--with-openldap</option>: This parameter will compile
