From 716bcefd296e3ee39ff65e8ef89e671c9828191d Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sat, 8 Jun 2019 18:38:12 +0300 Subject: [PATCH] manpages updates for release 0.29 --- manpages.mdwn | 2 +- manpages/notmuch-1.mdwn | 4 +- manpages/notmuch-address-1.mdwn | 10 +-- manpages/notmuch-compact-1.mdwn | 4 +- manpages/notmuch-config-1.mdwn | 17 +++- manpages/notmuch-count-1.mdwn | 6 +- manpages/notmuch-dump-1.mdwn | 4 +- manpages/notmuch-emacs-mua-1.mdwn | 4 +- manpages/notmuch-hooks-5.mdwn | 4 +- manpages/notmuch-insert-1.mdwn | 4 +- manpages/notmuch-new-1.mdwn | 26 +++--- manpages/notmuch-properties-7.mdwn | 4 +- manpages/notmuch-reindex-1.mdwn | 4 +- manpages/notmuch-reply-1.mdwn | 4 +- manpages/notmuch-restore-1.mdwn | 4 +- manpages/notmuch-search-1.mdwn | 10 +-- manpages/notmuch-search-terms-7.mdwn | 122 ++++++++++++++------------- manpages/notmuch-show-1.mdwn | 37 ++++---- manpages/notmuch-tag-1.mdwn | 4 +- 19 files changed, 147 insertions(+), 127 deletions(-) diff --git a/manpages.mdwn b/manpages.mdwn index c394bbc..aa2f987 100644 --- a/manpages.mdwn +++ b/manpages.mdwn @@ -24,4 +24,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. -

0.28

+

0.29

diff --git a/manpages/notmuch-1.mdwn b/manpages/notmuch-1.mdwn index a337685..c86fec7 100644 --- a/manpages/notmuch-1.mdwn +++ b/manpages/notmuch-1.mdwn @@ -184,7 +184,7 @@

COPYRIGHT

-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
-

0.28

+

0.29

diff --git a/manpages/notmuch-address-1.mdwn b/manpages/notmuch-address-1.mdwn index 9196696..cefd87b 100644 --- a/manpages/notmuch-address-1.mdwn +++ b/manpages/notmuch-address-1.mdwn @@ -92,9 +92,9 @@ --exclude=(true|false) A message is called "excluded" if it matches at least one tag in - search.tag_exclude that does not appear explicitly in the search - terms. This option specifies whether to omit excluded messages - in the search process. + search.exclude_tags that does not appear explicitly in the + search terms. This option specifies whether to omit excluded + messages in the search process. The default value, true, prevents excluded messages from match‐ ing the search terms. @@ -127,7 +127,7 @@

COPYRIGHT

-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
-

0.28

+

0.29

diff --git a/manpages/notmuch-compact-1.mdwn b/manpages/notmuch-compact-1.mdwn index 64a6061..cee6008 100644 --- a/manpages/notmuch-compact-1.mdwn +++ b/manpages/notmuch-compact-1.mdwn @@ -61,7 +61,7 @@

COPYRIGHT

-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
-

0.28

+

0.29

diff --git a/manpages/notmuch-config-1.mdwn b/manpages/notmuch-config-1.mdwn index 3e8cca4..2e4fa2c 100644 --- a/manpages/notmuch-config-1.mdwn +++ b/manpages/notmuch-config-1.mdwn @@ -181,9 +181,9 @@ │secret keys │ │ │ │ │ ├──────────────┼───────┼──────┼─────────┼──────┤ │Stash session │ │ │ │ X │ - │keys │ │ │ │ │ + │keys ├──────────────┼───────┼──────┼─────────┼──────┤ - │Delete │ │ │ │ │ + │Delete │stashed ses‐ │ │ │ │ │ │sion keys on │ │ │ │ │ │reindex │ │ │ │ │ @@ -202,6 +202,15 @@ Default: auto. + index.header.<prefix> [STORED IN DATABASE] + Define the query prefix <prefix>, based on a mail header. For + example index.header.List=List-Id will add a probabilistic pre‐ + fix List: that searches the List-Id field. User defined pre‐ + fixes must not start with 'a'...'z'; in particular adding a pre‐ + fix with same name as a predefined prefix is not supported. See + notmuch-search-terms(7) for a list of existing prefixes, and an + explanation of probabilistic prefixes. + built_with.<name> Compile time feature <name>. Current possibilities include "com‐ pact" (see notmuch-compact(1)) and "field_processor" (see not‐ @@ -238,7 +247,7 @@

COPYRIGHT

-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
-

0.28

+

0.29

diff --git a/manpages/notmuch-count-1.mdwn b/manpages/notmuch-count-1.mdwn index 7a2246e..aedf0f8 100644 --- a/manpages/notmuch-count-1.mdwn +++ b/manpages/notmuch-count-1.mdwn @@ -39,7 +39,7 @@ the same message-id). --exclude=(true|false) - Specify whether to omit messages matching search.tag_exclude + Specify whether to omit messages matching search.exclude_tags from the count (the default) or not. --batch @@ -74,7 +74,7 @@

