From: David Bremner <david@tethera.net>
Date: Fri, 25 Jun 2021 12:34:29 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: archive/debian/0.33_rc0-1~54
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=4b0c6fb2f1ba989fee554cb8fa2612046d6414a8;p=notmuch
Merge branch 'release'
---
4b0c6fb2f1ba989fee554cb8fa2612046d6414a8
diff --cc doc/man1/notmuch-config.rst
index 56f4a160,209226a3..138501a8
--- a/doc/man1/notmuch-config.rst
+++ b/doc/man1/notmuch-config.rst
@@@ -81,10 -74,13 +81,13 @@@ paths are presumed relative to `$HOME`
`backups`.
**database.hook_dir**
-
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.
+
+ Default: See HOOKS, below.
+
**user.name**
Your full name.
@@@ -246,33 -252,21 +249,33 @@@ FILE
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.
-- ``$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 ""
+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.
- Hooks
+ 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
========