diff options
| author | Glenn Morris | 2016-11-15 18:53:25 -0500 |
|---|---|---|
| committer | Glenn Morris | 2016-11-15 18:53:25 -0500 |
| commit | f758fcdb126689f4e640f0a4264b348d5995ce2d (patch) | |
| tree | ebeb277d92596e465d03d5a50f34c9824be2d1c9 | |
| parent | 5b0cddd91535025bbf0c69d17e2d4e470dd350c5 (diff) | |
| download | emacs-f758fcdb126689f4e640f0a4264b348d5995ce2d.tar.gz emacs-f758fcdb126689f4e640f0a4264b348d5995ce2d.zip | |
* doc/emacs/cmdargs.texi (Initial Options): Copyedit for --daemon.
| -rw-r--r-- | doc/emacs/cmdargs.texi | 7 |
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}). | |||
| 327 | 327 | ||
| 328 | @item -daemon | 328 | @item -daemon |
| 329 | @opindex -daemon | 329 | @opindex -daemon |
| 330 | @itemx --daemon | 330 | @itemx --daemon[=@var{name}] |
| 331 | @opindex --daemon | 331 | @opindex --daemon |
| 332 | Start Emacs as a daemon---after Emacs starts up, it starts the Emacs | 332 | Start Emacs as a daemon---after Emacs starts up, it starts the Emacs |
| 333 | server and disconnects from the terminal without opening any frames. | 333 | server and disconnects from the terminal without opening any frames. |
| 334 | (Optionally, you can specify an explicit @var{name} for the server.) | ||
| 334 | You can then use the @command{emacsclient} command to connect to Emacs | 335 | You can then use the @command{emacsclient} command to connect to Emacs |
| 335 | for editing. @xref{Emacs Server}, for information about using Emacs | 336 | for editing. @xref{Emacs Server}, for information about using Emacs |
| 336 | as a daemon. | 337 | as a daemon. |
| 337 | 338 | ||
| 338 | @item -daemon=@var{SERVER-NAME} | ||
| 339 | Start emacs in background as a daemon, and use @var{SERVER-NAME} as | ||
| 340 | the server name. | ||
| 341 | |||
| 342 | @item --no-desktop | 339 | @item --no-desktop |
| 343 | @opindex --no-desktop | 340 | @opindex --no-desktop |
| 344 | Do not reload any saved desktop. @xref{Saving Emacs Sessions}. | 341 | Do not reload any saved desktop. @xref{Saving Emacs Sessions}. |