--- a/src/doc/user/usermanual.xml
+++ b/src/doc/user/usermanual.xml
@@ -226,13 +226,12 @@
diacritics (<literal>sake</literal> / <literal>sakĂŠ</literal>,
<literal>mate</literal> / <literal>matĂŠ</literal>).</para>
- <para>&RCL; versions 1.18 and newer can optionally store the raw
- terms, without accent stripping or case conversion. In this
- configuration, default searches will behave as before, but it is
- possible to perform searches sensitive to case and
- diacritics. This is described in more detail
- in the <link linkend="RCL.INDEXING.CONFIG.SENS">section about index
- case and diacritics sensitivity</link>.</para>
+ <para>&RCL; can optionally store the raw terms, without accent
+ stripping or case conversion. In this configuration, default searches
+ will behave as before, but it is possible to perform searches
+ sensitive to case and diacritics. This is described in more detail in
+ the <link linkend="RCL.INDEXING.CONFIG.SENS">section about index case
+ and diacritics sensitivity</link>.</para>
<para>&RCL; has many parameters which define exactly what to
index, and how to classify and decode the source
@@ -327,7 +326,7 @@
<sect2 id="RCL.INDEXING.INTRODUCTION.MODES">
<title>Indexing modes</title>
- <para>&RCL; indexing can be performed along two different modes:
+ <para>&RCL; indexing can be performed along two main modes:
<itemizedlist>
<listitem>
<formalpara>
@@ -343,18 +342,16 @@
</listitem>
<listitem>
<formalpara><title><link linkend="RCL.INDEXING.MONITOR">Real
- time indexing:</link></title>
- <para>indexing takes place as soon as a file is created or
- changed. <command>recollindex</command> runs as a daemon
- and uses a file system alteration monitor such as
- <application>inotify</application>,
- <application>Fam</application> or
- <application>Gamin</application>
- to detect file changes.</para>
- </formalpara>
+ time indexing:</link></title> <para>indexing takes place as
+ soon as a file is created or
+ changed. <command>recollindex</command> runs as a daemon and
+ uses a file system alteration monitor
+ (e.g. <application>inotify</application>) to detect file
+ changes.</para> </formalpara>
</listitem>
</itemizedlist>
</para>
+
<para>The choice between the two methods is mostly a matter of
preference, and they can be combined by setting up multiple
indexes (ie: use periodic indexing on a big documentation
@@ -362,6 +359,12 @@
directory). Monitoring a big file system tree can consume
significant system resources.</para>
+ <para>With &RCL; 1.25 and newer, it is also possible to set up an
+ index so that only a subset of the tree will be monitored and the
+ rest will be covered by batch/incremental indexing. (See the
+ details in the <link linkend="RCL.INDEXING.MONITOR">Real time
+ indexing</link> section.</para>
+
<para>The choice of method and the parameters used can be
configured from the <command>recoll</command> GUI:
<menuchoice>
@@ -378,11 +381,12 @@
mostly resume from where things stopped (the file tree walk has to
be restarted from the beginning).</para>
- <para>When the real time indexer is running, only a stop operation
- is available from the menu. When no indexing is running, you have
- a choice of updating the index or rebuilding it (the first choice
- only processes changed files, the second one zeroes the index
- before starting so that all files are processed).</para>
+ <para>When the real time indexer is running, two operations are
+ available from the menu: 'Stop' and 'Trigger incremental pass'.
+ When no indexing is running, you have a choice of updating the
+ index or rebuilding it (the first choice only processes changed
+ files, the second one zeroes the index before starting so that all
+ files are processed).</para>
</sect2>
@@ -1456,7 +1460,7 @@
session monitoring (else the daemon will not start).</para>
<para>By default, the messages from the indexing daemon will be
- setn to the same file as those from the interactive commands
+ sent to the same file as those from the interactive commands
(<literal>logfilename</literal>). You may want to change this
by setting the <varname>daemlogfilename</varname> and
<varname>daemloglevel</varname> configuration parameters. Also
@@ -1481,6 +1485,17 @@
system resources. You probably do not want to enable it if
your system is short on resources. Periodic indexing is
adequate in most cases.</para>
+
+ <para>As of &RCL; 1.25, you can set the <link
+ linkend="RCL.INSTALL.CONFIG.RECOLLCONF.MONITORDIRS">monitordirs</link>
+ configuration variable to specify that only a subset of your indexed
+ files will be monitored for instant indexing. In this situation, an
+ incremental pass on the full tree can be triggered by either
+ restarting the indexer, or just running the
+ <command>recollindex</command>, which will notify the running
+ process. The <command>recoll</command> GUI also has a menu entry for
+ this.</para>
+
<note><title>Increasing resources for inotify</title>
<para>On Linux systems, monitoring a big tree may need