From 35007ad9daca9cac39fe758b5815aa6389379d38 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 15 Nov 2016 18:21:06 -0500 Subject: [PATCH] * src/emacs.c (usage_message): Mention named daemon. (Bug#24949) * doc/man/emacs.1.in: Likewise. --- doc/man/emacs.1.in | 10 ++++++---- src/emacs.c | 2 +- 2 files changed, 7 insertions(+), 5 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 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\ ", -- 2.39.5