Return-Path: <jani@nikula.org>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id 21FB2431FD0
	for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:27:22 -0800 (PST)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
X-Spam-Flag: NO
X-Spam-Score: -0.7
X-Spam-Level: 
X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
	tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id bWYqmhghRCw1 for <notmuch@notmuchmail.org>;
	Sat, 22 Feb 2014 14:27:18 -0800 (PST)
Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com
	[209.85.215.177]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id A694B429E3B
	for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:26:16 -0800 (PST)
Received: by mail-ea0-f177.google.com with SMTP id h10so926144eak.8
	for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:26:15 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
	:references:in-reply-to:references;
	bh=t318l0YjStni3Cs0e4lv2MAjyzvDsWgzFExMQhw3h0Y=;
	b=Zlx+cKYsUKiS/ye8iEgq0XbwC/2cKZsxa5YQxMDKnN/JiHqWAnZXfhD01zRj6RnoWZ
	OGHW41cCmNCUhIVFtPfhXMR/xb0OfbMwYNUXdSz8YhKM7TAUpEsGmEKnT+LSU9hlkmV4
	cr32JDNxeKWACxrf61r13suzXv9wpYpCYktgklq5wVf0xdi0WbMlcZrw70wRsdkAnBBn
	R35Xqhl2UVDGWfL1Yxq2Aj2u0MhH/1lfvV1hBBF7dX2SQCpPO+I8IkNvROKZclXdiUQ4
	vDxxa1vscdOoisGfuD5j6j5uoR7nBP7AdzLrbt+dG3seaSq2o20jKGmebv2qlqEXO568
	BTkw==
X-Gm-Message-State:
 ALoCoQnMvGjApALvKuI6v0VpkC4RcXYwC4etsUDoBNRydUAGZDgZzcfqkShIKgXhapT/4XPSlm5Q
X-Received: by 10.14.53.8 with SMTP id f8mr16145681eec.3.1393107975491;
	Sat, 22 Feb 2014 14:26:15 -0800 (PST)
Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.
	[88.195.111.91])
	by mx.google.com with ESMTPSA id 46sm43750314ees.4.2014.02.22.14.26.14
	for <multiple recipients>
	(version=TLSv1.2 cipher=RC4-SHA bits=128/128);
	Sat, 22 Feb 2014 14:26:14 -0800 (PST)
From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org
Subject: [PATCH v2 12/13] man: update man pages for folder: and path: search
	terms
Date: Sun, 23 Feb 2014 00:25:43 +0200
Message-Id:
 <821de68fd9b99fa4d3731df256a6b61653f024eb.1393105055.git.jani@nikula.org>
X-Mailer: git-send-email 1.8.5.3
In-Reply-To: <cover.1393105055.git.jani@nikula.org>
References: <cover.1393105055.git.jani@nikula.org>
In-Reply-To: <cover.1393105055.git.jani@nikula.org>
References: <cover.1393105055.git.jani@nikula.org>
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Feb 2014 22:27:22 -0000

---
 man/man7/notmuch-search-terms.7 | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7
index a768b630a4d1..907403dd6f2e 100644
--- a/man/man7/notmuch-search-terms.7
+++ b/man/man7/notmuch-search-terms.7
@@ -54,6 +54,8 @@ terms to match against specific portions of an email, (where
 
 	folder:<directory-path>
 
+	path:<directory-path> or path:<directory-path>/**
+
 	date:<since>..<until>
 
 The
@@ -101,12 +103,26 @@ thread ID values can be seen in the first column of output from
 
 The
 .B folder:
-prefix can be used to search for email message files that are
-contained within particular directories within the mail store. If the
-same email message has multiple message files associated with it, it's
-sufficient for a match that at least one of the files is contained
-within a matching directory. Only the directory components below the
-top-level mail database path are available to be searched.
+and
+.B path:
+prefixes can be used to search for email message files that are
+contained within particular directories within the mail store. The
+directories are specified relative from the top-level mail database
+path, and thus only the directory components below that are available
+to be searched.
+
+The
+.B folder:
+prefix matches messages in the specified maildir folder, i.e. in the
+specified directory and its "new" and "cur" subdirectories. The
+.B path:
+prefix matches messages in the specified directory only, unless the
+"/**" suffix is used to denote the specified directory and all its
+subdirectories recursively. For both, the empty string "" matches the
+top level maildir folder or directory. If the same email message has
+multiple message files associated with it, it's sufficient for a match
+that at least one of the files is contained within a matching
+directory.
 
 The
 .B date:
-- 
1.8.5.3