COPYRIGHT

-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
-

0.28

+

0.29

diff --git a/manpages/notmuch-dump-1.mdwn b/manpages/notmuch-dump-1.mdwn index 62ee5bc..f086eba 100644 --- a/manpages/notmuch-dump-1.mdwn +++ b/manpages/notmuch-dump-1.mdwn @@ -114,7 +114,7 @@

COPYRIGHT

-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
-

0.28

+

0.29

diff --git a/manpages/notmuch-emacs-mua-1.mdwn b/manpages/notmuch-emacs-mua-1.mdwn index 19a438c..0dc8cb8 100644 --- a/manpages/notmuch-emacs-mua-1.mdwn +++ b/manpages/notmuch-emacs-mua-1.mdwn @@ -89,7 +89,7 @@

COPYRIGHT

-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
-

0.28

+

0.29

diff --git a/manpages/notmuch-hooks-5.mdwn b/manpages/notmuch-hooks-5.mdwn index ecde274..d24912f 100644 --- a/manpages/notmuch-hooks-5.mdwn +++ b/manpages/notmuch-hooks-5.mdwn @@ -63,7 +63,7 @@

COPYRIGHT

-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
-

0.28

+

0.29

diff --git a/manpages/notmuch-insert-1.mdwn b/manpages/notmuch-insert-1.mdwn index 9c69318..85695d7 100644 --- a/manpages/notmuch-insert-1.mdwn +++ b/manpages/notmuch-insert-1.mdwn @@ -113,7 +113,7 @@

COPYRIGHT

-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
-

0.28

+

0.29

