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)
This commit is contained in:
Eli Zaretskii 2019-05-04 12:22:49 +03:00
parent 3e29de2ce0
commit 04340a8e2f
2 changed files with 12 additions and 7 deletions

View file

@ -347,13 +347,15 @@ Start Emacs with minimum customizations. This is similar to using
@itemx --bg-daemon[=@var{name}] @itemx --bg-daemon[=@var{name}]
@itemx --fg-daemon[=@var{name}] @itemx --fg-daemon[=@var{name}]
Start Emacs as a daemon: after Emacs starts up, it starts the Emacs Start Emacs as a daemon: after Emacs starts up, it starts the Emacs
server without opening any frames. server without opening any frames. You can then use the
(Optionally, you can specify an explicit @var{name} for the server.) @command{emacsclient} command to connect to Emacs for editing.
You can then use the @command{emacsclient} command to connect to Emacs (Optionally, you can specify an explicit @var{name} for the server; if
for editing. @xref{Emacs Server}, for information about using Emacs you do, you will need to specify the same @var{name} when you invoke
as a daemon. A ``background'' daemon disconnects from the terminal @command{emacsclient}, via its @option{--socket-name} option, see
and runs in the background (@samp{--daemon} is an alias for @ref{emacsclient Options}.) @xref{Emacs Server}, for information
@samp{--bg-daemon}). 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 @item --no-desktop
@opindex --no-desktop @opindex --no-desktop

View file

@ -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 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 name, give the same absolute file name as @var{server-name} to this
option to instruct @command{emacsclient} to connect to that server. 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 @item -t
@itemx --tty @itemx --tty