From 82519e627698a46aff1d6aa2edaa9520b55df2a1 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Sun, 14 Apr 2019 16:36:04 +0200
Subject: [PATCH] doc

---
 src/doc/user/recoll.conf.xml | 8 ++++----
 src/doc/user/usermanual.html | 8 ++++----
 src/doc/user/usermanual.xml  | 8 +++++++-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/doc/user/recoll.conf.xml b/src/doc/user/recoll.conf.xml
index 1b409d71..0d6d7557 100644
--- a/src/doc/user/recoll.conf.xml
+++ b/src/doc/user/recoll.conf.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <sect2 id="RCL.INSTALL.CONFIG.RECOLLCONF">
 <title>Recoll main configuration file, recoll.conf </title>
 <sect3 id="RCL.INSTALL.CONFIG.RECOLLCONF.WHATDOCS">
@@ -168,9 +168,9 @@ for the command used.</para></listitem></varlistentry>
 <listitem><para>Command used to guess
 MIME types if the internal methods fails This should be a
 "file -i" workalike.  The file path will be added as a last parameter to
-the command line. 'xdg-mime' works better than the traditional 'file'
+the command line. "xdg-mime" works better than the traditional "file"
 command, and is now the configured default (with a hard-coded fallback to
-'file')</para></listitem></varlistentry>
+"file")</para></listitem></varlistentry>
 <varlistentry id="RCL.INSTALL.CONFIG.RECOLLCONF.PROCESSWEBQUEUE">
 <term><varname>processwebqueue</varname></term>
 <listitem><para>Decide if we process the
@@ -706,7 +706,7 @@ is a space-separated list of qualified XMP tag names. Each element can also
 include a translation to a Recoll field name, separated by a '|'
 character. If the second element is absent, the tag name is used as the
 Recoll field names. You will also need to add specifications to the
-'fields' file to direct processing of the extracted data.</para></listitem></varlistentry>
+"fields" file to direct processing of the extracted data.</para></listitem></varlistentry>
 <varlistentry id="RCL.INSTALL.CONFIG.RECOLLCONF.PDFEXTRAMETAFIX">
 <term><varname>pdfextrametafix</varname></term>
 <listitem><para>Define name of XMP field editing script. This
diff --git a/src/doc/user/usermanual.html b/src/doc/user/usermanual.html
index 02ff5c15..ac050522 100644
--- a/src/doc/user/usermanual.html
+++ b/src/doc/user/usermanual.html
@@ -8491,10 +8491,10 @@ for i in range(nres):
                   <p>Command used to guess MIME types if the
                   internal methods fails This should be a "file -i"
                   workalike. The file path will be added as a last
-                  parameter to the command line. 'xdg-mime' works
-                  better than the traditional 'file' command, and
+                  parameter to the command line. "xdg-mime" works
+                  better than the traditional "file" command, and
                   is now the configured default (with a hard-coded
-                  fallback to 'file')</p>
+                  fallback to "file")</p>
                 </dd>
                 <dt><a name=
                 "RCL.INSTALL.CONFIG.RECOLLCONF.PROCESSWEBQUEUE" id=
@@ -9457,7 +9457,7 @@ for i in range(nres):
                   a '|' character. If the second element is absent,
                   the tag name is used as the Recoll field names.
                   You will also need to add specifications to the
-                  'fields' file to direct processing of the
+                  "fields" file to direct processing of the
                   extracted data.</p>
                 </dd>
                 <dt><a name=
diff --git a/src/doc/user/usermanual.xml b/src/doc/user/usermanual.xml
index df783935..c2a48b80 100644
--- a/src/doc/user/usermanual.xml
+++ b/src/doc/user/usermanual.xml
@@ -10,9 +10,15 @@
 <!ENTITY WIN "<application>Windows</application>">
 <!ENTITY LIN "<application>Unix</application>-like systems">
 <!ENTITY FAQS "https://www.lesbonscomptes.com/recoll/faqsandhowtos/">
+<!ENTITY RCLCONF SYSTEM "recoll.conf.xml">
 ]>
 
 <book lang="en">
+
+
+  <!-- A nice overview of docbook elements:
+
+       https://tdg.docbook.org/tdg/4.5/ch02.html#ch02-logdiv -->
   
   <bookinfo>
     <title>Recoll user manual</title>
@@ -6353,7 +6359,7 @@ for i in range(nres):
       </sect2>
 
       <!-- <sect2 id="RCL.INSTALL.CONFIG.RECOLLCONF"> -->
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="recoll.conf.xml" /> 
+&RCLCONF;
 
 
       <sect2 id="RCL.INSTALL.CONFIG.FIELDS">