From a5c2a95b71bd37a27b7d0eeed4c5ba78ad51fd1a Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Thu, 7 Apr 2016 16:46:07 +0200
Subject: [PATCH] web

---
 website/download.html |  6 ++--
 website/features.html | 64 ++++++++++++++++++++++++-------------------
 website/index.html.en |  5 +++-
 website/index.html.fr |  5 +++-
 4 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/website/download.html b/website/download.html
index 5874e5c7..8d8046fa 100644
--- a/website/download.html
+++ b/website/download.html
@@ -69,7 +69,7 @@
       <div id="general">
         <h2><a name="general">General information</a></h2>
 
-        <p>The current version is 1.21.5. <a href="release-1.21.html">Release
+        <p>The current version is 1.21.6. <a href="release-1.21.html">Release
             notes</a>.</p>
 
         <p>Recoll <a href="usermanual/usermanual.html#RCL.INSTALL">Installation / building
@@ -116,12 +116,12 @@
       <div id="source">
         <h2><a name="source">Source</a></h2>
 
-        <h3>Current release distribution: 1.21.5:</h3>
+        <h3>Current release distribution: 1.21.6:</h3>
         <!-- Attention: source packages must remain here, not in a
         subdirectory, because of all the places they're referred from
         (package watches) -->
 
-        <p><a href="recoll-1.21.5.tar.gz">recoll-1.21.5.tar.gz</a>.</p>
+        <p><a href="recoll-1.21.6.tar.gz">recoll-1.21.6.tar.gz</a>.</p>
 
         <!--
         <h3>Snapshot</h3>
diff --git a/website/features.html b/website/features.html
index a1ae72f5..4249f0d0 100644
--- a/website/features.html
+++ b/website/features.html
@@ -101,6 +101,13 @@
         the only additional package you will need is the Python language
         installation.</p>
 
+      <p>Many formats are processed
+        by <span class="application">Python</span> scripts. The Python
+        dependency will not always be mentionned. In general, Recoll
+        expects Python 2.x to be available (many, but not all, scripts
+        are compatible with Python 3). Formats which are processed
+        using <span class="application">Python</span> and its standard
+        library are listed in the <i>native</i> section.</p>
         
       <h4>File types indexed natively</h4>
 
@@ -131,8 +138,32 @@
           and <span class="application">Powerpoint</span>
           for <span class="application">Recoll</span> versions 1.19.12
           and later.</li>
+
+        <li><span class="application">Tar</span> archives. Tar file
+        indexing is disabled by default (because tar archives don't
+        typically contain the kind of documents that people search
+        for), you will need to enable it explicitely, like with the
+        following in your
+          <span class="filename">$HOME/.recoll/mimeconf</span> file:
+          <pre>
+[index]
+application/x-tar = execm rcltar
+</pre>
+        </li> 
+
+        <li><span class="application">Zip</span> archives.</li>
+        <li><span class="application">Konqueror webarchive</span>
+          format with Python (uses the <tt>tarfile</tt> standard
+          library module).</li>
+
+        <li><span class="application">Mimehtml web archive
+            format</span> (support based on the mail 
+          filter, which introduces some mild weirdness, but still
+          usable).</li>
       </ul>
 
+
+
       <h4>File types indexed with external helpers</h4>
 
       <p>Many document types need the <span class="command">iconv</span>
@@ -141,7 +172,8 @@
       <h5>The XML ones</h5>
 
       <p>The following types need <span class="command">
-          xsltproc</span> from the <b>libxslt</b> package.
+          xsltproc</span> from the <b>libxslt</b> package, (and the
+          Python2 libxslt module for recoll 1.22).
         Quite a few also need <span class="command">unzip</span>:</p>
 
       <ul>
@@ -210,7 +242,6 @@
         class="literal">libwpd-tools</span> or such, not the base <a
         span="literal">libwpd</a> package.</li>
 
-
         <li><span class="application">Lyx</span> files (needs 
           <span class="application">Lyx</span> to be installed).</li>
 
@@ -234,28 +265,14 @@
         <li><span class="application">EPUB</span> files
           with <span class="command">Python</span> and this
           <a href="http://pypi.python.org/pypi/epub/">Python epub</a>
-            decoding module.</li>
+            decoding module, which is packaged on Fedora, but not Debian.</li>
         
-        <li><span class="application">Tar</span> archives (needs <span
-        class="command">Python</span>). Tar file indexing is disabled
-        by default (because tar archives don't typically contain the
-        kind of documents that people search for), you will need to
-        enable it explicitely, like with the following in your
-          <span class="filename">$HOME/.recoll/mimeconf</span> file:
-          <pre>
-[index]
-application/x-tar = execm rcltar
-</pre>
-        </li> 
-
-        <li><span class="application">Zip</span> archives (needs <span
-        class="command">Python</span>).</li>
-
         <li><span class="application">Rar</span> archives (needs <span
         class="command">Python</span>), the
         <a href="http://pypi.python.org/pypi/rarfile/">rarfile</a> Python
         module and the <a
-        href="http://www.rarlab.com/rar_add.htm">unrar</a> utility.</li>
+        href="http://www.rarlab.com/rar_add.htm">unrar</a>
+        utility. The Python module is packaged by Fedora, not by Debian.</li>
 
         <li><span class="application">7zip</span> archives (needs 
           <span class="command">Python</span> and  
@@ -349,15 +366,6 @@ application/x-tar = execm rcltar
             notes here</a>.
         </li> 
 
-        <li><span class="application">Konqueror webarchive</span>
-          format with Python (uses the <tt>tarfile</tt> standard
-          library module).</li>
-
-        <li><span class="application">Mimehtml web archive
-            format</span> (support based on the mail 
-          filter, which introduces some mild weirdness, but still
-          usable).</li>
-
       </ul>
 
       <h2><a name="other">Other features</a></h2>
diff --git a/website/index.html.en b/website/index.html.en
index 75650d48..943c09b4 100644
--- a/website/index.html.en
+++ b/website/index.html.en
@@ -58,7 +58,7 @@
       </ul>
 
       <p>The current <span class="application">Recoll</span> version is
-	<a href="download.html">1.21.5</a> 
+	<a href="download.html">1.21.6</a> 
 	(<a href="release-1.21.html">Release notes</a>,
         <a href="BUGS.html">known
           bugs</a>, <a href="release-history.html">Release history</a>).</p>
@@ -98,6 +98,9 @@
       
       <dl>
 
+        <dt>2016-04-07</dt><dd>Release 1.21.6  adds KDE5 compatibility
+          for the KIO slave.</dd>
+        
         <dt>2016-01-29</dt><dd>Release 1.21.5 is out. It fixes a
           relatively nasty bug affecting all previous 1.21 versions:
           the query language parser processed incorrectly multiple
diff --git a/website/index.html.fr b/website/index.html.fr
index 7ef2238f..48039256 100644
--- a/website/index.html.fr
+++ b/website/index.html.fr
@@ -104,9 +104,12 @@
           bitbucket.org</p> 
 
       <h2>Nouvelles: </h2>
-      <dl>
 
+      <dl>
         
+        <dt>2016-04-07</dt><dd>Release 1.21.6: compatibilité KDE5 pour le
+          KIO slave.</dd>
+
         <dt>2016-01-29</dt><dd>Version 1.21.5. Cetter version corrige
           un problème de l'interpréteur de langage
           d'interrogation. Une requête incorrecte était généré quand