From 58b8cbb141f21508d0978c8ecbf46baa2ab6c3ba Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Fri, 1 Mar 2013 18:43:26 +0200 Subject: [PATCH] [PATCH] man: show and reply --decrypt option requires gpg-agent --- 08/fbdbbd2893021e3bd42b67a7ab20038ca04381 | 113 ++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 08/fbdbbd2893021e3bd42b67a7ab20038ca04381 diff --git a/08/fbdbbd2893021e3bd42b67a7ab20038ca04381 b/08/fbdbbd2893021e3bd42b67a7ab20038ca04381 new file mode 100644 index 000000000..374e385d1 --- /dev/null +++ b/08/fbdbbd2893021e3bd42b67a7ab20038ca04381 @@ -0,0 +1,113 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 2F041431FAF + for ; Fri, 1 Mar 2013 08:43:31 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id FPsxB0o95iNH for ; + Fri, 1 Mar 2013 08:43:30 -0800 (PST) +Received: from mail-la0-f42.google.com (mail-la0-f42.google.com + [209.85.215.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 7B7B4431FAE + for ; Fri, 1 Mar 2013 08:43:30 -0800 (PST) +Received: by mail-la0-f42.google.com with SMTP id fe20so3156460lab.1 + for ; Fri, 01 Mar 2013 08:43:29 -0800 (PST) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to + :references:x-gm-message-state; + bh=m69Rx5gBhXupvwowVG1PIR6qs1xhAsDIxIomeL3Y+1I=; + b=JuFCsOmWcHya68L7rhaX0ExV4TwvC6TblvRNRaL+N9o+YArSqlWR8zTFmILVETgh1N + idT7W0i/JDE9IvQc3I6P/T97ONmhWGPUFInp1J+So84CKPoTzwTm2kbIaOhBg4mg4929 + JkUalyEKa0Mh6nGfwI+gjs4URsKlj5ifKrFfsXlFGefvZxIM5icIknq985v3fQ9B8kz1 + JEY8aKonWfhGuDr8VN5dA8tw5iNgYKbe4Mph3GNcivGSybyqa8Kt8luUMsxLN+UnIP38 + rxjE/bvGlBkgCy2fhBpwErM75TLfvI9cWLqTULueOzpVakLjWRzbX0pE78btA47lrtae + iH3w== +X-Received: by 10.152.133.52 with SMTP id oz20mr9677027lab.30.1362156207557; + Fri, 01 Mar 2013 08:43:27 -0800 (PST) +Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id tm10sm6938877lab.10.2013.03.01.08.43.25 + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Fri, 01 Mar 2013 08:43:26 -0800 (PST) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH] man: show and reply --decrypt option requires gpg-agent +Date: Fri, 1 Mar 2013 18:43:26 +0200 +Message-Id: <1362156206-19481-1-git-send-email-jani@nikula.org> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1361950838-22919-1-git-send-email-jani@nikula.org> +References: <1361950838-22919-1-git-send-email-jani@nikula.org> +X-Gm-Message-State: + ALoCoQlIGu4A+w/O7frl0lq9aJigl9gQpjr0ql1JIHyEGFZbgfgq47et1M4ebnjtj2vzCUr6XshJ +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 01 Mar 2013 16:43:31 -0000 + +--- + man/man1/notmuch-reply.1 | 9 ++++++--- + man/man1/notmuch-show.1 | 9 +++++++-- + 2 files changed, 13 insertions(+), 5 deletions(-) + +diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1 +index 454bdee..bf2021f 100644 +--- a/man/man1/notmuch-reply.1 ++++ b/man/man1/notmuch-reply.1 +@@ -89,9 +89,12 @@ user's addresses. + + Decrypt any MIME encrypted parts found in the selected content + (ie. "multipart/encrypted" parts). Status of the decryption will be +-reported (currently only supported with --format=json and --format=sexp) +-and the multipart/encrypted part will be replaced by the decrypted +-content. ++reported (currently only supported with --format=json and ++--format=sexp) and on successful decryption the multipart/encrypted ++part will be replaced by the decrypted content. ++ ++Decryption expects a functioning \fBgpg-agent\fR(1) to provide any ++needed credentials. Without one, the decryption will fail. + .RE + + See \fBnotmuch-search-terms\fR(7) +diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 +index 8be9eae..7697dfc 100644 +--- a/man/man1/notmuch-show.1 ++++ b/man/man1/notmuch-show.1 +@@ -163,8 +163,13 @@ will be replaced by the signed data. + Decrypt any MIME encrypted parts found in the selected content + (ie. "multipart/encrypted" parts). Status of the decryption will be + reported (currently only supported with --format=json and +---format=sexp) and the multipart/encrypted part will be replaced +-by the decrypted content. Implies --verify. ++--format=sexp) and on successful decryption the multipart/encrypted ++part will be replaced by the decrypted content. ++ ++Decryption expects a functioning \fBgpg-agent\fR(1) to provide any ++needed credentials. Without one, the decryption will fail. ++ ++Implies --verify. + .RE + + .RS 4 +-- +1.7.10.4 + -- 2.26.2