[PATCH 3/3] doc: add more information on operators.

diff --git a/94/1a46405182c685caa30bd0d8b5ed2a172a7a5e b/94/1a46405182c685caa30bd0d8b5ed2a172a7a5e
new file mode 100644 (file)
index 0000000..762318c
--- /dev/null
+++ b/94/1a46405182c685caa30bd0d8b5ed2a172a7a5e
@@ -0,0 +1,119 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1B6E0431FB6\r
+       for <notmuch@notmuchmail.org>; Sun, 18 Jan 2015 05:39:37 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+       tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id KAcoMLjEYktR for <notmuch@notmuchmail.org>;\r
+       Sun, 18 Jan 2015 05:39:36 -0800 (PST)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+       [87.98.215.224])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 95B41431FAF\r
+       for <notmuch@notmuchmail.org>; Sun, 18 Jan 2015 05:39:36 -0800 (PST)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+       4.80) (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1YCpSV-0006ay-1f; Sun, 18 Jan 2015 13:00:03 +0000\r
+Received: (nullmailer pid 29996 invoked by uid 1000); Sun, 18 Jan 2015\r
+       12:59:36 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Jani Nikula <jani@nikula.org>, David Bremner <david@tethera.net>,\r
+       notmuch@notmuchmail.org\r
+Subject: [PATCH 3/3] doc: add more information on operators.\r
+Date: Sun, 18 Jan 2015 13:59:31 +0100\r
+Message-Id: <1421585971-29949-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1421585971-29949-1-git-send-email-david@tethera.net>\r
+References: <87h9vojsa0.fsf@nikula.org>\r
+       <1421585971-29949-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 18 Jan 2015 13:39:37 -0000\r
+\r
+More material borrowed from the wiki page on "searching"\r
+---\r
+ doc/man7/notmuch-search-terms.rst | 43 ++++++++++++++++++++++++++++++++++-----\r
+ 1 file changed, 38 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/doc/man7/notmuch-search-terms.rst b/doc/man7/notmuch-search-terms.rst\r
+index 3b27053..a315fbe 100644\r
+--- a/doc/man7/notmuch-search-terms.rst\r
++++ b/doc/man7/notmuch-search-terms.rst\r
+@@ -118,17 +118,50 @@ The time range can also be specified using timestamps with a syntax of:\r
+ Each timestamp is a number representing the number of seconds since\r
+ 1970-01-01 00:00:00 UTC.\r
+ \r
+-In addition to individual terms, multiple terms can be combined with\r
+-Boolean operators ( **and**, **or**, **not** , etc.). Each term in the\r
+-query will be implicitly connected by a logical AND if no explicit\r
+-operator is provided, (except that terms with a common prefix will be\r
+-implicitly combined with OR until we get Xapian defect #402 fixed).\r
++Operators\r
++---------\r
+ \r
++In addition to individual terms, multiple terms can be combined with\r
++Boolean operators ( **and**, **or**, **not**, and **xor**). Each term\r
++in the query will be implicitly connected by a logical AND if no\r
++explicit operator is provided, (except that terms with a common prefix\r
++will be implicitly combined with OR until we get Xapian defect #402\r
++fixed).  The shorthand '-<term>' can be used for 'not <term>' but\r
++unfortunately this does not work at the start of an expression.\r
+ Parentheses can also be used to control the combination of the Boolean\r
+ operators, but will have to be protected from interpretation by the\r
+ shell, (such as by putting quotation marks around any parenthesized\r
+ expression).\r
+ \r
++In addition to the standard boolean operators, Xapian provides several\r
++operators specific to text searching.\r
++\r
++::\r
++\r
++        notmuch search term1 NEAR term2\r
++\r
++will return results where term1 is within 10 words of term2. The\r
++threshold can be set like this:\r
++\r
++::\r
++\r
++        notmuch search term1 NEAR/2 term2\r
++\r
++The search\r
++\r
++::\r
++\r
++        notmuch search term1 ADJ term2\r
++\r
++will return results where term1 is within 10 words of term2, but in the\r
++same order as in the query. The threshold can be set the same as with\r
++NEAR:\r
++\r
++::\r
++\r
++        notmuch search term1 ADJ/7 term2\r
++\r
++\r
+ Stemming\r
+ --------\r
+ \r
+-- \r
+2.1.4\r
+\r