X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=manpages%2Fnotmuch-1.mdwn;h=27767423e9e00fda89d818977e596be1e83e4992;hb=bf4ac2a31d4b8220d28b36de018a4ad516d60baf;hp=5a276e5fcf1567a2a0f4c791cfac28e3abb6dca4;hpb=6562766d20047abcb3bab0d88a1e5849baaae76d;p=notmuch-wiki

diff --git a/manpages/notmuch-1.mdwn b/manpages/notmuch-1.mdwn
index 5a276e5..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>
@@ -87,8 +100,8 @@
        tax. See <b>notmuch-search-terms</b>(7) for more details on the supported syn‐
        tax.
 
-       The <b>search</b>, <b>show</b> and <b>count</b> commands are used to query the  email  data‐
-       base.
+       The <b>search</b>, <b>show</b>, <b>address</b> and <b>count</b> commands  are  used  to  query  the
+       email database.
 
        The  <b>reply</b>  command  is  useful  for  preparing a template for an email
        reply.
@@ -127,7 +140,7 @@
        <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/'>notmuch-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/'>not‐</a>
        <a href='../notmuch-restore-1/'>much-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/'>not‐</a>
-       <a href='../notmuch-show-1/'>much-show</a>(1), <a href='../notmuch-tag-1/'>notmuch-tag</a>(1)
+       <a href='../notmuch-show-1/'>much-show</a>(1), <a href='../notmuch-tag-1/'>notmuch-tag</a>(1), <a href='../notmuch-address-1/'>notmuch-address</a>(1)
 
        The notmuch website: <b>http://notmuchmail.org</b>
 </pre>
@@ -149,7 +162,7 @@
 
 <h2>COPYRIGHT</h2>
 <pre>
-       2014, Carl Worth and many others
+       2009-2015, Carl Worth and many others
 </pre>
 
-<h2>0.18.1</h2>
+<h2>0.21</h2>