* 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 3b1566f6caabaa608f7aed96860b85ae3c8e2c0c..73bc38d7984129d8cb85cbdfdf15f63f4185217d 100644 (file)
--- 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 75328c5e3e01a398d8fc7813f6e00f867a5f9d5c..aeba9631696a360bdc9b98e960dd4eba0433b384 100644 (file)
--- 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\
 ",