X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=doc%2Fman1%2Fnotmuch-emacs-mua.rst;h=7c5729047173815a08bb2ce0c10754120a528db3;hb=018e69f558c4ad36cefce42a11c2cdfe7270cb04;hp=7c2f5c24f1c08c7e9af6ea16bea50c7a1e96171d;hpb=ac609e5a3b8d2f528cc65fd4661e25e5140a7baf;p=notmuch

diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst
index 7c2f5c24..7c572904 100644
--- a/doc/man1/notmuch-emacs-mua.rst
+++ b/doc/man1/notmuch-emacs-mua.rst
@@ -37,8 +37,20 @@ Supported options for **notmuch-emacs-mua** include
         Even if a window system is available, use the current terminal.
 
     ``--client``
-        Use **emacsclient**, rather than **emacs**. This will start
-        an Emacs daemon process if necessary.
+        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.