1.15.5

src/VERSION

@@ -1 +1 @@
-1.15.4
+1.15.5

src/doc/user/usermanual.sgml

@@ -513,14 +513,40 @@ recoll
           <replaceable>confdir</replaceable> option to specify a non-default
           configuration directory.</para>
 
+        <para>Reasons to use either the indexing thread or the
+        <command>recollindex</command> command:
+          <itemizedlist>
+            <listitem><para>Starting the indexing thread is more convenient,
+            being just one click away.</para>
+            </listitem>
+            <listitem><para>The <command>recollindex</command> command has
+            more options, especially the one to reset the index
+            (<literal>-z</literal>).</para>
+            </listitem>
+            <listitem><para>The <command>recollindex</command> command will
+            not take down your GUI if it crashes (a rare occurrence, but who
+            knows...)</para>
+            </listitem>
+            <listitem><para>The <command>recollindex</command> command uses
+            <command>setpriority/nice</command> to lower its priority while
+            indexing 
+            (it will also use <command>ionice</command> when this becomes
+            more widely available), the thread can't do it, else it would
+            also slow down the user/search interface.</para>
+            </listitem>
+          </itemizedlist>
+          I'll let the reader decide where my heart belongs...</para>
+
         <para>If the <command>recoll</command> program finds no index
           when it starts, it will automatically start indexing (except
           if canceled).</para>
 
-        <para>The indexing process can be interrupted by sending an
+        <para>The <command>recollindex</command> indexing process can be
+          interrupted by sending an 
           interrupt (^C, SIGINT) or terminate (SIGTERM) signal. Some time may
           elapse before the process exits, because it needs to properly flush
-          and close the index.</para>
+          and close the index. The indexing thread can be equivalently
+          stopped from the menu.</para>
 
 	<para>After such an interruption, the index will be somewhat
 	  inconsistent because some operations which are normally performed
@@ -966,11 +992,11 @@ fvwm
 
       <para>The preview tabs have an internal incremental search
       function. You initiate the search either by typing a
-      <keycap>/</keycap> (slash) inside the text area or by clicking
-      into the <guilabel>Search for:</guilabel> text field and
-      entering the search string. You can then use the
-      <guilabel>Next</guilabel> and <guilabel>Previous</guilabel>
-      buttons to find the next/previous occurrence. You can also type
+      <keycap>/</keycap> (slash) or <keycap>CTL-F</keycap> inside the text
+      area or by clicking into the <guilabel>Search for:</guilabel> text
+      field and entering the search string. You can then use the
+      <guilabel>Next</guilabel> and <guilabel>Previous</guilabel> buttons
+      to find the next/previous occurrence. You can also type
       <keycap>F3</keycap> inside the text area to get to the next
       occurrence.</para>