1 Return-Path: <jani@nikula.org>
\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 2F041431FAF
\r
6 for <notmuch@notmuchmail.org>; Fri, 1 Mar 2013 08:43:31 -0800 (PST)
\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 FPsxB0o95iNH for <notmuch@notmuchmail.org>;
\r
16 Fri, 1 Mar 2013 08:43:30 -0800 (PST)
\r
17 Received: from mail-la0-f42.google.com (mail-la0-f42.google.com
\r
18 [209.85.215.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 7B7B4431FAE
\r
21 for <notmuch@notmuchmail.org>; Fri, 1 Mar 2013 08:43:30 -0800 (PST)
\r
22 Received: by mail-la0-f42.google.com with SMTP id fe20so3156460lab.1
\r
23 for <notmuch@notmuchmail.org>; Fri, 01 Mar 2013 08:43:29 -0800 (PST)
\r
24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
25 d=google.com; s=20120113;
\r
26 h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to
\r
27 :references:x-gm-message-state;
\r
28 bh=m69Rx5gBhXupvwowVG1PIR6qs1xhAsDIxIomeL3Y+1I=;
\r
29 b=JuFCsOmWcHya68L7rhaX0ExV4TwvC6TblvRNRaL+N9o+YArSqlWR8zTFmILVETgh1N
\r
30 idT7W0i/JDE9IvQc3I6P/T97ONmhWGPUFInp1J+So84CKPoTzwTm2kbIaOhBg4mg4929
\r
31 JkUalyEKa0Mh6nGfwI+gjs4URsKlj5ifKrFfsXlFGefvZxIM5icIknq985v3fQ9B8kz1
\r
32 JEY8aKonWfhGuDr8VN5dA8tw5iNgYKbe4Mph3GNcivGSybyqa8Kt8luUMsxLN+UnIP38
\r
33 rxjE/bvGlBkgCy2fhBpwErM75TLfvI9cWLqTULueOzpVakLjWRzbX0pE78btA47lrtae
\r
35 X-Received: by 10.152.133.52 with SMTP id oz20mr9677027lab.30.1362156207557;
\r
36 Fri, 01 Mar 2013 08:43:27 -0800 (PST)
\r
37 Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.
\r
39 by mx.google.com with ESMTPS id tm10sm6938877lab.10.2013.03.01.08.43.25
\r
40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
41 Fri, 01 Mar 2013 08:43:26 -0800 (PST)
\r
42 From: Jani Nikula <jani@nikula.org>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH] man: show and reply --decrypt option requires gpg-agent
\r
45 Date: Fri, 1 Mar 2013 18:43:26 +0200
\r
46 Message-Id: <1362156206-19481-1-git-send-email-jani@nikula.org>
\r
47 X-Mailer: git-send-email 1.7.10.4
\r
48 In-Reply-To: <1361950838-22919-1-git-send-email-jani@nikula.org>
\r
49 References: <1361950838-22919-1-git-send-email-jani@nikula.org>
\r
51 ALoCoQlIGu4A+w/O7frl0lq9aJigl9gQpjr0ql1JIHyEGFZbgfgq47et1M4ebnjtj2vzCUr6XshJ
\r
52 X-BeenThere: notmuch@notmuchmail.org
\r
53 X-Mailman-Version: 2.1.13
\r
55 List-Id: "Use and development of the notmuch mail system."
\r
56 <notmuch.notmuchmail.org>
\r
57 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
58 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
59 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
60 List-Post: <mailto:notmuch@notmuchmail.org>
\r
61 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
62 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
63 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
64 X-List-Received-Date: Fri, 01 Mar 2013 16:43:31 -0000
\r
67 man/man1/notmuch-reply.1 | 9 ++++++---
\r
68 man/man1/notmuch-show.1 | 9 +++++++--
\r
69 2 files changed, 13 insertions(+), 5 deletions(-)
\r
71 diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1
\r
72 index 454bdee..bf2021f 100644
\r
73 --- a/man/man1/notmuch-reply.1
\r
74 +++ b/man/man1/notmuch-reply.1
\r
75 @@ -89,9 +89,12 @@ user's addresses.
\r
77 Decrypt any MIME encrypted parts found in the selected content
\r
78 (ie. "multipart/encrypted" parts). Status of the decryption will be
\r
79 -reported (currently only supported with --format=json and --format=sexp)
\r
80 -and the multipart/encrypted part will be replaced by the decrypted
\r
82 +reported (currently only supported with --format=json and
\r
83 +--format=sexp) and on successful decryption the multipart/encrypted
\r
84 +part will be replaced by the decrypted content.
\r
86 +Decryption expects a functioning \fBgpg-agent\fR(1) to provide any
\r
87 +needed credentials. Without one, the decryption will fail.
\r
90 See \fBnotmuch-search-terms\fR(7)
\r
91 diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1
\r
92 index 8be9eae..7697dfc 100644
\r
93 --- a/man/man1/notmuch-show.1
\r
94 +++ b/man/man1/notmuch-show.1
\r
95 @@ -163,8 +163,13 @@ will be replaced by the signed data.
\r
96 Decrypt any MIME encrypted parts found in the selected content
\r
97 (ie. "multipart/encrypted" parts). Status of the decryption will be
\r
98 reported (currently only supported with --format=json and
\r
99 ---format=sexp) and the multipart/encrypted part will be replaced
\r
100 -by the decrypted content. Implies --verify.
\r
101 +--format=sexp) and on successful decryption the multipart/encrypted
\r
102 +part will be replaced by the decrypted content.
\r
104 +Decryption expects a functioning \fBgpg-agent\fR(1) to provide any
\r
105 +needed credentials. Without one, the decryption will fail.
\r