[PATCH v8 07/11] man: Add --decrypt to reply flags

diff --git a/f3/79dc7130488e3cb241251ca1d679d844146900 b/f3/79dc7130488e3cb241251ca1d679d844146900
new file mode 100644 (file)
index 0000000..cbda706
--- /dev/null
+++ b/f3/79dc7130488e3cb241251ca1d679d844146900
@@ -0,0 +1,82 @@
+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 952DE431FDA\r
+       for <notmuch@notmuchmail.org>; Sun, 18 Mar 2012 09:33:13 -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 tests=[none]\r
+       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 HECHU2QsRA0X for <notmuch@notmuchmail.org>;\r
+       Sun, 18 Mar 2012 09:33:12 -0700 (PDT)\r
+Received: from smtp-out-04.shaw.ca (smtp-out-04.shaw.ca [64.59.134.12])\r
+       by olra.theworths.org (Postfix) with ESMTP id 62A0D431E82\r
+       for <notmuch@notmuchmail.org>; Sun, 18 Mar 2012 09:33:02 -0700 (PDT)\r
+Received: from lb7f8hsrpno-svcs.dcs.int.inet (HELO pd6ml1no-ssvc.prod.shaw.ca)\r
+       ([10.0.144.222])\r
+       by pd5mo1no-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=Cufqhujp69hR+MhiHu40yK/USb/hlYs0+irVU46A6+k=\r
+       c=1 sm=1\r
+       a=GJYKSf5GIDUA:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17\r
+       a=F2Q6KqCKwiUKKGQy3tkA:9 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117\r
+Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56])\r
+       by pd6ml1no-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 64F60800422C; 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 07/11] man: Add --decrypt to reply flags\r
+Date: Sun, 18 Mar 2012 10:32:39 -0600\r
+Message-Id: <1332088363-22476-8-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:14 -0000\r
+\r
+---\r
+ man/man1/notmuch-reply.1 |   10 ++++++++++\r
+ 1 files changed, 10 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1\r
+index ec8da1f..7ee3ceb 100644\r
+--- a/man/man1/notmuch-reply.1\r
++++ b/man/man1/notmuch-reply.1\r
+@@ -68,6 +68,16 @@ values from the first that contains something other than only the\r
+ user's addresses.\r
+ .RE\r
+ .RE\r
++.RS\r
++.TP 4\r
++.B \-\-decrypt\r
++\r
++Decrypt any MIME encrypted parts found in the selected content\r
++(ie. "multipart/encrypted" parts). Status of the decryption will be\r
++reported (currently only supported with --format=json) and the\r
++multipart/encrypted part will be replaced by the decrypted\r
++content.\r
++.RE\r
+ \r
+ See \fBnotmuch-search-terms\fR(7)\r
+ for details of the supported syntax for <search-terms>.\r
+-- \r
+1.7.5.4\r
+\r