1 Return-Path: <amdragon@mit.edu>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 1D56A431FC7
\r
6 for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 20:12:07 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id W-j-pgVNTyuu for <notmuch@notmuchmail.org>;
\r
16 Tue, 24 Jul 2012 20:12:04 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id B5EE3431FAF
\r
20 for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 20:12:04 -0700 (PDT)
\r
21 X-AuditID: 1209190e-b7fb56d0000008b2-c9-500f6404c267
\r
22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
\r
23 by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id F9.30.02226.4046F005; Tue, 24 Jul 2012 23:12:04 -0400 (EDT)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q6P3C44T011356;
\r
27 Tue, 24 Jul 2012 23:12:04 -0400
\r
28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])
\r
29 (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q6P3C2nV029104
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
33 Tue, 24 Jul 2012 23:12:03 -0400 (EDT)
\r
34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)
\r
35 (envelope-from <amdragon@mit.edu>)
\r
36 id 1Sts14-0007gZ-Md; Tue, 24 Jul 2012 23:12:02 -0400
\r
37 From: Austin Clements <amdragon@MIT.EDU>
\r
38 To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org
\r
39 Subject: Re: [PATCH v2] man: show: update man page for entire-thread and json.
\r
40 In-Reply-To: <1343156277-28146-1-git-send-email-markwalters1009@gmail.com>
\r
41 References: <20120722163628.GE31834@mit.edu>
\r
42 <1343156277-28146-1-git-send-email-markwalters1009@gmail.com>
\r
43 User-Agent: Notmuch/0.13.2+59~g78b98ba (http://notmuchmail.org) Emacs/23.3.1
\r
45 Date: Tue, 24 Jul 2012 23:12:02 -0400
\r
46 Message-ID: <87r4s0pm9p.fsf@awakening.csail.mit.edu>
\r
48 Content-Type: text/plain; charset=us-ascii
\r
49 X-Brightmail-Tracker:
\r
50 H4sIAAAAAAAAA+NgFrrHIsWRmVeSWpSXmKPExsUixG6nrsuSwh9gcPiIiMXquTwW12/OZHZg
\r
51 8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4MvbcP8dWcI+/4tfh5SwNjKd5uhg5OSQETCSW
\r
52 7+hkhrDFJC7cW88GYgsJ7GOU6D+V2cXIBWRvYJT4fGEhO4Rzkkli6dnXUM4SRomtxzeBtbMJ
\r
53 aEhs27+cEcQWEXCVePrtM1Ccg0NYwE9i+jNhkDCngJfExeszGSE2ZEnc2/eJEaREVCBB4uDx
\r
54 GpAwi4CqxLnW16wgNi/QcdsezWaHsAUlTs58wgJiMwtoSdz495JpAqPALCSpWUhSCxiZVjHK
\r
55 puRW6eYmZuYUpybrFicn5uWlFuka6+VmluilppRuYgQFI6ck3w7GrweVDjEKcDAq8fD+fsIX
\r
56 IMSaWFZcmXuIUZKDSUmUlyuJP0CILyk/pTIjsTgjvqg0J7X4EKMEB7OSCG9RGFCONyWxsiq1
\r
57 KB8mJc3BoiTOeyXlpr+QQHpiSWp2ampBahFMVoaDQ0mC1zIZqFGwKDU9tSItM6cEIc3EwQky
\r
58 nAdouA5IDW9xQWJucWY6RP4Uo6KUOG8ISEIAJJFRmgfXC0sWrxjFgV4R5tUHqeIBJhq47ldA
\r
59 g5mABj8P4wMZXJKIkJJqYEydHPvT+Zfy7B3dn2JU1uu8MJjwReV8qtgOKfd+wZNbmKUiKwJt
\r
60 KqYKvNAOF0k9sqE8oOdj80Jr1+Sd7HKss/+pCfgqHzQtMXvou3Rpou7TnDevT03QeHvirO0r
\r
61 w/fWUuYJtY2nNk+conVX+cXHs59O/trOsrhGZ5L3I5GDbhuvxScvSmA7x6zEUpyRaKjFXFSc
\r
63 X-BeenThere: notmuch@notmuchmail.org
\r
64 X-Mailman-Version: 2.1.13
\r
66 List-Id: "Use and development of the notmuch mail system."
\r
67 <notmuch.notmuchmail.org>
\r
68 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
69 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
70 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
71 List-Post: <mailto:notmuch@notmuchmail.org>
\r
72 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
73 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
74 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
75 X-List-Received-Date: Wed, 25 Jul 2012 03:12:07 -0000
\r
79 On Tue, 24 Jul 2012, Mark Walters <markwalters1009@gmail.com> wrote:
\r
80 > Previously in notmuch show --format=json implied --entire-thread. This
\r
81 > is still the default but it is now possible to disable this. Update
\r
82 > the manpage to reflect this.
\r
85 > Update the manpage since --format=json and --entire-thread=false is
\r
86 > now supported. Reworded as Austin suggested.
\r
92 > man/man1/notmuch-show.1 | 21 +++++++++++++--------
\r
93 > 1 files changed, 13 insertions(+), 8 deletions(-)
\r
95 > diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1
\r
96 > index 506583a..765b22c 100644
\r
97 > --- a/man/man1/notmuch-show.1
\r
98 > +++ b/man/man1/notmuch-show.1
\r
99 > @@ -24,11 +24,14 @@ Supported options for
\r
103 > -.B \-\-entire\-thread
\r
104 > +.B \-\-entire\-thread=(true|false)
\r
106 > -By default only those messages that match the search terms will be
\r
107 > -displayed. With this option, all messages in the same thread as any
\r
108 > -matched message will be displayed.
\r
111 > +outputs all messages in the thread of any message matching the search
\r
112 > +terms; if false, it outputs only the matching messages. For
\r
113 > +.B --format=json
\r
114 > +this defaults to true. For other formats, this defaults to false.
\r
118 > @@ -55,11 +58,13 @@ be nested.
\r
119 > The output is formatted with Javascript Object Notation (JSON). This
\r
120 > format is more robust than the text format for automated
\r
121 > processing. The nested structure of multipart MIME messages is
\r
122 > -reflected in nested JSON output. JSON output always includes all
\r
123 > -messages in a matching thread; in effect
\r
124 > +reflected in nested JSON output. By default JSON output includes all
\r
125 > +messages in a matching thread; that is, by default,
\r
126 > .B \-\-format=json
\r
128 > -.B \-\-entire\-thread
\r
130 > +.B "\-\-entire\-thread"
\r
131 > +The caller can disable this behaviour by setting
\r
132 > +.B \-\-entire\-thread=false
\r