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 7132848d3ae647800efd43144cf1f42d085a2724..5ff001593deac011cd472659f18df631174957b5 100644 (file)
--- a/manpages/notmuch-show-1.mdwn
+++ b/manpages/notmuch-show-1.mdwn
@@ -127,39 +127,47 @@
                (ie.  "multipart/encrypted"  parts).  Status  of the decryption
                will be reported (currently only supported  with  --format=json
                and  --format=sexp)  and  on  successful  decryption the multi-
-               part/encrypted part will be replaced by the decrypted content.
+               part/encrypted part will be replaced by the decrypted  content.
 
-               Decryption expects a functioning <b>gpg-agent</b>(1)  to  provide  any
+               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>
 
-               Specify  whether  to  omit threads only matching search.tag_ex-
-               clude from the search results (the default) or not.  In  either
-               case  the excluded message will be marked with the exclude flag
-               (except when output=mbox when  there  is  nowhere  to  put  the
+               Specify whether to omit threads  only  matching  search.tag_ex-
+               clude  from  the search results (the default) or not. In either
+               case the excluded message will be marked with the exclude  flag
+               (except  when  output=mbox  when  there  is  nowhere to put the
                flag).
 
-               If  --entire-thread  is specified then complete threads are re-
+               If --entire-thread is specified then complete threads  are  re-
                turned regardless (with the excluded flag being set when appro-
-               priate)  but threads that only match in an excluded message are
+               priate) but threads that only match in an excluded message  are
                not returned when <b>--exclude=true.</b>
 
                The default is <b>--exclude=true.</b>
 
            <b>--body=(true|false)</b>
 
-               If true (the default) <b>notmuch</b> <b>show</b> includes the bodies  of  the
-               messages   in   the  output;  if  false,  bodies  are  omitted.
-               <b>--body=false</b> is only implemented for the json and sexp  formats
+               If  true  (the default) <b>notmuch</b> <b>show</b> includes the bodies of the
+               messages  in  the  output;  if  false,  bodies   are   omitted.
+               <b>--body=false</b>  is only implemented for the json and sexp formats
                and it is incompatible with <b>--part</b> &gt<b>&</b>gt; <b>0.</b>
 
-               This  is  useful  if the caller only needs the headers as body-
+               This is useful if the caller only needs the  headers  as  body-
                less output is much faster and substantially smaller.
 
-       A common use of <b>notmuch</b> <b>show</b> is to display a  single  thread  of  email
+           <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.
 </pre>
@@ -175,9 +183,10 @@
 
 <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-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-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>