manpages updates for release 0.35

diff --git a/manpages.mdwn b/manpages.mdwn
index b97fef0131ea7d76c03a4b8e8c6dbbca5e2b2af0..41b77724cfee73b9daebd8b10ffcc31c2766bc0a 100644 (file)
--- a/manpages.mdwn
+++ b/manpages.mdwn
@@ -25,4 +25,4 @@ The manual pages are licensed under
 [the GNU General Public License](https://www.gnu.org/licenses/gpl.txt),
 either version 3.0 or at your option any later version.
 
 [the GNU General Public License](https://www.gnu.org/licenses/gpl.txt),
 either version 3.0 or at your option any later version.
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-1.mdwn b/manpages/notmuch-1.mdwn
index 19253e3e2d5d280ee85f18e6c2c3c2ed4e5680c3..9c46fcd0b46f085965c3588438f1bf7f65b39d0d 100644 (file)
--- a/manpages/notmuch-1.mdwn
+++ b/manpages/notmuch-1.mdwn
@@ -193,7 +193,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-address-1.mdwn b/manpages/notmuch-address-1.mdwn
index 1c649c2752eee0ad36e860e68503986b9b0fa106..30d8ceca5a9b4851d7742af7669b7b05593a23cc 100644 (file)
--- a/manpages/notmuch-address-1.mdwn
+++ b/manpages/notmuch-address-1.mdwn
@@ -127,7 +127,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-compact-1.mdwn b/manpages/notmuch-compact-1.mdwn
index 3ee6e2ddc208ea87438b605f1038c82e60a6fabb..8f8cf6a56d230598c198a79881372a2e768969f5 100644 (file)
--- a/manpages/notmuch-compact-1.mdwn
+++ b/manpages/notmuch-compact-1.mdwn
@@ -50,7 +50,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-config-1.mdwn b/manpages/notmuch-config-1.mdwn
index bee4eb2d3187a8bee237f4420804541ea973a222..a8c8ccde10dbab7d5dfbefe3804e50285238b3a0 100644 (file)
--- a/manpages/notmuch-config-1.mdwn
+++ b/manpages/notmuch-config-1.mdwn
@@ -138,6 +138,16 @@
               Default:   empty   list.   Note   that   <b>notmuch-setup</b>(1)   puts
               <b>deleted;spam</b> here when creating new configuration file.
 
               Default:   empty   list.   Note   that   <b>notmuch-setup</b>(1)   puts
               <b>deleted;spam</b> here when creating new configuration file.
 

+       <b>show.extra_headers</b>
+          By default <a href='../notmuch-show-1/'>notmuch-show</a>(1) includes the following headers in  struc‐
+          tured  output if they are present in the message: <u>Subject</u>, <u>From</u>, <u>To</u>,
+          <u>Cc</u>, <u>Bcc</u>, <u>Reply-To</u>, <u>Date</u>. This option allows the specification  of  a
+          list of further headers to output.
+
+          History: This configuration value was introduced in notmuch 0.35.
+
+          Default: empty list.
+

        <b>maildir.synchronize</b>_<b>flags</b>
               If true, then the following maildir flags (in message filenames)
               will be synchronized with the corresponding notmuch tags:
        <b>maildir.synchronize</b>_<b>flags</b>
               If true, then the following maildir flags (in message filenames)
               will be synchronized with the corresponding notmuch tags:


@@ -153,7 +163,7 @@
                             ├─────┼────────────────────────────┤
                             │R    │ replied                    │
                             ├─────┼────────────────────────────┤
                             ├─────┼────────────────────────────┤
                             │R    │ replied                    │
                             ├─────┼────────────────────────────┤

-                            │S    │ unread   (added  when  &apos;S&apos; │
+                            │S    │ unread  (added  when   &apos;S&apos; │

                             │     │ flag is not present)       │
                             └─────┴────────────────────────────┘
 
                             │     │ flag is not present)       │
                             └─────┴────────────────────────────┘
 


@@ -161,42 +171,41 @@
               and update tags, while the <a href='../notmuch-tag-1/'>notmuch-tag</a>(1) and <a href='../notmuch-restore-1/'>notmuch-restore</a>(1)
               commands will notice tag changes and update flags in filenames.
 
               and update tags, while the <a href='../notmuch-tag-1/'>notmuch-tag</a>(1) and <a href='../notmuch-restore-1/'>notmuch-restore</a>(1)
               commands will notice tag changes and update flags in filenames.
 

-              If there have been any changes  in  the  maildir  (new  messages
-              added,  old  ones  removed  or  renamed,  maildir flags changed,
+              If  there  have  been  any  changes in the maildir (new messages
+              added, old ones  removed  or  renamed,  maildir  flags  changed,

               etc.),  it  is  advisable  to  run  <a href='../notmuch-new-1/'>notmuch-new</a>(1)  before  <a href='../notmuch-tag-1/'>not‐</a>
               etc.),  it  is  advisable  to  run  <a href='../notmuch-new-1/'>notmuch-new</a>(1)  before  <a href='../notmuch-tag-1/'>not‐</a>

-              <a href='../notmuch-tag-1/'>much-tag</a>(1)  or  <a href='../notmuch-restore-1/'>notmuch-restore</a>(1)  commands  to ensure the tag
-              changes are properly synchronized to the maildir flags,  as  the
+              <a href='../notmuch-tag-1/'>much-tag</a>(1) or <a href='../notmuch-restore-1/'>notmuch-restore</a>(1) commands  to  ensure  the  tag
+              changes  are  properly synchronized to the maildir flags, as the

               commands expect the database and maildir to be in sync.
 
               Default: <b>true</b>.
 
        <b>index.decrypt</b>
               commands expect the database and maildir to be in sync.
 
               Default: <b>true</b>.
 
        <b>index.decrypt</b>

-              Policy  for decrypting encrypted messages during indexing.  Must
+              Policy for decrypting encrypted messages during indexing.   Must

               be one of: <b>false</b>, <b>auto</b>, <b>nostash</b>, or <b>true</b>.
 
               be one of: <b>false</b>, <b>auto</b>, <b>nostash</b>, or <b>true</b>.
 

-              When indexing an encrypted e-mail message, if this  variable  is
-              set  to  <b>true</b>, notmuch will try to decrypt the message and index
-              the cleartext, stashing a copy of any  discovered  session  keys
+              When  indexing  an encrypted e-mail message, if this variable is
+              set to <b>true</b>, notmuch will try to decrypt the message  and  index
+              the  cleartext,  stashing  a copy of any discovered session keys

               for the message.  If <b>auto</b>, it will try to index the cleartext if
               for the message.  If <b>auto</b>, it will try to index the cleartext if

-              a stashed session key is already known  for  the  message  (e.g.
-              from  a  previous  copy), but will not try to access your secret
+              a  stashed  session  key  is already known for the message (e.g.
+              from a previous copy), but will not try to  access  your  secret

               keys.  Use <b>false</b> to avoid decrypting even when a stashed session
               key is already present.
 
               keys.  Use <b>false</b> to avoid decrypting even when a stashed session
               key is already present.
 

-              <b>nostash</b>  is  the  same  as  <b>true</b>  except  that it will not stash
+              <b>nostash</b> is the same as  <b>true</b>  except  that  it  will  not  stash

               newly-discovered session keys in the database.
 
               newly-discovered session keys in the database.
 

-              From the command line (i.e. during  <a href='../notmuch-new-1/'>notmuch-new</a>(1),  <a href='../notmuch-insert-1/'>notmuch-in‐</a>
+              From  the  command line (i.e. during <a href='../notmuch-new-1/'>notmuch-new</a>(1), <a href='../notmuch-insert-1/'>notmuch-in‐</a>

               <a href='../notmuch-insert-1/'>sert</a>(1), or <a href='../notmuch-reindex-1/'>notmuch-reindex</a>(1)), the user can override the data‐
               base&apos;s stored decryption policy with the <b>--decrypt=</b> option.
 
               <a href='../notmuch-insert-1/'>sert</a>(1), or <a href='../notmuch-reindex-1/'>notmuch-reindex</a>(1)), the user can override the data‐
               base&apos;s stored decryption policy with the <b>--decrypt=</b> option.
 

-              Here is a table that summarizes the  functionality  of  each  of
+              Here  is  a  table  that summarizes the functionality of each of

               these policies:
 
                       ┌──────────────┬───────┬──────┬─────────┬──────┐
                       │              │ false │ auto │ nostash │ true │
               these policies:
 
                       ┌──────────────┬───────┬──────┬─────────┬──────┐
                       │              │ false │ auto │ nostash │ true │

-                      └──────────────┴───────┴──────┴─────────┴──────┘
-
+                      ├──────────────┼───────┼──────┼─────────┼──────┤

                       │Index cleart‐ │       │ X    │ X       │ X    │
                       │ext     using │       │      │         │      │
                       │stashed  ses‐ │       │      │         │      │
                       │Index cleart‐ │       │ X    │ X       │ X    │
                       │ext     using │       │      │         │      │
                       │stashed  ses‐ │       │      │         │      │


@@ -211,45 +220,45 @@
                       ├──────────────┼───────┼──────┼─────────┼──────┤
                       │Delete
                       │stashed  ses‐ │       │      │         │      │
                       ├──────────────┼───────┼──────┼─────────┼──────┤
                       │Delete
                       │stashed  ses‐ │       │      │         │      │

-                      │sion  keys on │       │      │         │      │
+                      │sion keys  on │       │      │         │      │

                       │reindex       │       │      │         │      │
                       └──────────────┴───────┴──────┴─────────┴──────┘
 
                       │reindex       │       │      │         │      │
                       └──────────────┴───────┴──────┴─────────┴──────┘
 

-              Stashed session keys are kept in the database as properties  as‐
-              sociated  with  the message.  See <b>session-key</b> in <a href='../notmuch-properties-7/'>notmuch-proper‐</a>
+              Stashed  session keys are kept in the database as properties as‐
+              sociated with the message.  See <b>session-key</b>  in  <a href='../notmuch-properties-7/'>notmuch-proper‐</a>

               <a href='../notmuch-properties-7/'>ties</a>(7) for more details about how they can be useful.
 
               <a href='../notmuch-properties-7/'>ties</a>(7) for more details about how they can be useful.
 

-              Be aware that the notmuch index  is  likely  sufficient  (and  a
-              stashed  session key is certainly sufficient) to reconstruct the
-              cleartext of the message itself, so please ensure that the  not‐
-              much  message  index  is  adequately  protected.  DO NOT USE <b>in-</b>
-              <b>dex.decrypt=true</b> or  <b>index.decrypt=nostash</b>  without  considering
+              Be  aware  that  the  notmuch  index is likely sufficient (and a
+              stashed session key is certainly sufficient) to reconstruct  the
+              cleartext  of the message itself, so please ensure that the not‐
+              much message index is adequately  protected.   DO  NOT  USE  <b>in-</b>
+              <b>dex.decrypt=true</b>  or  <b>index.decrypt=nostash</b>  without considering

               the security of your index.
 
               Default: <b>auto</b>.
 
        <b>index.header.&lt;prefix&gt;</b>
               the security of your index.
 
               Default: <b>auto</b>.
 
        <b>index.header.&lt;prefix&gt;</b>

-              Define  the  query  prefix &lt;prefix&gt;, based on a mail header. For
-              example <b>index.header.List=List-Id</b> will add a probabilistic  pre‐
-              fix  <b>List:</b>  that  searches the <b>List-Id</b> field.  User defined pre‐
+              Define the query prefix &lt;prefix&gt;, based on a  mail  header.  For
+              example  <b>index.header.List=List-Id</b> will add a probabilistic pre‐
+              fix <b>List:</b> that searches the <b>List-Id</b> field.   User  defined  pre‐

               fixes must not start with &apos;a&apos;...&apos;z&apos;; in particular adding a pre‐
               fixes must not start with &apos;a&apos;...&apos;z&apos;; in particular adding a pre‐

-              fix  with same name as a predefined prefix is not supported. See
-              <a href='../notmuch-search-terms-7/'>notmuch-search-terms</a>(7) for a list of existing prefixes, and  an
+              fix with same name as a predefined prefix is not supported.  See
+              <a href='../notmuch-search-terms-7/'>notmuch-search-terms</a>(7)  for a list of existing prefixes, and an

               explanation of probabilistic prefixes.
 
        <b>built</b>_<b>with.&lt;name&gt;</b>
               Compile  time  feature  &lt;name&gt;.  Current  possibilities  include
               explanation of probabilistic prefixes.
 
        <b>built</b>_<b>with.&lt;name&gt;</b>
               Compile  time  feature  &lt;name&gt;.  Current  possibilities  include

-              &quot;retry_lock&quot; (configure option, included  by  default).   (since
-              notmuch  0.30,  &quot;compact&quot;  and  &quot;field_processor&quot; are always in‐
+              &quot;retry_lock&quot;  (configure  option,  included by default).  (since
+              notmuch 0.30, &quot;compact&quot; and  &quot;field_processor&quot;  are  always  in‐

               cluded.)
 
        <b>query.&lt;name&gt;</b>
               cluded.)
 
        <b>query.&lt;name&gt;</b>

-              Expansion   for   named   query   called   &lt;name&gt;.   See    <a href='../notmuch-search-terms-7/'>not‐</a>
+              Expansion    for   named   query   called   &lt;name&gt;.   See   <a href='../notmuch-search-terms-7/'>not‐</a>

               <a href='../notmuch-search-terms-7/'>much-search-terms</a>(7) for more information about named queries.
 
        <b>squery.&lt;name&gt;</b>
               Expansion for named query called &lt;name&gt;, using s-expression syn‐
               <a href='../notmuch-search-terms-7/'>much-search-terms</a>(7) for more information about named queries.
 
        <b>squery.&lt;name&gt;</b>
               Expansion for named query called &lt;name&gt;, using s-expression syn‐

-              tax. See  <a href='../notmuch-sexp-queries-7/'>notmuch-sexp-queries</a>(7)  for  more  information  about
+              tax.  See  <a href='../notmuch-sexp-queries-7/'>notmuch-sexp-queries</a>(7)  for  more  information about

               s-expression queries.
 </pre>
 
               s-expression queries.
 </pre>
 


@@ -264,10 +273,10 @@
        2. File specified by <b>NOTMUCH</b>_<b>CONFIG</b> environment variable.
 
        3. <b>$XDG</b>_<b>CONFIG</b>_<b>HOME/notmuch/&lt;profile&gt;/config</b> where <b>&lt;profile&gt;</b> is defined
        2. File specified by <b>NOTMUCH</b>_<b>CONFIG</b> environment variable.
 
        3. <b>$XDG</b>_<b>CONFIG</b>_<b>HOME/notmuch/&lt;profile&gt;/config</b> where <b>&lt;profile&gt;</b> is defined

-          by  <b>NOTMUCH</b>_<b>PROFILE</b>   environment   variable   if   set,   <b>$XDG</b>_<b>CON-</b>
+          by   <b>NOTMUCH</b>_<b>PROFILE</b>   environment   variable   if   set,  <b>$XDG</b>_<b>CON-</b>

           <b>FIG</b>_<b>HOME/notmuch/default/config</b> otherwise.
 
           <b>FIG</b>_<b>HOME/notmuch/default/config</b> otherwise.
 

-       4. <b>$HOME/.notmuch-config.&lt;profile&gt;</b>  where  <b>&lt;profile&gt;</b> is defined by <b>NOT-</b>
+       4. <b>$HOME/.notmuch-config.&lt;profile&gt;</b> where <b>&lt;profile&gt;</b> is defined  by  <b>NOT-</b>

           <b>MUCH</b>_<b>PROFILE</b> environment variable if set, <b>$HOME/.notmuch-config</b> oth‐
           erwise.
 </pre>
           <b>MUCH</b>_<b>PROFILE</b> environment variable if set, <b>$HOME/.notmuch-config</b> oth‐
           erwise.
 </pre>


@@ -280,7 +289,7 @@
 
        2. Directory specified by config key <b>database.path</b>.
 
 
        2. Directory specified by config key <b>database.path</b>.
 

-       3. <b>$XDG</b>_<b>DATA</b>_<b>HOME/notmuch/&lt;profile&gt;</b>  where <b>&lt;profile&gt;</b> is defined by <b>NOT-</b>
+       3. <b>$XDG</b>_<b>DATA</b>_<b>HOME/notmuch/&lt;profile&gt;</b> where <b>&lt;profile&gt;</b> is defined by  <b>NOT-</b>

           <b>MUCH</b>_<b>PROFILE</b> environment variable if set, <b>$XDG</b>_<b>DATA</b>_<b>HOME/notmuch/de-</b>
           <b>fault</b> otherwise.
 
           <b>MUCH</b>_<b>PROFILE</b> environment variable if set, <b>$XDG</b>_<b>DATA</b>_<b>HOME/notmuch/de-</b>
           <b>fault</b> otherwise.
 


@@ -295,8 +304,8 @@
 
        1. Directory specified by <b>database.hook</b>_<b>dir</b> configuration option.
 
 
        1. Directory specified by <b>database.hook</b>_<b>dir</b> configuration option.
 

-       2. <b>$XDG</b>_<b>CONFIG</b>_<b>HOME/notmuch/&lt;profile&gt;/hooks</b>  where <b>&lt;profile&gt;</b> is defined
-          by  <b>NOTMUCH</b>_<b>PROFILE</b>   environment   variable   if   set,   <b>$XDG</b>_<b>CON-</b>
+       2. <b>$XDG</b>_<b>CONFIG</b>_<b>HOME/notmuch/&lt;profile&gt;/hooks</b> where <b>&lt;profile&gt;</b> is  defined
+          by   <b>NOTMUCH</b>_<b>PROFILE</b>   environment   variable   if   set,  <b>$XDG</b>_<b>CON-</b>

           <b>FIG</b>_<b>HOME/notmuch/default/hooks</b> otherwise.
 
        3. <b>&lt;database.path&gt;/.notmuch/hooks</b>
           <b>FIG</b>_<b>HOME/notmuch/default/hooks</b> otherwise.
 
        3. <b>&lt;database.path&gt;/.notmuch/hooks</b>


@@ -304,8 +313,8 @@
 
 <h2>SEE ALSO</h2>
 <pre>
 
 <h2>SEE ALSO</h2>
 <pre>

-       <a href='../notmuch-1/'>notmuch</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/'>notmuch-hooks</a>(5), <a href='../notmuch-insert-1/'>not‐</a>
-       <a href='../notmuch-insert-1/'>much-insert</a>(1),  <a href='../notmuch-new-1/'>notmuch-new</a>(1),   <a href='../notmuch-properties-7/'>notmuch-properties</a>(7),   <a href='../notmuch-reply-1/'>notmuch-re‐</a>
+       <a href='../notmuch-1/'>notmuch</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/'>notmuch-hooks</a>(5),  <a href='../notmuch-insert-1/'>not‐</a>
+       <a href='../notmuch-insert-1/'>much-insert</a>(1),   <a href='../notmuch-new-1/'>notmuch-new</a>(1),   <a href='../notmuch-properties-7/'>notmuch-properties</a>(7),  <a href='../notmuch-reply-1/'>notmuch-re‐</a>

        <a href='../notmuch-reply-1/'>ply</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-show-1/'>notmuch-show</a>(1), <a href='../notmuch-tag-1/'>notmuch-tag</a>(1)
 </pre>
        <a href='../notmuch-reply-1/'>ply</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-show-1/'>notmuch-show</a>(1), <a href='../notmuch-tag-1/'>notmuch-tag</a>(1)
 </pre>


@@ -317,7 +326,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-count-1.mdwn b/manpages/notmuch-count-1.mdwn
index 47dd4fcda413984c9ede6b1e01c16f3ee125aac3..1470448077f752084c6f515316990090c515fa46 100644 (file)
--- a/manpages/notmuch-count-1.mdwn
+++ b/manpages/notmuch-count-1.mdwn
@@ -74,7 +74,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-dump-1.mdwn b/manpages/notmuch-dump-1.mdwn
index ae0127054123e22995124ee2afcaab8b1e84b170..cdd881b550768942eeaed0d4fcdaf6103a2ae250 100644 (file)
--- a/manpages/notmuch-dump-1.mdwn
+++ b/manpages/notmuch-dump-1.mdwn
@@ -114,7 +114,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-emacs-mua-1.mdwn b/manpages/notmuch-emacs-mua-1.mdwn
index 69866ff883998d56a44521a04234df64f53aa098..4e6f71d95f4b45190dc80b567d0e81102ba5e4ea 100644 (file)
--- a/manpages/notmuch-emacs-mua-1.mdwn
+++ b/manpages/notmuch-emacs-mua-1.mdwn
@@ -89,7 +89,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-hooks-5.mdwn b/manpages/notmuch-hooks-5.mdwn
index e6369929a3afa8d958e937e20397f8162d76fc15..6a7ae271fee902eff9158e89f0c201407a5a007e 100644 (file)
--- a/manpages/notmuch-hooks-5.mdwn
+++ b/manpages/notmuch-hooks-5.mdwn
@@ -63,7 +63,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-insert-1.mdwn b/manpages/notmuch-insert-1.mdwn
index affbe16e34310c04b92a85f8c31f23eeaff5889c..46a6aa7a246fac84592663321b9cae689e3e9199 100644 (file)
--- a/manpages/notmuch-insert-1.mdwn
+++ b/manpages/notmuch-insert-1.mdwn
@@ -13,10 +13,10 @@
 <h2>DESCRIPTION</h2>
 <pre>
        <b>notmuch</b> <b>insert</b> reads a message from standard input and delivers it into
 <h2>DESCRIPTION</h2>
 <pre>
        <b>notmuch</b> <b>insert</b> reads a message from standard input and delivers it into

-       the maildir directory given by configuration option <b>database.path</b>, then
-       incorporates  the  message into the notmuch database. It is an alterna‐
-       tive to using a separate tool to deliver the message then running  <a href='../notmuch-new-1/'>not‐</a>
-       <a href='../notmuch-new-1/'>much-new</a>(1) afterwards.
+       the maildir directory given by configuration option <b>database.mail</b>_<b>root</b>,
+       then  incorporates  the message into the notmuch database. It is an al‐
+       ternative to using a separate tool to deliver the message then  running
+       <a href='../notmuch-new-1/'>notmuch-new</a>(1) afterwards.

 
        The  new message will be tagged with the tags specified by the <b>new.tags</b>
        configuration option, then by operations specified on the command-line:
 
        The  new message will be tagged with the tags specified by the <b>new.tags</b>
        configuration option, then by operations specified on the command-line:


@@ -34,8 +34,8 @@
 
        <b>--folder=&lt;folder&gt;</b>
               Deliver  the  message  to  the specified folder, relative to the
 
        <b>--folder=&lt;folder&gt;</b>
               Deliver  the  message  to  the specified folder, relative to the

-              top-level directory given by the value of <b>database.path</b>. The de‐
-              fault  is  the  empty  string,  which  means  delivering  to the
+              top-level directory given by the  value  of  <b>database.mail</b>_<b>root</b>.
+              The  default  is the empty string, which means delivering to the

               top-level directory.
 
        <b>--create-folder</b>
               top-level directory.
 
        <b>--create-folder</b>


@@ -113,7 +113,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-new-1.mdwn b/manpages/notmuch-new-1.mdwn
index 69bbc399f5eb79b8da82117dd49f8949cac7988b..caba2acd8643e2ae0a221303dabe320a6562840b 100644 (file)
--- a/manpages/notmuch-new-1.mdwn
+++ b/manpages/notmuch-new-1.mdwn
@@ -92,7 +92,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-properties-7.mdwn b/manpages/notmuch-properties-7.mdwn
index 81de1973c821d5ef752fb4ea83c0928afee8cbbb..8cfd7f6ab11f8f1dc310393cd8bd7356517492f4 100644 (file)
--- a/manpages/notmuch-properties-7.mdwn
+++ b/manpages/notmuch-properties-7.mdwn
@@ -75,66 +75,69 @@
               sage.
 
        <b>session-key</b>
               sage.
 
        <b>session-key</b>

-          When <a href='../notmuch-show-1/'>notmuch-show</a>(1) or <a href='../notmuch-reply-1/'>notmuch-reply</a>(1) encounters a  message  with
-          an  encrypted  part, if notmuch finds a <b>session-key</b> property associ‐
-          ated with the message, it will try that stashed session key for  de‐
-          cryption.
-
-          If  you  do  not  want to use any stashed session keys that might be
-          present, you should pass those programs <b>--decrypt=false</b>.
-
-          Using a stashed session key with &quot;notmuch show&quot; will speed  up  ren‐
-          dering  of  long  encrypted threads.  It also allows the user to de‐
-          stroy the secret part of any expired encryption-capable subkey while
-          still  being  able to read any retained messages for which they have
-          stashed the session key.  This enables truly deletable e-mail, since
-          (once  the  session  key  and  asymmetric subkey are both destroyed)
-          there are no keys left that can be used to decrypt any copy  of  the
-          original message previously stored by an adversary.
-
-          However,  access to the stashed session key for an encrypted message
-          permits full byte-for-byte reconstruction of the cleartext  message.
-          This includes attachments, cryptographic signatures, and other mate‐
-          rial that cannot be reconstructed from the index alone.
-
-          See <b>index.decrypt</b> in <a href='../notmuch-config-1/'>notmuch-config</a>(1) for more details about how to
-          set notmuch&apos;s policy on when to store session keys.
-
-          The  session key should be in the ASCII text form produced by GnuPG.
-          For OpenPGP, that consists of a decimal representation of  the  hash
-          algorithm  used  (identified  by  number from RFC 4880, e.g. 9 means
-          AES-256) followed by a colon, followed by a hexadecimal  representa‐
-          tion  of  the  algorithm-specific  key.  For example, an AES-128 key
-          might   be   stashed   in    a    notmuch    property    as:    <b>ses-</b>
-          <b>sion-key=7:14B16AF65536C28AF209828DFE34C9E0</b>.
+              When <a href='../notmuch-show-1/'>notmuch-show</a>(1) or <a href='../notmuch-reply-1/'>notmuch-reply</a>(1)  encounters  a  message
+              with  an encrypted part, if notmuch finds a <b>session-key</b> property
+              associated with the message, it will try  that  stashed  session
+              key for decryption.
+
+              If you do not want to use any stashed session keys that might be
+              present, you should pass those programs <b>--decrypt=false</b>.
+
+              Using a stashed session key with &quot;notmuch show&quot;  will  speed  up
+              rendering of long encrypted threads.  It also allows the user to
+              destroy the secret part of any expired encryption-capable subkey
+              while  still  being able to read any retained messages for which
+              they have stashed the session key.  This enables truly deletable
+              e-mail,  since  (once  the session key and asymmetric subkey are
+              both destroyed) there are no keys left that can be used  to  de‐
+              crypt  any  copy of the original message previously stored by an
+              adversary.
+
+              However, access to the stashed session key for an encrypted mes‐
+              sage  permits full byte-for-byte reconstruction of the cleartext
+              message.  This includes attachments,  cryptographic  signatures,
+              and  other  material that cannot be reconstructed from the index
+              alone.
+
+              See <b>index.decrypt</b> in <a href='../notmuch-config-1/'>notmuch-config</a>(1) for  more  details  about
+              how to set notmuch&apos;s policy on when to store session keys.
+
+              The  session  key  should  be in the ASCII text form produced by
+              GnuPG.  For OpenPGP, that consists of a  decimal  representation
+              of  the hash algorithm used (identified by number from RFC 4880,
+              e.g. 9 means AES-256) followed by a colon, followed by  a  hexa‐
+              decimal representation of the algorithm-specific key.  For exam‐
+              ple, an AES-128 key might be stashed in a notmuch  property  as:
+              <b>session-key=7:14B16AF65536C28AF209828DFE34C9E0</b>.

 
        <b>index.repaired</b>
 
        <b>index.repaired</b>

-          Some  messages  arrive in forms that are confusing to view; they can
-          be mangled by mail transport agents, or the sending mail user  agent
-          may structure them in a way that is confusing.  If notmuch knows how
-          to both detect and repair such a problematic message, it will do  so
-          during indexing.
-
-          If  it applies a message repair during indexing, it will use the <b>in-</b>
-          <b>dex.repaired</b> property to note the type of repair(s) it performed.
-
-          <b>index.repaired=skip-protected-headers-legacy-display</b> indicates  that
-          when indexing the cleartext of an encrypted message, notmuch skipped
-          over a &quot;legacy-display&quot; text/rfc822-headers part that  it  found  in
-          that  message,  since  it  was  able to index the built-in protected
-          headers directly.
-
-          <b>index.repaired=mixedup</b> indicates the repair  of  a  &quot;Mixed  Up&quot;  en‐
-          crypted  PGP/MIME  message,  a mangling typically produced by Micro‐
-          soft&apos;s
-          <u>https://tools.ietf.org/html/draft-dkg-openpgp-pgpmime-message-mangling</u>
-          for more information.
+              Some  messages  arrive in forms that are confusing to view; they
+              can be mangled by mail transport agents,  or  the  sending  mail
+              user  agent  may  structure them in a way that is confusing.  If
+              notmuch knows how to both detect and repair such  a  problematic
+              message, it will do so during indexing.
+
+              If  it applies a message repair during indexing, it will use the
+              <b>index.repaired</b> property to note the type of  repair(s)  it  per‐
+              formed.
+
+              <b>index.repaired=skip-protected-headers-legacy-display</b>   indicates
+              that when indexing the cleartext of an encrypted  message,  not‐
+              much  skipped  over  a &quot;legacy-display&quot; text/rfc822-headers part
+              that it found in that message, since it was able  to  index  the
+              built-in protected headers directly.
+
+              <b>index.repaired=mixedup</b>  indicates the repair of a &quot;Mixed Up&quot; en‐
+              crypted PGP/MIME message, a mangling typically produced  by  Mi‐
+              crosoft&apos;s
+              <u>https://tools.ietf.org/html/draft-dkg-openpgp-pgpmime-message-mangling</u>
+              for more information.

 </pre>
 
 <h2>SEE ALSO</h2>
 <pre>
        <a href='../notmuch-1/'>notmuch</a>(1), <a href='../notmuch-config-1/'>notmuch-config</a>(1), <a href='../notmuch-dump-1/'>notmuch-dump</a>(1), <a href='../notmuch-insert-1/'>notmuch-insert</a>(1), <a href='../notmuch-new-1/'>not‐</a>
 </pre>
 
 <h2>SEE ALSO</h2>
 <pre>
        <a href='../notmuch-1/'>notmuch</a>(1), <a href='../notmuch-config-1/'>notmuch-config</a>(1), <a href='../notmuch-dump-1/'>notmuch-dump</a>(1), <a href='../notmuch-insert-1/'>notmuch-insert</a>(1), <a href='../notmuch-new-1/'>not‐</a>

-       <a href='../notmuch-new-1/'>much-new</a>(1),  <a href='../notmuch-reindex-1/'>notmuch-reindex</a>(1), <a href='../notmuch-reply-1/'>notmuch-reply</a>(1), <a href='../notmuch-restore-1/'>notmuch-restore</a>(1),
+       <a href='../notmuch-new-1/'>much-new</a>(1), <a href='../notmuch-reindex-1/'>notmuch-reindex</a>(1), <a href='../notmuch-reply-1/'>notmuch-reply</a>(1),  <a href='../notmuch-restore-1/'>notmuch-restore</a>(1),

        <a href='../notmuch-search-terms-7/'>notmuch-search-terms</a>(7), <a href='../notmuch-show-1/'>notmuch-show</a>(1)
 </pre>
 
        <a href='../notmuch-search-terms-7/'>notmuch-search-terms</a>(7), <a href='../notmuch-show-1/'>notmuch-show</a>(1)
 </pre>
 


@@ -145,7 +148,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-reindex-1.mdwn b/manpages/notmuch-reindex-1.mdwn
index 12bda6050e305cda911ecb45f2999d7dd503eb13..fca8c92aac1ffc9f9764eba8b7d123ebb95052f3 100644 (file)
--- a/manpages/notmuch-reindex-1.mdwn
+++ b/manpages/notmuch-reindex-1.mdwn
@@ -91,7 +91,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-reply-1.mdwn b/manpages/notmuch-reply-1.mdwn
index ed6d3114227b9e7addde1d6af6721d16a9e33464..ad897b5fb45591af65878fff752bd81f3d06a16e 100644 (file)
--- a/manpages/notmuch-reply-1.mdwn
+++ b/manpages/notmuch-reply-1.mdwn
@@ -62,7 +62,7 @@
 
        <b>--reply-to=(all|sender)</b>
 
 
        <b>--reply-to=(all|sender)</b>
 

-              <b>all</b> (default)
+              <b>all</b> <b>(default)</b>

                      Replies to all addresses.
 
               <b>sender</b> Replies only to the sender. If  replying  to  user&apos;s  own
                      Replies to all addresses.
 
               <b>sender</b> Replies only to the sender. If  replying  to  user&apos;s  own


@@ -127,7 +127,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-restore-1.mdwn b/manpages/notmuch-restore-1.mdwn
index 8c173dd2049fa4e8310c1d59b7873f8de23a80b9..75d8bf1e4b6b8d63d0ea16f56771ff466114d2f4 100644 (file)
--- a/manpages/notmuch-restore-1.mdwn
+++ b/manpages/notmuch-restore-1.mdwn
@@ -99,7 +99,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-search-1.mdwn b/manpages/notmuch-search-1.mdwn
index 18b268e285000075eb26f27367ffe74524ac3a2f..6ea3bab36c96cbbade398ff6627dba2e9126200e 100644 (file)
--- a/manpages/notmuch-search-1.mdwn
+++ b/manpages/notmuch-search-1.mdwn
@@ -110,7 +110,7 @@
               search  terms.  This  option  specifies whether to omit excluded
               messages in the search process.
 
               search  terms.  This  option  specifies whether to omit excluded
               messages in the search process.
 

-              <b>true</b> (default)
+              <b>true</b> <b>(default)</b>

                      Prevent excluded messages from matching the search terms.
 
               <b>all</b>    Additionally prevent excluded messages from appearing  in
                      Prevent excluded messages from matching the search terms.
 
               <b>all</b>    Additionally prevent excluded messages from appearing  in


@@ -176,7 +176,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-search-terms-7.mdwn b/manpages/notmuch-search-terms-7.mdwn
index b3561a3c52b154330eb9df8ceafd48e5da6db03e..5d1cae1e10122cdb7986f99a01f00598e68f7fa1 100644 (file)
--- a/manpages/notmuch-search-terms-7.mdwn
+++ b/manpages/notmuch-search-terms-7.mdwn
@@ -432,7 +432,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-sexp-queries-7.mdwn b/manpages/notmuch-sexp-queries-7.mdwn
index 6744e9145a3b867df36f9df23434f7be7a478950..e6968ada5ebd74cfcb454c0d432a219831505792 100644 (file)
--- a/manpages/notmuch-sexp-queries-7.mdwn
+++ b/manpages/notmuch-sexp-queries-7.mdwn
@@ -19,7 +19,7 @@
        <b>tax()</b>.   Support for this syntax is currently optional, you can test if
        your build of notmuch supports it with
 
        <b>tax()</b>.   Support for this syntax is currently optional, you can test if
        your build of notmuch supports it with
 

-          $ notmuch config get built_with.sexpr_query
+          $ notmuch config get built_with.sexp_queries

 </pre>
 
 <h3> &nbsp; S-EXPRESSIONS</h3>
 </pre>
 
 <h3> &nbsp; S-EXPRESSIONS</h3>


@@ -28,13 +28,13 @@
        s-expressions inside parentheses. Atoms are either
 
        <u>basic</u> <u>value</u>
        s-expressions inside parentheses. Atoms are either
 
        <u>basic</u> <u>value</u>

-              A  basic  value  is an unquoted string containing no whitespace,
-              double quotes, or parentheses.
+          A basic value is an unquoted string containing no whitespace, double
+          quotes, or parentheses.

 
        <u>quoted</u> <u>string</u>
 
        <u>quoted</u> <u>string</u>

-              Double quotes (&quot;) delimit strings possibly containing whitespace
-              or parentheses. These can contain double quote characters by es‐
-              caping with backslash. E.g. <b>&quot;this</b> <b>is</b> <b>a</b> <b>quote</b> <b>\&quot;&quot;</b>.
+          Double quotes (&quot;) delimit strings possibly containing whitespace  or
+          parentheses.  These  can contain double quote characters by escaping
+          with backslash. E.g. <b>&quot;this</b> <b>is</b> <b>a</b> <b>quote</b> <b>\&quot;&quot;</b>.

 </pre>
 
 <h3> &nbsp; S-EXPRESSION QUERIES</h3>
 </pre>
 
 <h3> &nbsp; S-EXPRESSION QUERIES</h3>


@@ -43,9 +43,11 @@
        <u>query</u>  consisting  of  a  prefix atom (first element) defining a <u>field</u>,
        <u>logical</u> <u>operation</u>, or <u>modifier</u>, and 0 or more subqueries.
 
        <u>query</u>  consisting  of  a  prefix atom (first element) defining a <u>field</u>,
        <u>logical</u> <u>operation</u>, or <u>modifier</u>, and 0 or more subqueries.
 

-       <b>*</b>      &quot;*&quot; matches any non-empty string in the current field.
+       <b>*</b>
+          &quot;*&quot; matches any non-empty string in the current field.

 
 

-       <b>()</b>     The empty list matches all messages
+       <b>()</b>
+          The empty list matches all messages

 
        <u>term</u>
           Match all messages  containing  <u>term</u>,  possibly  after  stemming  or
 
        <u>term</u>
           Match all messages  containing  <u>term</u>,  possibly  after  stemming  or


@@ -54,25 +56,25 @@
           values)  in  s-expression queries.  For information on phrase split‐
           ting see <u>FIELDS</u>.
 
           values)  in  s-expression queries.  For information on phrase split‐
           ting see <u>FIELDS</u>.
 

