--- a/src/doc/user/usermanual.xml
+++ b/src/doc/user/usermanual.xml
@@ -5651,880 +5651,10 @@
 
 	  </sect2>
 
-      <sect2 id="RCL.INSTALL.CONFIG.RECOLLCONF">
-        <title>The main configuration file, recoll.conf</title>
-
-        <para><filename>recoll.conf</filename> is the main
-         configuration file. It defines things like
-         what to index (top directories and things to ignore), and the
-         default character set to use for document types which do not
-         specify it internally.</para>
-
-        <para>The default configuration will index your home
-         directory. If this is not appropriate, start
-         <command>recoll</command> to create a blank 
-         configuration, click <guimenu>Cancel</guimenu>, and edit
-         the configuration file before restarting the command. This
-         will start the initial indexing, which may take some time.</para>
-
-        <para>Most of the following parameters can be changed from the
-        <guilabel>Index Configuration</guilabel> menu in the
-        <command>recoll</command> interface. Some can only be set by
-        editing the configuration file.</para>
-
-        <sect3 id="RCL.INSTALL.CONFIG.RECOLLCONF.FILES">
-          <title>Parameters affecting what documents we index:</title>
-
-        <variablelist>
-
-          <varlistentry id="RCL.INSTALL.CONFIG.RECOLLCONF.TOPDIRS">
-            <term><varname>topdirs</varname></term>
-            <listitem><para>Specifies the list of directories or files to
-            index (recursively for directories). You can use symbolic links
-            as elements of this list. See the
-            <varname>followLinks</varname> option about following symbolic links
-            found under the top elements (not followed by default).</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>skippedNames</varname></term>
-            <listitem>
-              <para>A space-separated list of wilcard patterns for
-               names of files or directories that should be completely
-               ignored. The list defined in the default file is: </para>
-<programlisting>
-skippedNames = #* bin CVS  Cache cache* caughtspam  tmp .thumbnails .svn \
- 	       *~ .beagle .git .hg .bzr loop.ps .xsession-errors \
-	       .recoll* xapiandb recollrc recoll.conf 
-</programlisting>
-              <para>The list can be redefined at any sub-directory in the
-		indexed area.</para>
-              <para>The top-level directories are not affected by this
-                list (that is, a directory in <varname>topdirs</varname>
-                might match and would still be indexed).</para>
-                <para>The list in the default configuration does not
-                exclude hidden directories (names beginning with a
-                dot), which means that it may index quite a few things
-                that you do not want. On the other hand, email user
-                agents like <application>thunderbird</application>
-                usually store messages in hidden directories, and you
-                probably want this indexed. One possible solution is to
-                have <filename>.*</filename> in
-                <varname>skippedNames</varname>, and add things like
-                <filename>~/.thunderbird</filename> or
-                <filename>~/.evolution</filename> in
-                <varname>topdirs</varname>.</para> 
-
-                <para>Not even the file names are indexed for patterns
-                in this list. See the
-                <varname>noContentSuffixes</varname> variable for an alternative
-                approach which indexes the file names.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>noContentSuffixes</varname></term>
-          <listitem><para>This is a list of file name endings (not
-          wildcard expressions, nor dot-delimited suffixes). Only the
-          names of matching files will be indexed (no attempt at MIME
-          type identification, no decompression, no content
-          indexing). This can be redefined for
-          subdirectories, and edited from the GUI. The default value is:
-<programlisting>
-noContentSuffixes = .md5 .map \
-       .o .lib .dll .a .sys .exe .com \
-       .mpp .mpt .vsd \
-	   .img .img.gz .img.bz2 .img.xz .image .image.gz .image.bz2 .image.xz \
-       .dat .bak .rdf .log.gz .log .db .msf .pid \
-       ,v ~ #
-</programlisting>
-          </para></listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>skippedPaths</varname> and
-             <varname>daemSkippedPaths</varname> </term>
-            <listitem>
-              <para>A space-separated list of patterns for
-               <emphasis>paths</emphasis> of files or directories that should be skipped.
-               There is no default in the sample configuration file,
-               but the code always adds the configuration and database
-               directories in there.</para>
-              <para><varname>skippedPaths</varname> is used both by
-              batch and real time
-              indexing. <varname>daemSkippedPaths</varname> can be
-              used to specify things that should be indexed at
-              startup, but not monitored.</para>
-              <para>Example of use for skipping text files only in a
-              specific directory:</para>
-              <programlisting>
-skippedPaths = ~/somedir/*.txt
-              </programlisting>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry id="RCL.INSTALL.CONFIG.RECOLLCONF.SKIPPEDPATHSFNMPATHNAME">
-            <term><varname>skippedPathsFnmPathname</varname></term>
-                <listitem><para>The values in the
-                <varname>*skippedPaths</varname> variables are matched by
-                default with <literal>fnmatch(3)</literal>, with the
-                FNM_PATHNAME flag. This means that '/'
-                characters must be matched explicitely. You can set
-                <varname>skippedPathsFnmPathname</varname> to 0 to disable
-                the use of FNM_PATHNAME (meaning that /*/dir3 will match
-                /dir1/dir2/dir3).</para>
-
-            </listitem>
-          </varlistentry>
-
-	  <varlistentry id="RCL.INSTALL.CONFIG.RECOLLCONF.ZIPSKIPPEDNAMES">
-	    <term><varname>zipSkippedNames</varname></term>
-	    <listitem><para>A space-separated list of patterns for
-               names of files or directories that should be ignored
-               inside zip archives. This is used directly by the zip
-               handler, and has a function similar to skippedNames, but
-               works independantly. Can be redefined for filesystem
-               subdirectories. For versions up to 1.19, you will need
-               to update the Zip handler and install a supplementary
-               Python module. The details are
-               described <ulink url="https://bitbucket.org/medoc/recoll/wiki/Filtering%20out%20Zip%20archive%20members">on
-		  the &RCL; wiki</ulink>.
-	    </para></listitem>
-	  </varlistentry>
-
-          <varlistentry id="RCL.INSTALL.CONFIG.RECOLLCONF.FOLLOWLINKS">
-            <term><varname>followLinks</varname></term>
-            <listitem><para>Specifies if the indexer should follow
-            symbolic links while walking the file tree. The default is
-            to ignore symbolic links to avoid multiple indexing of
-            linked files. No effort is made to avoid duplication when
-            this option is set to true. This option can be set
-            individually for each of the <varname>topdirs</varname>
-            members by using sections. It can not be changed below the
-            <varname>topdirs</varname> level.</para>
-            </listitem> 
-          </varlistentry>
-
-          <varlistentry><term><varname>indexedmimetypes</varname></term>
-            <listitem><para>&RCL; normally indexes any file which it
-            knows how to read. This list lets you restrict the indexed
-            MIME types to what you specify. If the variable is
-            unspecified or the list empty (the default), all supported
-            types are processed. Can be redefined for subdirectories.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>excludedmimetypes</varname></term>
-            <listitem><para> This list lets you exclude some MIME types from
-            indexing. Can be redefined for subdirectories.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>compressedfilemaxkbs</varname></term>
-            <listitem><para>Size limit for compressed (.gz or .bz2)
-            files. These need to be decompressed in a temporary
-            directory for identification, which can be very wasteful
-            if 'uninteresting' big compressed files are present.
-            Negative means no limit, 0 means no processing of any
-            compressed file. Defaults to -1.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>textfilemaxmbs</varname></term>
-            <listitem><para>Maximum size for text files. Very big text
-            files are often uninteresting logs. Set to -1 to disable
-            (default 20MB).</para>  
-            </listitem>
-           </varlistentry>
-
-          <varlistentry><term><varname>textfilepagekbs</varname></term>
-            <listitem><para>If set to other than -1, text files will be
-            indexed as multiple documents of the given page size. This may
-            be useful if you do want to index very big text files as it
-            will both reduce memory usage at index time and help with
-            loading data to the preview window. A size of a few megabytes
-            would seem reasonable (default: 1MB).</para>
-            </listitem>
-           </varlistentry>
-
-          <varlistentry><term><varname>membermaxkbs</varname></term>
-            <listitem><para>This defines the maximum size in kilobytes for
-            an archive member (zip, tar or rar at the moment). Bigger
-            entries will be skipped.</para>
-              </listitem>
-            </varlistentry>
-
-          <varlistentry><term><varname>indexallfilenames</varname></term>
-            <listitem><para>&RCL; indexes file names in a special
-            section of the database to allow specific file names
-            searches using wild cards. This parameter decides if 
-            file name indexing is performed only for files with MIME
-            types that would qualify them for full text indexing, or
-            for all files inside the selected subtrees, independently of
-            MIME type.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>usesystemfilecommand</varname></term>
-            <listitem><para>Decide if we execute a system command 
-            (<command>file</command> <option>-i</option> by default)
-            as a final step for determining the MIME type for a file
-            (the main procedure uses suffix associations as defined in
-            the <filename>mimemap</filename> file). This can be useful
-            for files with suffix-less names, but it will also cause
-            the indexing of many bogus "text" files.</para>
-            </listitem> 
-	  </varlistentry>
-
-          <varlistentry><term><varname>systemfilecommand</varname></term>
-            <listitem><para>Command to use for mime for mime type
-            determination if <literal>usesystefilecommand</literal> is
-            set. Recent versions of <command>xdg-mime</command> sometimes
-            work better than <command>file</command>.</para>
-            </listitem> 
-	  </varlistentry>
-
-          <varlistentry><term><varname>processwebqueue</varname></term>
-            <listitem><para>If this is set, process the directory where
-            Web browser plugins copy visited pages for indexing.</para>
-            </listitem>
-           </varlistentry>
-
-          <varlistentry><term><varname>webqueuedir</varname></term>
-            <listitem><para>The path to the web indexing queue. This is
-            hard-coded in the Firefox plugin as
-            <filename>~/.recollweb/ToIndex</filename> so there should be no
-            need to change it.</para> 
-            </listitem>
-           </varlistentry>
-
-        </variablelist>
-       </sect3>
-
-       <sect3 id="RCL.INSTALL.CONFIG.RECOLLCONF.TERMS">
-	<title>Parameters affecting how we generate terms:</title>
-
-        <para>Changing some of these parameters will imply a full
-          reindex. Also, when using multiple indexes, it may not make sense
-          to search indexes that don't share the values for these parameters,
-          because they usually affect both search and index operations.</para>
-
-        <variablelist>
-
-          <varlistentry><term><varname>indexStripChars</varname></term>
-            <listitem><para>Decide if we strip characters of diacritics and
-                convert them to lower-case before terms are indexed. If we
-                don't, searches sensitive to case and diacritics can be
-                performed, but the index will be bigger, and some marginal
-                weirdness may sometimes occur. The default is a stripped
-                index (<literal>indexStripChars = 1</literal>) for
-                now. When using multiple indexes for a search,
-                this parameter must be defined identically for
-                all. Changing the value implies an index reset.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>maxTermExpand</varname></term>
-            <listitem><para>Maximum expansion count for a single term (e.g.:
-                when using wildcards). The default of 10000 is reasonable and
-                will avoid queries that appear frozen while the engine is
-                walking the term list.</para>
-            </listitem>
-         </varlistentry>
-
-          <varlistentry><term><varname>maxXapianClauses</varname></term>
-            <listitem><para>Maximum number of elementary clauses we can add
-                to a single Xapian query. In some cases, the result of term
-                expansion can be multiplicative, and we want to avoid using
-                excessive memory. The default of 100 000 should be both
-                high enough in most cases and compatible with current
-                typical hardware configurations.</para>
-            </listitem>
-         </varlistentry>
-
-          <varlistentry><term><varname>nonumbers</varname></term>
-            <listitem><para>If this set to true, no terms will be generated
-            for numbers. For example "123", "1.5e6", 192.168.1.4, would not
-            be indexed ("value123" would still be). Numbers are often quite
-            interesting to search for, and this should probably not be set
-            except for special situations, ie, scientific documents with huge
-            amounts of numbers in them. This can only be set for a whole
-            index, not for a subtree.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>dehyphenate</varname></term>
-            <listitem><para>Determines if, given an input of
-            <literal>co-worker</literal>, we add a term for
-            <literal>coworker</literal>. This possibility is new in version
-            1.22, and on by default. Setting the variable to off allows
-            restoring the previous behaviour.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>nocjk</varname></term>
-            <listitem><para>If this set to true, specific east asian
-            (Chinese Korean Japanese) characters/word splitting is
-            turned off. This will save a small amount of cpu if you
-            have no CJK documents. If your document base does include
-            such text but you are not interested in searching it,
-            setting <varname>nocjk</varname> may be a significant time
-            and space saver.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>cjkngramlen</varname></term>
-            <listitem><para>This lets you adjust the size of n-grams
-            used for indexing CJK text. The default value of 2 is
-            probably appropriate in most cases. A value of 3 would
-            allow more precision and efficiency on longer words, but
-            the index will be approximately twice as large.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>indexstemminglanguages</varname></term>
-            <listitem><para>A list of languages for which the stem
-            expansion databases will be built. See <citerefentry>
-            <refentrytitle>recollindex</refentrytitle>
-            <manvolnum>1</manvolnum> </citerefentry> or use the
-            <command>recollindex</command> <option>-l</option> command
-            for possible values. You can add a stem expansion database
-            for a different language by using
-            <command>recollindex</command> <option>-s</option>, but it
-            will be deleted during the next indexing. Only languages
-            listed in the configuration file are permanent.</para>
-            </listitem> 
-          </varlistentry>
-         
-          <varlistentry><term><varname>defaultcharset</varname></term>
-            <listitem><para>The name of the character set used for
-            files that do not contain a character set definition (ie:
-            plain text files). This can be redefined for any
-            sub-directory. If it is not set at all, the character set
-            used is the one defined by the nls environment (
-	    <envar>LC_ALL</envar>, <envar>LC_CTYPE</envar>, 
-	    <envar>LANG</envar>), or <literal>iso8859-1</literal> 
-	    if nothing is set.</para> 
-	   </listitem>
-         </varlistentry>
-
-          <varlistentry><term><varname>unac_except_trans</varname></term>
-            <listitem><para>This is a list of characters, encoded in UTF-8,
-            which should be handled specially when converting text to
-            unaccented lowercase.  For example, in Swedish, the letter
-            <literal>a with diaeresis</literal> has full alphabet
-            citizenship and should not be turned into an
-            <literal>a</literal>. Each element in the space-separated list
-            has the special character as first element and the translation
-            following. The handling of both the lowercase and upper-case
-            versions of a character should be specified, as appartenance to
-            the list will turn-off both standard accent and case
-            processing. Example for Swedish:</para>
-                <programlisting>
-unac_except_trans =  ���� ���� ���� ���� ���� ����
-            </programlisting>
-
-            <para>Note that the translation is not limited to a single
-            character, you could very well have something like
-            <literal>��ue</literal> in the list.</para>
-
-             <para>The default value set for
-             <literal>unac_except_trans</literal> can't be listed here
-             because I have trouble with SGML and UTF-8, but it only
-             contains ligature decompositions: german ss, oe, ae, fi,
-             fl.</para>
-
-             <para>This parameter can't be defined for subdirectories, it
-             is global, because there is no way to do otherwise when
-             querying. If you have document sets which would need different
-             values, you will have to index and query them separately.</para> 
-              </listitem>
-            </varlistentry>
-
-          <varlistentry><term><varname>maildefcharset</varname></term>
-            <listitem><para>This can be used to define the default
-		character set specifically for email messages which don't
-		specify it. This is mainly useful for readpst (libpst) dumps,
-		which are utf-8 but do not say so.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>localfields</varname></term>
-            <listitem><para>This allows setting fields for all documents
-            under a given directory. Typical usage would be to set an
-            "rclaptg" field, to be used in <filename>mimeview</filename> to
-            select a specific viewer. If several fields are to be set, they
-            should be separated with a semi-colon (';') character, which there
-            is currently no way to escape. Also note the initial semi-colon. 
-            Example:
-		<literal>localfields= ;rclaptg=gnus;other = val</literal>, then
-		select specifier viewer with
-		<literal>mimetype|tag=...</literal> in
-		<filename>mimeview</filename>.</para>  
-            </listitem>
-           </varlistentry>
-
-          <varlistentry><term><varname>testmodifusemtime</varname></term>
-            <listitem><para>If true, use mtime instead of default ctime to
-              determine if a file has been modified (in addition to
-              size, which is always used). Setting this can reduce
-              re-indexing on systems where extended attributes are
-              modified (by some other application), but not indexed
-              (changing extended attributes only affects
-              ctime). Notes:
-              <itemizedlist>
-                <listitem><para>This may prevent detection of change
-                in some marginal file rename cases (the target would
-                need to have the same size and
-                mtime).</para></listitem>
-                <listitem><para>You should probably also set
-                noxattrfields to 1 in this case, except if you still
-                prefer to perform xattr indexing, for example if the
-                local file update pattern makes it of value (as in
-                general, there is a risk for pure extended attributes
-                updates without file modification to go
-                undetected).</para></listitem>
-              </itemizedlist>
-                Perform a full index reset after changing the value of
-                this parameter.
-            </para></listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>noxattrfields</varname></term>
-            <listitem><para>Recoll versions 1.19 and later
-                automatically translate file extended attributes into
-                document fields (to be processed according to the
-                parameters from the <filename>fields</filename>
-                file). Setting this variable to 1 will disable the
-                behaviour.</para></listitem>
-          </varlistentry>
-
-          <varlistentry id="RCL.INSTALL.CONFIG.RECOLLCONF.METADATACMDS">
-            <term><varname>metadatacmds</varname></term>
-            <listitem><para>This allows executing external commands
-                for each file and storing the output in &RCL; document
-                fields. This could be used for example to index
-                external tag data. The value is a list of field names
-                and commands, don't forget an initial
-                semi-colon. Example:
-                <programlisting>
-[/some/area/of/the/fs]
-metadatacmds = ; tags = tmsu tags %f; otherfield = somecmd -xx %f
-                </programlisting>
-              </para> <para>As a specially disgusting hack brought by
-                &RCL; 1.19.7, if a "field name" begins
-                with <literal>rclmulti</literal>, the data returned by
-                the command is expected to contain multiple field
-                values, in configuration file format. This allows
-                setting several fields by executing a single
-                command. Example:
-                <programlisting>
-metadatacmds = ; rclmulti1 = somecmd %f
-                </programlisting>
-                If <literal>somecmd</literal> returns data in the form
-                of:
-                <programlisting>
-field1 = value1
-field2 = value for field2
-                </programlisting>
-                <literal>field1</literal>
-                and <literal>field2</literal> will be set inside the
-                document metadata.</para>
-            </listitem>
-          </varlistentry>
-
-        </variablelist>
-
-
-       </sect3>
-
-       <sect3 id="RCL.INSTALL.CONFIG.RECOLLCONF.STORAGE">
-	<title>Parameters affecting where and how we store things:</title>
-
-
-          <variablelist>
-          
-          <varlistentry><term><varname>cachedir</varname></term>
-            <listitem>
-            <para>When not explicitly specified, the &RCL; data directories
-            are stored relative to the configuration directory. If
-            <literal>cachedir</literal> is set, the directories are stored
-            under the specified value instead (e.g. if
-            <literal>cachedir</literal> is set to
-            <filename>~/.cache/recoll</filename>, the default
-            <literal>dbdir</literal> would be
-            <filename>~/.cache/recoll/xapiandb</filename> instead of
-            <filename>~/.recoll/xapiandb</filename> ). This affects the
-            default values for <literal>dbdir</literal>,
-            <literal>webcachedir</literal>,
-            <literal>mboxcachedir</literal>, and
-            <literal>aspellDicDir</literal>, which can still be
-            individually specified to override
-            <literal>cachedir</literal>. Note that if you have multiple
-            configurations, each must have a different
-            <literal>cachedir</literal>.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>dbdir</varname></term>
-            <listitem><para>The name of the Xapian data directory. It
-            will be created if needed when the index is
-            initialized. If this is not an absolute path, it will be
-            interpreted relative to the configuration directory. The
-            value can have embedded spaces but starting or trailing
-            spaces will be trimmed. You cannot use quotes here.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>idxstatusfile</varname></term>
-            <listitem><para>The name of the scratch file where the indexer
-                process updates its status. Default:
-            <filename>idxstatus.txt</filename> inside the configuration
-            directory.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>maxfsoccuppc</varname></term>
-            <listitem><para>Maximum file system occupation before we
-            stop indexing. The value is a percentage, corresponding to
-            what the "Capacity" df output column shows.  The default
-            value is 0, meaning no checking. </para>
-            </listitem>
-          </varlistentry>
-
-	  <varlistentry><term><varname>mboxcachedir</varname></term>
-	    <listitem><para>The directory where mbox message offsets cache
-	    files are held. This is normally $RECOLL_CONFDIR/mboxcache, but
-	    it may be useful to share a directory between different
-	    configurations.</para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry><term><varname>mboxcacheminmbs</varname></term>
-	    <listitem><para>The minimum mbox file size over which we
-		cache the offsets. There is really no sense in caching
-		offsets for small files. The default is 5 MB.</para>
-	    </listitem>
-	   </varlistentry>
-
-          <varlistentry><term><varname>webcachedir</varname></term>
-            <listitem><para>This is only used by the web browser
-            plugin indexing code, and defines where the cache for visited
-            pages will live. Default:
-            <filename>$RECOLL_CONFDIR/webcache</filename></para> 
-            </listitem>
-
-           </varlistentry>
-          <varlistentry><term><varname>webcachemaxmbs</varname></term>
-            <listitem><para>This is only used by the web browser
-            plugin indexing code, and defines the maximum size for the web
-            page cache. Default: 40 MB. Quite unfortunately, this is only
-            taken into account when creating the cache file. You need to
-            delete the file for a change to be taken into account.</para> 
-            </listitem>
-           </varlistentry>
-
-
-          <varlistentry><term><varname>idxflushmb</varname></term>
-            <listitem><para>Threshold (megabytes of new text data) where we
-            flush from memory to disk index. Setting this can help control
-            memory usage. A value of 0 means no explicit flushing, letting
-            Xapian use its own default, which is flushing every 10000 (or
-            XAPIAN_FLUSH_THRESHOLD) documents, which gives little memory
-            usage control, as memory usage also depends on average document
-            size. The default value is 10, and it is probably a bit low. If
-            your system usually has free memory, you can try higher values
-            between 20 and 80. In my experience, values beyond 100 are
-            always counterproductive.</para> 
-            </listitem>
-          </varlistentry>
-
-        </variablelist>
-       </sect3>
-
-       <sect3 id="RCL.INSTALL.CONFIG.RECOLLCONF.IDXTHREADS">
-	<title>Parameters affecting multithread processing</title>
-
-        <para>The &RCL; indexing process 
-          <command>recollindex</command> can use multiple threads to
-          speed up indexing on multiprocessor systems. The work done
-          to index files is divided in several stages and some of the
-          stages can be executed by multiple threads. The stages are:
-          <orderedlist>
-            <listitem>File system walking: this is always performed by
-              the main thread.</listitem>
-            <listitem>File conversion and data extraction.</listitem>
-            <listitem>Text processing (splitting, stemming,
-            etc.)</listitem>
-            <listitem>&XAP; index update.</listitem>
-          </orderedlist>
-        </para>
-        <para>You can also read a 
-          <ulink url="http://www.recoll.org/idxthreads/threadingRecoll.html">
-            longer document</ulink> about the transformation of
-          &RCL; indexing to multithreading.</para>
-
-        <para>The threads configuration is controlled by two
-          configuration file parameters.</para>
-
-	 <variablelist>
-
-          <varlistentry><term><varname>thrQSizes</varname></term>
-            <listitem><para>This variable defines the job input queues
-                configuration. There are three possible queues for
-                stages 2, 3 and 4, and this parameter should give the
-                queue depth for each stage (three integer values). If
-                a value of -1 is used for a given stage, no queue is
-                used, and the thread will go on performing the next
-                stage. In practise, deep queues have not been shown to
-                increase performance. A value of 0 for the first queue
-                tells &RCL; to perform autoconfiguration (no need for
-                the two other values in this case) - this is the
-                default configuration.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>thrTCounts</varname></term>
-            <listitem><para>This defines the number of threads used
-                for each stage. If a value of -1 is used for one of
-                the queue depths, the corresponding thread count is
-                ignored. It makes no sense to use a value other than 1
-                for the last stage because updating the &XAP; index is
-                necessarily single-threaded (and protected by a
-                mutex).</para>
-            </listitem>
-          </varlistentry>
-
-         </variablelist>
-
-         <para>The following example would use three queues (of depth 2),
-         and 4 threads for converting source documents, 2 for
-         processing their text, and one to update the index. This was
-         tested to be the best configuration on the test system
-         (quadri-processor with multiple disks).
-<programlisting>
-thrQSizes = 2 2 2
-thrTCounts =  4 2 1
-</programlisting>
-         </para>
-
-         <para>The following example would use a single queue, and the
-           complete processing for each document would be performed by
-           a single thread (several documents will still be processed
-           in parallel in most cases). The threads will use mutual
-           exclusion when entering the index update stage. In practise
-           the performance would be close to the precedent case in
-           general, but worse in certain cases (e.g. a Zip archive
-           would be performed purely sequentially), so the previous
-           approach is preferred. YMMV...  The 2 last values for
-           thrTCounts are ignored.
-<programlisting>
-thrQSizes = 2 -1 -1
-thrTCounts =  6 1 1
-</programlisting>
-         </para>
-
-         <para>The following example would disable
-           multithreading. Indexing will be performed by a single
-           thread.
-<programlisting>
-thrQSizes = -1 -1 -1
-</programlisting>
-         </para>
-
-       </sect3>
-
-       <sect3 id="RCL.INSTALL.CONFIG.RECOLLCONF.MISC">
-	<title>Miscellaneous parameters:</title>
-
-	 <variablelist>
-
-           <varlistentry><term><varname>autodiacsens</varname></term>
-            <listitem><para>IF the index is not stripped, decide if we
-                automatically trigger diacritics sensitivity if the search
-                term has accented characters (not in
-                <literal>unac_except_trans</literal>). Else you need to use
-                the query language and the <literal>D</literal> modifier to
-                specify diacritics sensitivity. Default is no.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>autocasesens</varname></term>
-            <listitem><para>IF the index is not stripped, decide if we
-                automatically trigger character case sensitivity if the
-                search term has upper-case characters in any but the first
-                position. Else you need to use the query language and the
-                <literal>C</literal> modifier to specify character-case
-                sensitivity. Default is yes.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>loglevel,daemloglevel</varname></term>
-            <listitem><para>Verbosity level for recoll and
-            recollindex. A value of 4 lists quite a lot of
-            debug/information messages. 2 only lists errors. The
-            <literal>daem</literal>version is specific to the indexing monitor
-            daemon.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>logfilename,
-		daemlogfilename</varname></term> 
-            <listitem><para>Where the messages should go. 'stderr' can
-            be used as a special value, and is the default. The
-            <literal>daem</literal>version is specific to the indexing monitor
-            daemon.</para>
-            </listitem>
-          </varlistentry>
-
-           <varlistentry><term><varname>checkneedretryindexscript</varname></term>
-           <listitem><para>This defines the name for a command
-           executed by <command>recollindex</command> when starting
-           indexing. If the exit status of the command is 0,
-           <command>recollindex</command> retries to index all files
-           which previously could not be indexed because of data
-           extraction errors. The default value is a script which
-           checks if any of the common <filename>bin</filename>
-           directories have changed (indicating that a helper program
-           may have been installed).</para>
-           </listitem>
-           </varlistentry>
-
-          <varlistentry><term><varname>mondelaypatterns</varname></term>
-            <listitem><para>This allows specify wildcard path patterns
-            (processed with fnmatch(3) with 0 flag), to match files which
-            change too often and for which a delay should be observed before
-            re-indexing. This is a space-separated list, each entry being a
-            pattern and a time in seconds, separated by a colon. You can
-            use double quotes if a path entry contains white
-            space. Example:</para>  
-              <programlisting>
-mondelaypatterns = *.log:20 "this one has spaces*:10"
-              </programlisting>
-            </listitem>
-           </varlistentry>
-
-          <varlistentry><term><varname>monixinterval</varname></term>
-            <listitem><para>Minimum interval (seconds) for processing the
-            indexing queue. The real time monitor does not process each
-            event when it comes in, but will wait this time for the queue
-            to accumulate to diminish overhead and in order to aggregate
-            multiple events to the same file. Default 30 S.</para>
-            </listitem>
-           </varlistentry>
-
-          <varlistentry><term><varname>monauxinterval</varname></term>
-            <listitem><para>Period (in seconds) at which the real time
-            monitor will regenerate the auxiliary databases (spelling,
-            stemming) if needed. The default is one hour.</para>
-              </listitem>
-           </varlistentry>
-
-           <varlistentry><term><varname>monioniceclass, monioniceclassdata
-           </varname></term><listitem><para>These allow defining the
-           <application>ionice</application> class and data used by the
-           indexer (default class 3, no data).</para>
-         </listitem>
-           </varlistentry>
-
-           <varlistentry><term><varname>filtermaxseconds</varname></term>
-           <listitem><para>Maximum handler execution time, after which it
-           is aborted. Some postscript programs just loop...</para> 
-           </listitem>
-           </varlistentry>
-
-           <varlistentry><term><varname>filtermaxmbytes</varname></term>
-           <listitem><para>&RCL; 1.20.7 and later. Maximum handler memory
-           utilisation. This uses setrlimit(RLIMIT_AS) on most systems
-           (total virtual memory space size limit). Some programs may start
-           with 500 MBytes of mapped shared libraries, so take this into
-           account when choosing a value. The default is a liberal
-           2000MB.</para>
-           </listitem>
-           </varlistentry>
-
-          <varlistentry><term><varname>filtersdir</varname></term>
-            <listitem><para>A directory to search for the external
-            input handler scripts used to index some types of files. The
-            value should not be changed, except if you want to modify
-            one of the default scripts. The value can be redefined for
-            any sub-directory. </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>iconsdir</varname></term>
-            <listitem><para>The name of the directory where
-            <command>recoll</command> result list icons are
-            stored. You can change this if you want different
-            images.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>idxabsmlen</varname></term>
-            <listitem><para>&RCL; stores an abstract for each indexed
-            file inside the database. The text can come from an actual
-            'abstract' section in the document or will just be the
-            beginning of the document. It is stored in the index so
-            that it can be displayed inside the result lists without
-            decoding the original
-            file. The <varname>idxabsmlen</varname> parameter defines
-            the size of the stored abstract. The default value is 250 bytes.
-            The search interface gives you the choice to display this
-            stored text or a synthetic abstract built by extracting
-            text around the search terms. If you always
-            prefer the synthetic abstract, you can reduce this value
-            and save a little space.
-            </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>idxmetastoredlen</varname></term>
-            <listitem><para>Maximum stored length for metadata
-                fields. This does not affect indexing (the whole field is
-                processed anyway), just the amount of data stored in the
-                index for the purpose of displaying fields inside result
-                lists or previews. The default value is 150 bytes which
-                may be too low if you have custom fields.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>aspellLanguage</varname></term>
-            <listitem><para>Language definitions to use when creating
-            the aspell dictionary.  The value must match a set of
-            aspell language definition files. You can type "aspell
-            config" to see where these are installed (look for
-            data-dir). The default if the variable is not set is to
-            use your desktop national language environment to guess
-            the value.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>noaspell</varname></term>
-            <listitem><para>If this is set, the aspell dictionary
-            generation is turned off. Useful for cases where you don't
-            need the functionality or when it is unusable because
-            aspell crashes during dictionary generation.</para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry><term><varname>mhmboxquirks</varname></term>
-            <listitem><para>This allows definining location-related quirks
-            for the mailbox handler. Currently only the
-            <literal>tbird</literal> flag is defined, and it should be set
-            for directories which hold
-            <application>Thunderbird</application> data, as their folder
-            format is weird. Example: 
-            <programlisting>[/path/to/my/mozilla/mail] 
-mhmboxquirks = tbird</programlisting>
-             It should be noted that later &RCL;
-             versions have improved automatic detection of
-             <application>Thunderbird</application> folders, so that this
-             should not be needed at all in most cases.</para>
-              </listitem>
-            </varlistentry>
-
-
-        </variablelist>
-       </sect3>
-      </sect2>
+      <!-- <sect2 id="RCL.INSTALL.CONFIG.RECOLLCONF"> -->
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+        href="recoll.conf.xml" /> 
+
 
       <sect2 id="RCL.INSTALL.CONFIG.FIELDS">
 	<title>The fields file</title>