summaryrefslogtreecommitdiff
path: root/doc/lispref/os.texi
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2017-05-29 22:13:53 -0400
committerNoam Postavsky <npostavs@gmail.com>2017-05-29 22:18:55 -0400
commit75b849294656fd92e77a2a6281ff4dceaaa38475 (patch)
tree3df43d0cc640c8f5522461be9d346530d26e3bcd /doc/lispref/os.texi
parent941a2e7347e3a0d393e67872e6151be8cc66d9a2 (diff)
downloademacs-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/lispref/os.texi')
-rw-r--r--doc/lispref/os.texi6
1 files changed, 3 insertions, 3 deletions
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