doc/notmuch: merge two sections on external commands.

When adding the description of the propagation of NOTMUCH_CONFIG, I
missed that there was already a section on external commands, with a
different title.

diff --git a/doc/man1/notmuch.rst b/doc/man1/notmuch.rst
index e0892e01667be75a8ae66ab3a89ad737ad9f12e8..1fec4ee556efc3a33ceb07a9b38fd5c077ff2806 100644 (file)
--- a/doc/man1/notmuch.rst
+++ b/doc/man1/notmuch.rst
@@ -130,14 +130,16 @@ and to restore from that dump.
 The :any:`notmuch-config(1)` command can be used to get or set
 settings in the notmuch configuration file.
 
 The :any:`notmuch-config(1)` command can be used to get or set
 settings in the notmuch configuration file.
 

-CUSTOM COMMANDS
----------------
+EXTERNAL COMMANDS
+-----------------

 
 If the given command is not known to notmuch, notmuch tries to execute
 the external **notmuch-<subcommand>** in :envvar:`PATH` instead. This
 allows users to have their own notmuch related tools to be run via the
 notmuch command. By design, this does not allow notmuch's own commands
 
 If the given command is not known to notmuch, notmuch tries to execute
 the external **notmuch-<subcommand>** in :envvar:`PATH` instead. This
 allows users to have their own notmuch related tools to be run via the
 notmuch command. By design, this does not allow notmuch's own commands

-to be overridden using external commands.
+to be overridden using external commands.  The environment variable
+:envvar:`NOTMUCH_CONFIG` will be set according to :option:`--config`,
+if the latter is present.

 
 OPTION SYNTAX
 -------------
 
 OPTION SYNTAX
 -------------


@@ -185,14 +187,6 @@ of notmuch.
    If set to a non-empty value, the notmuch library will print (to
    stderr) Xapian queries it constructs.
 
    If set to a non-empty value, the notmuch library will print (to
    stderr) Xapian queries it constructs.
 

-EXTERNAL COMMANDS
-=================
-
-When given a subcommand `foo` not recognized as built-in, notmuch will
-try to run the command (e.g. script) `notmuch-foo` in the user's
-path. The :envvar:`NOTMUCH_CONFIG` will be set according to
-:option:`--config`, if the latter is present.
-

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