From 8a7fec1b97de5925c3d134a267ee5b6659a4b8d7 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Wed, 15 Jun 2016 11:59:58 +0200
Subject: [PATCH] web

---
 website/download.html            | 166 ++++++++++++++++---------------
 website/index.html.en            |   8 +-
 website/index.html.fr            | 112 +++------------------
 website/pages/recoll-mingw.txt   |   4 +-
 website/pages/recoll-windows.txt |  22 ++--
 website/release-1.22.html        |  49 ++++++---
 website/release-history.html     |  16 ++-
 7 files changed, 166 insertions(+), 211 deletions(-)

diff --git a/website/download.html b/website/download.html
index 01724de7..f2efe8cd 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.7. <a href="release-1.21.html">Release
+        <p>The current version is 1.22.1. <a href="release-1.22.html">Release
             notes</a>.</p>
 
         <p>Recoll <a href="usermanual/usermanual.html#RCL.INSTALL">Installation / building
@@ -116,20 +116,20 @@
       <div id="source">
         <h2><a name="source">Source</a></h2>
 
-        <h3>Current release distribution: 1.21.7:</h3>
+        <h3>Current release distribution: 1.22.1:</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.7.tar.gz">recoll-1.21.7.tar.gz</a>.</p>
-
-        <h3>1.22.0:</h3>
-
-        <p>As with any .0 release, don't use this is you absolutely
-          don't want to run into trouble:</p>
-        <p><a href="recoll-1.22.0.tar.gz">recoll-1.22.0.tar.gz</a>.</p>
+        <p><a href="recoll-1.22.1.tar.gz">recoll-1.22.1.tar.gz</a>.</p>
         <p><a href="release-1.22.html">The release notes</a>.</p>
 
+        <h3>Previous production release 1.21.7:</h3>
+
+        <p><a href="recoll-1.21.7.tar.gz">recoll-1.21.7.tar.gz</a>.</p>
+        <p><a href="release-1.21.html">The release notes</a>.</p>
+
+
         <!--
         <h3>Snapshot</h3>
         <p>I sometimes release a source tarfile when I consider that the
@@ -145,69 +145,76 @@
 
         <p>You will probably get these from the <a href="#ubuntu">PPA</a>, but
           here are the source files. These are not included in the main tar file
