Commit 35007ad9 authored by Glenn Morris's avatar Glenn Morris
Browse files

* src/emacs.c (usage_message): Mention named daemon. (Bug#24949)

* doc/man/emacs.1.in: Likewise.
parent 8b48e937
......@@ -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
......
......@@ -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\
",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment