summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2016-11-15 18:53:25 -0500
committerGlenn Morris <rgm@gnu.org>2016-11-15 18:53:25 -0500
commitf758fcdb126689f4e640f0a4264b348d5995ce2d (patch)
treeebeb277d92596e465d03d5a50f34c9824be2d1c9
parent5b0cddd91535025bbf0c69d17e2d4e470dd350c5 (diff)
downloademacs-f758fcdb126689f4e640f0a4264b348d5995ce2d.tar.gz
* doc/emacs/cmdargs.texi (Initial Options): Copyedit for --daemon.
-rw-r--r--doc/emacs/cmdargs.texi7
1 files changed, 2 insertions, 5 deletions
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 881bf11a9f0..8db2ea12c89 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -327,18 +327,15 @@ setting @code{inhibit-x-resources} to @code{t} (@pxref{Resources}).
@item -daemon
@opindex -daemon
-@itemx --daemon
+@itemx --daemon[=@var{name}]
@opindex --daemon
Start Emacs as a daemon---after Emacs starts up, it starts the Emacs
server and disconnects from the terminal without opening any frames.
+(Optionally, you can specify an explicit @var{name} for the server.)
You can then use the @command{emacsclient} command to connect to Emacs
for editing. @xref{Emacs Server}, for information about using Emacs
as a daemon.
-@item -daemon=@var{SERVER-NAME}
-Start emacs in background as a daemon, and use @var{SERVER-NAME} as
-the server name.
-
@item --no-desktop
@opindex --no-desktop
Do not reload any saved desktop. @xref{Saving Emacs Sessions}.