diff --git a/manpages/notmuch-new-1.mdwn b/manpages/notmuch-new-1.mdwn index 51d5674..e29f2e8 100644 --- a/manpages/notmuch-new-1.mdwn +++ b/manpages/notmuch-new-1.mdwn @@ -44,25 +44,29 @@ --quiet Do not print progress or results. + --verbose + Print file names being processed. Ignored when combined with + --quiet. + --decrypt=(true|nostash|auto|false) - If true, when encountering an encrypted message, try to decrypt - it while indexing, and stash any discovered session keys. If + If true, when encountering an encrypted message, try to decrypt + it while indexing, and stash any discovered session keys. If auto, try to use any session key already known to belong to this - message, but do not attempt to use the user's secret keys. If + message, but do not attempt to use the user's secret keys. If decryption is successful, index the cleartext of the message. - Be aware that the index is likely sufficient (and the session + Be aware that the index is likely sufficient (and the session key is certainly sufficient) to reconstruct the cleartext of the - message itself, so please ensure that the notmuch message index - is adequately protected. DO NOT USE --decrypt=true or + message itself, so please ensure that the notmuch message index + is adequately protected. DO NOT USE --decrypt=true or --decrypt=nostash without considering the security of your index. See also index.decrypt in notmuch-config(1). --full-scan - By default notmuch-new uses directory modification times - (mtimes) to optimize the scanning of directories for new mail. + By default notmuch-new uses directory modification times + (mtimes) to optimize the scanning of directories for new mail. This option turns that optimization off. @@ -76,7 +80,7 @@

SEE ALSO

-       notmuch(1), notmuch-config(1), notmuch-count(1), notmuch-dump(1),  not‐
+       notmuch(1),  notmuch-config(1), notmuch-count(1), notmuch-dump(1), not‐
        much-hooks(5), notmuch-insert(1), notmuch-reply(1), notmuch-restore(1),
        notmuch-search(1),   notmuch-search-terms(7),   notmuch-show(1),   not‐
        much-tag(1)
@@ -89,7 +93,7 @@
 
 
COPYRIGHT

 
-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
 

 
-
0.28

+
0.29

diff --git a/manpages/notmuch-properties-7.mdwn b/manpages/notmuch-properties-7.mdwn
index 8cb4c67..f285188 100644
--- a/manpages/notmuch-properties-7.mdwn
+++ b/manpages/notmuch-properties-7.mdwn
@@ -123,7 +123,7 @@
 
 
COPYRIGHT

 
-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
 

 
-
0.28

+
0.29

diff --git a/manpages/notmuch-reindex-1.mdwn b/manpages/notmuch-reindex-1.mdwn
index 0ab6195..3af7668 100644
--- a/manpages/notmuch-reindex-1.mdwn
+++ b/manpages/notmuch-reindex-1.mdwn
@@ -91,7 +91,7 @@
 
 
COPYRIGHT

 
-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
 

 
-
0.28

+
0.29

diff --git a/manpages/notmuch-reply-1.mdwn b/manpages/notmuch-reply-1.mdwn
index 4941e6a..cae4c5e 100644
--- a/manpages/notmuch-reply-1.mdwn
+++ b/manpages/notmuch-reply-1.mdwn
@@ -126,7 +126,7 @@
 
 
COPYRIGHT

 
-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
 

 
-
0.28

+
0.29

diff --git a/manpages/notmuch-restore-1.mdwn b/manpages/notmuch-restore-1.mdwn
index 2148de1..0d6b1ab 100644
--- a/manpages/notmuch-restore-1.mdwn
+++ b/manpages/notmuch-restore-1.mdwn
@@ -99,7 +99,7 @@
 
 
COPYRIGHT

 
-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
 

 
-
0.28

+
0.29

diff --git a/manpages/notmuch-search-1.mdwn b/manpages/notmuch-search-1.mdwn
index 31d9ba4..098d9be 100644
--- a/manpages/notmuch-search-1.mdwn
+++ b/manpages/notmuch-search-1.mdwn
@@ -106,9 +106,9 @@
 
        --exclude=(true|false|all|flag)
               A message is called "excluded" if it matches at least one tag in
-              search.tag_exclude that does not appear explicitly in the search
-              terms.  This  option specifies whether to omit excluded messages
-              in the search process.
+              search.exclude_tags that  does  not  appear  explicitly  in  the
+              search  terms.  This  option  specifies whether to omit excluded
+              messages in the search process.
 
               true (default)
                      Prevent excluded messages from matching the search terms.
@@ -176,7 +176,7 @@
 
 
COPYRIGHT

 
-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
 

 
-
0.28

+
0.29

diff --git a/manpages/notmuch-search-terms-7.mdwn b/manpages/notmuch-search-terms-7.mdwn
index 7d37be9..e46c6b5 100644
--- a/manpages/notmuch-search-terms-7.mdwn
+++ b/manpages/notmuch-search-terms-7.mdwn
@@ -47,6 +47,9 @@
 
           notmuch search 'from:"/bob@.*[.]example[.]com/"'
 
+       body:<word-or-quoted-phrase>
+              Match terms in the body of messages.
+
        from:<name-or-address> or from:/<regex>/
               The  from:  prefix  is  used to match the name or address of the
               sender of an email message.
@@ -165,27 +168,30 @@
               notmuch  (and  extensions)  to add metadata to messages. A given
               key can be present on a given  message  with  several  different
               values.  See notmuch-properties(7) for more details.
+
+       User  defined  prefixes  are  also supported, see notmuch-config(1) for
+       details.

  Operators

-       In  addition  to  individual terms, multiple terms can be combined with
-       Boolean operators (and, or, not, and xor). Each term in the query  will
-       be  implicitly  connected  by  a logical AND if no explicit operator is
-       provided (except that terms with a common  prefix  will  be  implicitly
-       combined  with  OR).   The  shorthand  '-<term>'  can  be used for 'not
+       In addition to individual terms, multiple terms can  be  combined  with
+       Boolean  operators (and, or, not, and xor). Each term in the query will
+       be implicitly connected by a logical AND if  no  explicit  operator  is
+       provided  (except  that  terms  with a common prefix will be implicitly
+       combined with OR).  The  shorthand  '-<term>'  can  be  used  for  'not
        <term>' but unfortunately this does not work at the start of an expres‐
-       sion.   Parentheses  can also be used to control the combination of the
+       sion.  Parentheses can also be used to control the combination  of  the
        Boolean operators, but will have to be protected from interpretation by
        the shell, (such as by putting quotation marks around any parenthesized
        expression).
 
-       In addition to the standard boolean operators, Xapian provides  several
+       In  addition to the standard boolean operators, Xapian provides several
        operators specific to text searching.
 
           notmuch search term1 NEAR term2
 
-       will  return  results  where  term1  is  within  10 words of term2. The
+       will return results where term1  is  within  10  words  of  term2.  The
        threshold can be set like this:
 
           notmuch search term1 NEAR/2 term2
@@ -195,7 +201,7 @@
           notmuch search term1 ADJ term2
 
        will return results where term1 is within 10 words of term2, but in the
-       same  order  as in the query. The threshold can be set the same as with
+       same order as in the query. The threshold can be set the same  as  with
        NEAR:
 
           notmuch search term1 ADJ/7 term2
@@ -209,35 +215,35 @@
           notmuch search details
           notmuch search detail
 
-       will all return identical results, because Xapian first  "reduces"  the
+       will  all  return identical results, because Xapian first "reduces" the
        term to the common stem (here 'detail') and then performs the search.
 
-       There  are  two  ways to turn this off: a search for a capitalized word
-       will be performed unstemmed, so that one can search for "John" and  not
-       get  results  for  "Johnson";  phrase  searches are also unstemmed (see
-       below for details).  Stemming is currently only supported for  English.
+       There are two ways to turn this off: a search for  a  capitalized  word
+       will  be performed unstemmed, so that one can search for "John" and not
+       get results for "Johnson"; phrase  searches  are  also  unstemmed  (see
+       below  for details).  Stemming is currently only supported for English.
        Searches for words in other languages will be performed unstemmed.

  Wildcards

-       It  is  possible  to  use  a  trailing  '*' as a wildcard. A search for
+       It is possible to use a trailing  '*'  as  a  wildcard.  A  search  for
        'wildc*' will match 'wildcard', 'wildcat', etc.

  Boolean and Probabilistic Prefixes

-       Xapian (and hence notmuch)  prefixes  are  either  boolean,  supporting
-       exact  matches  like  "tag:inbox"  or  probabilistic, supporting a more
-       flexible term based searching. Certain special prefixes  are  processed
-       by  notmuch  in  a way not strictly fitting either of Xapian's built in
+       Xapian  (and  hence  notmuch)  prefixes  are either boolean, supporting
+       exact matches like "tag:inbox"  or  probabilistic,  supporting  a  more
+       flexible  term  based searching. Certain special prefixes are processed
+       by notmuch in a way not strictly fitting either of  Xapian's  built  in
        styles. The prefixes currently supported by notmuch are as follows.
 
        Boolean
               tag:, id:, thread:, folder:, path:, property:
 
        Probabilistic
-              to:, attachment:, mimetype:
+              body:, to:, attachment:, mimetype:
 
        Special
               from:, query:, subject:
@@ -245,10 +251,10 @@
 
 
   Terms and phrases

 
-       In general Xapian distinguishes between lists  of  terms  and  phrases.
+       In  general  Xapian  distinguishes  between lists of terms and phrases.
        Phrases are indicated by double quotes (but beware you probably need to
-       protect those from your shell) and insist that  those  unstemmed  words
-       occur  in  that  order. One useful, but initially surprising feature is
+       protect  those  from  your shell) and insist that those unstemmed words
+       occur in that order. One useful, but initially  surprising  feature  is
        that the following are equivalent ways to write the same phrase.
 
        · "a list of words"
