aboutsummaryrefslogtreecommitdiffstats
path: root/doc/man
diff options
context:
space:
mode:
authorNoam Postavsky2018-05-10 22:47:04 -0400
committerNoam Postavsky2018-05-10 22:47:04 -0400
commitbe2e8cb8be28affa830c21e2425573c3a1855a85 (patch)
tree322c2782a2b6349a46a0860e73eba5c446d0ab60 /doc/man
parent1d9e66aea17787e03954f32c6cd7561c881bb444 (diff)
downloademacs-be2e8cb8be28affa830c21e2425573c3a1855a85.tar.gz
emacs-be2e8cb8be28affa830c21e2425573c3a1855a85.zip
* doc/man/emacs.1.in: Document --fg-daemon and --bg-daemon.
Diffstat (limited to 'doc/man')
-rw-r--r--doc/man/emacs.1.in5
1 files changed, 4 insertions, 1 deletions
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
123as the terminal instead of using stdin/stdout. 123as the terminal instead of using stdin/stdout.
124This must be the first argument specified in the command line. 124This must be the first argument specified in the command line.
125.TP 125.TP
126.BI \-\-daemon "\fR[=\fPname\fR]" 126.BI \-\-daemon "\fR[=\fPname\fR], " \-\-bg\-daemon "\fR[=\fPname\fR]"
127Start Emacs as a daemon, enabling the Emacs server and disconnecting 127Start Emacs as a daemon, enabling the Emacs server and disconnecting
128from the terminal. You can then use the emacsclient (see 128from the terminal. You can then use the emacsclient (see
129.BR emacsclient (1)) 129.BR emacsclient (1))
@@ -131,6 +131,9 @@ command to
131connect to the server (with optional 131connect to the server (with optional
132.IR name ")." 132.IR name ")."
133.TP 133.TP
134.BI \-\-fg\-daemon "\fR[=\fPname\fR]"
135Like "\-\-bg\-daemon", but don't disconnect from the terminal.
136.TP
134.B \-\-version 137.B \-\-version
135Display 138Display
136.I Emacs 139.I Emacs