-       <b>(</b> <u>field</u> <b>q</b>_<b>1</b> <b>q</b>_<b>2</b> <b>...</b> <b>q</b>_<b>n</b> <b>)</b>
-              Restrict the queries q_1 to q_n to <u>field</u>, and combine  with  <u>and</u>
-              (for most fields) or <u>or</u>. See <u>FIELDS</u> for more information.
-
-       <b>(</b> <u>operator</u> <b>q</b>_<b>1</b> <b>q</b>_<b>2</b> <b>...</b> <b>q</b>_<b>n</b> <b>)</b>
-              Combine  queries  q_1  to q_n. Currently supported operators are
-              <b>and</b>, <b>or</b>, and <b>not</b>. <b>(not</b> q_1 ... q_n <b>)</b> is equivalent to <b>(and</b>  <b>(not</b>
-              q_1 <b>)</b> <b>...</b> <b>(not</b> q_n <b>))</b>.
-
-       <b>(</b> <u>modifier</u> <b>q</b>_<b>1</b> <b>q</b>_<b>2</b> <b>...</b> <b>q</b>_<b>n</b> <b>)</b>
-              Combine  queries q_1 to q_n, and reinterpret the result (e.g. as
-              a regular expression).  See <u>MODIFIERS</u> for more information.
-
-       <b>(macro</b> <b>(</b> <b>p</b>_<b>1</b> <b>...</b> <b>p</b>_<b>n</b> <b>)</b> <b>body)</b>
-              Define saved query with parameter substitution.  The  syntax  is
-              recognized  only  in saved s-expression queries (see <b>squery.*</b> in
-              <a href='../notmuch-config-1/'>notmuch-config</a>(1)). Parameter names in  <b>body</b>  must  be  prefixed
-              with <b>,</b> to be expanded (see <u>MACRO</u> <u>EXAMPLES</u>).  Macros may refer to
-              other macros, but only to their own parameters [1].
+       <b>(</b> <u>field</u> <u>q</u>1 <u>q</u>2 ... <u>q</u>n <b>)</b>
+          Restrict the queries <u>q</u>1 to <u>q</u>n to <u>field</u>, and combine  with  <u>and</u>  (for
+          most fields) or <u>or</u>. See <u>FIELDS</u> for more information.
+
+       <b>(</b> <u>operator</u> <u>q</u>1 <u>q</u>2 ... <u>q</u>n <b>)</b>
+          Combine queries <u>q</u>1 to <u>q</u>n. Currently supported operators are <b>and</b>, <b>or</b>,
+          and <b>not</b>. <b>(not</b> <u>q</u>1 ... <u>q</u>n <b>)</b> is equivalent to <b>(and</b> <b>(not</b> <u>q</u>1 <b>)</b>  <b>...</b>  <b>(not</b>
+          <u>q</u>n <b>))</b>.
+
+       <b>(</b> <u>modifier</u> <u>q</u>1 <u>q</u>2 ... <u>q</u>n <b>)</b>
+          Combine queries <u>q</u>1 to <u>q</u>n, and reinterpret the result (e.g. as a reg‐
+          ular expression).  See <u>MODIFIERS</u> for more information.
+
+       <b>(macro</b> <b>(</b> <u>p</u>1 ... <u>p</u>n <b>)</b> <b>body)</b>
+          Define saved query with parameter substitution. The syntax is recog‐
+          nized  only  in  saved  s-expression  queries  (see <b>squery.*</b> in <a href='../notmuch-config-1/'>not‐</a>
+          <a href='../notmuch-config-1/'>much-config</a>(1)). Parameter names in <b>body</b> must be prefixed with <b>,</b>  to
+          be expanded (see <u>MACRO</u> <u>EXAMPLES</u>).  Macros may refer to other macros,
+          but only to their own parameters [1].

 </pre>
 
 <h3> &nbsp; FIELDS</h3>
 </pre>
 
 <h3> &nbsp; FIELDS</h3>


