doc: document new option `show.extra_headers`

[notmuch] / doc / man1 / notmuch-config.rst

diff --git a/doc/man1/notmuch-config.rst b/doc/man1/notmuch-config.rst
index 32290a38a3e60605230e24e0dbab651b97effc5d..41e1338b12e8a34bc4ce87c7462f1f3f35ab5852 100644 (file)
--- a/doc/man1/notmuch-config.rst
+++ b/doc/man1/notmuch-config.rst
@@ -1,3 +1,5 @@
+.. _notmuch-config(1):
+

 ==============
 notmuch-config
 ==============
 ==============
 notmuch-config
 ==============


@@ -17,43 +19,50 @@ DESCRIPTION
 The **config** command can be used to get or set settings in the notmuch
 configuration file and corresponding database.
 
 The **config** command can be used to get or set settings in the notmuch
 configuration file and corresponding database.
 

-**get**
-    The value of the specified configuration item is printed to
-    stdout. If the item has multiple values (it is a list), each value
-    is separated by a newline character.
+.. program:: config
+
+.. option:: get
+
+   The value of the specified configuration item is printed to
+   stdout. If the item has multiple values (it is a list), each value
+   is separated by a newline character.
+
+.. option:: set
+
+   The specified configuration item is set to the given value. To
+   specify a multiple-value item (a list), provide each value as a
+   separate command-line argument.

 
 

-**set**
-    The specified configuration item is set to the given value. To
-    specify a multiple-value item (a list), provide each value as a
-    separate command-line argument.
+   If no values are provided, the specified configuration item will
+   be removed from the configuration file.

 
 

-    If no values are provided, the specified configuration item will
-    be removed from the configuration file.
+   With the `--database` option, updates configuration metadata
+   stored in the database, rather than the default (text)
+   configuration file.

 
 

-    With the `--database` option, updates configuration metadata
-    stored in the database, rather than the default (text)
-    configuration file.
+.. option:: list

 
 

-**list**
-    Every configuration item is printed to stdout, each on a separate
-    line of the form::
+   Every configuration item is printed to stdout, each on a separate
+   line of the form::

 
 

-        section.item=value
+     section.item=value

 
 

-    No additional whitespace surrounds the dot or equals sign
-    characters. In a multiple-value item (a list), the values are
-    separated by semicolon characters.
+   No additional whitespace surrounds the dot or equals sign
+   characters. In a multiple-value item (a list), the values are
+   separated by semicolon characters.

 
 

-The available configuration items are described below.
+The available configuration items are described below. Non-absolute
+paths are presumed relative to `$HOME` for items in section
+**database**.

 
 

-**database.path**
+database.path

     Notmuch will store its database here, (in
     sub-directory named ``.notmuch`` if **database.mail\_root**
     is unset).
 
     Notmuch will store its database here, (in
     sub-directory named ``.notmuch`` if **database.mail\_root**
     is unset).
 

-    Default: ``$MAILDIR`` variable if set, otherwise ``$HOME/mail``.
+    Default: see :ref:`database`

 
 

-**database.mail_root**
+database.mail_root

     The top-level directory where your mail currently exists and to
     where mail will be delivered in the future. Files should be
     individual email messages.
     The top-level directory where your mail currently exists and to
     where mail will be delivered in the future. Files should be
     individual email messages.


@@ -63,37 +72,56 @@ The available configuration items are described below.
     Default: For compatibility with older configurations, the value of
     database.path is used if **database.mail\_root** is unset.
 
     Default: For compatibility with older configurations, the value of
     database.path is used if **database.mail\_root** is unset.
 

-**database.hook_dir**
+database.backup_dir
+    Directory to store tag dumps when upgrading database.

 
 

+    History: this configuration value was introduced in notmuch 0.32.
+
+    Default: A sibling directory of the Xapian database called
+    `backups`.
+
+database.hook_dir

     Directory containing hooks run by notmuch commands. See
     Directory containing hooks run by notmuch commands. See

