--- /dev/null
+Return-Path: <jani@nikula.org>\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 21FB2431FD0\r
+ for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:27:22 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 bWYqmhghRCw1 for <notmuch@notmuchmail.org>;\r
+ Sat, 22 Feb 2014 14:27:18 -0800 (PST)\r
+Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com\r
+ [209.85.215.177]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id A694B429E3B\r
+ for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:26:16 -0800 (PST)\r
+Received: by mail-ea0-f177.google.com with SMTP id h10so926144eak.8\r
+ for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:26:15 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references:in-reply-to:references;\r
+ bh=t318l0YjStni3Cs0e4lv2MAjyzvDsWgzFExMQhw3h0Y=;\r
+ b=Zlx+cKYsUKiS/ye8iEgq0XbwC/2cKZsxa5YQxMDKnN/JiHqWAnZXfhD01zRj6RnoWZ\r
+ OGHW41cCmNCUhIVFtPfhXMR/xb0OfbMwYNUXdSz8YhKM7TAUpEsGmEKnT+LSU9hlkmV4\r
+ cr32JDNxeKWACxrf61r13suzXv9wpYpCYktgklq5wVf0xdi0WbMlcZrw70wRsdkAnBBn\r
+ R35Xqhl2UVDGWfL1Yxq2Aj2u0MhH/1lfvV1hBBF7dX2SQCpPO+I8IkNvROKZclXdiUQ4\r
+ vDxxa1vscdOoisGfuD5j6j5uoR7nBP7AdzLrbt+dG3seaSq2o20jKGmebv2qlqEXO568\r
+ BTkw==\r
+X-Gm-Message-State:\r
+ ALoCoQnMvGjApALvKuI6v0VpkC4RcXYwC4etsUDoBNRydUAGZDgZzcfqkShIKgXhapT/4XPSlm5Q\r
+X-Received: by 10.14.53.8 with SMTP id f8mr16145681eec.3.1393107975491;\r
+ Sat, 22 Feb 2014 14:26:15 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+ [88.195.111.91])\r
+ by mx.google.com with ESMTPSA id 46sm43750314ees.4.2014.02.22.14.26.14\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sat, 22 Feb 2014 14:26:14 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 12/13] man: update man pages for folder: and path: search\r
+ terms\r
+Date: Sun, 23 Feb 2014 00:25:43 +0200\r
+Message-Id:\r
+ <821de68fd9b99fa4d3731df256a6b61653f024eb.1393105055.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <cover.1393105055.git.jani@nikula.org>\r
+References: <cover.1393105055.git.jani@nikula.org>\r
+In-Reply-To: <cover.1393105055.git.jani@nikula.org>\r
+References: <cover.1393105055.git.jani@nikula.org>\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: Sat, 22 Feb 2014 22:27:22 -0000\r
+\r
+---\r
+ man/man7/notmuch-search-terms.7 | 28 ++++++++++++++++++++++------\r
+ 1 file changed, 22 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7\r
+index a768b630a4d1..907403dd6f2e 100644\r
+--- a/man/man7/notmuch-search-terms.7\r
++++ b/man/man7/notmuch-search-terms.7\r
+@@ -54,6 +54,8 @@ terms to match against specific portions of an email, (where\r
+ \r
+ folder:<directory-path>\r
+ \r
++ path:<directory-path> or path:<directory-path>/**\r
++\r
+ date:<since>..<until>\r
+ \r
+ The\r
+@@ -101,12 +103,26 @@ thread ID values can be seen in the first column of output from\r
+ \r
+ The\r
+ .B folder:\r
+-prefix can be used to search for email message files that are\r
+-contained within particular directories within the mail store. If the\r
+-same email message has multiple message files associated with it, it's\r
+-sufficient for a match that at least one of the files is contained\r
+-within a matching directory. Only the directory components below the\r
+-top-level mail database path are available to be searched.\r
++and\r
++.B path:\r
++prefixes can be used to search for email message files that are\r
++contained within particular directories within the mail store. The\r
++directories are specified relative from the top-level mail database\r
++path, and thus only the directory components below that are available\r
++to be searched.\r
++\r
++The\r
++.B folder:\r
++prefix matches messages in the specified maildir folder, i.e. in the\r
++specified directory and its "new" and "cur" subdirectories. The\r
++.B path:\r
++prefix matches messages in the specified directory only, unless the\r
++"/**" suffix is used to denote the specified directory and all its\r
++subdirectories recursively. For both, the empty string "" matches the\r
++top level maildir folder or directory. If the same email message has\r
++multiple message files associated with it, it's sufficient for a match\r
++that at least one of the files is contained within a matching\r
++directory.\r
+ \r
+ The\r
+ .B date:\r
+-- \r
+1.8.5.3\r
+\r