Merge branch 'release'

diff --cc doc/man1/notmuch-config.rst
index 56f4a1600153517edce62d9094ff37ef1ffb13c1,209226a3d9954580f44300ce8f8fdfa80c7eba56..138501a8fdbff5175d361ac2f82bdea06894c149
--- 1/doc/man1/notmuch-config.rst
--- 2/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
  ========