-    **notmuch-hooks(5)**.
+    :any:`notmuch-hooks(5)`.
+
+    History: this configuration value was introduced in notmuch 0.32.

 
 

-**user.name**
+    Default: See HOOKS, below.
+
+database.autocommit
+
+    How often to commit transactions to disk. `0` means wait until
+    command completes, otherwise an integer `n` specifies to commit to
+    disk after every `n` completed transactions.
+
+    History: this configuration value was introduced in notmuch 0.33.
+
+user.name

     Your full name.
 
     Default: ``$NAME`` variable if set, otherwise read from
     ``/etc/passwd``.
 
     Your full name.
 
     Default: ``$NAME`` variable if set, otherwise read from
     ``/etc/passwd``.
 

-**user.primary\_email**
+user.primary\_email

     Your primary email address.
 
     Default: ``$EMAIL`` variable if set, otherwise constructed from
     the username and hostname of the current machine.
 
     Your primary email address.
 
     Default: ``$EMAIL`` variable if set, otherwise constructed from
     the username and hostname of the current machine.
 

-**user.other\_email**
+user.other\_email

     A list of other email addresses at which you receive email.
 
     Default: not set.
 
     A list of other email addresses at which you receive email.
 
     Default: not set.
 

-**new.tags**
+new.tags

     A list of tags that will be added to all messages incorporated by
     **notmuch new**.
 
     Default: ``unread;inbox``.
 
     A list of tags that will be added to all messages incorporated by
     **notmuch new**.
 
     Default: ``unread;inbox``.
 

-**new.ignore**
+new.ignore

     A list to specify files and directories that will not be searched
     A list to specify files and directories that will not be searched

-    for messages by **notmuch new**. Each entry in the list is either:
+    for messages by :any:`notmuch-new(1)`. Each entry in the list is either:

 
     A file or a directory name, without path, that will be ignored,
     regardless of the location in the mail store directory hierarchy.
 
     A file or a directory name, without path, that will be ignored,
     regardless of the location in the mail store directory hierarchy.


@@ -109,15 +137,29 @@ The available configuration items are described below.
 
     Default: empty list.
 
 
     Default: empty list.
 

-**search.exclude\_tags**
+search.exclude\_tags

     A list of tags that will be excluded from search results by
     default. Using an excluded tag in a query will override that
     exclusion.
 
     A list of tags that will be excluded from search results by
     default. Using an excluded tag in a query will override that
     exclusion.
 

-    Default: empty list. Note that **notmuch-setup(1)** puts
+    Default: empty list. Note that :any:`notmuch-setup(1)` puts

     ``deleted;spam`` here when creating new configuration file.
 
     ``deleted;spam`` here when creating new configuration file.
 

-**maildir.synchronize\_flags**
+.. _show.extra_headers:
+
+show.extra\_headers
+
+    By default :any:`notmuch-show(1)` includes the following headers
+    in structured output if they are present in the message:
+    `Subject`, `From`, `To`, `Cc`, `Bcc`, `Reply-To`, `Date`. 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.
+
+maildir.synchronize\_flags

     If true, then the following maildir flags (in message filenames)
     will be synchronized with the corresponding notmuch tags:
 
     If true, then the following maildir flags (in message filenames)
     will be synchronized with the corresponding notmuch tags:
 


@@ -135,20 +177,22 @@ The available configuration items are described below.
     | S      | unread (added when 'S' flag is not present)   |
     +--------+-----------------------------------------------+
 
     | S      | unread (added when 'S' flag is not present)   |
     +--------+-----------------------------------------------+
 

