Switch to side-by-side view

--- a/website/pages/recoll-windows.txt
+++ b/website/pages/recoll-windows.txt
@@ -1,10 +1,12 @@
 = Recoll on Windows
 Jean-Francois Dockes <jf at dockes.org>
+
+:recollversion: 1.22.0-20160414
 
 image:recoll-windows10-thumb.png[link="recoll-windows10.png"]
 
 Recoll for Windows was built on Windows 7, and tried on Windows 7 and
-10. It now seems quite stable (12 November 2015)
+10. It now seems quite stable (14 April 2016)
 
 Recoll is free and licensed under the GPL. You will be asked to accept the
 license during the installation. For a regular user, and in a nutshell, the
@@ -18,23 +20,33 @@
 page, send an email, or use the
 https://bitbucket.org/medoc/recoll/issues[BitBucket Recoll issues tracker].
 
-NOTE: Especially, I would very much like information about system
-compatibility. It seems that Recoll does not work on Windows XP, and there is
-little I can do about it. I know that it runs on Windows 7 32 bits, and
-Windows 10 64 bits (my two Virtualbox instances). I have a report that the
-installer crashes on Windows 7 64 bits, but I would really like more data
-points. Please send me news of your success or failure.
+NOTE: Especially, I would like information about system compatibility. It
+seems that Recoll does not work on Windows XP, and there is little I can do
+about it. I know that it runs on Windows 7 32 bits, and Windows 10 64 bits
+(my two Virtualbox instances). I have a report that the installer crashes
+on Windows 7 64 bits, but I would really like more data points. Please send
+me news of your success or failure.
+
+NOTE: About the installer: this needs administrator rights, in order to
+install to `C:\Program Files`. If you want to install on a machine where
+you have no administrator rights, you can use the
+http://www.recoll.org/windows/recoll-archive-{recollversion}.7z[installation
+directory archive] instead and extract it anywhere, this works just the
+same (you will need the free http://www.7-zip.org/[7z] to extract it). If
+you are in this case, you can ignore the setup-related steps of the
+procedure of course.
+
+
 
 Procedure: 
 
 - Download the Recoll setup file from the
-  http://www.recoll.org/windows/recoll-setup-1.22.0-20160317.exe[Recoll
+  http://www.recoll.org/windows/recoll-setup-{recollversion}.exe[Recoll
   web site], or (probably faster) from 
-  https://bitbucket.org/medoc/recoll/downloads/recoll-setup-1.22.0-20160317.exe[BitBucket].
+  https://bitbucket.org/medoc/recoll/downloads/recoll-setup-{recollversion}.exe[BitBucket].
 
 - Execute the setup file. This is a vanilla installer generated by Inno
-  Setup, and it will ask the usual questions. If you have no administrative
-  rights, take care to select a target directory where you can write.
+  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
@@ -68,6 +80,19 @@
   create and update the index by using the `File` menu (or executing
   `recollindex.exe` from a command window).
 
+== Change Log
+
+Changes in 20160414
+
+- The setup script has changed back to needing administrator rights,
+  because this is what is convenient for most people. Use the installation
+  directory archive to install in a non-standard location without admin
+  rights.
+- Fixed a bug which had the whole indexing stop if a script would time out
+  on a specific file (it will very rarely happen that a pathologically bad
+  file can throw an input handler in a loop).
+-
+
 Changes in 20160317
 
 - Small change to the setup script so that administrative rights are not
@@ -93,7 +118,6 @@
   fuzzing experiment on the input processors. Especially, frequent crashes
   in the image tag extractor caused very ennoying Windows popups about
   a Python error.
-
 
 Fixed in 20151115 and later