Index: xsoft/office/abiword.xml
===================================================================
--- xsoft/office/abiword.xml	(revision ebec0ca664afcdde267cee6bf6c8adc3dce80bd3)
+++ xsoft/office/abiword.xml	(revision bb9728099f29795aaa463687b87e662613785838)
@@ -5,14 +5,19 @@
   %general-entities;
 
+  <!ENTITY AbiWord-minor-version "2.9">
+
   <!ENTITY AbiWord-download-http
-  "http://www.abisource.com/downloads/abiword/&AbiWord-version;/source/abiword-&AbiWord-version;.tar.gz">
+           "http://www.abisource.com/downloads/abiword/&AbiWord-version;/source/abiword-&AbiWord-version;.tar.gz">
   <!ENTITY AbiWord-download-ftp  " ">
-  <!ENTITY AbiWord-md5sum        "cb9852ee7245eea41a290e8fe5e2dff2">
+  <!ENTITY AbiWord-md5sum        "62e59bea4279c7ec48de8824aea8dc58">
   <!ENTITY AbiWord-size          "10 MB">
-  <!ENTITY AbiWord-buildsize     "484 MB">
+
+  <!ENTITY AbiWordDocs-download-http
+           "http://www.abisource.com/downloads/abiword/&AbiWord-version;/source/abiword-docs-&AbiWord-version;.tar.gz">
+  <!ENTITY AbiWordDocs-md5sum        "1.4 MB">
+  <!ENTITY AbiWordDocs-size          "4e694a7ba6bf8294b3498118f2b6eb27">
+
+  <!ENTITY AbiWord-buildsize     "1.8 GB (160 MB installed)">
   <!ENTITY AbiWord-time          "6.6 SBU">
-  <!ENTITY AbiWordDocs-download-http
-  "http://www.abisource.com/downloads/abiword/&AbiWord-version;/source/abiword-docs-&AbiWord-version;.tar.gz">
-  <!ENTITY AbiWord-minor-version "2.9">
 ]>
 
@@ -35,5 +40,5 @@
 
     <para>
-      <application>AbiWord</application> is a word processor. It is useful for
+      <application>AbiWord</application> is a word processor which is useful for
       writing reports, letters and other formatted documents.
     </para>
@@ -76,17 +81,18 @@
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Optional Documentation: If running on a gnome desktop, the help menu
-          will open <application>epiphany</application> at
-          <ulink url="http://www.abisource.com/help/en-US/index.html"/>. If you
-          wish to install a copy of the en-US, fr-FR and pl-PL HTML
-          documentation on your machine, download
-          <ulink url="&AbiWordDocs-download-http;"/> (size 1.4MB md5sum
-          ca0b5bc27d20d542297bffd707b07d63). The local files will not be
-          automatically referenced if you do not have a fairly complete gnome
-          desktop (epiphany and yelp on their own are not enough), but you can
-          still open them in your browser of choice.
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          AbiWord Docs: <ulink url="&AbiWordDocs-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          AbiWord Docs MD5 sum: &AbiWordDocs-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          AbiWord Docs size: &AbiWordDocs-size;
         </para>
       </listitem>
@@ -99,8 +105,5 @@
       <xref linkend="boost"/>,
       <xref linkend="fribidi"/>,
-      <xref linkend="goffice"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="librsvg"/> and
+      <xref linkend="goffice010"/> and
       <xref linkend="wv"/>
     </para>
@@ -108,47 +111,39 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="enchant"/> (for spellchecking)
+      <xref linkend="enchant"/> 
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="dbus-glib"/> (for the collab sugar backend),
-      <xref linkend="empathy"/> and
-      <xref linkend="telepathy-glib"/> (for the collab telepathy backend),
-      <xref linkend="gnutls"/> and
-      <xref linkend="libsoup"/> (for the collab service),
+      <ulink url="http://aiksaurus.sourceforge.net/">Aiksaurus</ulink>,
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="evolution-data-server"/>,
+      <xref linkend="gobject-introspection"/>,
+      <ulink url="http://helm.cs.unibo.it/mml-widget/">GtkMathView</ulink>,
+      <ulink url="&gnome-download-http;/libchamplain">libchamplain</ulink>,
+      <xref linkend="libgcrypt"/>,
+      <xref linkend="libical"/>,
+      <xref linkend="libsoup"/>,
+      <ulink url="http://sourceforge.net/projects/wvware">libwmf</ulink>,
+      <ulink url="http://sourceforge.net/projects/libwpd/">libwpd</ulink>,
+      <ulink url="http://sourceforge.net/projects/libwpg/">libwpg</ulink>,
+      <ulink url="http://sourceforge.net/projects/libwps/">libwps</ulink>,
       <ulink url="http://www.abisource.com/projects/link-grammar/">Link Grammar Parser</ulink>,
