add a link to dkg's page about inline pgp

[notmuch-wiki] / manpages / notmuch-show-1.mdwn

diff --git a/manpages/notmuch-show-1.mdwn b/manpages/notmuch-show-1.mdwn
index ceac45c6d6ec4a624ffa2c9dd0fae1df241337a8..5ff001593deac011cd472659f18df631174957b5 100644 (file)
--- a/manpages/notmuch-show-1.mdwn
+++ b/manpages/notmuch-show-1.mdwn
@@ -126,8 +126,13 @@
                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 re-
-               placed by the decrypted content.  Implies --verify.
+               and  --format=sexp)  and  on  successful  decryption the multi-
+               part/encrypted part will be replaced by the decrypted  content.
+
+               Decryption  expects  a  functioning <b>gpg-agent</b>(1) to provide any
+               needed credentials. Without one, the decryption will fail.
+
+               Implies --verify.
 
            <b>--exclude=(true|false)</b>
 
@@ -154,6 +159,14 @@
                This is useful if the caller only needs the  headers  as  body-
                less output is much faster and substantially smaller.
 
+           <b>--include-html</b>
+
+               Include &quot;text/html&quot; parts as part of the output (currently only
+               supported with --format=json and --format=sexp).   By  default,
+               unless <b>--part=N</b> is used to select a specific part or <b>--include-</b>
+               <b>html</b> is used to include all &quot;text/html&quot;  parts,  no  part  with
+               content type &quot;text/html&quot; is included in the output.
+
        A  common  use  of  <b>notmuch</b> <b>show</b> is to display a single thread of email
        messages. For this, use a search term of &quot;thread:&lt;thread-id&gt;&quot; as can be
        seen in the first column of output from the <b>notmuch</b> <b>search</b> command.
@@ -171,8 +184,9 @@
 <h2>SEE ALSO</h2>
 <pre>
        <a href='../notmuch-1/'>notmuch</a>(1),  <a href='../notmuch-config-1/'>notmuch-config</a>(1), <a href='../notmuch-count-1/'>notmuch-count</a>(1), <a href='../notmuch-dump-1/'>notmuch-dump</a>(1), <a href='../notmuch-hooks-5/'>not-</a>
-       <a href='../notmuch-hooks-5/'>much-hooks</a>(5),  <a href='../notmuch-new-1/'>notmuch-new</a>(1),  <a href='../notmuch-reply-1/'>notmuch-reply</a>(1),  <a href='../notmuch-restore-1/'>notmuch-restore</a>(1),
-       <a href='../notmuch-search-1/'>notmuch-search</a>(1), <a href='../notmuch-search-terms-7/'>notmuch-search-terms</a>(7), <a href='../notmuch-tag-1/'>notmuch-tag</a>(1)
+       <a href='../notmuch-hooks-5/'>much-hooks</a>(5),  <a href='../notmuch-insert-1/'>notmuch-insert</a>(1),  <a href='../notmuch-new-1/'>notmuch-new</a>(1),   <a href='../notmuch-reply-1/'>notmuch-reply</a>(1),
+       <a href='../notmuch-restore-1/'>notmuch-restore</a>(1),  <a href='../notmuch-search-1/'>notmuch-search</a>(1),  <a href='../notmuch-search-terms-7/'>notmuch-search-terms</a>(7),  <a href='../notmuch-tag-1/'>not-</a>
+       <a href='../notmuch-tag-1/'>much-tag</a>(1)
 </pre>
 
-<h2>Notmuch 0.15.2</h2>
+<h2>Notmuch 0.17</h2>