--- /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 9B61D421171\r
+ for <notmuch@notmuchmail.org>; Sat, 17 Aug 2013 05:11:54 -0700 (PDT)\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 hkkCL3mSKfkL for <notmuch@notmuchmail.org>;\r
+ Sat, 17 Aug 2013 05:11:50 -0700 (PDT)\r
+Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com\r
+ [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 4ABD5429E4A\r
+ for <notmuch@notmuchmail.org>; Sat, 17 Aug 2013 05:11:41 -0700 (PDT)\r
+Received: by mail-bk0-f53.google.com with SMTP id d7so913662bkh.26\r
+ for <notmuch@notmuchmail.org>; Sat, 17 Aug 2013 05:11:40 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=google.com; s=20120113;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references:in-reply-to:references;\r
+ bh=sB51YMdzTimwYDfK+LkstuirW5oZMIeZ0qLaPCLa+Ec=;\r
+ b=aZSaatEwUvOajwP176dTZ7EjvmaHEWHBZngVr0rgjfCdU20BsCN8JZH4zucpjQGDKQ\r
+ SwIP7VOosZ/ACzTm729Uuk5hsGdydTpMlR3DQde4EHCYbgu/qyUiEbFPk3lT3trVCCfV\r
+ x9ektlf5YbWGOiPIYhfM+I5CZa0EhqZ9ZTxl60K/3S+Lp216NAlBYsN7nJFqaM6bZcf6\r
+ loOXT/Bxtz1P+799fwA8G/0wr5sPR0fkzi/UK1HqOM02xFoYAFg059S48UTzD6iOfYTF\r
+ tbOa/Se8jmZAulMX7RXP/k9wD1NxY240n8HdXklfjaMaSA8O1AewGThonXB6VSlPPdxn\r
+ nmLQ==\r
+X-Gm-Message-State:\r
+ ALoCoQn1OwLHo4GbJozm8CO4U2CYOVchrhhwnGxkFBC0ch9sVKaZugcGpUTn/u3s2VL2Z3BbXuQK\r
+X-Received: by 10.205.9.198 with SMTP id ox6mr1661198bkb.19.1376741499997;\r
+ Sat, 17 Aug 2013 05:11:39 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+ [88.195.111.91])\r
+ by mx.google.com with ESMTPSA id if11sm249815bkc.15.1969.12.31.16.00.00\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sat, 17 Aug 2013 05:11:38 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 3/8] man: document notmuch search --duplicate=N\r
+Date: Sat, 17 Aug 2013 15:11:28 +0300\r
+Message-Id:\r
+ <fbe62d787c8acb242aa29a3f0c0790e89951bf84.1376741447.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <cover.1376741447.git.jani@nikula.org>\r
+References: <cover.1376741447.git.jani@nikula.org>\r
+In-Reply-To: <cover.1376741447.git.jani@nikula.org>\r
+References: <cover.1376741447.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, 17 Aug 2013 12:11:55 -0000\r
+\r
+Document the notmuch search --duplicate=N option.\r
+\r
+---\r
+\r
+v3: clarify dupe vs. folder prefix per Mark's suggestion\r
+---\r
+ man/man1/notmuch-search.1 | 20 ++++++++++++++++++++\r
+ 1 file changed, 20 insertions(+)\r
+\r
+diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1\r
+index 2d6ecaf..f69a4cd 100644\r
+--- a/man/man1/notmuch-search.1\r
++++ b/man/man1/notmuch-search.1\r
+@@ -80,6 +80,10 @@ Output the filenames of all messages matching the search terms, either\r
+ one per line (\-\-format=text), separated by null characters\r
+ (\-\-format=text0), as a JSON array (\-\-format=json), or as an\r
+ S-Expression list (\-\-format=sexp).\r
++\r
++Note that each message may have multiple filenames associated with it.\r
++All of them are included in the output, unless limited with the\r
++\-\-duplicate=N option.\r
+ .RE\r
+ .RS 4\r
+ .TP 4\r
+@@ -158,6 +162,22 @@ but the "match count" is the number of matching non-excluded messages in the\r
+ thread, rather than the number of matching messages.\r
+ .RE\r
+ \r
++.RS 4\r
++.TP 4\r
++.BR \-\-duplicate=N\r
++\r
++Effective with\r
++.BR --output=files ,\r
++output the Nth filename associated with each message matching the\r
++query (N is 1-based). If N is greater than the number of files\r
++associated with the message, don't print anything.\r
++\r
++Note that this option is orthogonal with the\r
++.BR folder:\r
++search prefix. The prefix matches messages based on filenames. This\r
++option filters filenames of the matching messages.\r
++.RE\r
++\r
+ .SH EXIT STATUS\r
+ \r
+ This command supports the following special exit status codes\r
+-- \r
+1.7.10.4\r
+\r