From: Noam Postavsky <npostavs@gmail.com>
Date: Fri, 11 May 2018 02:47:04 +0000 (-0400)
Subject: * doc/man/emacs.1.in: Document --fg-daemon and --bg-daemon.
X-Git-Tag: emacs-26.1~39
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be2e8cb;p=emacs.git

* doc/man/emacs.1.in: Document --fg-daemon and --bg-daemon.
---

diff --git a/doc/man/emacs.1.in b/doc/man/emacs.1.in
index 51169530419..e332fb45c7b 100644
--- a/doc/man/emacs.1.in
+++ b/doc/man/emacs.1.in
@@ -123,7 +123,7 @@ Use specified
 as the terminal instead of using stdin/stdout.
 This must be the first argument specified in the command line.
 .TP
-.BI \-\-daemon "\fR[=\fPname\fR]"
+.BI \-\-daemon "\fR[=\fPname\fR], " \-\-bg\-daemon "\fR[=\fPname\fR]"
 Start Emacs as a daemon, enabling the Emacs server and disconnecting
 from the terminal.  You can then use the emacsclient (see
 .BR emacsclient (1))
@@ -131,6 +131,9 @@ command to
 connect to the server (with optional
 .IR name ")."
 .TP
+.BI \-\-fg\-daemon "\fR[=\fPname\fR]"
+Like "\-\-bg\-daemon", but don't disconnect from the terminal.
+.TP
 .B \-\-version
 Display
 .I Emacs