@@ -277,8 +283,8 @@
 
 
   Quoting

 
-       Double  quotes  are  also  used  by the notmuch query parser to protect
-       boolean terms, regular expressions, or subqueries containing spaces  or
+       Double quotes are also used by the  notmuch  query  parser  to  protect
+       boolean  terms, regular expressions, or subqueries containing spaces or
        other special characters, e.g.
 
           tag:"a tag"
@@ -287,7 +293,7 @@
 
           thread:"{from:mallory and date:2009}"
 
-       As  with  phrases, you need to protect the double quotes from the shell
+       As with phrases, you need to protect the double quotes from  the  shell
        e.g.
 
           % notmuch search 'folder:"/^.*/(Junk|Spam)$/"'
@@ -296,11 +302,11 @@
 
 
DATE AND TIME SEARCH

 
-       notmuch understands a variety of standard and natural ways of  express‐
+       notmuch  understands a variety of standard and natural ways of express‐
        ing dates and times, both in absolute terms ("2012-10-24") and in rela‐
-       tive terms ("yesterday"). Any number of relative terms can be  combined
-       ("1  hour  25  minutes") and an absolute date/time can be combined with
-       relative terms to further adjust it. A  non-exhaustive  description  of
+       tive  terms ("yesterday"). Any number of relative terms can be combined
+       ("1 hour 25 minutes") and an absolute date/time can  be  combined  with
+       relative  terms  to  further adjust it. A non-exhaustive description of
        the syntax supported for absolute and relative terms is given below.
 

 
