*** empty log message ***

src/doc/man/recollindex.1

@@ -1,4 +1,4 @@
-.\" $Id: recollindex.1,v 1.3 2006-11-20 18:07:02 dockes Exp $ (C) 2005 J.F.Dockes\$
+.\" $Id: recollindex.1,v 1.4 2006-12-22 11:01:28 dockes Exp $ (C) 2005 J.F.Dockes\$
 .TH RECOLLINDEX 1 "8 January 2006"
 .SH NAME
 recollindex \- indexing command for the Recoll full text search system
@@ -17,6 +17,10 @@ recollindex \- indexing command for the Recoll full text search system
 .B -m
 ]
 [
+.B -w
+<seconds>
+]
+[
 .B -D
 ]
 .br
@@ -28,6 +32,14 @@ recollindex \- indexing command for the Recoll full text search system
 .B -i 
 <filename [filename ...]>
 .br
+.B recollindex 
+[
+.B -c
+<configdir>
+]
+.B -e 
+<filename [filename ...]>
+.br
 .B recollindex
 [
 .B -c
@@ -54,7 +66,7 @@ The
 option specifies the configuration directory name, overriding the
 default or $RECOLL_CONFDIR.
 .PP
-There are three modes of operation. 
+There are several modes of operation. 
 .PP
 The normal mode will index the set of files described in the configuration
 file 
@@ -67,22 +79,30 @@ is given, the database will be erased before starting.
 If option 
 .B
 -m 
-is given, then recollindex is started for real time monitoring, using the
+is given, recollindex is started for real time monitoring, using the
-package it was configured for (either fam, gamin, or inotify). This mode
+file system monitoring package it was configured for (either fam, gamin, or
-must have been explicitely configured when building the package, it is not
+inotify). This mode must have been explicitely configured when building the
-available by default. The program will normally detach from the controlling
+package, it is not available by default. The program will normally detach
-terminal and become a daemon. If option 
+from the controlling terminal and become a daemon. If option
 .B
 -D 
-is given, it will stay in foreground.
+is given, it will stay in the foreground. Option
+.B
+-w 
+<seconds> can be used to specify that the program should sleep for the
+specified time before indexing. The default value is 60.
 
 .PP
-The two other modes are useful mainly for testing.
+The other modes are useful mainly for testing.
 .PP
 .B recollindex -i
 will index individual files into the database. The stem expansion databases
 will not be updated.
 .PP
+.B recollindex -e
+will erase data for individual files from the database. The stem expansion
+databases will not be updated.
+.PP
 .B recollindex -s 
 will build the stem expansion database for a given language, which may or
 may not be part of the list in the configuration file. If the language is

src/doc/user/usermanual.sgml

@@ -24,7 +24,7 @@
       Dockes</holder>
     </copyright>
 
-    <releaseinfo>$Id: usermanual.sgml,v 1.31 2006-12-20 09:54:17 dockes Exp $</releaseinfo>
+    <releaseinfo>$Id: usermanual.sgml,v 1.32 2006-12-22 11:01:28 dockes Exp $</releaseinfo>
 
     <abstract>
       <para>This document introduces full text search notions
@@ -439,11 +439,10 @@ recoll
       <filename>examples</filename> directory (typically
       <filename>/usr/local/[share/]recoll/examples</filename>).</para>
 
-      <para>Starting and stopping the daemon could be performed, for
+      <para>Starting and stopping the daemon can be performed as part
-      example, as part of the user session script. For example, my
+      of the user session script. For example, my out of fashion
-      out of fashion xdm-based session has a
+      xdm-based session has a <filename>.xsession</filename> script
-      <filename>.xsession</filename> script with the following lines 
+      with the following lines at the end:</para>
-      at the end:</para> 
 
       <programlisting>recollconf=$HOME/.recoll-home
 recolldata=/usr/local/share/recoll
@@ -616,6 +615,8 @@ RECOLL_CONFDIR=$recollconf $recolldata/examples/rclmon.sh stop
 	  <listitem><para><guilabel>Copy File Name</guilabel></para></listitem>
 	  <listitem><para><guilabel>Copy Url</guilabel></para></listitem>
 	  <listitem><para><guilabel>Find similar</guilabel></para></listitem>
+	  <listitem><para><guilabel>Find similar</guilabel></para></listitem>
+	  <listitem><para><guilabel>Parent document</guilabel></para></listitem>
 	</itemizedlist>
 
 	<para>The <guilabel>Preview</guilabel> and
@@ -630,6 +631,21 @@ RECOLL_CONFDIR=$recollconf $recolldata/examples/rclmon.sh stop
           search, with a good chance of finding documents related to the
          current result.</para>
 
+	<para>The <guilabel>Copy File Name</guilabel> and
+	<guilabel>Copy Url</guilabel> copy the relevant data to the
+	clipboard, for later pasting.</para> 
+
+        <para>The <guilabel>Parent document</guilabel> entry will
+          appear for documents which are not actually files but are
+          part of, or attached to, a higher level document. This entry
+          is mainly useful for email attachments and permits viewing
+          the message to which the document is attached. Note that the
+          entry will also appear for an email which is part of an mbox
+          folder file, but that you can't actually visualize the
+          folder (there will be an error dialog if you try). &RCL; is
+          unfortunately not yet smart enough to disable the entry in
+          this case.</para>
+
       </sect2>
     </sect1>
 

src/qtgui/spell_w.h

@@ -1,6 +1,6 @@
 #ifndef _ASPELL_W_H_INCLUDED_
 #define _ASPELL_W_H_INCLUDED_
-/* @(#$Id: spell_w.h,v 1.6 2006-12-19 12:11:21 dockes Exp $  (C) 2006 J.F.Dockes */
+/* @(#$Id: spell_w.h,v 1.7 2006-12-22 11:01:28 dockes Exp $  (C) 2006 J.F.Dockes */
 /*
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@
 
 #include <qvariant.h>
 #include <qwidget.h>
-#include "rcldb.h"
 
 //MOC_SKIP_BEGIN
 #if QT_VERSION < 0x040000