Index: general/genlib/libgsf.xml
===================================================================
--- general/genlib/libgsf.xml	(revision b84342d699c4f5430198c171ad05928b2b9fe238)
+++ general/genlib/libgsf.xml	(revision e7fc5cf084ba51b1a2b0241bf71a4847c3e78ad9)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY libgsf-download-http "&gnome-download-http;/libgsf/1.14/libgsf-&libgsf-version;.tar.bz2">
-  <!ENTITY libgsf-download-ftp  "&gnome-download-ftp;/libgsf/1.14/libgsf-&libgsf-version;.tar.bz2">
-  <!ENTITY libgsf-md5sum        "2b702648b853402554c97d75405c60d3">
-  <!ENTITY libgsf-size          "684 KB">
-  <!ENTITY libgsf-buildsize     "19 MB">
-  <!ENTITY libgsf-time          "0.3 SBU">
+  <!ENTITY libgsf-download-http "&gnome-download-http;/libgsf/1.14/libgsf-&libgsf-version;.tar.xz">
+  <!ENTITY libgsf-download-ftp  "&gnome-download-ftp;/libgsf/1.14/libgsf-&libgsf-version;.tar.xz">
+  <!ENTITY libgsf-md5sum        "3e71b5af1999e62495c6750e51dbbe02">
+  <!ENTITY libgsf-size          "504 KB">
+  <!ENTITY libgsf-buildsize     "13 MB">
+  <!ENTITY libgsf-time          "0.5 SBU">
 ]>
 
@@ -30,8 +30,9 @@
     <title>Introduction to libgsf</title>
 
-    <para>The <application>libgsf</application> package contains
-    <filename class="libraryfile">libgsf-1</filename> libraries. These are
-    useful for providing an extensible input/output abstraction layer for
-    structured file formats.</para>
+    <para>
+      The <application>libgsf</application> package contains the library 
+      used for providing an extensible input/output abstraction layer for
+      structured file formats.
+    </para>
 
     &lfs70_checked;
@@ -40,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libgsf-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libgsf-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libgsf-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libgsf-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libgsf-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libgsf-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&libgsf-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libgsf-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libgsf-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libgsf-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libgsf-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libgsf-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -62,22 +75,23 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libxml2"/>,
-    <xref linkend="pkgconfig"/>, and
-    <xref linkend="perl-xml-parser"/></para>
+    <para role="required">
+      <xref linkend="intltool"/>,
+      <xref linkend="libxml2"/> and
+      <xref linkend="pkgconfig"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gdk-pixbuf"/> 
+      (To build gsf-office-thumbnailer)
+    </para>
+
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python2"/>,
-    <xref linkend="pygtk"/>,
-    <xref linkend="GConf"/> (required to build the
-    <command>gsf-office-thumbnailer</command> program),
-    <xref linkend="gnome-vfs"/> and <xref linkend="libbonobo"/> (required to
-    build the <filename class='libraryfile'>libgsf-gnome-1.so</filename>
-    library which provides GNOME-2 support), and
-    <xref linkend="gtk-doc"/></para>
-
-    <para>Note: you should build the
-    <filename class='libraryfile'>libgsf-gnome-1.so</filename> library if you
-    plan on building <!-- <xref linkend="gnucash"/> or -->
-    <xref linkend="gnumeric"/> with GNOME-2 support.</para>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="pygtk"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -89,17 +103,22 @@
     <title>Installation of libgsf</title>
 
-    <para>Install <application>libgsf</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-  --sysconfdir=&gnome-old-etc-dir; &amp;&amp;
+    <para>
+      Install <application>libgsf</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
-    <para>Running <command>make check</command> will build a battery of test
-    programs which are built using the just-created
-    <filename class='libraryfile'>libgsf-1</filename> library. All the programs
-    should build successfully with no errors displayed.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Running <command>make check</command> will build a battery of test
+      programs which are built using the just-created
+      <filename class='libraryfile'>libgsf-1</filename> library. All the programs
+      should build successfully with no errors displayed.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -110,17 +129,9 @@
     <title>Command Explanations</title>
 
-    <para><command>--sysconfdir=&gnome-old-etc-dir;</command>: Use this parameter to
-    ensure that if <application>GConf</application> has been installed, this
-    package&apos;s schema files will be installed in the correct location instead
-    of <filename class="directory">/usr/etc/</filename>.</para>
-
-    <para><option>--without-python</option>: This parameter is required
-    if <application>Python</application> is not installed.</para>
-
-    <para><option>--disable-static</option>: This switch prevents the
-    static libraries in this package being built and installed.</para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -130,16 +141,78 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gsf, gsf-office-thumbnailer (optional), and gsf-vba-dump</seg>
-        <seg>libgsf-1.{so,a} and optionally, libgsf-gnome-1.{so,a}</seg>
-        <seg>/usr/include/libgsf-1 and /usr/share/gtk-doc/html/gsf and
-        optionally, /usr/lib/python&python2-majorver;/site-packages/gsf</seg>
+        <seg>
+          gsf, gsf-office-thumbnailer and gsf-vba-dump
+        </seg>
+        <seg>
+          libgsf-1.so
+        </seg>
+        <seg>
+          /usr/include/libgsf-1 and
+          /usr/share/gtk-doc/html/gsf
+        </seg>
       </seglistitem>
     </segmentedlist>
 
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gsf">
+        <term><command>gsf</command></term>
+        <listitem>
+          <para>
+            is a simple archive utility, somewhat similar to tar(1).
+          </para>
+          <indexterm zone="libgsf gsf">
+            <primary sortas="b-gsf">gsf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gsf-office-thumbnailer">
+        <term><command>gsf-office-thumbnailer</command></term>
+        <listitem>
+          <para>
+            is used internally by GNOME applications such as Nautilus to generate 
+            thumbnails of several types of office application files.
+          </para>
+          <indexterm zone="libgsf gsf-office-thumbnailer">
+            <primary sortas="b-gsf-office-thumbnailer">gsf-office-thumbnailer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gsf-vba-dump">
+        <term><command>gsf-vba-dump</command></term>
+        <listitem>
+          <para>
+            is used to extract Visual Basic for Applications macros from files.
+          </para>
+          <indexterm zone="libgsf gsf-vba-dump">
+            <primary sortas="b-gsf-vba-dump">gsf-vba-dump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgsf-1">
+        <term><filename class="libraryfile">libgsf-1.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libgsf</application> API functions.
+          </para>
+          <indexterm zone="libgsf libgsf-1">
+            <primary sortas="c-libgsf-1">libgsf-1.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
   </sect2>
 
