add c++ compiler to build prerequisites

src/doc/user/usermanual.sgml

@@ -2711,17 +2711,27 @@ while query.next >= 0 and query.next < nres:
       <sect2 id="rcl.install.building.prereqs">
         <title>Prerequisites</title>
 
-      <para>At the very least, you will need to download and install the
+	<para>C++ compiler. Up to &RCL; version 1.13.04, its absence can
-        <ulink url="http://www.xapian.org">xapian core package</ulink>
+	manifest itself by strange messages about a missing
-          and the <ulink
+	iconv_open.</para>
-          url="http://www.trolltech.com/products/qt/index.html">qt
+
-          run-time and development packages</ulink>.
+	<para>Development files for 
-          Check the <ulink url="http://www.recoll.org/download.html">
+        <ulink url="http://www.xapian.org">
+         <application>Xapian core</application></ulink></para>
+
+	<para>Development files for 
+         <ulink url="http://www.trolltech.com/products/qt/index.html">
+         <application>Qt</application> </ulink>.</para>
+
+	<para>Development files for <application>X11</application> and
+	<application>zlib</application>.</para>
+
+        <para>Check the <ulink url="http://www.recoll.org/download.html">
          &RCL; download page</ulink> for up to date version
          information.</para>
 
       <para>You will most probably be able to find a binary package for
-        <application>qt</application> for your system. You may have to
+        <application>Qt</application> for your system. You may have to
         compile &XAP; but this is not difficult (if you are using
         <application>FreeBSD</application>, there is a port).</para>
 
@@ -2736,7 +2746,7 @@ while query.next >= 0 and query.next < nres:
       <sect2 id="rcl.install.building.build">
         <title>Building</title>
 
-      <para>&RCL; has been built on Linux, FreeBSD, macosx, and Solaris,
+      <para>&RCL; has been built on Linux, FreeBSD, Mac OS X, and Solaris,
       most versions after 2005 should be ok, maybe some older ones too
       (Solaris 8 is ok). If you build on another system, and
         need to modify things,
@@ -3451,21 +3461,21 @@ skippedPaths = ~/somedir/&lowast;.txt
       file. This would extract a specific mail header and
       use it as a searchable field, with data displayable inside result
       lists. (Side note: as the mail filter does no decoding on the values,
-      only plain ascii headers can be indexed, and that only the
+      only plain ascii headers can be indexed, and only the
-      first occurrence will be used in the case of multiple occurrence
+      first occurrence will be used for headers that occur several times).
-      headers).
 
 <programlisting>[prefixes]
-# Index mail_mytag contents (with the given prefix)
+# Index mailmytag contents (with the given prefix)
 mailmytag = XMTAG
 
 [stored]
-# Store mail_mytag inside the document data record
+# Store mailmytag inside the document data record (so that it can be
+# displayed - as %(mailmytag) - in result lists).
 mailmytag = 
 
 [mail]
 # Extract the X-My-Tag mail header, and use it internally with the
-# mail_mytag field name
+# mailmytag field name
 x-my-tag = mailmytag
 </programlisting>
 </para>

website/download.html

@@ -118,52 +118,63 @@
 
       <h2><a name="source">Source</a></h2>
 
