[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 35007ad: * src/emacs.c (usage_message): Mention nam
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 35007ad: * src/emacs.c (usage_message): Mention named daemon. (Bug#24949) |
Date: |
Tue, 15 Nov 2016 23:21:10 +0000 (UTC) |
branch: master
commit 35007ad9daca9cac39fe758b5815aa6389379d38
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* 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 3b1566f..73bc38d 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 75328c5..aeba963 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\
",
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 35007ad: * src/emacs.c (usage_message): Mention named daemon. (Bug#24949),
Glenn Morris <=