From 0fa0c273abc89a87dff81420e23169851b440167 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Fri, 28 Feb 2020 14:37:19 +0100
Subject: [PATCH] doc

---
 src/doc/user/recoll.conf.xml |  9 ++++++---
 src/doc/user/usermanual.html | 12 ++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/doc/user/recoll.conf.xml b/src/doc/user/recoll.conf.xml
index 30bc4eef..5ecce81f 100644
--- a/src/doc/user/recoll.conf.xml
+++ b/src/doc/user/recoll.conf.xml
@@ -708,7 +708,7 @@ with possibly meaning-altering missing words.</para></listitem></varlistentry>
 <varlistentry id="RCL.INSTALL.CONFIG.RECOLLCONF.PDFOCR">
 <term><varname>pdfocr</varname></term>
 <listitem><para>Attempt OCR of PDF files with no text content. This can be defined in subdirectories. The default is off because
-OCR is so very slow. Will only do anything if ocrprogs is defined.</para></listitem></varlistentry>
+OCR is so very slow.</para></listitem></varlistentry>
 <varlistentry id="RCL.INSTALL.CONFIG.RECOLLCONF.PDFATTACH">
 <term><varname>pdfattach</varname></term>
 <listitem><para>Enable PDF attachment extraction by executing pdftk (if
@@ -739,8 +739,11 @@ duplicate values.</para></listitem></varlistentry>
 <term><varname>ocrprogs</varname></term>
 <listitem><para>OCR modules to try. The top OCR script will try to load the corresponding modules in
 order and use the first which reports being capable of performing OCR on
-the input file. Modules for tesseract and ABBYY FineReader are present in
-the standard distribution.</para></listitem></varlistentry>
+the input file. Modules for tesseract (tesseract) and ABBYY FineReader
+(abbyy) are present in the standard distribution. For compatibility with
+the previous version, if this is not defined at all, the default value is
+"tesseract". Use an explicit empty value if needed. A value of "abbyy
+tesseract" will try everything.</para></listitem></varlistentry>
 <varlistentry id="RCL.INSTALL.CONFIG.RECOLLCONF.OCRCACHEDIR">
 <term><varname>ocrcachedir</varname></term>
 <listitem><para>Location for caching OCR data. The default if this is empty or undefined is to store the cached
diff --git a/src/doc/user/usermanual.html b/src/doc/user/usermanual.html
index 9f038bf2..e97e382d 100644
--- a/src/doc/user/usermanual.html
+++ b/src/doc/user/usermanual.html
@@ -9650,8 +9650,7 @@ for i in range(nres):
                 <dd>
                   <p>Attempt OCR of PDF files with no text content.
                   This can be defined in subdirectories. The
-                  default is off because OCR is so very slow. Will
-                  only do anything if ocrprogs is defined.</p>
+                  default is off because OCR is so very slow.</p>
                 </dd>
                 <dt><a name=
                 "RCL.INSTALL.CONFIG.RECOLLCONF.PDFATTACH" id=
@@ -9714,8 +9713,13 @@ for i in range(nres):
                   try to load the corresponding modules in order
                   and use the first which reports being capable of
                   performing OCR on the input file. Modules for
-                  tesseract and ABBYY FineReader are present in the
-                  standard distribution.</p>
+                  tesseract (tesseract) and ABBYY FineReader
+                  (abbyy) are present in the standard distribution.
+                  For compatibility with the previous version, if
+                  this is not defined at all, the default value is
+                  "tesseract". Use an explicit empty value if
+                  needed. A value of "abbyy tesseract" will try
+                  everything.</p>
                 </dd>
                 <dt><a name=
                 "RCL.INSTALL.CONFIG.RECOLLCONF.OCRCACHEDIR" id=