From 1e9a421dee38e4fed32c4d10814e70906d459550 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Tue, 12 Jan 2016 16:54:58 +0100
Subject: [PATCH] doc

---
 website/download.html     | 9 +++------
 website/index.html.en     | 4 +++-
 website/index.html.fr     | 4 +++-
 website/release-1.21.html | 7 +++++++
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/website/download.html b/website/download.html
index 01f91429..0f3beed7 100644
--- a/website/download.html
+++ b/website/download.html
@@ -69,7 +69,7 @@ function showdiv(viewid)
 <div id="general">
 <h2><a name="general">General information</a></h2>
 
-<p>The current version is 1.21.3. <a href="release-1.21.html">Release
+<p>The current version is 1.21.4. <a href="release-1.21.html">Release
     notes</a>.</p>
 
 <p>Recoll <a href="usermanual/RCL.INSTALL.html">Installation / building
@@ -116,12 +116,12 @@ is probably no necessity to upgrade anyway.</p>
 <div id="source">
 <h2><a name="source">Source</a></h2>
 
-<h3>Current release distribution: 1.21.3:</h3>
+<h3>Current release distribution: 1.21.4:</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.3.tar.gz">recoll-1.21.3.tar.gz</a>.</p>
+<p><a href="recoll-1.21.4.tar.gz">recoll-1.21.4.tar.gz</a>.</p>
 
 <!--
 <h3>Snapshot</h3>
@@ -268,9 +268,6 @@ sudo apt-get install recoll [python-recoll python3-recoll]
 <a href="debian/pool/main/r/recoll/">debian/pool/main/r/recoll/</a><br/>
 </p>
 
-<p>Note: the 1.21.0 packages which are in the repositories for
-  Stretch/testing can't be installed on Wheezy or Jessie.</p>
-
 <h3><a name="ubuntu">Ubuntu</a></h3>
 
 <p>There are Personal Package Archives on launchpad.net for <a
diff --git a/website/index.html.en b/website/index.html.en
index 0efebf8d..192d013e 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.3</a> 
+	<a href="download.html">1.21.4</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>
@@ -97,6 +97,8 @@
       <div class="news">
       
       <dl>
+        
+        <dt>2016-01-12</dt><dd>Release 1.21.4 is out.</dd>
 
         <dt>2015-11-09</dt>
         <dd>
diff --git a/website/index.html.fr b/website/index.html.fr
index 750753c3..7705f051 100644
--- a/website/index.html.fr
+++ b/website/index.html.fr
@@ -49,7 +49,7 @@
       <p><span class="application">Recoll</span> est un logiciel libre
 	gratuit, dont le code source est disponible sous licence GPL.
 	La dernière version est 
-        <a class="important" href="download.html">1.21.3</a>
+        <a class="important" href="download.html">1.21.4</a>
 	(<a href="release-1.21.html">notes sur la version, en
 	anglais</a>)</p> 
 
@@ -106,6 +106,8 @@
       <h2>Nouvelles: </h2>
       <dl>
 
+        <dt>2016-01-12</dt><dd>Version 1.21.4</dd>
+        
         <dt>2015-11-09</dt>
 
         <dd>Recoll indexe Windows ! Il y a encore quelques éléments
diff --git a/website/release-1.21.html b/website/release-1.21.html
index f24ae5f3..aa1546cc 100644
--- a/website/release-1.21.html
+++ b/website/release-1.21.html
@@ -59,9 +59,16 @@
       <ul>
         <li>1.21.4:
           <ul>
+            <li>Show confirmation dialog when opening a temporary file
+              (to warn the user about possible lost edits). The dialog
+              has a 'disable' checkbox.</li>
             <li>Fixed bug which would crash the GUI when clicking an
               Open link after modifying the indexing configuration
               through the GUI tool.</li>
+            <li>Fix not showing results with paths over 1000
+              characters.</li>
+            <li>Fix Show subdocs: too many docs were shown in some
+              cases, and the Preview button in the dialog was inactive.</li>
           </ul>
         <li>1.21.3: 
         <ul>