Index: general/genlib/xapian.xml
===================================================================
--- general/genlib/xapian.xml	(revision 5bf63c035f0d7939b04641673b062d54e75630cd)
+++ general/genlib/xapian.xml	(revision 4e95b37b74c93b48cf6873fdfddf90ebd8e8ff77)
@@ -77,6 +77,5 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --disable-static \
+<screen><userinput>./configure --prefix=/usr --disable-static             \
             --docdir=/usr/share/doc/xapian-core-&xapian-version; &amp;&amp;
 make</userinput></screen>
@@ -120,4 +119,208 @@
       </seglistitem>
     </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="copydatabase">
+        <term><command>copydatabase</command></term>
+        <listitem>
+          <para>
+            perform a document-by-document copy of one or more
+            <application>Xapian</application> databases.
+          </para>
+          <indexterm zone="xapian copydatabase">
+            <primary sortas="b-copydatabase">copydatabase</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="delve">
+        <term><command>delve</command></term>
+        <listitem>
+          <para>
+            inspect the contents of a <application>Xapian</application>
+            database.
+          </para>
+          <indexterm zone="xapian delve">
+            <primary sortas="b-delve">delve</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="quest">
+        <term><command>quest</command></term>
+        <listitem>
+          <para>
+            is a search command line tool.
+          </para>
+          <indexterm zone="xapian quest">
+            <primary sortas="b-quest">quest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="simpleexpand">
+        <term><command>simpleexpand</command></term>
+        <listitem>
+          <para>
+            is a simple example program demonstrating query expansion.
+          </para>
+          <indexterm zone="xapian simpleexpand">
+            <primary sortas="b-simpleexpand">simpleexpand</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="simpleindex">
+        <term><command>simpleindex</command></term>
+        <listitem>
+          <para>
+            index each paragraph of a text file as a
+            <application>Xapian</application> document.
+          </para>
+          <indexterm zone="xapian simpleindex">
+            <primary sortas="b-simpleindex">simpleindex</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="simplesearch">
+        <term><command>simplesearch</command></term>
+        <listitem>
+          <para>
+            is a simple command line search utility.
+          </para>
+          <indexterm zone="xapian simplesearch">
+            <primary sortas="b-simplesearch">simplesearch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xapian-check">
+        <term><command>xapian-check</command></term>
+        <listitem>
+          <para>
+            check the consistency of a database or table.
+          </para>
+          <indexterm zone="xapian xapian-check">
+            <primary sortas="b-xapian-check">xapian-check</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xapian-chert-update">
+        <term><command>xapian-chert-update</command></term>
+        <listitem>
+          <para>
+            update a chert database to the new format keys.
+          </para>
+          <indexterm zone="xapian xapian-chert-update">
+            <primary sortas="b-xapian-chert-update">xapian-chert-update</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xapian-compact">
+        <term><command>xapian-compact</command></term>
+        <listitem>
+          <para>
+            compact a database, or merge and compact several.
+          </para>
+          <indexterm zone="xapian xapian-compact">
+            <primary sortas="b-xapian-compact">xapian-compact</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xapian-config">
+        <term><command>xapian-config</command></term>
+        <listitem>
+          <para>
+            report information about the installed xapian.
+          </para>
+          <indexterm zone="xapian xapian-config">
+            <primary sortas="b-xapian-config">xapian-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xapian-inspect">
+        <term><command>xapian-inspect</command></term>
+        <listitem>
+          <para>
+            inspect the contents of a flint table for development or debugging.
+          </para>
+          <indexterm zone="xapian xapian-inspect">
+            <primary sortas="b-xapian-inspect">xapian-inspect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xapian-metadata">
+        <term><command>xapian-metadata</command></term>
+        <listitem>
+          <para>
+            read and write user metadata.
+          </para>
+          <indexterm zone="xapian xapian-metadata">
+            <primary sortas="b-xapian-metadata">xapian-metadata</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xapian-progsrv">
+        <term><command>xapian-progsrv</command></term>
+        <listitem>
+          <para>
+            remote server for use with <application>ProgClient</application>.
+          </para>
+          <indexterm zone="xapian xapian-progsrv">
+            <primary sortas="b-xapian-progsrv">xapian-progsrv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xapian-replicate">
+        <term><command>xapian-replicate</command></term>
+        <listitem>
+          <para>
+            replicate a database from a master server to a local copy.
+          </para>
+          <indexterm zone="xapian xapian-replicate">
+            <primary sortas="b-xapian-replicate">xapian-replicate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xapian-replicate-server">
+        <term><command>xapian-replicate-server</command></term>
+        <listitem>
+          <para>
+            service database replication requests from clients.
+          </para>
+          <indexterm zone="xapian xapian-replicate-server">
+            <primary sortas="b-xapian-replicate-server">xapian-replicate-server</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xapian-tcpsrv">
+        <term><command>xapian-tcpsrv</command></term>
+        <listitem>
+          <para>
+            is the TCP daemon for use with <application>Xapian</application>'s
+            remote backend.
+          </para>
+          <indexterm zone="xapian xapian-tcpsrv">
+            <primary sortas="b-xapian-tcpsrv">xapian-tcpsrv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
   </sect2>
 
