manpages (0.21) update

15 files changed, 88 insertions, 38 deletions

diff --git a/manpages/notmuch-1.mdwn b/manpages/notmuch-1.mdwn
index 2e45c93..2776742 100644
--- a/manpages/notmuch-1.mdwn
+++ b/manpages/notmuch-1.mdwn
@@ -41,7 +41,9 @@
 <pre>
        Supported global options for <b>notmuch</b> include
 
-          <b>--help</b> Print a synopsis of available commands and exit.
+          <b>--help</b> <b>[command-name]</b>
+                 Print a synopsis of available commands  and  exit.   With  an
+                 optional command name, show the man page for that subcommand.
 
           <b>--version</b>
                  Print the installed version of notmuch, and exit.
@@ -49,6 +51,17 @@
           <b>--config=FILE</b>
                  Specify the configuration file to  use.  This  overrides  any
                  configuration file specified by ${NOTMUCH_CONFIG}.
+
+          <b>--uuid=HEX</b>
+                 Enforce that the database UUID  (a  unique  identifier  which
+                 persists  until  e.g. the database is compacted) is HEX; exit
+                 with an error if it is not. This is useful to detect rollover
+                 in  modification  counts  on messages. You can find this UUID
+                 using e.g. <b>notmuch</b> <b>count</b> <b>--lastmod</b>
+
+       All global options except <b>--config</b> can also be specified after the com‐
+       mand.  For example, <b>notmuch</b> <b>subcommand</b> <b>--uuid=HEX</b> is equivalent to <b>not-</b>
+       <b>much</b> <b>--uuid=HEX</b> <b>subcommand</b>.
 </pre>
 
 <h2>COMMANDS</h2>
@@ -149,7 +162,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2015, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.20.2</h2>
+<h2>0.21</h2>
diff --git a/manpages/notmuch-address-1.mdwn b/manpages/notmuch-address-1.mdwn
index 4346373..b3f6f82 100644
--- a/manpages/notmuch-address-1.mdwn
+++ b/manpages/notmuch-address-1.mdwn
@@ -53,6 +53,26 @@
                      Note:  With this option, addresses are printed only after
                      the whole search is finished. This may take long time.
 
+          <b>--deduplicate=(no|mailbox|address)</b>
+              Control the deduplication of results.
+
+              <b>no</b>     Output all occurences of addresses in the  matching  mes‐
+                     sages. This is not applicable with --output=count.
+
+              <b>mailbox</b>
+                     Deduplicate  addresses  based on the full, case sensitive
+                     name and email address, or mailbox. This  is  effectively
+                     the  same as piping the --deduplicate=no output to <b>sort</b> <b>|</b>
+                     <b>uniq</b>, except for  the  order  of  results.  This  is  the
+                     default.
+
+              <b>address</b>
+                     Deduplicate  addresses  based  on  the  case  insensitive
+                     address part of the mailbox. Of all  the  variants  (with
+                     different  name  or  case),  print the one occurring most
+                     frequently among the matching messages. If --output=count
+                     is specified, include all variants in the count.
+
           <b>--sort=(newest-first|oldest-first)</b>
                  This option can be used to present results in either  chrono‐
                  logical  order  (<b>oldest-first</b>) or reverse chronological order
@@ -62,7 +82,9 @@
                  cal  order,  (that  is,  the newest results will be displayed
                  first).
 
-                 This option is not supported with --output=count.
+                 However, if either --output=count or --deduplicate=address is
+                 specified, this option  is  ignored  and  the  order  of  the
+                 results is unspecified.
 
           <b>--exclude=(true|false)</b>
                  A message is called &quot;excluded&quot; if it matches at least one tag
@@ -101,7 +123,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2015, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.20.2</h2>
+<h2>0.21</h2>
diff --git a/manpages/notmuch-compact-1.mdwn b/manpages/notmuch-compact-1.mdwn
index fad318c..bc83cb6 100644
--- a/manpages/notmuch-compact-1.mdwn
+++ b/manpages/notmuch-compact-1.mdwn
@@ -61,7 +61,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2015, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.20.2</h2>
+<h2>0.21</h2>
diff --git a/manpages/notmuch-config-1.mdwn b/manpages/notmuch-config-1.mdwn
index 4dfa612..4efc3cf 100644
--- a/manpages/notmuch-config-1.mdwn
+++ b/manpages/notmuch-config-1.mdwn
@@ -157,7 +157,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2015, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.20.2</h2>
+<h2>0.21</h2>
diff --git a/manpages/notmuch-count-1.mdwn b/manpages/notmuch-count-1.mdwn
index 2bd7357..4678361 100644
--- a/manpages/notmuch-count-1.mdwn
+++ b/manpages/notmuch-count-1.mdwn
@@ -49,6 +49,11 @@
                  option is not compatible with specifying search terms on  the
                  command line.
 
+          <b>--lastmod</b>
+                 Append  lastmod  (counter for number of database updates) and
+                 UUID to  the  output.  lastmod  values  are  only  comparable
+                 between databases with the same UUID.
+
           <b>--input=&lt;filename&gt;</b>
                  Read  input  from  given file, instead of from stdin. Implies
                  <b>--batch</b>.
