diff options
| author | Noam Postavsky | 2018-05-10 22:47:04 -0400 |
|---|---|---|
| committer | Noam Postavsky | 2018-05-10 22:47:04 -0400 |
| commit | be2e8cb8be28affa830c21e2425573c3a1855a85 (patch) | |
| tree | 322c2782a2b6349a46a0860e73eba5c446d0ab60 | |
| parent | 1d9e66aea17787e03954f32c6cd7561c881bb444 (diff) | |
| download | emacs-be2e8cb8be28affa830c21e2425573c3a1855a85.tar.gz emacs-be2e8cb8be28affa830c21e2425573c3a1855a85.zip | |
* doc/man/emacs.1.in: Document --fg-daemon and --bg-daemon.
| -rw-r--r-- | doc/man/emacs.1.in | 5 |
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 | |||
| 123 | as the terminal instead of using stdin/stdout. | 123 | as the terminal instead of using stdin/stdout. |
| 124 | This must be the first argument specified in the command line. | 124 | This 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]" |
| 127 | Start Emacs as a daemon, enabling the Emacs server and disconnecting | 127 | Start Emacs as a daemon, enabling the Emacs server and disconnecting |
| 128 | from the terminal. You can then use the emacsclient (see | 128 | from the terminal. You can then use the emacsclient (see |
| 129 | .BR emacsclient (1)) | 129 | .BR emacsclient (1)) |
| @@ -131,6 +131,9 @@ command to | |||
| 131 | connect to the server (with optional | 131 | connect to the server (with optional |
| 132 | .IR name ")." | 132 | .IR name ")." |
| 133 | .TP | 133 | .TP |
| 134 | .BI \-\-fg\-daemon "\fR[=\fPname\fR]" | ||
| 135 | Like "\-\-bg\-daemon", but don't disconnect from the terminal. | ||
| 136 | .TP | ||
| 134 | .B \-\-version | 137 | .B \-\-version |
| 135 | Display | 138 | Display |
| 136 | .I Emacs | 139 | .I Emacs |