From 509091036eccf20881e8e998876d816b81a4803e Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Tue, 27 Oct 2015 07:38:30 +0100
Subject: [PATCH] web

---
 website/BUGS.html                | 10 ++++++++++
 website/download.html            | 16 +++++++++-------
 website/index.html.en            | 15 +++++++++++++++
 website/pages/recoll-windows.txt | 19 ++++++++++++++-----
 4 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/website/BUGS.html b/website/BUGS.html
index d8b287f2..cdb4e100 100644
--- a/website/BUGS.html
+++ b/website/BUGS.html
@@ -83,6 +83,16 @@ versions.</i></p>
     recoll.</li>
 </ul>
 
+<h2><a name="b_1_21_2">recoll 1.21.2</a></h2>
+<ul>
+  <li>A bug in the verification of configuration file path variables
+    generates spurious warnings from recollindex 
+    when the skippedPaths variable contains elements with
+    wildcards. This has no consequence except for the spurious error
+    message.</li>
+</ul>
+
+
 <h2><a name="b_1_20_1">recoll 1.20.1</a></h2>
 <ul>
   <li>The web history queue is not processed by the real time indexer</li>
diff --git a/website/download.html b/website/download.html
index 91b3209b..956697b8 100644
--- a/website/download.html
+++ b/website/download.html
@@ -224,12 +224,14 @@ many distributions.</p>
 
 <h3><a name="debian">Debian</a></h3>
 
-<p>The Debian Recoll packages are usually fairly up to date (at least in
-testing), just use the appropriate Debian repository.</p>
+<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-05)...</i>. So
-  I am maintaining a repository for packages built for Debian
-  Wheezy. To add the repository to your sources:</p>
+<p><i>Except they're not at the moment (2015-10)...</i>. So
+  I am maintaining a repository for packages built for Debian Wheezy,
+  which also work on Jessie. This currently has recoll 1.20.6 (the
+  standard repos have 1.17...) To add the repository to your
+  sources:</p>
 
 <ul>
   <li>Create and edit <span class="filename">
@@ -251,8 +253,8 @@ sudo apt-get install recoll
 <a href="debian/pool/main/r/recoll/">debian/pool/main/r/recoll/</a><br/>
 </p>
 
-<p>The official Debian repository has 1.20.3 packages for Sid. I guess
-  that they should run on Jessie. Contact me if this does not work for you.</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>
 
diff --git a/website/index.html.en b/website/index.html.en
index 940a20f0..72970bd4 100644
--- a/website/index.html.en
+++ b/website/index.html.en
@@ -98,6 +98,21 @@
 
       
       <dl>
+        <dt>2015-10-17</dt>
+        <dd>A bug in the verification of configuration file path variables
+          generates spurious warnings from recollindex when the
+          skippedPaths variable contains elements with wildcards. This
+          has no consequence except for the spurious error
+          message.</dd>
+
+        <dt>2015-10-14</dt>
+        <dd>I think that Recoll for MS-Windows is ready for
+        testing. Have a look at
+          the <a href="pages/recoll-windows.html">installation
+          page</a>, and you can
+          even <a href="pages/recoll-mingw.html">build it
+          yourself</a></dd>
+
         <dt>2015-10-08</dt>
         <dd><a href="pics/windows-recoll.html">
             <img align="left" width="100" alt="Recoll on MS-Windows" 
diff --git a/website/pages/recoll-windows.txt b/website/pages/recoll-windows.txt
index 4c57ed74..6f51f729 100644
--- a/website/pages/recoll-windows.txt
+++ b/website/pages/recoll-windows.txt
@@ -1,14 +1,16 @@
 = Trying out Recoll on Windows
 Jean-Francois Dockes <jf at dockes.org>
 
+image:recoll-windows10-thumb.png[link="recoll-windows10.png"]
+
 The Windows port of Recoll has reached a point where it can be tested. At
 least, it will not break your system, and it does not crash too often.
 
-It was only built and tried on Windows 7.
+It was built on Windows 7, and tried on Windows 7 and 10.
 
-We would be very eager to get some feedback from some actual Windows user
+I would be very eager to get some feedback from some actual Windows user
 (I am only a visitor to Windows...). Is this useful at all ? What would 
-make more useful ? 
+make it more useful ? 
 
 There is no installer for the moment, the program and its auxiliary files
 are stored in a Zip file. This is quite big, because it contains a good
@@ -18,7 +20,10 @@ The Zip creates a `recoll` directory. As far as I know, there is no
 assumption where it should reside, I use `c:/recoll`, but anywhere
 else should be ok.
 
-http://www.lesbonscomptes.com/recoll/windows/[Download directory]
+You can get the Zip file either from the 
+http://www.lesbonscomptes.com/recoll/windows/[download directory on
+lesbonscomptes] or from 
+https://bitbucket.org/medoc/recoll/downloads/[the one on bitbucket].
 
 Besides extracting the Zip, you need to:
 
@@ -42,8 +47,12 @@ Besides extracting the Zip, you need to:
      PATH and add them as: `C:\Python27;C:\Program Files\7-Zip` (use a
      semi-colon as separator).
 
+Windows tricks:
 
-Know problems:
+ - When filtering the search with a `dir:` clause, an absolute path
+   should be specified as `/c/mydir` instead of `c:/mydir`
+
+Known problems:
 
  - The default result list font is particularly ugly. Change it from 
    `Preferences->GUI Configuration->Result List->Result List Font`