From 59e5cc4150a247cbceb7c3d9da74b634ff638337 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Tue, 25 Apr 2017 10:18:21 +0200
Subject: [PATCH] web

---
 website/download.html            | 28 ++++++++--------------------
 website/pages/recoll-windows.txt |  6 +++---
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/website/download.html b/website/download.html
index b9889c3d..2cc6198b 100644
--- a/website/download.html
+++ b/website/download.html
@@ -327,13 +327,14 @@ sudo apt-get install recoll
 
         <h3>CentOS 7.1</h3>
 
-        <p>CentOS ships neither Xapian nor Recoll. <a href="centos71">Here are
-            some packages.</a>. There are only x86_64 binaries
-          for now, use the source rpm for other archs. As far as I know, the
-          only specific issue is that CentOS does not seem to have the Qt
-          WebKit module. The Recoll build uses QTextBrowser instead of a
-          WebKit QWebView, so no Javascript or advanced CSS in the result list
-          or snippets window for you.</p>
+        <p>CentOS ships neither Xapian nor
+          Recoll. <a href="downloads/centos71">Here are some
+          packages.</a>. There are only x86_64 binaries for now, use
+          the source rpm for other archs. As far as I know, the only
+          specific issue is that CentOS does not seem to have the Qt
+          WebKit module. The Recoll build uses QTextBrowser instead of
+          a WebKit QWebView, so no Javascript or advanced CSS in the
+          result list or snippets window for you.</p>
 
 
         <h3>OpenSUSE</h3>
@@ -350,19 +351,6 @@ sudo apt-get install recoll
           not build antiword, just tell the software manager to "break" recoll
           by installing anyway, and get antiword somewhere else.</p>
 
-        <!--
-        <h3>Mageia</h3>
-
-        <p>Mageia version 2: <a
-                                href="mageia2/recoll-1.18.1-1.mga2.i586.rpm">mageia2/recoll-1.18.1-1.mga2.i586.rpm,
-          </a><a
-                 href="mageia2/recoll-debug-1.18.1-1.mga2.i586.rpm">recoll-debug-1.18.1-1.mga2.i586.rpm</a>.
-          <br>
-          Source: <a
-                     href="mageia2/recoll-1.18.1-1.mga2.src.rpm">recoll-1.18.1-1.mga2.src.rpm</a>
-        </p>
-        -->
-
 
       </div> <!-- Packages -->
 
diff --git a/website/pages/recoll-windows.txt b/website/pages/recoll-windows.txt
index 0737ea6d..0d353076 100644
--- a/website/pages/recoll-windows.txt
+++ b/website/pages/recoll-windows.txt
@@ -3,7 +3,7 @@ Jean-Francois Dockes <jf at dockes.org>
 :date:
 
 :recollversion: 1.23.0-2017-01-07-78b8ad
-:windir: downwin-0e7f2
+:windir: downwin-21a72
 
 image:recoll-windows10-thumb.png[link="recoll-windows10.png"]
 
@@ -36,7 +36,7 @@ files which would take space for nothing otherwise.
 == Installation
 
 - Download the 
-  http://www.recoll.org/{windir}/recoll-setup-{recollversion}.exe[Recoll
+  http://www.recoll.org/downloads/{windir}/recoll-setup-{recollversion}.exe[Recoll
   setup file].
 
 - Execute the setup file. This is a vanilla installer generated by Inno
@@ -54,7 +54,7 @@ files which would take space for nothing otherwise.
 //NOTE: The installer 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/{windir}/recoll-{recollversion}.7z[installation
+//http://www.recoll.org/downloads/{windir}/recoll-{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