diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2017-05-29 22:13:53 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2017-05-29 22:18:55 -0400 |
| commit | 75b849294656fd92e77a2a6281ff4dceaaa38475 (patch) | |
| tree | 3df43d0cc640c8f5522461be9d346530d26e3bcd /doc | |
| parent | 941a2e7347e3a0d393e67872e6151be8cc66d9a2 (diff) | |
| download | emacs-75b849294656fd92e77a2a6281ff4dceaaa38475.tar.gz | |
Rename '--new-daemon' to 'fg-daemon' and '--old-daemon' to '--bg-daemon'
* doc/emacs/cmdargs.texi (Initial Options):
* doc/lispref/os.texi (Startup Summary):
* etc/NEWS:
* etc/emacs.service:
* src/emacs.c (main):
* src/lisp.h: Rename '--new-daemon' to 'fg-daemon' and '--old-daemon' to
'--bg-daemon'.
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}). @opindex -daemon @itemx --daemon[=@var{name}] @opindex --daemon -@itemx --old-daemon[=@var{name}] -@itemx --new-daemon[=@var{name}] +@itemx --bg-daemon[=@var{name}] +@itemx --fg-daemon[=@var{name}] Start Emacs as a daemon---after Emacs starts up, it starts the Emacs server 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. An ``old-style'' daemon disconnects from the terminal +as a daemon. A ``background'' daemon disconnects from the terminal and runs in the background (@samp{--daemon} is an alias for -@samp{--old-daemon}). +@samp{--bg-daemon}). @item --no-desktop @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. Run without an interactive terminal. @xref{Batch Mode}. @item --daemon -@itemx --old-daemon -@itemx --new-daemon +@itemx --bg-daemon +@itemx --fg-daemon Do not initialize any display; just start a server. -(An ``old-style'' daemon automatically runs in the background.) +(A ``background'' daemon automatically runs in the background.) @item --no-init-file @itemx -q |