@@ -69,7 +74,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2015, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.20.2</h2>
+<h2>0.21</h2>
diff --git a/manpages/notmuch-dump-1.mdwn b/manpages/notmuch-dump-1.mdwn
index 18ed9a2..9ba6476 100644
--- a/manpages/notmuch-dump-1.mdwn
+++ b/manpages/notmuch-dump-1.mdwn
@@ -87,7 +87,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2015, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.20.2</h2>
+<h2>0.21</h2>
diff --git a/manpages/notmuch-hooks-5.mdwn b/manpages/notmuch-hooks-5.mdwn
index 08f07ce..3d6ccec 100644
--- a/manpages/notmuch-hooks-5.mdwn
+++ b/manpages/notmuch-hooks-5.mdwn
@@ -63,7 +63,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2015, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.20.2</h2>
+<h2>0.21</h2>
diff --git a/manpages/notmuch-insert-1.mdwn b/manpages/notmuch-insert-1.mdwn
index 00d27c4..49a8eb7 100644
--- a/manpages/notmuch-insert-1.mdwn
+++ b/manpages/notmuch-insert-1.mdwn
@@ -78,7 +78,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2015, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.20.2</h2>
+<h2>0.21</h2>
diff --git a/manpages/notmuch-new-1.mdwn b/manpages/notmuch-new-1.mdwn
index d809fcc..3af25ff 100644
--- a/manpages/notmuch-new-1.mdwn
+++ b/manpages/notmuch-new-1.mdwn
@@ -60,7 +60,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2015, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.20.2</h2>
+<h2>0.21</h2>
diff --git a/manpages/notmuch-reply-1.mdwn b/manpages/notmuch-reply-1.mdwn
index f3dd705..0c36791 100644
--- a/manpages/notmuch-reply-1.mdwn
+++ b/manpages/notmuch-reply-1.mdwn
@@ -116,7 +116,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2015, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.20.2</h2>
+<h2>0.21</h2>
diff --git a/manpages/notmuch-restore-1.mdwn b/manpages/notmuch-restore-1.mdwn
index a005ded..8aca220 100644
--- a/manpages/notmuch-restore-1.mdwn
+++ b/manpages/notmuch-restore-1.mdwn
@@ -80,7 +80,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2015, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.20.2</h2>
+<h2>0.21</h2>
diff --git a/manpages/notmuch-search-1.mdwn b/manpages/notmuch-search-1.mdwn
index c9b8b85..355dca6 100644
--- a/manpages/notmuch-search-1.mdwn
+++ b/manpages/notmuch-search-1.mdwn
@@ -163,7 +163,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2015, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.20.2</h2>
+<h2>0.21</h2>
diff --git a/manpages/notmuch-search-terms-7.mdwn b/manpages/notmuch-search-terms-7.mdwn
index a6b61f3..b36c16b 100644
--- a/manpages/notmuch-search-terms-7.mdwn
+++ b/manpages/notmuch-search-terms-7.mdwn
@@ -57,6 +57,8 @@
 
        · date:&lt;since&gt;..&lt;until&gt;
 
+       · lastmod:&lt;initial-revision&gt;..&lt;final-revision&gt;
+
        The <b>from:</b> prefix is used to match the name or address of the sender  of
        an email message.
 
@@ -122,6 +124,12 @@
 
        Each  timestamp  is  a  number representing the number of seconds since
        1970-01-01 00:00:00 UTC.
+
+       The <b>lastmod:</b> prefix can be used to restrict the result by the  database
+       revision  number  of  when  messages  were  last  modified  (tags  were
+       added/removed or filenames changed).  This is usually used in  conjunc‐
+       tion  with  the <b>--uuid</b> argument to <b>notmuch</b> <b>search</b> to find messages that
+       have changed since an earlier query.
 </pre>
 
 <h3> &nbsp; Operators</h3>
@@ -254,7 +262,14 @@
        could describe (the end of yesterday). Similarly,  date:january..febru‐
        ary matches from the beginning of January to the end of February.
 
-       Currently,  we  do  not  support  spaces  in range expressions. You can
+       date:&lt;expr&gt;..!  can be used as a shorthand for date:&lt;expr&gt;..&lt;expr&gt;. The
+       expansion takes place before interpretation,  and  thus,  for  example,
+       date:monday..!  matches  from  the beginning of Monday until the end of
+       Monday. (Note that  entering  date:&lt;expr&gt;  without  &quot;..&quot;,  for  example
+       date:yesterday,  won&apos;t work, as it&apos;s not interpreted as a range expres‐
+       sion at all. Again, use date:yesterday..!)
+
+       Currently, we do not support  spaces  in  range  expressions.  You  can
        replace the spaces with &apos;_&apos;, or (in most cases) &apos;-&apos;, or (in some cases)
        leave  the  spaces out altogether. Examples in this man page use spaces
        for clarity.
@@ -263,11 +278,6 @@
        ble  to specify date:..&lt;until&gt; or date:&lt;since&gt;.. 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.
-
-       Entering  date:expr  without  &quot;..&quot;  (for  example date:yesterday) won&apos;t
-       work, as it&apos;s not interpreted as a range expression  at  all.  You  can
-       achieve  the expected result by duplicating the expr both sides of &quot;..&quot;
-       (for example date:yesterday..yesterday).
 </pre>
 
 <h3> &nbsp; Relative date and time</h3>
@@ -358,7 +368,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2015, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.20.2</h2>
+<h2>0.21</h2>
diff --git a/manpages/notmuch-show-1.mdwn b/manpages/notmuch-show-1.mdwn
index 4b3c40f..ae337e7 100644
--- a/manpages/notmuch-show-1.mdwn
+++ b/manpages/notmuch-show-1.mdwn
@@ -185,7 +185,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2015, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.20.2</h2>
+<h2>0.21</h2>
diff --git a/manpages/notmuch-tag-1.mdwn b/manpages/notmuch-tag-1.mdwn
index 9de1b64..3225843 100644
--- a/manpages/notmuch-tag-1.mdwn
+++ b/manpages/notmuch-tag-1.mdwn
@@ -114,7 +114,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2015, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.20.2</h2>
+<h2>0.21</h2>