Index: general/sysutils/strigi.xml
===================================================================
--- general/sysutils/strigi.xml	(revision 1798ac0cd8210703042c061d06b79effafbcf9f7)
+++ general/sysutils/strigi.xml	(revision faa6936ff3c52d0b3080c76e9489801ce43b2c7f)
@@ -30,5 +30,8 @@
     <title>Introduction to Strigi</title>
 
-    <para><application>Strigi</application> is a desktop search engine.</para>
+    <para><application>Strigi</application> is a program for fast indexing and
+    searching of personal data. It can gather and index information from
+    files in the filesystem even if they are hidden in emails or
+    archives.</para>
 
     &lfs75_checked;
@@ -74,5 +77,6 @@
     <xref linkend="ffmpeg"/>,
     <xref linkend="exiv2"/>,
-    <xref linkend="clucene"/>, and
+    <ulink url="http://sourceforge.net/projects/clucene/files/clucene-core-stable/">
+       CLucene version 0.9x</ulink> , and
     <ulink url="http://logging.apache.org/log4cxx/">log4cxx</ulink>
     </para>
@@ -89,11 +93,14 @@
     commands:</para>
 
-<!-- CMAKE_INSTALL_LIBDIR is used so the package doesn't write over lib64 symlink on 64 bit system -->
-<screen><userinput>sed -i "s|BufferedStream :|STREAMS_EXPORT &amp;|" libstreams/include/strigi/bufferedstream.h &amp;&amp;
+<screen><userinput>sed -i "s/BufferedStream :/STREAMS_EXPORT &amp;/" libstreams/include/strigi/bufferedstream.h &amp;&amp;
+
 mkdir build &amp;&amp;
-cd build &amp;&amp;
+cd    build &amp;&amp;
+
 cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_INSTALL_LIBDIR=lib  \
       -DCMAKE_BUILD_TYPE=Release  \
+      -DENABLE_CLUCENE=OFF        \
+      -DENABLE_CLUCENE_NG=OFF     \
       .. &amp;&amp;
 make</userinput></screen>
@@ -113,4 +120,9 @@
       <command>sed -i "..."</command>: This command fixes the build with recent
       <application>GCC</application> versions.
+    </para>
+
+    <para>
+      <parameter>-DCMAKE_INSTALL_LIBDIR=lib</parameter>: This switch is used so
+      the package doesn't write over the lib64 symlink on 64 bit systems.
     </para>
 
@@ -132,4 +144,10 @@
     </para>
 
+    <para>
+      <option>-DENABLE_CLUCENE*=OFF</option>: These statements disable the
+      package from trying to use <xref linkend="clucene"/> (current stable
+      version). 
+    </para>
+
   </sect2>
 
@@ -144,12 +162,12 @@
       <seglistitem>
         <seg>deepfind, deepgrep, rdfindexer, strigiclient, strigicmd,
-        strigidaemon and xmlindexer</seg>
+        strigidaemon, and xmlindexer</seg>
         <seg>libsearchclient.so, libstreamanalyzer.so, libstreams.so,
-        libstrigihtmlgui.so, libstrigiqtdbusclient.so and several in
+        libstrigihtmlgui.so, libstrigiqtdbusclient.so, and several in
         /usr/lib/strigi</seg>
-        <seg>/usr/include/strigi, /usr/lib/strigi and /usr/share/strigi</seg>
+        <seg>/usr/include/strigi, /usr/lib/strigi, and /usr/share/strigi</seg>
       </seglistitem>
     </segmentedlist>
-<!--
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -157,30 +175,73 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="iodbc-config">
-        <term><command>iodbc-config</command></term>
-        <listitem>
-          <para>is a utility for retrieving the installation options of strigi</para>
-          <indexterm zone="strigi iodbc-config">
-            <primary sortas="b-iodbc-config">iodbc-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iodbctest">
-        <term><command>iodbctest{,w}</command></term>
-        <listitem>
-          <para>is an interactive SQL processor</para>
-          <indexterm zone="strigi iodbctest">
-            <primary sortas="b-iodbctest">iodbctest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iodbcadm">
-        <term><command>iodbcadm</command></term>
-        <listitem>
-          <para>is a graphical administration utility</para>
-          <indexterm zone="strigi iodbcadm">
-            <primary sortas="b-iodbcadm">iodbcadm</primary>
+      <varlistentry id="deepfind">
+        <term><command>deepfind</command></term>
+        <listitem>
+          <para>is a utility for searching for filenames in compressed 
+          archives like tar, cpio, and zip</para>
+          <indexterm zone="strigi deepfind">
+            <primary sortas="b-deepfind">deepfind</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="deepgrep">
+        <term><command>deepgrep</command></term>
+        <listitem>
+          <para>is a utility for searching compressed archives like 
+                    tar, cpio, and zip</para>
+          <indexterm zone="strigi deepgrep">
+            <primary sortas="b-deepgrep">deepgrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rdfindexer">
+        <term><command>rdfindexer</command></term>
+        <listitem>
+          <para>manages and performs indexing of the RDF data for entities 
+          present on your site</para>
+          <indexterm zone="strigi rdfindexer">
+            <primary sortas="b-rdfindexer">rdfindexer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="strigiclient">
+        <term><command>strigiclient</command></term>
+        <listitem>
+          <para>is a Qt4 client (GUI) for the Strigi Desktop Search software</para>
+          <indexterm zone="strigi strigiclient">
+            <primary sortas="b-strigiclient">strigiclient</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="strigicmd">
+        <term><command>strigicmd</command></term>
+        <listitem>
+          <para>is a program for creating and querying indices</para>
+          <indexterm zone="strigi strigicmd">
+            <primary sortas="b-strigicmd">strigicmd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="strigidaemon">
+        <term><command>strigidaemon</command></term>
+        <listitem>
+          <para>is a daemon program for maintaining indices</para>
+          <indexterm zone="strigi strigidaemon">
+            <primary sortas="b-strigidaemon">strigidaemon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xmlindexer">
+        <term><command>xmlindexer</command></term>
+        <listitem>
+          <para>indexes XML documents</para>
+          <indexterm zone="strigi xmlindexer">
+            <primary sortas="b-xmlindexer">xmlindexer</primary>
           </indexterm>
         </listitem>
@@ -188,5 +249,5 @@
 
     </variablelist>
--->
+
   </sect2>
 