-      <p><b>Current version:</b> 1.13.04: 
+      <h3>Current version:1.13.04:</h3> 
       <!-- Attention: source packages must remain here, not in a
         subdirectory, because of all the places they're referred from
         (package watches( -->
-      
+       <p><a href="recoll-1.13.04.tar.gz">recoll-1.13.04.tar.gz</a>.
-	<a href="recoll-1.13.04.tar.gz">recoll-1.13.04.tar.gz</a>.
 	Recoll 1.13.04 fixes stemming, which was broken in 1.13.
 	<a href="CHANGES.html">Changes</a>. <a href="BUGS.html">Bugs</a>.
 	</p>
 
-      <p>If you want to build Recoll from source, you will need to install
+      <h3>Prerequisites for building from source:</h3>
-	the Xapian core development libraries. You will find source and
+        <ul>
-	binary packages on the <a href="http://www.xapian.org/download.php">
+	 <li>C++ compiler. Its absence sometimes manifests itself by
-	  Xapian download page</a>. 
+	 strange messages about iconv_open (fixed after 1.13.04).</li>
-	Recoll 1.13 needs at least xapian 1.0.5, I suggest using the
-	latest 1.0 Xapian (1.0.18 currently). It's at least quite
-	preferable to use a Xapian version after 1.0.12 as they don't
-	need the <a href="BUGS.html#XapianNearPatch">NEAR patch</a>
-	any more.</p>
 
-      <p><a name="xapian12-src"><em>Compiling with Xapian
+         <li><p>Xapian core development libraries. Most Linux distributions
-	    1.2:</em></a> because of some small 
+           carry them in their package repository. Or you will find source and
-	include file issues, Recoll 1.13 does not compile with Xapian
+	   binary packages on the 
-	1.2. You can apply this <a href="files/xapian12.patch">small
+           <a href="http://www.xapian.org/download.php">
-	  patch</a> to fix the problem. With the patch applied, Recoll
+           Xapian download page</a>. <br>
-	works just fine with the latest and greatest Xapian.</p>
 
-      <p>You will also need the development files for libX11 and zlib.</p>
+	   Recoll 1.13 needs at least xapian 1.0.5, I suggest using the
+	   latest 1.0 Xapian (1.0.18 currently). It's at least quite
+   	   preferable to use a Xapian version after 1.0.12 as they don't
+	   need the <a href="BUGS.html#XapianNearPatch">NEAR patch</a>
+	   any more.</p>
 
-      <table>
+           <p><a name="xapian12-src"><em>Compiling with Xapian
-	<tr><td valign="top">Qt:</td>
+	     1.2:</em></a> because of some small 
-	  <td>
+	     include file issues, Recoll 1.13 does not compile with Xapian
+	     1.2. You can apply this <a href="files/xapian12.patch">small
+	     patch</a> to fix the problem. With the patch applied, Recoll
+	   works just fine with the latest and greatest Xapian.</p>
+        </li>
+        <li>X11 development files.</li>
+        <li>zlib development files.</p>
+        <li><p>Qt development files
 	  You can build with Qt 3.3 or Qt 4. Recoll will
 	  automatically be configured to build with Qt 4 if the version
-	  of qmake found in $PATH:$QTDIR/bin is for Qt 4 (you can also
+	  of qmake found in $PATH:$QTDIR/bin is for Qt 4 (you can/should also
 	  set the QMAKE variable to explicitely choose the
-	  desired version, like <tt>QMAKE=qmake-qt4</tt>).</td></tr> 
+	  desired version, like <tt>QMAKE=qmake-qt4</tt>).</p>
-	<tr><td></td><td>
+          <p>There seems to be a few issues in Qt 4.4.0 (2008-08-23),
-	  There seems to be a few issues in Qt 4.4.0 (2008-08-23),
 	  resulting in problems when displaying the Recoll result
-	  list. <br> Qt 4.3, 4.4.x,4.5 and 4.6 seem to work fine.
+	  list. <br> Qt 4.3, 4.4.x,4.5 and 4.6 seem to work fine.</p></li>
-	</td></tr>
+      </ul>
-      </table>
 
-      <p>Older recoll releases:
+      <h3>KDE kicker applet:</h3>
-	<a href="recoll-1.13.02.tar.gz">1.13.02</a>.
+       <p>the applet can start a Recoll search
+        from the KDE toolbar. It is in a separate source file.
+	<a href="recoll_applet-1.10.0.tgz">recoll_applet-1.10.0.tgz</a>.
+	This is a very slightly modified version of the 
+	<a href="http://demandiseineseite.gmxhome.de/find/">
+	find_applet</a>. It will work with any recoll version after 1.10.</p>
+
+      <h3>Older recoll releases:</h3>
+       <p>
+        <a href="recoll-1.13.02.tar.gz">1.13.02</a>.
 	<a href="recoll-1.12.4.tar.gz">1.12.4</a>.
 	<a href="recoll-1.11.4.tar.gz">1.11.4</a>.
 	<a href="recoll-1.10.6.tar.gz">1.10.6</a>.
@@ -179,12 +190,6 @@
 	<a href="older/recoll-1.0.16.tar.gz">1.0.16</a>.
       </p>
 
-      <p>A separate source file contains a KDE kicker applet to start
-	a Recoll search from the KDE toolbar: 
-	<a href="recoll_applet-1.10.0.tgz">recoll_applet-1.10.0.tgz</a>.
-	This is a very slightly modified version of the 
-	<a href="http://demandiseineseite.gmxhome.de/find/">
-	  find_applet</a>. It will work with any recoll version after 1.10.</p>
 
       <h2><a name="rpms">Packages</a></h2>