From: Glenn Morris <rgm@gnu.org>
Date: Tue, 15 Nov 2016 23:21:06 +0000 (-0500)
Subject: * src/emacs.c (usage_message): Mention named daemon.  (Bug#24949)
X-Git-Tag: emacs-26.0.90~1322
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=35007ad9daca9cac39fe758b5815aa6389379d38;p=emacs.git

* src/emacs.c (usage_message): Mention named daemon.  (Bug#24949)
* doc/man/emacs.1.in: Likewise.
---

diff --git a/doc/man/emacs.1.in b/doc/man/emacs.1.in
index 3b1566f6caa..73bc38d7984 100644
--- a/doc/man/emacs.1.in
+++ b/doc/man/emacs.1.in
@@ -123,11 +123,13 @@ Use specified
 as the terminal instead of using stdin/stdout.
 This must be the first argument specified in the command line.
 .TP
-.B \-\-daemon
+.BI \-\-daemon "\fR[=\fPname\fR]"
 Start Emacs as a daemon, enabling the Emacs server and disconnecting
-from the terminal.  You can then use the emacsclient command to
-connect to the server (see
-.BR emacsclient (1)).
+from the terminal.  You can then use the emacsclient (see
+.BR emacsclient (1))
+command to
+connect to the server (with optional
+.IR name ")."
 .TP
 .B \-\-version
 Display
diff --git a/src/emacs.c b/src/emacs.c
index 75328c5e3e0..aeba9631696 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -223,7 +223,7 @@ Initialization options:\n\
     "\
 --batch                     do not do interactive display; implies -q\n\
 --chdir DIR                 change to directory DIR\n\
---daemon                    start a server in the background\n\
+--daemon[=NAME]             start a (named) server in the background\n\
 --debug-init                enable Emacs Lisp debugger for init file\n\
 --display, -d DISPLAY       use X server DISPLAY\n\
 ",