@@ -308,35 +314,35 @@
 
        date:<since>..<until>
 
-       The  above  expression  restricts  the  results  to  only messages from
+       The above expression  restricts  the  results  to  only  messages  from
        <since> to <until>, based on the Date: header.
 
-       <since> and <until> can describe imprecise times, such as  "yesterday".
-       In  this  case, <since> is taken as the earliest time it could describe
+       <since>  and <until> can describe imprecise times, such as "yesterday".
+       In this case, <since> is taken as the earliest time it  could  describe
        (the beginning of yesterday) and <until> is taken as the latest time it
-       could  describe (the end of yesterday). Similarly, date:january..febru‐
+       could describe (the end of yesterday). Similarly,  date:january..febru‐
        ary matches from the beginning of January to the end of February.
 
-       If specifying a time range using timestamps  in  conjunction  with  the
-       date  prefix,  each  timestamp must be preceded by @ (ASCII hex 40). As
-       above, each timestamp is a number representing the  number  of  seconds
+       If  specifying  a  time  range using timestamps in conjunction with the
+       date prefix, each timestamp must be preceded by @ (ASCII  hex  40).  As
+       above,  each  timestamp  is a number representing the number of seconds
        since 1970-01-01 00:00:00 UTC. For example:
           date:@<initial-timestamp>..@<final-timestamp>
 
-       date:<expr>..!  can be used as a shorthand for date:<expr>..<expr>. The
-       expansion takes place before interpretation,  and  thus,  for  example,
-       date:monday..!  matches  from  the beginning of Monday until the end of
-       Monday.  With Xapian Field Processor  support  (see  below),  non-range
-       date  queries such as date:yesterday will work, but otherwise will give
+       date:<expr>..! can be used as a shorthand for date:<expr>..<expr>.  The
+       expansion  takes  place  before  interpretation, and thus, for example,
+       date:monday..! matches from the beginning of Monday until  the  end  of
+       Monday.   With  Xapian  Field  Processor support (see below), non-range
+       date queries such as date:yesterday will work, but otherwise will  give
        unexpected results; if in doubt use date:yesterday..!
 
-       Currently, we do not support  spaces  in  range  expressions.  You  can
+       Currently,  we  do  not  support  spaces  in range expressions. You can
        replace the spaces with '_', or (in most cases) '-', or (in some cases)
-       leave the spaces out altogether. Examples in this man page  use  spaces
+       leave  the  spaces out altogether. Examples in this man page use spaces
        for clarity.
 
-       Open-ended  ranges are supported (since Xapian 1.2.1), i.e. it's possi‐
-       ble to specify date:..<until> or date:<since>.. to not limit the  start
+       Open-ended ranges are supported (since Xapian 1.2.1), i.e. it's  possi‐
+       ble  to specify date:..<until> or date:<since>.. to not limit the start
        or end time, respectively. Pre-1.2.1 Xapian does not report an error on
        open ended ranges, but it does not work as expected either.
 

@@ -348,15 +354,15 @@
 
        All refer to past, can be repeated and will be accumulated.
 
-       Units  can  be  abbreviated to any length, with the otherwise ambiguous
+       Units can be abbreviated to any length, with  the  otherwise  ambiguous
        single m being m for minutes and M for months.
 
