--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 A089F431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 25 Nov 2012 14:48:33 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 47ePqaG2oRc0 for <notmuch@notmuchmail.org>;\r
+ Sun, 25 Nov 2012 14:48:33 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id E4588431FAE\r
+ for <notmuch@notmuchmail.org>; Sun, 25 Nov 2012 14:48:32 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Tckzz-0003Fy-Gt; Sun, 25 Nov 2012 22:48:31 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Tckzz-0007Ry-30; Sun, 25 Nov 2012 22:48:27 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: david@tethera.net, notmuch@notmuchmail.org\r
+Subject: Re: [Patch v2 12/17] man: document notmuch tag --batch,\r
+ --input options\r
+In-Reply-To: <1353792017-31459-13-git-send-email-david@tethera.net>\r
+References: <1353792017-31459-1-git-send-email-david@tethera.net>\r
+ <1353792017-31459-13-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.14+81~g9730584 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sun, 25 Nov 2012 22:48:30 +0000\r
+Message-ID: <87sj7xi9j5.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 4dd1d513c83a6436fb78418c74be5925 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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, 25 Nov 2012 22:48:33 -0000\r
+\r
+\r
+On Sat, 24 Nov 2012, david@tethera.net wrote:\r
+> From: Jani Nikula <jani@nikula.org>\r
+>\r
+> ---\r
+> man/man1/notmuch-tag.1 | 52 +++++++++++++++++++++++++++++++++++++++++++++++-\r
+> 1 file changed, 51 insertions(+), 1 deletion(-)\r
+>\r
+> diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1\r
+> index 0f86582..751db7b 100644\r
+> --- a/man/man1/notmuch-tag.1\r
+> +++ b/man/man1/notmuch-tag.1\r
+> @@ -4,7 +4,12 @@ notmuch-tag \- add/remove tags for all messages matching the search terms\r
+> \r
+> .SH SYNOPSIS\r
+> .B notmuch tag\r
+> -.RI "+<" tag> "|\-<" tag "> [...] [\-\-] <" search-term ">..."\r
+> +.RI "+<" tag ">|\-<" tag "> [...] [\-\-] <" search-terms ">"\r
+> +\r
+> +.B notmuch tag\r
+> +.RI "--batch"\r
+> +.RI "[ --input=<" filename "> ]"\r
+> +\r
+> \r
+> .SH DESCRIPTION\r
+> \r
+> @@ -29,6 +34,51 @@ updates the maildir flags according to tag changes if the\r
+> configuration option is enabled. See \fBnotmuch-config\fR(1) for\r
+> details.\r
+> \r
+> +Supported options for\r
+> +.B tag\r
+> +include\r
+> +.RS 4\r
+> +.TP 4\r
+> +.BR \-\-batch\r
+> +\r
+> +Read batch tagging operations from standard input. This is more\r
+> +efficient than repeated\r
+> +.B notmuch tag\r
+> +invocations. See\r
+> +.B TAG FILE FORMAT\r
+> +below for the input format. This option is not compatible with\r
+> +specifying tagging on the command line.\r
+> +.RE\r
+> +\r
+> +.RS 4\r
+> +.TP 4\r
+> +.BR "\-\-input=" <filename>\r
+> +\r
+> +Read input from given file, instead of from stdin. Implies\r
+> +.BR --batch .\r
+> +\r
+> +.SH TAG FILE FORMAT\r
+> +\r
+> +The input must consist of lines of the format:\r
+> +\r
+> +.RI "T +<" tag ">|\-<" tag "> [...] [\-\-] <" search-terms ">"\r
+\r
+Is the T at the start of the line a remnant from a previous version?\r
+\r
+Mark\r
+\r
+\r
+> +\r
+> +Each line is interpreted similarly to\r
+> +.B notmuch tag\r
+> +command line arguments. The delimiter is one or more spaces ' '. Any\r
+> +characters in <tag> and <search-terms>\r
+> +.B may\r
+> +be hex encoded with %NN where NN is the hexadecimal value of the\r
+> +character. Any ' ' and '%' characters in <tag> and <search-terms>\r
+> +.B must\r
+> +be hex encoded (using %20 and %25, respectively). Any characters that\r
+> +are not part of <tag> or <search-terms>\r
+> +.B must not\r
+> +be hex encoded.\r
+> +\r
+> +Leading and trailing space ' ' is ignored. Empty lines and lines\r
+> +beginning with '#' are ignored.\r
+> +\r
+> .SH SEE ALSO\r
+> \r
+> \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r