X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=doc%2Fman1%2Fnotmuch-emacs-mua.rst;h=7c5729047173815a08bb2ce0c10754120a528db3;hb=f47fcbe0c59ea42f79a9ebbdabd381a03970dbd5;hp=32b7286391880dd4685c2219263a8b3d215b5e9b;hpb=5240c438f5f6212fbce811ea4fd55ae964c97d99;p=notmuch

diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst
index 32b72863..7c572904 100644
--- a/doc/man1/notmuch-emacs-mua.rst
+++ b/doc/man1/notmuch-emacs-mua.rst
@@ -18,10 +18,6 @@ Supported options for **notmuch-emacs-mua** include
     ``-h, --help``
         Display help.
 
-    ``--client``
-        Use emacsclient, rather than emacs. This will start
-        an emacs daemon process if necessary.
-
     ``-s, --subject=``\ <subject>
         Specify the subject of the message.
 
@@ -38,7 +34,23 @@ Supported options for **notmuch-emacs-mua** include
         Specify a file to include into the body of the message.
 
     ``--no-window-system``
-        Even if a window system is available, use the current terminal
+        Even if a window system is available, use the current terminal.
+
+    ``--client``
+        Use **emacsclient**, rather than **emacs**. For
+        **emacsclient** to work, you need an already running Emacs
+        with a server, or use ``--auto-daemon``.
+
+    ``--auto-daemon``
+        Automatically start Emacs in daemon mode, if the Emacs server
+        is not running. Applicable with ``--client``. Implies
+        ``--create-frame``.
+
+    ``--create-frame``
+        Create a new frame instead of trying to use the current Emacs
+        frame. Applicable with ``--client``. This will be required
+        when Emacs is running (or automatically started with
+        ``--auto-daemon``) in daemon mode.
 
     ``--print``
         Output the resulting elisp to stdout instead of evaluating it.
@@ -51,11 +63,11 @@ Options may be specified multiple times.
 ENVIRONMENT VARIABLES
 =====================
 
-``EMACS``
-Name of emacs command to invoke
+**EMACS**
+    Name of emacs command to invoke. Defaults to "emacs".
 
-``EMACSCLIENT``
-Name of emacsclient comment to invoke
+**EMACSCLIENT**
+    Name of emacsclient command to invoke. Defaults to "emacsclient".
 
 SEE ALSO
 ========