diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/cmdargs.texi | 8 | ||||
| -rw-r--r-- | doc/lispref/os.texi | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index 6f76ef39d9b..0b1a400b364 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi | |||
| @@ -336,16 +336,16 @@ setting @code{inhibit-x-resources} to @code{t} (@pxref{Resources}). | |||
| 336 | @opindex -daemon | 336 | @opindex -daemon |
| 337 | @itemx --daemon[=@var{name}] | 337 | @itemx --daemon[=@var{name}] |
| 338 | @opindex --daemon | 338 | @opindex --daemon |
| 339 | @itemx --old-daemon[=@var{name}] | 339 | @itemx --bg-daemon[=@var{name}] |
| 340 | @itemx --new-daemon[=@var{name}] | 340 | @itemx --fg-daemon[=@var{name}] |
| 341 | Start Emacs as a daemon---after Emacs starts up, it starts the Emacs | 341 | Start Emacs as a daemon---after Emacs starts up, it starts the Emacs |
| 342 | server without opening any frames. | 342 | server without opening any frames. |
| 343 | (Optionally, you can specify an explicit @var{name} for the server.) | 343 | (Optionally, you can specify an explicit @var{name} for the server.) |
| 344 | You can then use the @command{emacsclient} command to connect to Emacs | 344 | You can then use the @command{emacsclient} command to connect to Emacs |
| 345 | for editing. @xref{Emacs Server}, for information about using Emacs | 345 | for editing. @xref{Emacs Server}, for information about using Emacs |
| 346 | as a daemon. An ``old-style'' daemon disconnects from the terminal | 346 | as a daemon. A ``background'' daemon disconnects from the terminal |
| 347 | and runs in the background (@samp{--daemon} is an alias for | 347 | and runs in the background (@samp{--daemon} is an alias for |
| 348 | @samp{--old-daemon}). | 348 | @samp{--bg-daemon}). |
| 349 | 349 | ||
| 350 | @item --no-desktop | 350 | @item --no-desktop |
| 351 | @opindex --no-desktop | 351 | @opindex --no-desktop |
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 438f48c3471..e6ec60f9236 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi | |||
| @@ -337,10 +337,10 @@ Do not display a splash screen. | |||
| 337 | Run without an interactive terminal. @xref{Batch Mode}. | 337 | Run without an interactive terminal. @xref{Batch Mode}. |
| 338 | 338 | ||
| 339 | @item --daemon | 339 | @item --daemon |
| 340 | @itemx --old-daemon | 340 | @itemx --bg-daemon |
| 341 | @itemx --new-daemon | 341 | @itemx --fg-daemon |
| 342 | Do not initialize any display; just start a server. | 342 | Do not initialize any display; just start a server. |
| 343 | (An ``old-style'' daemon automatically runs in the background.) | 343 | (A ``background'' daemon automatically runs in the background.) |
| 344 | 344 | ||
| 345 | @item --no-init-file | 345 | @item --no-init-file |
| 346 | @itemx -q | 346 | @itemx -q |