@@ -137,7 +139,8 @@
              │tag        │ and     │ term   │ yes    │ yes      │ yes   │
              ├───────────┼─────────┼────────┼────────┼──────────┼───────┤
              │thread     │ or      │ term   │ yes    │ yes      │ yes   │
              │tag        │ and     │ term   │ yes    │ yes      │ yes   │
              ├───────────┼─────────┼────────┼────────┼──────────┼───────┤
              │thread     │ or      │ term   │ yes    │ yes      │ yes   │

-             ├───────────┼─────────┼────────┼────────┼──────────┼───────┤
+             └───────────┴─────────┴────────┴────────┴──────────┴───────┘
+

              │to         │ and     │ phrase │ yes    │ yes      │ no    │
              └───────────┴─────────┴────────┴────────┴──────────┴───────┘
 </pre>
              │to         │ and     │ phrase │ yes    │ yes      │ no    │
              └───────────┴─────────┴────────┴────────┴──────────┴───────┘
 </pre>


@@ -148,96 +151,97 @@
        that are neither operators nor fields.
 
        <b>(infix</b> <u>atom</u> <b>)</b>
        that are neither operators nor fields.
 
        <b>(infix</b> <u>atom</u> <b>)</b>

-              Interpret  <u>atom</u>  as   an   infix   notmuch   query   (see   <a href='../notmuch-search-terms-7/'>not‐</a>
-              <a href='../notmuch-search-terms-7/'>much-search-terms</a>(7)). Not supported inside fields.
+          Interpret   <u>atom</u>   as   an   infix   notmuch   query    (see    <a href='../notmuch-search-terms-7/'>not‐</a>
+          <a href='../notmuch-search-terms-7/'>much-search-terms</a>(7)). Not supported inside fields.

 
 

