From be2e8cb8be28affa830c21e2425573c3a1855a85 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Thu, 10 May 2018 22:47:04 -0400 Subject: [PATCH] * doc/man/emacs.1.in: Document --fg-daemon and --bg-daemon. --- doc/man/emacs.1.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- 2.39.5