Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision d32301b6ccb4344b22d5353e7d5fbb8f86ca5cf2)
+++ gnome/add/add.xml	(revision 97ccf511e66e87f8435e0d2c520f78adaaa660fc)
@@ -48,4 +48,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cheese.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="devhelp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evolution.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany-extensions.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file-roller.xml"/>
Index: gnome/add/evolution.xml
===================================================================
--- gnome/add/evolution.xml	(revision 97ccf511e66e87f8435e0d2c520f78adaaa660fc)
+++ gnome/add/evolution.xml	(revision 97ccf511e66e87f8435e0d2c520f78adaaa660fc)
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-version;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-version;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-md5sum        "1c661fb7a982ba6b3624becaa3079eb8">
+  <!ENTITY evolution-size          "11 MB">
+  <!ENTITY evolution-buildsize     "420 MB">
+  <!ENTITY evolution-time          "18.6 SBU">
+]>
+
+<sect1 id="evolution" xreflabel="Evolution-&evolution-version;">
+  <?dbhtml filename="evolution.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Evolution-&evolution-version;</title>
+
+  <indexterm zone="evolution">
+    <primary sortas="a-Evolution">Evolution</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Evolution</title>
+
+    <para>The <application>Evolution</application> package contains an
+    integrated mail, calendar and address book suite designed for the
+    <application>GNOME</application> environment.</para>
+
+    &lfs70_built;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&evolution-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&evolution-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &evolution-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &evolution-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &evolution-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &evolution-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Evolution Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="evolution-data-server"/>,
+    <xref linkend="gnome-desktop"/>,
+    <xref linkend="gtkhtml"/>,
+    <xref linkend="libcanberra"/>,
+    <xref linkend="libunique"/>, and
+    <xref linkend="shared-mime-info"/></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"/>,
+    <xref linkend="seamonkey"/> or
+    <ulink url="http://www.mozilla.org/products/mozilla1.x/">Mozilla</ulink>
+    installed. These packages contain internal copies of
+    <application>NSS</application> (or they used a system-installed copy).
+    If any of the four packages are installed, one way or another you will
+    already have NSS/NSPR libraries on your system.</para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="clutter-gtk"/>,
+    <xref linkend="dbus-glib"/>,
+    <xref linkend="docbook-utils"/>,
+    <ulink url="http://www.freedesktop.org/wiki/Software/GeoClue">GeoClue</ulink>,
+    <xref linkend="gstreamer"/>,
+    <xref linkend="gtk-doc"/>,
+    <xref linkend="mitkrb"/>,
+    <ulink url="http://projects.gnome.org/libchamplain/">libchamplain</ulink>,
+    <xref linkend="libgweather"/>,
+    <xref linkend="libnotify"/>,
+    <ulink url="http://www.five-ten-sg.com/libpst/">libpst</ulink>,
+    <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>,
+    <xref linkend="NetworkManager"/> and
+    <xref linkend="openldap"/>.</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/evolution"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Evolution</title>
+
+    <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 two parameter settings from
+      the <command>configure</command> command below:</para>
+
+      <literallayout><parameter>            --enable-nss
+            --enable-smime</parameter></literallayout>
+
+      <para>The <application>Evolution</application>
+      <command>configure</command> script only looks for the stand-alone
+      <application>NSS</application> package and the
+      <application>Mozilla</application> and
+      <application>Firefox</application> browsers for the NSS/NSPR libraries.
+      If you are using <application>Thunderbird</application> as your source
+      for the NSS/NSPR libraries, you will have to add the following two
+      parameter settings to the <command>configure</command> command
+      below:</para>
+
+      <literallayout><parameter>            --with-nspr-includes=/usr/include/nspr
+            --with-nss-includes=/usr/include/nss</parameter></literallayout>
+    </note>
+
+<screen><userinput>./configure --prefix=$GNOME_PREFIX \
+            --sysconfdir=$GNOME_SYSCONFDIR \
+            --libexecdir=$GNOME_PREFIX/lib \
+            --enable-nss \
+            --enable-smime \
+            --disable-image-inline \
+            --disable-pst-import &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <!-- 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>
+    -->
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
+    <para><parameter>--libexecdir=$GNOME_PREFIX/lib</parameter>: This parameter
+    causes the libexec files to be installed in the preferred location of
+    <filename class="directory">$GNOME_PREFIX/lib/evolution</filename> instead
+    of <filename
+    class="directory">$GNOME_PREFIX/libexec/evolution</filename>.</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>--disable-image-inline</parameter>: This parameter is used
+    to disable the image-inline plugin.</para>
+
+    <para><parameter>--disable-pst-import</parameter>: This parameter is used to
+    disable the pst-import plugin.</para>
+
+    <!-- changed to optional since gnome-3.2 requires NM in my experience : ken -->
+    <para><option>--disable-nm</option>: This parameter is used to disable
+    <application>NetworkManager</application> support. Use it if you have not
+    installed <application>NetworkManager</application>.</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
+    LDAP support into <application>Evolution</application>.</para>
+
+    <para><option>--with-krb5=/usr</option>: This parameter will compile
+    <application>Kerberos5</application> support into
+    <application>Evolution</application>.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>evolution, evolution-settings, evolution-addressbook-export,
+        evolution-alarm-notify, evolution-backup, and killev</seg>
+        <seg>libcomposer.so, libeabutil.so, libeconduit.so,
+        libecontacteditor.so, libecontactlisteditor.so, libemformat.so,
+        libemiscwidgets.so, libeshell.so, libessmime.so, libetable.so,
+        libetext.so, libetimezonedialog.so, libeutil.so, libevolution-a11y.so,
+        libevolution-addressbook-importers.so,
+        libevolution-calendar-importers.so, libevolution-calendar.so,
+        libevolution-mail-importers.so, libevolution-mail-settings.so,
+        libevolution-mail.so, libevolution-smime.so, libfilter.so, libmenus.so,
+        libevolution-module-addressbook.so, libevolution-module-calendar.so,
+        libevolution-module-mail.so, libevolution-module-plugin-lib.so,
+        liborg-gnome-addressbook-file.so, liborg-gnome-audio-inline.so,
+        liborg-gnome-backup-restore.so, liborg-gnome-bogo-junk-plugin.so,
+        liborg-gnome-calendar-file.so, liborg-gnome-calendar-http.so,
+        liborg-gnome-calendar-weather.so, liborg-gnome-default-mailer.so,
+        liborg-gnome-default-source.so, liborg-gnome-email-custom-header.so,
+        liborg-gnome-evolution-attachment-reminder.so,
+        liborg-gnome-evolution-bbdb.so, liborg-gnome-evolution-caldav.so,
+        liborg-gnome-evolution-google.so,
+        liborg-gnome-evolution-startup-wizard.so,
+        liborg-gnome-evolution-webdav.so, liborg-gnome-groupwise-features.so,
+        liborg-gnome-imap-features.so, liborg-gnome-itip-formatter.so,
+        liborg-gnome-mail-notification.so, liborg-gnome-mail-to-task.so,
+        liborg-gnome-mailing-list-actions.so, liborg-gnome-mark-all-read.so,
+        liborg-gnome-plugin-manager.so, liborg-gnome-prefer-plain.so,
+        liborg-gnome-publish-calendar.so, liborg-gnome-sa-junk-plugin.so,
+        liborg-gnome-save-calendar.so, liborg-gnome-subject-thread.so,
+        liborg-gnome-templates.so, and liborg-gnome-vcard-inline.so</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/{include/evolution-&gnome-version;/{addressbook/gui/widgets,
+        calendar/{common,gui/dialogs},composer,e-conduit,e-util,em-format,
+        filter,mail,menus,misc,shell,table,text},
+        lib/evolution/&gnome-version;/{modules,plugins},
+        share/{evolution/&gnome-version;/{default/*,ecps,errors,etspec,
+        help/quickref/*,icons/hicolor/{16x16/{actions,apps,places,status},
+        22x22/{actions,apps,places},24x24/{actions,apps,places,status},
+        32x32/{actions,apps,status},48x48/{actions,apps,categories,status},
+        scalable/actions},images,sounds,ui,views/{addressbook,calendar,mail,
+        memos,tasks}},gnome/help/evolution/*,gtk-doc/html/eshell,
+        omf/evolution}}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="evolution-prog">
+        <term><command>evolution</command></term>
+        <listitem>
+          <para>is an email, calendar and address book suite..</para>
+          <indexterm zone="evolution evolution-prog">
+            <primary sortas="g-evolution">evolution</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