-       <b>(matching</b> <b>q</b>_<b>1</b> <b>q</b>_<b>2</b> <b>...</b> <b>q</b>_<b>n</b> <b>)</b> <b>(of</b> <b>q</b>_<b>1</b> <b>q</b>_<b>2</b> <b>...</b> <b>q</b>_<b>n</b> <b>)</b>
-              Match  all messages have the same values of the current field as
-              those matching all of q_1 ... q_n. Supported in most term [7] or
-              phrase fields. Most commonly used in the <b>thread</b> field.
+       <b>(matching</b> <u>q</u>1 <u>q</u>2 ... <u>q</u>n <b>)</b> <b>(of</b> <u>q</u>1 <u>q</u>2 ... <u>q</u>n  <b>)</b>
+          Match  all  messages  have  the  same values of the current field as
+          those matching all of <u>q</u>1 ... <u>q</u>n.  Supported  in  most  term  [7]  or
+          phrase fields. Most commonly used in the <b>thread</b> field.

 
        <b>(query</b> <u>atom</u> <b>)</b>
 
        <b>(query</b> <u>atom</u> <b>)</b>

-              Expand  to  the saved query named by <u>atom</u>. See <a href='../notmuch-config-1/'>notmuch-config</a>(1)
-              for more. Note that the saved query  must  be  in  infix  syntax
-              (<a href='../notmuch-search-terms-7/'>notmuch-search-terms</a>(7)). Not supported inside fields.
+          Expand  to  the saved query named by <u>atom</u>. See <a href='../notmuch-config-1/'>notmuch-config</a>(1) for
+          more. Note that the saved  query  must  be  in  infix  syntax  (<a href='../notmuch-search-terms-7/'>not‐</a>
+          <a href='../notmuch-search-terms-7/'>much-search-terms</a>(7)). Not supported inside fields.

 
        <b>(regex</b> <u>atom</u> <b>)</b> <b>(rx</b> <u>atom</u> <b>)</b>
 
        <b>(regex</b> <u>atom</u> <b>)</b> <b>(rx</b> <u>atom</u> <b>)</b>

