diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-05-04 12:22:49 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-05-04 12:22:49 +0300 |
| commit | 04340a8e2f32c12e00000373e0067c570fd2a7cb (patch) | |
| tree | 56adbf8a9ac0f1b1b8208e73fb285569bcbb7352 | |
| parent | 3e29de2ce03d19af84d6dea361e13f0a398e79f1 (diff) | |
| download | emacs-04340a8e2f32c12e00000373e0067c570fd2a7cb.tar.gz | |
Improve documentation of the daemon and emacsclient
* doc/emacs/misc.texi (emacsclient Options):
* doc/emacs/cmdargs.texi (Initial Options): Document that
using --daemon=NAME will need to specify the same NAME when
invoking 'emacscilent'. (Bug#35547)
| -rw-r--r-- | doc/emacs/cmdargs.texi | 16 | ||||
| -rw-r--r-- | doc/emacs/misc.texi | 3 |
2 files changed, 12 insertions, 7 deletions
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index c870e6dad9d..a905b8f688f 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -347,13 +347,15 @@ Start Emacs with minimum customizations. This is similar to using @itemx --bg-daemon[=@var{name}] @itemx --fg-daemon[=@var{name}] Start Emacs as a daemon: after Emacs starts up, it starts the Emacs -server without opening any frames. -(Optionally, you can specify an explicit @var{name} for the server.) -You can then use the @command{emacsclient} command to connect to Emacs -for editing. @xref{Emacs Server}, for information about using Emacs -as a daemon. A ``background'' daemon disconnects from the terminal -and runs in the background (@samp{--daemon} is an alias for -@samp{--bg-daemon}). +server without opening any frames. You can then use the +@command{emacsclient} command to connect to Emacs for editing. +(Optionally, you can specify an explicit @var{name} for the server; if +you do, you will need to specify the same @var{name} when you invoke +@command{emacsclient}, via its @option{--socket-name} option, see +@ref{emacsclient Options}.) @xref{Emacs Server}, for information +about using Emacs as a daemon. A ``background'' daemon disconnects +from the terminal and runs in the background (@samp{--daemon} is an +alias for @samp{--bg-daemon}). @item --no-desktop @opindex --no-desktop diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 2d1617ef964..fc6b4cf1e7c 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -1925,6 +1925,9 @@ omitted, @command{emacsclient} connects to the first server it finds. If you set @code{server-name} of the Emacs server to an absolute file name, give the same absolute file name as @var{server-name} to this option to instruct @command{emacsclient} to connect to that server. +You need to use this option if you started Emacs as daemon +(@pxref{Initial Options}) and specified the name for the server +started by the daemon. @item -t @itemx --tty |