- 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.