From 76d58bc23a1aaef0308ffbdc8369b8f393d0b5fc Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Thu, 18 Dec 2014 18:13:17 +0100
Subject: [PATCH] VERSION -> 1.20.1, prepare for release

---
 src/VERSION               |  2 +-
 src/mk/manifest.txt       |  5 +++++
 website/release-1.20.html | 22 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/VERSION b/src/VERSION
index a270c618..0044d6cb 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-1.20.0p2
+1.20.1
diff --git a/src/mk/manifest.txt b/src/mk/manifest.txt
index 7efb999b..26bb545a 100644
--- a/src/mk/manifest.txt
+++ b/src/mk/manifest.txt
@@ -137,6 +137,7 @@ filters/rcllatinclass.py
 filters/rcllatinstops.zip
 filters/rcllyx
 filters/rclman
+filters/rclmpdf
 filters/rclnull
 filters/rclokulnote
 filters/rclopxml
@@ -307,6 +308,8 @@ qtgui/editdialog.h
 qtgui/editdialog.ui
 qtgui/firstidx.h
 qtgui/firstidx.ui
+qtgui/fragbuts.cpp
+qtgui/fragbuts.h
 qtgui/guiutils.cpp
 qtgui/guiutils.h
 qtgui/i18n/
@@ -344,6 +347,7 @@ qtgui/images/
 qtgui/images/asearch.png
 qtgui/images/cancel.png
 qtgui/images/close.png
+qtgui/images/code-block.png
 qtgui/images/down.png
 qtgui/images/firstpage.png
 qtgui/images/history.png
@@ -490,6 +494,7 @@ rcldb/xmacros.h
 recollinstall.in
 sampleconf/
 sampleconf/fields
+sampleconf/fragbuts.xml
 sampleconf/mimeconf
 sampleconf/mimemap
 sampleconf/mimeview
diff --git a/website/release-1.20.html b/website/release-1.20.html
index 40da87f5..85fb2f2e 100644
--- a/website/release-1.20.html
+++ b/website/release-1.20.html
@@ -87,6 +87,14 @@
             [somefield:term1,term2].
           </li>
 
+          <li>The Query Fragments tool was added to the GUI. This is a
+            window with customizable buttons to add arbitrary query
+            language fragments to the current search. This makes it
+            easy to define "pre-cooked" filters for things that you need
+            repeatedly. 
+            <a href="usermanual/usermanual.html#RCL.SEARCH.GUI.FRAGBUTS">
+              See the manual</a> for more details.</li>
+
           <li>We changed the way terms are generated from a compound
             string (e.g. an email address). Previously, for an address
             like <em>jfd@recoll.org</em>, only the simple terms and
@@ -97,6 +105,20 @@
             possible to search for left-truncated versions of the
             compound, e.g., all emails from a given domain.</li>
 
+          <li>New keyboard accelerators for the result table: Ctrl+r
+            switches the focus from the search entry to the table,
+            Ctrl+o opens the document for the current line, Ctrl+Shift+o
+            opens document and closes recoll, Ctrl+d previews the
+            document.</li> 
+
+          <li>A special term is now indexed for results from the web
+            history: use "-rclbes:BGL" to exclude the web results,
+            "rclbes:BGL" to restrict the results to the web ones. This
+            is difficult to remember, but the Query Fragments feature
+            means that you don't need too (this is in the sample Query
+            Fragments file).</li>
+
+
           <li>Recoll now indexes <em>#hashtags</em> as such.</li>
 
           <li>It is now possible to configure the GUI in wide form