-       Number can also be written out one,  two,  ...,  ten,  dozen,  hundred.
+       Number  can  also  be  written  out one, two, ..., ten, dozen, hundred.
        Additionally, the unit may be preceded by "last" or "this" (e.g., "last
        week" or "this month").
 
-       When combined with absolute date and time, the relative date  and  time
-       specification  will  be  relative  from the specified absolute date and
+       When  combined  with absolute date and time, the relative date and time
+       specification will be relative from the  specified  absolute  date  and
        time.
 
        Examples: 5M2d, two weeks
@@ -417,9 +423,9 @@
 
 
XAPIAN FIELD PROCESSORS

 
-       Certain optional features of the notmuch query processor  rely  on  the
-       presence  of  the Xapian field processor API. You can determine if your
-       notmuch was built against a sufficiently recent version  of  Xapian  by
+       Certain  optional  features  of the notmuch query processor rely on the
+       presence of the Xapian field processor API. You can determine  if  your
+       notmuch  was  built  against a sufficiently recent version of Xapian by
        running
 
           % notmuch config get built_with.field_processor
@@ -437,9 +443,9 @@
 
 
SEE ALSO

 
-       notmuch(1),  notmuch-config(1), notmuch-count(1), notmuch-dump(1), not‐
-       much-hooks(5), notmuch-insert(1),  notmuch-new(1),  notmuch-reindex(1),
-       notmuch-properties(1),   *notmuch-reply(1),   notmuch-restore(1),  not‐
+       notmuch(1), notmuch-config(1), notmuch-count(1), notmuch-dump(1),  not‐
+       much-hooks(5),  notmuch-insert(1),  notmuch-new(1), notmuch-reindex(1),
+       notmuch-properties(1),  *notmuch-reply(1),   notmuch-restore(1),   not‐
        much-search(1), *notmuch-show(1), notmuch-tag(1)
 

 
@@ -450,7 +456,7 @@
 
 
COPYRIGHT

 
-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
 

 
-
0.28

+
0.29

diff --git a/manpages/notmuch-show-1.mdwn b/manpages/notmuch-show-1.mdwn
index 6ad8953..3d5a1c4 100644
--- a/manpages/notmuch-show-1.mdwn
+++ b/manpages/notmuch-show-1.mdwn
@@ -164,35 +164,36 @@
               Default: auto
 
        --exclude=(true|false)
-              Specify whether to omit threads only matching search.tag_exclude
-              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).
+              Specify     whether    to    omit    threads    only    matching
+              search.exclude_tags 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
-              returned  regardless  (with  the  excluded  flag  being set when
-              appropriate) but threads that only match in an excluded  message
+              returned regardless (with  the  excluded  flag  being  set  when
+              appropriate)  but threads that only match in an excluded message
               are not returned when --exclude=true.
 
               The default is --exclude=true.
 
        --body=(true|false)
-              If  true  (the  default) notmuch show includes the bodies of the
-              messages  in  the  output;  if  false,   bodies   are   omitted.
-              --body=false  is  only implemented for the json and sexp formats
-              and it is incompatible with --part > 0.
+              If true (the default) notmuch show includes the  bodies  of  the
+              messages   in   the   output;  if  false,  bodies  are  omitted.
+              --body=false is only implemented for the  text,  json  and  sexp
+              formats and it is incompatible with --part > 0.
 
               This is useful if the caller only needs the headers as body-less
               output is much faster and substantially smaller.
 
        --include-html
-              Include  "text/html" parts as part of the output (currently only
-              supported with --format=json  and  --format=sexp).  By  default,
-              unless   --part=N   is   used  to  select  a  specific  part  or
+              Include "text/html" parts as part of the output (currently  only
+              supported  with --format=text, --format=json and --format=sexp).
+              By default, unless --part=N is used to select a specific part or
               --include-html is used to include all "text/html" parts, no part
               with content type "text/html" is included in the output.
 
-       A  common  use  of  notmuch show is to display a single thread of email
+       A common use of notmuch show is to display a  single  thread  of  email
        messages. For this, use a search term of "thread:<thread-id>" as can be
        seen in the first column of output from the notmuch search command.
 

@@ -208,8 +209,8 @@
 
 
SEE ALSO

 
-       notmuch(1),  notmuch-config(1), notmuch-count(1), notmuch-dump(1), not‐
-       much-hooks(5),  notmuch-insert(1),  notmuch-new(1),   notmuch-reply(1),
+       notmuch(1), notmuch-config(1), notmuch-count(1), notmuch-dump(1),  not‐
+       much-hooks(5),   notmuch-insert(1),  notmuch-new(1),  notmuch-reply(1),
        notmuch-restore(1),  notmuch-search(1),  notmuch-search-terms(7),  not‐
        much-tag(1)
 

@@ -221,7 +222,7 @@
 
 
COPYRIGHT

 
-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
 

 
-
0.28

+
0.29

diff --git a/manpages/notmuch-tag-1.mdwn b/manpages/notmuch-tag-1.mdwn
index 9c07ada..09333c7 100644
--- a/manpages/notmuch-tag-1.mdwn
+++ b/manpages/notmuch-tag-1.mdwn
@@ -113,7 +113,7 @@
 
 
COPYRIGHT

 
-       2009-2018, Carl Worth and many others
+       2009-2019, Carl Worth and many others
 

 
-
0.28

+
0.29

-- 
2.43.0