emacs: drop setting mail-user-agent, and document how to set it

[notmuch] / doc / notmuch-emacs.rst

diff --git a/doc/notmuch-emacs.rst b/doc/notmuch-emacs.rst
index 0df46df9e700fd1bd5bc046697b1247d8bfa9646..7772871b3eba99b696b51e5979a33c85c08bec85 100644 (file)
--- a/doc/notmuch-emacs.rst
+++ b/doc/notmuch-emacs.rst
@@ -62,8 +62,7 @@ notmuch-hello key bindings
 ``<return>``
     Activate the current widget.
 
-``g``
-``=``
+``g`` ``=``
     Refresh the buffer; mainly update the counts of messages for various
     saved searches.
 
@@ -101,7 +100,7 @@ unread mail, but there are several options for customization:
     The list of saved searches, including names, queries, and
     additional per-query options.
 
-:index:`notmuch-saved-searches-sort-function`
+:index:`notmuch-saved-search-sort-function`
     This variable controls how saved searches should be sorted. A value
     of ``nil`` displays the saved searches in the order they are stored
     in ‘notmuch-saved-searches’.
@@ -160,8 +159,7 @@ menu of results that the user can explore further by pressing
 ``<return>``
     Open thread on current line in :ref:`notmuch-show` mode
 
-``g``
-``=``
+``g`` ``=``
     Refresh the buffer
 
 ``?``
@@ -301,8 +299,7 @@ tags.
 ``p``
     Move to previous matching message
 
-``g``
-``=``
+``g`` ``=``
     Refresh the buffer
 
 ``?``
@@ -369,6 +366,16 @@ Importing Mail
 :index:`notmuch-poll-script`
    |docstring::notmuch-poll-script|
 
+Sending Mail
+------------
+
+:index:`mail-user-agent`
+
+       Emacs consults the variable :ref:`mail-user-agent` to choose a mail
+       sending package for commands like :ref:`report-emacs-bug` and
+       :ref:`compose-mail`.  To use ``notmuch`` for this, customize this
+       variable to the symbol :ref:`notmuch-user-agent`.
+
 Init File
 ---------
 
@@ -380,13 +387,3 @@ suffix exist it will be read instead (just one of these, chosen in this
 order). Most often users create ``~/.emacs.d/notmuch-config.el`` and just
 work with it. If Emacs was invoked with the ``-q`` or ``--no-init-file``
 options, ``notmuch-init-file`` is not read.
-
-.. include:: ../emacs/rstdoc.rsti
-
-.. include:: ../emacs/notmuch.rsti
-
-.. include:: ../emacs/notmuch-lib.rsti
-
-.. include:: ../emacs/notmuch-show.rsti
-
-.. include:: ../emacs/notmuch-tag.rsti