-    The **notmuch new** command will notice flag changes in filenames
-    and update tags, while the **notmuch tag** and **notmuch restore**
-    commands will notice tag changes and update flags in filenames.
+    The :any:`notmuch-new(1)` command will notice flag changes in
+    filenames and update tags, while the :any:`notmuch-tag(1)` and
+    :any:`notmuch-restore(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, etc.), it is
 
     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 **notmuch new** before **notmuch tag** or
-    **notmuch restore** 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.
+    advisable to run :any:`notmuch-new(1)` before
+    :any:`notmuch-tag(1)` or :any:`notmuch-restore(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: ``true``.
 
 
     Default: ``true``.
 

-**index.decrypt**
+index.decrypt

     Policy for decrypting encrypted messages during indexing.  Must be
     one of: ``false``, ``auto``, ``nostash``, or ``true``.
 
     Policy for decrypting encrypted messages during indexing.  Must be
     one of: ``false``, ``auto``, ``nostash``, or ``true``.
 


@@ -164,8 +208,8 @@ The available configuration items are described below.
     ``nostash`` is the same as ``true`` except that it will not stash
     newly-discovered session keys in the database.
 
     ``nostash`` is the same as ``true`` except that it will not stash
     newly-discovered session keys in the database.
 

-    From the command line (i.e. during **notmuch-new(1)**,
-    **notmuch-insert(1)**, or **notmuch-reindex(1)**), the user can
+    From the command line (i.e. during :any:`notmuch-new(1)`,
+    :any:`notmuch-insert(1)`, or :any:`notmuch-reindex(1)`), the user can

     override the database's stored decryption policy with the
     ``--decrypt=`` option.
 
     override the database's stored decryption policy with the
     ``--decrypt=`` option.
 


@@ -189,7 +233,7 @@ The available configuration items are described below.
 
     Stashed session keys are kept in the database as properties
     associated with the message.  See ``session-key`` in
 
     Stashed session keys are kept in the database as properties
     associated with the message.  See ``session-key`` in

-    **notmuch-properties(7)** for more details about how they can be
+    :any:`notmuch-properties(7)` for more details about how they can be

     useful.
 
     Be aware that the notmuch index is likely sufficient (and a
     useful.
 
     Be aware that the notmuch index is likely sufficient (and a


@@ -201,73 +245,99 @@ The available configuration items are described below.
 
     Default: ``auto``.
 
 
     Default: ``auto``.
 

-**index.header.<prefix>**
+index.header.<prefix>

     Define the query prefix <prefix>, based on a mail header. For
     example ``index.header.List=List-Id`` will add a probabilistic
     prefix ``List:`` that searches the ``List-Id`` field.  User
     defined prefixes must not start with 'a'...'z'; in particular
     adding a prefix with same name as a predefined prefix is not
     Define the query prefix <prefix>, based on a mail header. For
     example ``index.header.List=List-Id`` will add a probabilistic
     prefix ``List:`` that searches the ``List-Id`` field.  User
     defined prefixes must not start with 'a'...'z'; in particular
     adding a prefix with same name as a predefined prefix is not

-    supported. See **notmuch-search-terms(7)** for a list of existing
+    supported. See :any:`notmuch-search-terms(7)` for a list of existing

     prefixes, and an explanation of probabilistic prefixes.
 
     prefixes, and an explanation of probabilistic prefixes.
 

-**built_with.<name>**
+built_with.<name>

     Compile time feature <name>. Current possibilities include
     "retry_lock" (configure option, included by default).
     (since notmuch 0.30, "compact" and "field_processor" are
     always included.)
 
     Compile time feature <name>. Current possibilities include
     "retry_lock" (configure option, included by default).
     (since notmuch 0.30, "compact" and "field_processor" are
     always included.)
 

-**query.<name>**
+query.<name>

     Expansion for named query called <name>. See
     Expansion for named query called <name>. See

-    **notmuch-search-terms(7)** for more information about named
+    :any:`notmuch-search-terms(7)` for more information about named

     queries.
 
     queries.
 

-ENVIRONMENT
-===========
-
-The following environment variables can be used to control the behavior
-of notmuch.
-
-**NOTMUCH\_CONFIG**
-    Specifies the location of the notmuch configuration file.
-
-**NOTMUCH_PROFILE**
-    Selects among notmuch configurations.
+squery.<name>
+    Expansion for named query called <name>, using s-expression syntax. See
+    :any:`notmuch-sexp-queries(7)` for more information about s-expression
+    queries.

 
 FILES
 =====
 
 
 FILES
 =====
 

+.. _config_search:
+

 CONFIGURATION
 -------------
 
 CONFIGURATION
 -------------
 

-If ``NOTMUCH_CONFIG`` is unset, notmuch tries (in order)
+Notmuch configuration file search order:
+
+1. File specified by :option:`notmuch --config` global option; see
+   :any:`notmuch(1)`.
+
+2. File specified by :envvar:`NOTMUCH_CONFIG` environment variable.
+
+3. ``$XDG_CONFIG_HOME/notmuch/<profile>/config`` where ``<profile>``
+   is defined by :envvar:`NOTMUCH_PROFILE` environment variable if
+   set, ``$XDG_CONFIG_HOME/notmuch/default/config`` otherwise.
+
+4. ``$HOME/.notmuch-config.<profile>`` where ``<profile>`` is defined
+   by :envvar:`NOTMUCH_PROFILE` environment variable if set,
+   ``$HOME/.notmuch-config`` otherwise.

 
 

-- ``$XDG_CONFIG_HOME/notmuch/<profile>/config`` where ``<profile>`` is
-  defined by ``$NOTMUCH_PROFILE`` or "default"
-- ``${HOME}/.notmuch-config<profile>`` where ``<profile>`` is
-  ``.$NOTMUCH_PROFILE`` or ""
+.. _database:

 
 

-Hooks
+DATABASE LOCATION
+-----------------
+
+Notmuch database search order:
+
+1. Directory specified by :envvar:`NOTMUCH_DATABASE` environment variable.
+
+2. Directory specified by config key ``database.path``.
+
+3. ``$XDG_DATA_HOME/notmuch/<profile>`` where ``<profile>``
+   is defined by :envvar:`NOTMUCH_PROFILE` environment variable if
+   set, ``$XDG_DATA_HOME/notmuch/default`` otherwise.
+
+4. Directory specified by :envvar:`MAILDIR` environment variable.
+
+5. ``$HOME/mail``
+
+HOOKS

 -----
 
 -----
 

-If ``database.hook_dir`` is unset, notmuch tries (in order)
+Notmuch hook directory search order:
+
+1. Directory specified by ``database.hook_dir`` configuration option.
+
+2. ``$XDG_CONFIG_HOME/notmuch/<profile>/hooks`` where ``<profile>``
+   is defined by :envvar:`NOTMUCH_PROFILE` environment variable if
+   set, ``$XDG_CONFIG_HOME/notmuch/default/hooks`` otherwise.

 
 

-- ``$XDG_CONFIG_HOME/notmuch/<profile>/hooks`` where ``<profile>`` is
-  defined by ``$NOTMUCH_PROFILE`` or "default"
-- ``<database.path>/.notmuch/hooks``
+3. ``<database.path>/.notmuch/hooks``

 
 SEE ALSO
 ========
 
 
 SEE ALSO
 ========
 

-**notmuch(1)**,
-**notmuch-count(1)**,
-**notmuch-dump(1)**,
-**notmuch-hooks(5)**,
-**notmuch-insert(1)**,
-**notmuch-new(1)**,
-**notmuch-reply(1)**,
-**notmuch-restore(1)**,
-**notmuch-search(1)**,
-**notmuch-search-terms(7)**,
-**notmuch-properties(7)**,
-**notmuch-show(1)**,
-**notmuch-tag(1)**
+:any:`notmuch(1)`,
+:any:`notmuch-count(1)`,
+:any:`notmuch-dump(1)`,
+:any:`notmuch-hooks(5)`,
+:any:`notmuch-insert(1)`,
+:any:`notmuch-new(1)`,
+:any:`notmuch-properties(7)`,
+:any:`notmuch-reply(1)`,
+:any:`notmuch-restore(1)`,
+:any:`notmuch-search(1)`,
+:any:`notmuch-search-terms(7)`,
+:any:`notmuch-show(1)`,
+:any:`notmuch-tag(1)`