--- /dev/null
+Return-Path: <awg@lagos.xvx.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 85E72431FD0\r
+ for <notmuch@notmuchmail.org>; Sun, 18 Mar 2012 09:33:06 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_NONE=-0.0001] 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 G33I8hnAUz9u for <notmuch@notmuchmail.org>;\r
+ Sun, 18 Mar 2012 09:33:05 -0700 (PDT)\r
+Received: from idcmail-mo1so.shaw.ca (idcmail-mo1so.shaw.ca [24.71.223.10])\r
+ by olra.theworths.org (Postfix) with ESMTP id 75FC7431FAE\r
+ for <notmuch@notmuchmail.org>; Sun, 18 Mar 2012 09:33:01 -0700 (PDT)\r
+Received: from pd4ml3so-ssvc.prod.shaw.ca ([10.0.141.150])\r
+ by pd4mo1so-svcs.prod.shaw.ca with ESMTP; 18 Mar 2012 10:33:00 -0600\r
+X-Cloudmark-SP-Filtered: true\r
+X-Cloudmark-SP-Result: v=1.1 cv=b/gStvK98Bs6YfhBwCpxRApoLO2qoBYaarCtclPE+68=\r
+ c=1 sm=1\r
+ a=M44ri5VhD8EA:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17\r
+ a=42mLeXhgQZWaz3spHXIA:9 a=NKPy_LdsL9tpF4-_dDMA:7\r
+ a=HpAAvcLHHh0Zw7uRqdWCyQ==:117\r
+Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56])\r
+ by pd4ml3so-dmz.prod.shaw.ca with ESMTP; 18 Mar 2012 10:33:00 -0600\r
+Received: by lagos.xvx.ca (Postfix, from userid 1000)\r
+ id 43E9C8004204; Sun, 18 Mar 2012 10:33:00 -0600 (MDT)\r
+From: Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v8 06/11] man: Update notmuch-reply man page for JSON format.\r
+Date: Sun, 18 Mar 2012 10:32:38 -0600\r
+Message-Id: <1332088363-22476-7-git-send-email-awg+notmuch@xvx.ca>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <1332088363-22476-1-git-send-email-awg+notmuch@xvx.ca>\r
+References: <87fwd6kqtv.fsf@zancas.localnet>\r
+ <1332088363-22476-1-git-send-email-awg+notmuch@xvx.ca>\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 Mar 2012 16:33:06 -0000\r
+\r
+---\r
+ man/man1/notmuch-reply.1 | 10 ++++++++--\r
+ 1 files changed, 8 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1\r
+index deb3ae1..ec8da1f 100644\r
+--- a/man/man1/notmuch-reply.1\r
++++ b/man/man1/notmuch-reply.1\r
+@@ -37,12 +37,17 @@ Supported options for\r
+ include\r
+ .RS\r
+ .TP 4\r
+-.BR \-\-format= ( default | headers\-only )\r
++.BR \-\-format= ( default | json | headers\-only )\r
+ .RS\r
+ .TP 4\r
+ .BR default\r
+ Includes subject and quoted message body.\r
+ .TP\r
++.BR json\r
++Produces JSON output containing headers for a reply message and the\r
++contents of the original message. This output can be used by a client\r
++to create a reply message intelligently.\r
++.TP\r
+ .BR headers\-only\r
+ Only produces In\-Reply\-To, References, To, Cc, and Bcc headers.\r
+ .RE\r
+@@ -73,7 +78,8 @@ with a search string matching a single message, (such as\r
+ id:<message-id>), but it can be useful to reply to several messages at\r
+ once. For example, when a series of patches are sent in a single\r
+ thread, replying to the entire thread allows for the reply to comment\r
+-on issue found in multiple patches.\r
++on issues found in multiple patches. The default format supports\r
++replying to multiple messages at once, but the JSON format does not.\r
+ .RE\r
+ .RE\r
+ \r
+-- \r
+1.7.5.4\r
+\r