-              Interpret  <u>atom</u>  as a POSIX.2 regular expression (see <b>regex</b>(7)).
-              This applies in term fields and a subset [5]  of  phrase  fields
-              (see <u>Fields</u> <u>with</u> <u>supported</u> <u>modifiers</u>).
+          Interpret  <u>atom</u> as a POSIX.2 regular expression (see <b>regex</b>(7)). This
+          applies in term fields and a subset [5] of phrase fields (see <u>Fields</u>
+          <u>with</u> <u>supported</u> <u>modifiers</u>).

 
        <b>(starts-with</b> <u>subword</u> <b>)</b>
 
        <b>(starts-with</b> <u>subword</u> <b>)</b>

-              Matches  any term starting with <u>subword</u>.  This applies in either
-              phrase or term <u>fields</u>, or outside of fields  [6].  Note  that  a
-              <b>starts-with</b>  query  cannot  be part of a phrase. The atom <b>*</b> is a
-              synonym for <b>(starts-with</b> <b>&quot;&quot;)</b>.
+          Matches  any  term  starting  with  <u>subword</u>.  This applies in either
+          phrase or term <u>fields</u>,  or  outside  of  fields  [6].  Note  that  a
+          <b>starts-with</b>  query  cannot be part of a phrase. The atom <b>*</b> is a syn‐
+          onym for <b>(starts-with</b> <b>&quot;&quot;)</b>.

 </pre>
 
 <h2>EXAMPLES</h2>
 <pre>
 </pre>
 
 <h2>EXAMPLES</h2>
 <pre>

