[Emacs-diffs] emacs-26 04340a8: Improve documentation of the daemon and emacsclient

[Eli Zaretskii]

branch: emacs-26
commit 04340a8e2f32c12e00000373e0067c570fd2a7cb
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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)
---
 doc/emacs/cmdargs.texi | 16 +++++++++-------
 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 c870e6d..a905b8f 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 address@hidden
 @itemx address@hidden
 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
address@hidden).
+server without opening any frames.  You can then use the
address@hidden 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
address@hidden, via its @option{--socket-name} option, see
address@hidden 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 2d1617e..fc6b4cf 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