diff options
| author | Glenn Morris <rgm@gnu.org> | 2016-11-15 18:21:06 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2016-11-15 18:21:06 -0500 |
| commit | 35007ad9daca9cac39fe758b5815aa6389379d38 (patch) | |
| tree | e7e3aac1b3c67bd7c339dee9c42bc0758e9fb906 /doc/man | |
| parent | 8b48e937af801e11e2d1844d60b6e585ce09dcea (diff) | |
| download | emacs-35007ad9daca9cac39fe758b5815aa6389379d38.tar.gz | |
* src/emacs.c (usage_message): Mention named daemon. (Bug#24949)
* doc/man/emacs.1.in: Likewise.
Diffstat (limited to 'doc/man')
| -rw-r--r-- | doc/man/emacs.1.in | 10 |
1 files changed, 6 insertions, 4 deletions
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 |