-       <b>Wizard</b> Match all messages containing the word &quot;wizard&quot;, ignoring case.
+       <b>Wizard</b>
+          Match all messages containing the word &quot;wizard&quot;, ignoring case.

 
 

-       <b>added</b>  Match all messages containing &quot;added&quot;, but also those containing
-              &quot;add&quot;, &quot;additional&quot;, &quot;Additional&quot;, &quot;adds&quot;, etc... via stemming.
+       <b>added</b>
+          Match all messages containing &quot;added&quot;,  but  also  those  containing
+          &quot;add&quot;, &quot;additional&quot;, &quot;Additional&quot;, &quot;adds&quot;, etc... via stemming.

 
        <b>(and</b> <b>Bob</b> <b>Marley)</b>
 
        <b>(and</b> <b>Bob</b> <b>Marley)</b>

-              Match  messages  containing  words  &quot;Bob&quot; and &quot;Marley&quot;, or their
-              stems The words need not be adjacent.
+          Match  messages  containing words &quot;Bob&quot; and &quot;Marley&quot;, or their stems
+          The words need not be adjacent.

 
        <b>(not</b> <b>Bob</b> <b>Marley)</b>
 
        <b>(not</b> <b>Bob</b> <b>Marley)</b>

-              Match messages containing neither &quot;Bob&quot; nor &quot;Marley&quot;, nor  their
-              stems,
+          Match messages containing neither  &quot;Bob&quot;  nor  &quot;Marley&quot;,  nor  their
+          stems,

 
        <b>&quot;quick</b> <b>fox&quot;</b> <b>quick-fox</b> <b>quick@fox</b>
 
        <b>&quot;quick</b> <b>fox&quot;</b> <b>quick-fox</b> <b>quick@fox</b>

