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

2 files changed, 4 insertions, 3 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 60066b7c9fa..14cada4d4f5 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -78,10 +78,11 @@ affected by this, as SGI stopped supporting IRIX in December 2013.
 
 * Startup Changes in Emacs 26.1
 
-** New option '--new-daemon'.  This is the same as '--daemon', except
++++
+** New option '--fg-daemon'.  This is the same as '--daemon', except
 it runs in the foreground and does not fork.  This is intended for
 modern init systems such as systemd, which manage many of the traditional
-aspects of daemon behavior themselves.  '--old-daemon' is now an alias
+aspects of daemon behavior themselves.  '--bg-daemon' is now an alias
 for '--daemon'.
 
 +++
diff --git a/etc/emacs.service b/etc/emacs.service
index d9f7fc569d2..b29177b120c 100644
--- a/etc/emacs.service
+++ b/etc/emacs.service
@@ -8,7 +8,7 @@ Documentation=info:emacs man:emacs(1) https://gnu.org/software/emacs/
 
 [Service]
 Type=simple
-ExecStart=emacs --new-daemon
+ExecStart=emacs --fg-daemon
 ExecStop=emacsclient --eval "(kill-emacs)"
 Environment=SSH_AUTH_SOCK=%t/keyring/ssh
 Restart=on-failure