-      <ulink url="http://aiksaurus.sourceforge.net/">Aiksaurus</ulink>,
-      <ulink url="http://helm.cs.unibo.it/mml-widget/">GtkMathView</ulink>
-      (requires
-      <ulink url="http://www.gnome-db.org/">libgnomedb version &lt;1.3.0</ulink>*
-      which requires
-      <ulink url="http://www.gnome-db.org/">libgda version &lt;1.3.0</ulink>),
-      <ulink url="http://sourceforge.net/projects/mission-control/files/">libmissioncontrol</ulink>,
-      <ulink url="http://ftp.imendio.com/pub/imendio/loudmouth/src/">loudmouth</ulink>
-      (for the collab xmpp backend),
-      <ulink url="http://sourceforge.net/projects/wvware">libwmf</ulink>,
-      <ulink url="http://helm.cs.unibo.it/mml-widget/">GtkMathView</ulink> (requires
-      <ulink url="http://sourceforge.net/projects/gmetadom/">Gnome DOM Bindings</ulink>
-      which requires
-      <ulink url="http://gdome2.cs.unibo.it/">gdome2</ulink>),
-      <ulink url="http://libwpd.sourceforge.net/">libwpd</ulink>,
-      <ulink url="http://libots.sourceforge.net/">OTS</ulink>, and
-      <ulink url="http://software.frodo.looijaard.name/psiconv/">Psiconv</ulink>
-      Some of these are not automatically detected and need to be specified to the
-      configure script.
-    </para>
-
-    <para>
-      * The
-      <application>libgda</application>/<application>libgnomedb</application>
-      stack required for <application>AbiWord</application> database access may
-      conflict with the versions used by the <xref linkend="gnumeric"/> database
-      plugin. Though the libraries themselves pose no conflict, the executables
-      and support files may overwrite one another. Note that the current
-      (version 4.1.x) stack does not pose a conflict with any of the previous
-      versions (but does not support <application>AbiWord</application> database
-      access. <application>AbiWord</application> requires versions &lt;1.3.0.
-    </para>
+      <ulink url="&gnome-download-http;/loudmouth">Loudmouth</ulink>,
+      <xref linkend="redland"/>,
+      <xref linkend="telepathy-glib"/>,
+      <ulink url="http://libots.sourceforge.net/">OTS</ulink>
+      <ulink url="http://software.frodo.looijaard.name/psiconv/">Psiconv</ulink> and
+      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+    </para>
+
+    <note>
+      <para>
+        To enable many of the optional dependencies, review the information
+        from <command>./configure --help</command> for the necessary switches
+        you must pass to the <command>configure</command> script.
+      </para>
+    </note>
+
 
     <para condition="html" role="usernotes">
@@ -165,5 +160,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -192,4 +187,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -198,6 +194,15 @@
 
     <para>
-      <option>--disable-static</option>: This switch prevents the static library
-      being built.
+      <option>--disable-collab-backend-telepathy</option>: This switch disables
+      <application>Telepathy</application> Colab backend which causes build to
+      fail when using recent versions of <xref linkend="telepathy-glib"/>.
+    </para>
+
+    <para>
+      <option>--without-evolution-data-server</option>: This switch disables
+      <application>AbiWord</application>
+      <application>Evolution Data Server</application> support which is known
+      to fail when using recent versions of
+      <xref linkend="evolution-data-server"/>.
     </para>
 
@@ -210,4 +215,5 @@
       Parser</ulink>
     </para>
+
   </sect2>
 
@@ -266,5 +272,7 @@
         mimeinfo cache and allow the Help system to work.
       </para>
+
     </sect3>
+
   </sect2>
 
@@ -273,14 +281,20 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>abiword</seg>
-        <seg>libabiword-&AbiWord-minor-version; and one or more plugin library
-        support modules</seg>
-        <seg>/usr/lib/abiword-&AbiWord-minor-version; and
-        /usr/share/abiword-&AbiWord-minor-version;</seg>
+        <seg>
+          abiword
+        </seg>
+        <seg>
+          libabiword-&AbiWord-minor-version;.so
+        </seg>
+        <seg>
+          /usr/include/abiword-&AbiWord-minor-version;,
+          /usr/lib/abiword-&AbiWord-minor-version; and
+          /usr/share/abiword-&AbiWord-minor-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -306,5 +320,5 @@
 
       <varlistentry id="libabiword">
-        <term><filename class='libraryfile'>libabiword-&AbiWord-minor-version;.so</filename></term>
+        <term><filename class="libraryfile">libabiword-&AbiWord-minor-version;.so</filename></term>
         <listitem>
           <para>
@@ -316,5 +330,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
-  </sect2>
+
+  </sect2>
+
 </sect1>