-              Match  the <u>phrase</u> &quot;quick&quot; followed by &quot;fox&quot; in phrase fields (or
-              outside a field). Match the literal string in a term field.
+          Match the <u>phrase</u> &quot;quick&quot; followed by &quot;fox&quot; in phrase fields (or out‐
+          side a field). Match the literal string in a term field.

 
        <b>(folder</b> <b>(of</b> <b>(id</b> <b>1234@invalid)))</b>
 
        <b>(folder</b> <b>(of</b> <b>(id</b> <b>1234@invalid)))</b>

-              Match any message in the same folder as the one with  Message-Id
-              &quot;<u>1234@invalid</u>&quot;
+          Match any message in the same folder as the one with  Message-Id  &quot;‐
+          <u>1234@invalid</u>&quot;

 
        <b>(id</b> <b>1234@invalid</b> <b>blah@test)</b>
 
        <b>(id</b> <b>1234@invalid</b> <b>blah@test)</b>

-              Matches Message-Id &quot;<u>1234@invalid</u>&quot; <u>or</u> Message-Id &quot;<u>blah@test</u>&quot;
+          Matches Message-Id &quot;<u>1234@invalid</u>&quot; <u>or</u> Message-Id &quot;<u>blah@test</u>&quot;

 
 

-       <b>(and</b> <b>(infix</b> <b>date:2009-11-18..2009-11-18</b> <b>)</b> <b>(tag</b> <b>unread))</b>
-              Match messages in the given date range with tag unread.
+       <b>(and</b> <b>(infix</b> <b>&quot;date:2009-11-18..2009-11-18&quot;)</b> <b>(tag</b> <b>unread))</b>
+          Match messages in the given date range with tag unread.

 
        <b>(starts-with</b> <b>prelim)</b>
 
        <b>(starts-with</b> <b>prelim)</b>

-              Match any words starting with &quot;prelim&quot;.
+          Match any words starting with &quot;prelim&quot;.

 
 

-       <b>(subject</b> <b>quick</b> <b>brown</b> <b>fox</b> <b>)</b>
-              Match   messages   whose  subject  contains  &quot;quick&quot;  (anywhere,
-              stemmed) and the phrase &quot;brown fox&quot;.
+       <b>(subject</b> <b>quick</b> <b>&quot;brown</b> <b>fox&quot;)</b>
+          Match  messages  whose  subject contains &quot;quick&quot; (anywhere, stemmed)
+          and the phrase &quot;brown fox&quot;.

 
        <b>(subject</b> <b>(starts-with</b> <b>prelim))</b>
 
        <b>(subject</b> <b>(starts-with</b> <b>prelim))</b>

-              Matches any word starting with &quot;prelim&quot;, inside a  message  sub‐
-              ject.
+          Matches any word starting with &quot;prelim&quot;, inside a message subject.

 
 

-       <b>(subject</b> <b>(starts-wih</b> <b>quick)</b> <b>brown</b> <b>fox</b> <b>)</b>
-              Match  messages  whose  subject  contains &quot;quick brown fox&quot;, but
-              also &quot;brown fox quicksand&quot;.
+       <b>(subject</b> <b>(starts-wih</b> <b>quick)</b> <b>&quot;brown</b> <b>fox&quot;)</b>
+          Match messages whose subject contains &quot;quick brown  fox&quot;,  but  also
+          &quot;brown fox quicksand&quot;.

 
        <b>(thread</b> <b>(of</b> <b>(id</b> <b>1234@invalid)))</b>
 
        <b>(thread</b> <b>(of</b> <b>(id</b> <b>1234@invalid)))</b>

-              Match any message in the same thread as the one with  Message-Id
-              &quot;<u>1234@invalid</u>&quot;
+          Match  any  message in the same thread as the one with Message-Id &quot;‐
+          <u>1234@invalid</u>&quot;

 
        <b>(thread</b> <b>(matching</b> <b>(from</b> <b>bob@example.com)</b> <b>(to</b> <b>bob@example.com)))</b>
 
        <b>(thread</b> <b>(matching</b> <b>(from</b> <b>bob@example.com)</b> <b>(to</b> <b>bob@example.com)))</b>

-              Match  any  (messages  in) a thread containing a message from &quot;‐
-              <u>bob@example.com</u>&quot; and a (possibly distinct) message  to  &quot;bob  at
-              example.com&quot;)
+          Match any (messages in)  a  thread  containing  a  message  from  &quot;‐
+          <u>bob@example.com</u>&quot;  and a (possibly distinct) message to &quot;bob at exam‐
+          ple.com&quot;)

 
 

-       <b>(to</b>  <b>(or</b> <b>bob@example.com</b> <b>mallory@example.org))</b> <b>(or</b> <b>(to</b> <b>bob@example.com)</b>
+       <b>(to</b> <b>(or</b> <b>bob@example.com</b> <b>mallory@example.org))</b> <b>(or</b> <b>(to</b>  <b>bob@example.com)</b>

        <b>(to</b> <b>mallory@example.org))</b>
        <b>(to</b> <b>mallory@example.org))</b>

