summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2016-11-15 18:21:06 -0500
committerGlenn Morris <rgm@gnu.org>2016-11-15 18:21:06 -0500
commit35007ad9daca9cac39fe758b5815aa6389379d38 (patch)
treee7e3aac1b3c67bd7c339dee9c42bc0758e9fb906 /src/emacs.c
parent8b48e937af801e11e2d1844d60b6e585ce09dcea (diff)
downloademacs-35007ad9daca9cac39fe758b5815aa6389379d38.tar.gz
* src/emacs.c (usage_message): Mention named daemon. (Bug#24949)
* doc/man/emacs.1.in: Likewise.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c2
1 files changed, 1 insertions, 1 deletions
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\
",