--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 1D56A431FC7\r
+ for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 20:12:07 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\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 W-j-pgVNTyuu for <notmuch@notmuchmail.org>;\r
+ Tue, 24 Jul 2012 20:12:04 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
+ [18.9.25.14])\r
+ by olra.theworths.org (Postfix) with ESMTP id B5EE3431FAF\r
+ for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 20:12:04 -0700 (PDT)\r
+X-AuditID: 1209190e-b7fb56d0000008b2-c9-500f6404c267\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id F9.30.02226.4046F005; Tue, 24 Jul 2012 23:12:04 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q6P3C44T011356; \r
+ Tue, 24 Jul 2012 23:12:04 -0400\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q6P3C2nV029104\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Tue, 24 Jul 2012 23:12:03 -0400 (EDT)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1Sts14-0007gZ-Md; Tue, 24 Jul 2012 23:12:02 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2] man: show: update man page for entire-thread and json.\r
+In-Reply-To: <1343156277-28146-1-git-send-email-markwalters1009@gmail.com>\r
+References: <20120722163628.GE31834@mit.edu>\r
+ <1343156277-28146-1-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.13.2+59~g78b98ba (http://notmuchmail.org) Emacs/23.3.1\r
+ (i486-pc-linux-gnu)\r
+Date: Tue, 24 Jul 2012 23:12:02 -0400\r
+Message-ID: <87r4s0pm9p.fsf@awakening.csail.mit.edu>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFrrHIsWRmVeSWpSXmKPExsUixG6nrsuSwh9gcPiIiMXquTwW12/OZHZg\r
+ 8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4MvbcP8dWcI+/4tfh5SwNjKd5uhg5OSQETCSW\r
+ 7+hkhrDFJC7cW88GYgsJ7GOU6D+V2cXIBWRvYJT4fGEhO4Rzkkli6dnXUM4SRomtxzeBtbMJ\r
+ aEhs27+cEcQWEXCVePrtM1Ccg0NYwE9i+jNhkDCngJfExeszGSE2ZEnc2/eJEaREVCBB4uDx\r
+ GpAwi4CqxLnW16wgNi/QcdsezWaHsAUlTs58wgJiMwtoSdz495JpAqPALCSpWUhSCxiZVjHK\r
+ puRW6eYmZuYUpybrFicn5uWlFuka6+VmluilppRuYgQFI6ck3w7GrweVDjEKcDAq8fD+fsIX\r
+ IMSaWFZcmXuIUZKDSUmUlyuJP0CILyk/pTIjsTgjvqg0J7X4EKMEB7OSCG9RGFCONyWxsiq1\r
+ KB8mJc3BoiTOeyXlpr+QQHpiSWp2ampBahFMVoaDQ0mC1zIZqFGwKDU9tSItM6cEIc3EwQky\r
+ nAdouA5IDW9xQWJucWY6RP4Uo6KUOG8ISEIAJJFRmgfXC0sWrxjFgV4R5tUHqeIBJhq47ldA\r
+ g5mABj8P4wMZXJKIkJJqYEydHPvT+Zfy7B3dn2JU1uu8MJjwReV8qtgOKfd+wZNbmKUiKwJt\r
+ KqYKvNAOF0k9sqE8oOdj80Jr1+Sd7HKss/+pCfgqHzQtMXvou3Rpou7TnDevT03QeHvirO0r\r
+ w/fWUuYJtY2nNk+conVX+cXHs59O/trOsrhGZ5L3I5GDbhuvxScvSmA7x6zEUpyRaKjFXFSc\r
+ CAC/55Id8QIAAA==\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: Wed, 25 Jul 2012 03:12:07 -0000\r
+\r
+LGTM.\r
+\r
+On Tue, 24 Jul 2012, Mark Walters <markwalters1009@gmail.com> wrote:\r
+> Previously in notmuch show --format=json implied --entire-thread. This\r
+> is still the default but it is now possible to disable this. Update\r
+> the manpage to reflect this.\r
+> ---\r
+>\r
+> Update the manpage since --format=json and --entire-thread=false is\r
+> now supported. Reworded as Austin suggested.\r
+>\r
+> Best wishes\r
+>\r
+> Mark \r
+>\r
+> man/man1/notmuch-show.1 | 21 +++++++++++++--------\r
+> 1 files changed, 13 insertions(+), 8 deletions(-)\r
+>\r
+> diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1\r
+> index 506583a..765b22c 100644\r
+> --- a/man/man1/notmuch-show.1\r
+> +++ b/man/man1/notmuch-show.1\r
+> @@ -24,11 +24,14 @@ Supported options for\r
+> include\r
+> .RS 4\r
+> .TP 4\r
+> -.B \-\-entire\-thread\r
+> +.B \-\-entire\-thread=(true|false)\r
+> \r
+> -By default only those messages that match the search terms will be\r
+> -displayed. With this option, all messages in the same thread as any\r
+> -matched message will be displayed.\r
+> +If true,\r
+> +.B notmuch show\r
+> +outputs all messages in the thread of any message matching the search\r
+> +terms; if false, it outputs only the matching messages. For\r
+> +.B --format=json\r
+> +this defaults to true. For other formats, this defaults to false.\r
+> .RE\r
+> \r
+> .RS 4\r
+> @@ -55,11 +58,13 @@ be nested.\r
+> The output is formatted with Javascript Object Notation (JSON). This\r
+> format is more robust than the text format for automated\r
+> processing. The nested structure of multipart MIME messages is\r
+> -reflected in nested JSON output. JSON output always includes all\r
+> -messages in a matching thread; in effect\r
+> +reflected in nested JSON output. By default JSON output includes all\r
+> +messages in a matching thread; that is, by default,\r
+> .B \-\-format=json\r
+> -implies\r
+> -.B \-\-entire\-thread\r
+> +sets\r
+> +.B "\-\-entire\-thread"\r
+> +The caller can disable this behaviour by setting\r
+> +.B \-\-entire\-thread=false\r
+> \r
+> .RE\r
+> .RS 4\r
+> -- \r
+> 1.7.9.1\r