From: Glenn Morris <rgm@gnu.org>
Date: Tue, 15 Nov 2016 23:53:25 +0000 (-0500)
Subject: * doc/emacs/cmdargs.texi (Initial Options): Copyedit for --daemon.
X-Git-Tag: emacs-25.1.90~36
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f758fcdb126689f4e640f0a4264b348d5995ce2d;p=emacs.git

* doc/emacs/cmdargs.texi (Initial Options): Copyedit for --daemon.
---

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}.