-              Match  in  the  &quot;To&quot;  or  &quot;Cc&quot;  headers,  &quot;<u>bob@example.com</u>&quot;,  &quot;‐
-              <u>mallory@example.org</u>&quot;,  and  also  &quot;<u>bob@example.com.au</u>&quot;  since it
-              contains the adjacent triple &quot;bob&quot;, &quot;example&quot;, &quot;com&quot;.
+          Match   in   the   &quot;To&quot;   or  &quot;Cc&quot;  headers,  &quot;<u>bob@example.com</u>&quot;,  &quot;‐
+          <u>mallory@example.org</u>&quot;, and also &quot;<u>bob@example.com.au</u>&quot;  since  it  con‐
+          tains the adjacent triple &quot;bob&quot;, &quot;example&quot;, &quot;com&quot;.

 
        <b>(not</b> <b>(to</b> <b>*))</b>
 
        <b>(not</b> <b>(to</b> <b>*))</b>

-              Match messages with an empty or invalid &apos;To&apos; and &apos;Cc&apos; field.
+          Match messages with an empty or invalid &apos;To&apos; and &apos;Cc&apos; field.

 
        <b>(List</b> <b>*)</b>
 
        <b>(List</b> <b>*)</b>

-              Match messages with a non-empty List-Id header, assuming config‐
-              uration <b>index.header.List=List-Id</b>
+          Match  messages with a non-empty List-Id header, assuming configura‐
+          tion <b>index.header.List=List-Id</b>

 </pre>
 
 <h3> &nbsp; MACRO EXAMPLES</h3>
 </pre>
 
 <h3> &nbsp; MACRO EXAMPLES</h3>


@@ -253,7 +257,7 @@
           $ notmuch config set squery.Outer  &apos;(macro (x y) (and (tag ,x) (Inner ,y)))&apos;
           $ notmuch search --query=sexp &apos;(Outer inbox maildir)&apos;
 
           $ notmuch config set squery.Outer  &apos;(macro (x y) (and (tag ,x) (Inner ,y)))&apos;
           $ notmuch search --query=sexp &apos;(Outer inbox maildir)&apos;
 

-       Parameters  can  be re-used to reduce boilerplate. Any field, including
+       Parameters can be re-used to reduce boilerplate. Any  field,  including

        user defined fields is permitted within a macro.
 
           $ notmuch config set squery.About &apos;(macro (name) (or (subject ,name) (List ,name)))&apos;
        user defined fields is permitted within a macro.
 
           $ notmuch config set squery.About &apos;(macro (name) (or (subject ,name) (List ,name)))&apos;


@@ -262,7 +266,7 @@
 
 <h2>NOTES</h2>
 <pre>
 
 <h2>NOTES</h2>
 <pre>

-       [1]  Technically macros impliment lazy evaluation  and  lexical  scope.
+       [1]  Technically  macros  impliment  lazy evaluation and lexical scope.

             There is one top level scope containing all macro definitions, but
             all parameter definitions are local to a given macro.
 
             There is one top level scope containing all macro definitions, but
             all parameter definitions are local to a given macro.
 


@@ -272,13 +276,13 @@
 
        [4]  a.k.a. boolean prefixes
 
 
        [4]  a.k.a. boolean prefixes
 

-       [5]  Due to the implemention of phrase fields in Xapian, regex  queries
+       [5]  Due  to the implemention of phrase fields in Xapian, regex queries

             could only match individual words.
 
             could only match individual words.
 

-       [6]  Due  the  the way <b>body</b> is implemented in notmuch, this modifier is
+       [6]  Due the the way <b>body</b> is implemented in notmuch, this  modifier  is

             not supported in the <b>body</b> field.
 
             not supported in the <b>body</b> field.
 

-       [7]  Due to the way recursive <b>path</b> queries are implemented in  notmuch,
+       [7]  Due  to the way recursive <b>path</b> queries are implemented in notmuch,

             this modifier is not supported in the <b>path</b> field.
 </pre>
 
             this modifier is not supported in the <b>path</b> field.
 </pre>
 


@@ -289,7 +293,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-show-1.mdwn b/manpages/notmuch-show-1.mdwn
index 74106c112d0e27b6acacc943b0454fe24d4f893f..11278cb479c055c146ccbf6493cce649e7188616 100644 (file)
--- a/manpages/notmuch-show-1.mdwn
+++ b/manpages/notmuch-show-1.mdwn
@@ -33,7 +33,7 @@
 
        <b>--format=(text|json|sexp|mbox|raw)</b>
 
 
        <b>--format=(text|json|sexp|mbox|raw)</b>
 

-              <b>text</b> (default for messages)
+              <b>text</b> <b>(default</b> <b>for</b> <b>messages)</b>

                      The  default  plain-text format has all text-content MIME
                      parts decoded. Various components in  the  output,  (<b>mes-</b>
                      <b>sage</b>,  <b>header</b>,  <b>body</b>, <b>attachment</b>, and MIME <b>part</b>), will be
                      The  default  plain-text format has all text-content MIME
                      parts decoded. Various components in  the  output,  (<b>mes-</b>
                      <b>sage</b>,  <b>header</b>,  <b>body</b>, <b>attachment</b>, and MIME <b>part</b>), will be


@@ -70,7 +70,7 @@
                      is termed &quot;mboxrd&quot; format and described in detail here:
                         <u>http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/mail-mbox-formats.html</u>
 
                      is termed &quot;mboxrd&quot; format and described in detail here:
                         <u>http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/mail-mbox-formats.html</u>
 

-              <b>raw</b> (default if <b>--part</b> is given)
+              <b>raw</b> <b>(default</b> <b>if</b> <b>--part</b> <b>is</b> <b>given)</b>

                      Write  the  raw bytes of the given MIME part of a message
                      to standard out. For this format, it is an error to spec‐
                      ify a query that matches more than one message.
                      Write  the  raw bytes of the given MIME part of a message
                      to standard out. For this format, it is an error to spec‐
                      ify a query that matches more than one message.


@@ -210,6 +210,12 @@
        seen in the first column of output from the <a href='../notmuch-search-1/'>notmuch-search</a>(1) command.
 </pre>
 
        seen in the first column of output from the <a href='../notmuch-search-1/'>notmuch-search</a>(1) command.
 </pre>
 

+<h2>CONFIGURATION</h2>
+<pre>
+       Structured  output (json / sexp) is influenced by the configuration op‐
+       tion show.extra_headers. See <a href='../notmuch-config-1/'>notmuch-config</a>(1) for details.
+</pre>
+

 <h2>EXIT STATUS</h2>
 <pre>
        This command supports the following special exit status codes
 <h2>EXIT STATUS</h2>
 <pre>
        This command supports the following special exit status codes


@@ -221,8 +227,8 @@
 
 <h2>SEE ALSO</h2>
 <pre>
 
 <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-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-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>
        <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>


@@ -234,7 +240,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>

diff --git a/manpages/notmuch-tag-1.mdwn b/manpages/notmuch-tag-1.mdwn
index 8673f231752a05d65b2cb9b25e99714769143da5..2b3e5782feb4534bd34907587ee7ba6e259313ef 100644 (file)
--- a/manpages/notmuch-tag-1.mdwn
+++ b/manpages/notmuch-tag-1.mdwn
@@ -113,7 +113,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
 
 <h2>COPYRIGHT</h2>
 <pre>

-       2009-2021, Carl Worth and many others
+       2009-2022, Carl Worth and many others

 </pre>
 
 </pre>
 

-<h2>0.34</h2>
+<h2>0.35</h2>