-          any more. For recoll 1.19, 1.20 and 1.21 installations (choose on the
+          any more. For any Recoll version after 1.19 (choose on the
           Ubuntu version, not the Recoll one):
 
           <blockquote>
             <a href="recoll-lens-1.19.10.3543.tar.gz">
-              recoll-lens-1.19.10.3543.tar.gz</a> (Recoll 0.19 or 0.20, 
-            Ubuntu up to 13.04 Raring)<br>
+              recoll-lens-1.19.10.3543.tar.gz</a> (Ubuntu up to 13.04
+              Raring)<br> 
 
             <a href="unity-scope-recoll-1.20.2.4.tar.gz">
-              unity-scope-recoll-1.20.2.4.tar.gz</a> (Recoll 0.19 and later, Ubuntu
-            13.10 and later).<br>
+              unity-scope-recoll-1.20.2.4.tar.gz</a> (Ubuntu 13.10 and
+              later).<br> 
 
           </blockquote>
 
           For Recoll 1.18: 
-          <a href="recoll-lens-1.18.1.2997.tar.gz">recoll-lens-1.18.1.2997.tar.gz</a><br>
+          <a href="recoll-lens-1.18.1.2997.tar.gz">
+            recoll-lens-1.18.1.2997.tar.gz</a><br>
           For Recoll 1.17: 
-          <a href="recoll-lens-1.17.2.2697.tar.gz">recoll-lens-1.17.2.2697.tar.gz</a>
+          <a href="recoll-lens-1.17.2.2697.tar.gz">
+            recoll-lens-1.17.2.2697.tar.gz</a>
 
         </p>
 
         <h3>Prerequisites for building from source:</h3>
         <ul>
-          <li>C++ compiler. Its absence sometimes manifests itself by strange messages
-            about iconv_open (fixed after 1.13.04).</li>
-          <li><p>Xapian core development libraries. Most Linux distributions carry them
-              in their package repository. Or you will find source and binary packages on
-              the <a href="http://www.xapian.org/download.php">Xapian download page</a>.
+          <li>C++ compiler. Be aware that its absence sometimes
+          manifests itself by quite cryptic messages.</li>
+
+          <li><p>Xapian core development libraries. Most Linux
+              distributions carry them in their package repository. Or
+              you will find source and binary packages on
+              the <a href="http://www.xapian.org/download.php">Xapian
+              download page</a>.
               <br>
-              Recoll should still work with Xapian 1.0, but it is highly recommended to
-              use a Xapian 1.2 version.</p>
             <p><em>Note on building Xapian for older CPUs:</em> The build
-              configurations for Xapian releases 1.0.21 and 1.2.1 or newer enable the use
-              of SSE2 floating point instructions. These instructions are not available
-              in CPUs older than Intel Pentium 4 or AMD Athlon 64. When building for such
-              a CPU, you need to add the --disable-sse flag to the Xapian library
-              configure command. If this is not done, the problem signals itself by
-              "Illegal instruction" crashes (SIGILL) in recollindex and recoll. </p>
+              configurations for Xapian releases 1.0.21 and 1.2.1 or
+              newer enable the use of SSE2 floating point
+              instructions. These instructions are not available in
+              CPUs older than Intel Pentium 4 or AMD Athlon 64. When
+              building for such a CPU, you need to add the
+              --disable-sse flag to the Xapian library configure
+              command. If this is not done, the problem signals itself
+              by "Illegal instruction" crashes (SIGILL) in recollindex
+              and recoll. </p>
           </li>
-          <li>X11 development files.</li>
+          <li>Qt development files: Qt 4.4, 5.3 or newer (5.2 not ok).</li>
+          <li>Qt WebKit development files: these are quite often
+            distributed apart from the main Qt libraries. It is
+            possible to configure Recoll not to use Qt WebKit (see
+            configure --help).</li>
           <li>zlib development files.</li>
-          <li><p>Qt development files: Qt 4.4 or newer. The Recoll GUI will not build
-              with Qt releases older than 4.4.</p>
-          </li>
-          <li><p>Qt webkit development: Qt WebKit is quite often distributed apart from
-              the main Qt lib. It is possible to configure Recoll not to use Qt WebKit
-              (see configure --help).</p>
-          </li>
-          <li>Python development package: you can avoid needing this by configuring
-            with --disable-python-module.</li>
+          <li>X11 development files.</li>
+          <li>Python development package: you can avoid needing this
+            by configuring with --disable-python-module.</li>
         </ul>
 
         <h3>Source repository:</h3>
 
-        <p>The <span class="application">Recoll</span> source repository is hosted on
-          <a href="http://bitbucket.org/medoc/recoll/overview">bitbucket.org</a>. The
-          trunk is usually a bit on the bleeding edge, but there is always a maintenance
-          branch for the current production version.</p>
+        <p>The <span class="application">Recoll</span> source
+          repository is hosted
+          on <a href="http://bitbucket.org/medoc/recoll/overview">
+            bitbucket.org</a>. The trunk is usually a bit on the
+          bleeding edge, but there is always a maintenance branch for
+          the current production version.</p>
 
         <h3>Instructions for building</h3>
 
-        <p>Normally, it's just <tt>./configure; make; make install</tt>. If a bit
-          more detail is needed, 
+        <p>Normally, it's just:</p>
+        <div class="code">./configure; make; make install</div>
+        <p>If a bit more detail is needed, 
           <a href="http://www.recoll.org/usermanual/usermanual.html#RCL.INSTALL.BUILDING">
             there is some in the manual</a>.
 
@@ -216,76 +223,71 @@
       <div id="packages">
         <h2><a name="packages">Packages</a></h2>
 
-        <p>Packages or ports for Recoll are available in the standard repositories for
-          many distributions.</p>
+        <p>Packages or ports for Recoll are available in the standard
+          repositories for many distributions.</p>
 
-        <p>However they are often a bit older or built with older Xapian releases. Here
-          follow some pointers to find newer packages for some
-          distributions. In most cases, you will just need to use an
-          alternate repository.</p>
-
-        <p>I sometimes build binary packages when no appropriate repository
-          exists. Any binary package directly linked from this page need a Qt
-          4 (4.4 at least) runtime environment. To make things easier, on
-          systems where Xapian is not available from the standard package
-          repositories, the Recoll package will have a static link to Xapian
-          so that you do not need to build/install it separately.</p>
+        <p>However they are often a bit older or built with older
+          Xapian releases. Here follow some pointers to find newer
+          packages for some distributions. In most cases, you will
+          just need to use an alternate repository.</p>
 
         <h3><a name="debian">Debian</a></h3>
 
         <p>The Debian Recoll packages are usually fairly up to date, just use
           the appropriate Debian repository.</p>
 
-        <p><i>Except they're not at the moment (2015-10)...</i>. So
+        <p><i>Except they're not at the moment (2016-10)...</i>. So
           I am maintaining a repository for packages built for Debian Wheezy,
           and Jessie. This currently has recoll 1.21.x (the
           standard repos have 1.17...) To add the repository to your
           sources:</p>
 
-        <p>The public part of the key used to sign the repositories can
-          be downloaded and installed as follows:</p>
-
-        <div class="code">
-          wget -O - http://www.lesbonscomptes.com/key/jf@dockes.org.gpg.key | sudo apt-key add -
-        </div>
-
         <ul>
+
+          <li>Download the public key used to validate the repositories:
+            <div class="code">
+wget -O - http://www.lesbonscomptes.com/key/jf@dockes.org.gpg.key | sudo apt-key add -
+            </div>
+          </li>
+          
           <li>Create and edit <span class="filename">
               /etc/apt/sources.list.d/recoll.list</span>
             and add the following lines:<br>
             for wheezy (debian 7.x):<br>
             <div class="code">
-              deb http://www.lesbonscomptes.com/recoll/debian/ wheezy main
-              deb-src http://www.lesbonscomptes.com/recoll/debian/ wheezy main
+deb http://www.lesbonscomptes.com/recoll/debian/ wheezy main
+deb-src http://www.lesbonscomptes.com/recoll/debian/ wheezy main
             </div>
             for jessie (debian 8.x):<br>
             <div class="code">
-              deb http://www.lesbonscomptes.com/recoll/debian/ jessie main
-              deb-src http://www.lesbonscomptes.com/recoll/debian/ jessie main
+deb http://www.lesbonscomptes.com/recoll/debian/ jessie main
+deb-src http://www.lesbonscomptes.com/recoll/debian/ jessie main
             </div>
           <li>Then:
             <div class="code">
-              sudo apt-get update
-              sudo apt-get install recoll [python-recoll python3-recoll]
+sudo apt-get update
+sudo apt-get install recoll python-recoll python3-recoll
             </div>
           </li>
         </ul>
 
         <p>If you prefer to manually install the packages, they are here:
-          <a href="debian/pool/main/r/recoll/">debian/pool/main/r/recoll/</a><br/>
+          <a href="debian/pool/main/r/recoll/">
+            debian/pool/main/r/recoll/</a><br/>
         </p>
 
         <h3><a name="ubuntu">Ubuntu</a></h3>
 
-        <p>There are Personal Package Archives on launchpad.net for <a
-                                                                       href="https://launchpad.net/~recoll-backports/+archive/recoll-1.15-on">Recoll,
-            kio-recoll and recoll-lens</a>. These were built from the latest versions, for
-          a set of Ubuntu series. starting at Lucid. The installation is very simple: </p>
-        <pre><tt>
-            sudo add-apt-repository ppa:recoll-backports/recoll-1.15-on
-            sudo apt-get update
-            sudo apt-get install recoll
-        </tt></pre>
+        <p>There are Personal Package Archives on launchpad.net for
+          <a href="https://launchpad.net/~recoll-backports/+archive/recoll-1.15-on">
+            Recoll, kio-recoll and recoll-lens</a>. These were built
+          from the latest versions, for the current set of supported Ubuntu
+          versions. Procedure:</p>
+        <div class="code">
+sudo add-apt-repository ppa:recoll-backports/recoll-1.15-on
+sudo apt-get update
+sudo apt-get install recoll
+        </div>
 
         <p>The packages in the PPA now have a separate package for the Python
           extension, like the standard ones, so there should be no more
diff --git a/website/index.html.en b/website/index.html.en
index 3ca52ab0..011aa25e 100644
--- a/website/index.html.en
+++ b/website/index.html.en
@@ -59,8 +59,8 @@
       </ul>
 
       <p>The current <span class="application">Recoll</span> version is
-	<a href="download.html">1.21.6</a> 
-	(<a href="release-1.21.html">Release notes</a>,
+	<a href="download.html">1.22.1</a> 
+	(<a href="release-1.22.html">Release notes</a>,
         <a href="BUGS.html">known
           bugs</a>, <a href="release-history.html">Release history</a>).</p>
 
@@ -99,6 +99,10 @@
       
         <dl>
 
+          <dt>2016-06-15</dt><dd>Release 1.22.1 is available. This is
+            going to replace 1.21 as the main release. See
+            the <a href="release-1.22.html">the release notes</a>.</dd>
+
           <dt>2016-05-11</dt><dd>Release 1.21.7 fixes an ennoying but
             benign GUI crash-on-exit bug reported on Fedora 23 (qt5).</dd>
           
diff --git a/website/index.html.fr b/website/index.html.fr
index 1233ec92..2d96b1d0 100644
--- a/website/index.html.fr
+++ b/website/index.html.fr
@@ -49,8 +49,8 @@
       <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.5</a>
-	(<a href="release-1.21.html">notes sur la version, en
+        <a class="important" href="download.html">1.22.1</a>
+	(<a href="release-1.22.html">notes sur la version, en
 	anglais</a>)</p> 
 
       <p>L'interface utilisateur de 
@@ -106,24 +106,17 @@
       <h2>Nouvelles: </h2>
 
       <dl>
-        
+
+        <dt>2016-06-15</dt><dd>La version 1.22.1 est disponible et va
+          progressivement remplacer 1.21 comme version
+          principale. <a href="release-1.22.html">Notes de version</a>
+          (en anglais).</dd>
+          
         <dt>2016-05-11</dt><dd>Release 1.21.7: corrige un crash bénin
           mais agaçant au moment de quitter l'interface utilisateur
           (Fedora 23 / qt5).</dd>
 
-        <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
-          des types MIME ou des catégories multiples étaient
-          spécifiées, avec en conséquences des résultats
-          manquants.</dd>
-
-
         <dt>2015-11-09</dt>
-
         <dd>Recoll indexe Windows ! Il y a encore quelques éléments
           manquants, comme l'indexation temps-réel, et la traduction
           en Français, mais ça marche suffisamment bien pour être
@@ -131,83 +124,12 @@
           pas, c'est facile à désinstaller...
           Pas de traduction Française pour le moment. Il y
           a <a href="pages/recoll-windows.html"> quelques
-            explications en Anglais sur l'installation </a> (triviale,
-            il faut just installer Recoll et ajouter Python 2.7), et
-          <a href="http://www.recoll.org/windows/recoll-setup-1.22.0-20151115.exe">
-            l'installeur est là</a>. Si vous l'essayez, dites moi ce
-            que vous en pensez !
-        </dd>
-        
-        <dt>2015-10-01</dt>
-        <dd>Recoll 1.21.2 devient la version de production. La
-        principale modification de la version 1.21 est l'utilisation
-        d'un nouvel interpréteur pour le langage d'interrogation,
-        autorisant l'utilisation de parenthèses. Également: évite de
-        réessayer l'indexation de fichiers en erreur, fonction de
-        sauvegarde/restauration des recherches.</dd>
-
-        <dt>2015-04-25</dt>
-        <dd>Recoll 1.20.6 contient des corrections dans le traitement
-          des fichiers compressés, et la compatibilité Qt 5 (Ok avec Qt
-          5.3.2, ne fonctionne pas avec Qt 5.2.</dd>
-
-        <dt>2015-03-30</dt> 
-        <dd>1.20.4. Corrige l'indexation au fil de l'eau de
-          l'historique web (en utilisation avec le plugin Firefox).</dd>
-
-        <dt>2014-12-18</dt> <dd>Apparition de version 1.20.1 avec
-          quelques nouvelles fonctions, principalement dans l'interface
-          graphique. </dd>
-
-        <dt>2014-06-07</dt> <dd>La version 1.19.14 corrige encore
-          quelques problèmes dans l'indexation (erreurs dans la
-          vérification que l'index est à jour pour un document,
-          possible arrêt de l'indexation pour 20mn dans certains cas
-          rares, et autres).</dd>
-
-        <dt>2014-05-06</dt> <dd> Version 1.19.13. A de bonnes chances
-          de corriger les problèmes résiduels de l'indexation
-          concurrente (multithread).</dd>
-
-        <dt>2014-04-02</dt> <dd> Version 1.19.12. C'est la même que la
-          1.19.11 à part un paramètre pour la taille des attributs
-          stockés, qui n'est utile que dans des cas très
-          particuliers. Inutile de mettre à jour en général.</dd>
-        <dt>2013-11-25</dt> <dd> La version 1.19.11 est sortie. Elle
-          apporte un Scope pour le Dash de Ubuntu Unity (am I still
-          speaking French here ?), la compatibilité Python3, et un
-          nouveau filtre pour les fichiers PowerPoint.</dd>
-
-        <dt>2013-11-19</dt> <dd>Un <a href="filters/filters.html">nouveau
-            filtre</a> pour les fichiers PowerPoint. L'ancien était
-            basé sur le vénérable <b>catppt</b> de <b>catdoc</b>, et,
-            le plus souvent, n'extrayait rien des fichiers PowerPoint
-            récents. (Il s'agit bien de .ppt. .pptx est traité par un
-            filtre natif).</dd>
-
-        <dt>2013-11-11</dt> <dd>La version 1.19.9 est disponible. Elle
-        corrige quelques défauts, en particulier un problème dans la
-        gestion des dates dans les requêtes.</dd> 
-
-        <dt>2013-06-18</dt><dd>La version 1.19.8 est disponible.</dd>
-
-        <dt>2012-11-05</dt><dd>Recoll 1.18.1 est disponible. Cette
-          version peut faire des recherches sensibles aux majuscules et
-          aux accents, donner un accès direct à la bonne page pour les
-          documents PDF (uniquement avec <b>evince</b> par défaut,
-          mais il y a une ligne d'example pour qpdfview dans le
-          fichier de config par défaut), elle a un
-          historique des recherches complexes, et plein d'autres
-          petites améliorations. Les <a href="release-1.18.html">notes
-            de version</a> (en anglais). <span class="important">Cette
-            version utilise <b>evince</b> par défaut comme visualiseur
-            PDF même si recoll est configuré pour utiliser les
-            préférences du bureau. Vous pouvez retrouver le
-            comportement antérieur en éditant la liste "exceptions"
-            dans la configuration GUI.</span>
+            explications en Anglais sur l'installation </a>.
+          Si vous l'essayez, dites moi ce que vous en pensez !
         </dd>
 
-        <dt>2012-10-25</dt><dd> Un problème avec une solution simple peut provoquer
+        <dt>2012-10-25</dt><dd> Un problème avec une solution simple
+          peut provoquer 
           des <span class="important">plantages de
           recollindex</span>. 
           Si vous indexez des messages mail Mozilla/Thunderbird
@@ -226,16 +148,6 @@
           indexation incorrecte des messages.
         </dd>
 
-        <dt>2012-10-16</dt><dd> <a href="filters/filters.html">un nouveau filtre
-            pour les documents EPUB</a>.</dd> 
-
-        <dt>2012-05-24</dt><dd> Sortie de la
-          version <a href="download.html#source">1.17.3</a>. Voir
-          les <a href="release-1.17.html">les notes</a>. Cette version
-          corrige un "arrêt imprévu" de l'indexation qui se produisait
-          parfois en traitant certains messages mail.
-        </dd>
-
         <dt>2010-11-20</dt><dd>Un petit script pour activer/cacher recoll sur un
           bureau gnome d'un seul coup de clavier: 
           <a href="http://bitbucket.org/medoc/recoll/wiki/HotRecoll">
diff --git a/website/pages/recoll-mingw.txt b/website/pages/recoll-mingw.txt
index 46849ed9..d61440ed 100644
--- a/website/pages/recoll-mingw.txt
+++ b/website/pages/recoll-mingw.txt
@@ -149,7 +149,7 @@ This will be copied into the installation by the mkinstdir.sh script.
 === mutagen 
 
 Download and extract mutagen from https://pypi.python.org/pypi/mutagen
-Then in the mutagen directory (e.g. C:/temp/mutagen-1.31 where it is
+Then in the mutagen directory (e.g. C:/temp/mutagen-1.32 where it is
 expected by `mkinstdir.sh`):
 
      python setup.py build
@@ -219,7 +219,7 @@ libwpd directory of the recoll-windows-deps repository.
 
     cd ..
 
-    tar xf /data/source/00DISTS/libwpd-0.10.0.tar.gz
+    tar xf /c/recolldeps/libwpd/libwpd-0.10.0.tar.gz
     cd libwpd-0.10.0
     REVENGE_CFLAGS=-Ic:/temp/libwpd/librevenge-0.0.1.jfd/inc \
     REVENGE_LIBS="-Lc:/temp/libwpd/librevenge-0.0.1.jfd/src/lib/.libs -lrevenge-0.0" \
diff --git a/website/pages/recoll-windows.txt b/website/pages/recoll-windows.txt
index d4907848..a7459e75 100644
--- a/website/pages/recoll-windows.txt
+++ b/website/pages/recoll-windows.txt
@@ -48,11 +48,11 @@ Procedure:
 - Execute the setup file. This is a vanilla installer generated by Inno
   Setup, and it will ask the usual questions.
 
-- Download and install
-  https://www.python.org/ftp/python/2.7.10/python-2.7.10.msi[Python
-  2.7.10].
-  *_On the `Customize installation` screen, select "Add python.exe to Path"_*
-  
+- Download and install Python 2.7.10 or 2.7.11 (e.g.
+  https://www.python.org/ftp/python/2.7.11/python-2.7.11.msi[Python
+  2.7.11]). Recoll currently does not work with Python3. *_On the
+  `Customize installation` screen, select "Add python.exe to Path"_*
+
 - Optional: download and install the 7-zip program from
   http://www.7-zip.org/. This is only useful if you need to index files
   compressed with Unix methods (not needed for zip files).
@@ -67,15 +67,17 @@ The default result list font is particularly ugly. Change it from
 For those of you who would like to build themselves and possibly work on
 improving the Windows version, the link:recoll-mingw.html[build instructions].
 
-== Recoll Windows tips and tricks
 
-(not much for now...)
-
-When filtering the search with a `dir:` clause, an absolute path
-should be specified as `/c/mydir` instead of `c:/mydir`
 
 == Known problems:
 
+- Filtering by directory location ('dir:' clauses) is currently
+  case-sensitive, including drive letters. This will hopefully be fixed in
+  a future version.
+
+- Also, when filtering the search with a `dir:` clause, an absolute path
+  should be specified as `/c/mydir` instead of `c:/mydir`
+
 - There is no real-time or scheduled indexing as on Linux. For now, you
   create and update the index by using the `File` menu (or executing
   `recollindex.exe` from a command window).
diff --git a/website/release-1.22.html b/website/release-1.22.html
index 48729275..bb6a2491 100644
--- a/website/release-1.22.html
+++ b/website/release-1.22.html
@@ -36,9 +36,9 @@
         pinch, 1.22 search can mostly use an 1.19 index. </p>
 
       <p>Always reset the index if you do not know by which version it
-        was created (you're not sure it's at least 1.18). The best method
-        is to quit all Recoll programs and delete the index directory 
-        (<span class="literal">
+        was created (e.g.: you're not sure it's at least 1.18). The
+        best method is to quit all Recoll programs and delete the
+        index directory (<span class="literal">
           rm -rf ~/.recoll/xapiandb</span>), then start <code>recoll</code>
         or <code>recollindex</code>. <br> 
 
@@ -69,21 +69,23 @@
           Unix-y file types which are not processed on Windows, and the
           indexer is single-threaded.</li>
 
-        <li>Synonyms: users can define term synonyms groups in
-          ordinary text files. They are used only at query times to
-          expand a query to synonym terms.
+        <li>It is now possible to define synonyms groups, used only at
+          query-time to expand the query terms to their defined
+          synonyms.
           <a href="http://www.lesbonscomptes.com/recoll/usermanual/webhelp/docs/RCL.SEARCH.SYNONYMS.html">
             More details</a>.</li>
         
-        <li>Most input handlers are now compatible with
-          Python3. Actually the only ones which are not are kept back by
-          the library they use. Also most external handlers are now
-          persistent, and quite a few shell-script have been converted
-          to Python for use on Windows.</li> 
+        <li>Many shell-script input handlers have been converted to
+          Python and are now persistent. Most are compatible with
+          Python3 (the only ones which are not are kept back by the
+          library they use). There are still a few shell handlers,
+          mostly for less used and Linux-only formats. And a single
+          Perl-based one (rclimg, which uses the excellent exiftool
+          Perl library).</li>
 
-        <li>The build system has been converted to use the autotools in
-          a fairly standard way. The Windows build is based on Qt
-          Creator and MinGW.</li>
+        <li>The Unix/Linux build system has been converted to use the
+          autotools in a fairly standard way. The Windows build is
+          based on Qt Creator and MinGW.</li>
 
         <li>Make dehyphenation (co-worker->coworker in addition to the
           normal terms) optional, active by default.</li>
@@ -97,6 +99,25 @@
         
       </ul>
 
+      <h2>Minor releases</h2>
+      <ul>
+        <li>1.22.1:
+          <ul>
+            <li>Sidestep bus error in qt exit code by calling _exit()
+              instead of exit() in GUI exit code.</li>
+            <li>Eliminate the dependance of librecoll.so on libX11.</li>
+            <li>Hungarian translation.</li>
+            <li>GUI: enable displaying the Xapian docid in the result
+              list with %x.</li>
+            <li>GUI, advanced search: fix crash which occurred when
+              restoring clause list bigger than the default size (6
+              clauses).</li>
+            <li>The documentation (user manual and man page) for
+              recoll.conf is now generated from the structured
+              comments in the sample file.</li>
+          </ul>
+        </li>
+
     </div>
   </body>
 </html>
diff --git a/website/release-history.html b/website/release-history.html
index 89c1c43e..9a911da9 100644
--- a/website/release-history.html
+++ b/website/release-history.html
@@ -29,7 +29,21 @@
 	came with them.</p>
 
       <dl>
-	<dt><a href="release-1.21.html">Release 1.21</a> (future): new
+	<dt><a href="release-1.22.html">Release 1.22</a>: Windows
+	  port, autotools-based Unix/Linux build system.</dt> 
+	<dd>
+	  <ul>
+	    <li>A new autotools-based build system replaces the old
+	      mostly homegrown one for Unix-like platforms.</li> 
+            <li>Recoll was ported to Windows, where the build is based
+              on MinGW and Qt Creator.</li>
+            <li>New synonyms expansion feature.</li>
+	  </ul>
+	</dd>
+
+      
+      <dl>
+	<dt><a href="release-1.21.html">Release 1.21</a>: new
 	  query parser</dt> 
 	<dd>
 	  <ul>