Merge from origin/emacs-24

[gnu-emacs] / doc / man / emacsclient.1

diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1
index cae4d76634badbef76e575031999b5b916704c4f..6930271e548528438dd0472388da3193b4505338 100644 (file)
--- a/doc/man/emacsclient.1
+++ b/doc/man/emacsclient.1
@@ -52,12 +52,15 @@ options starting with two dashes (`-').
 .B \-a, \-\-alternate-editor=EDITOR
 if the Emacs server is not running, run the specified editor instead.
 This can also be specified via the `ALTERNATE_EDITOR' environment variable.
-If the value of EDITOR is the empty string, then Emacs is started in
-daemon mode and emacsclient will try to connect to it.
+If the value of EDITOR is the empty string, run `emacs \-\-daemon' to
+start Emacs in daemon mode, and try to connect to it.
 .TP
 .B -c, \-\-create-frame
 create a new frame instead of trying to use the current Emacs frame
 .TP
+.B \-F, \-\-frame-parameters=ALIST
+set the parameters of a newly-created frame.
+.TP
 .B \-d, \-\-display=DISPLAY
 tell the server to display the files on the given display.
 .TP
@@ -84,6 +87,9 @@ print version information and exit
 .TP
 .B \-H, \-\-help
 print this usage information message and exit
+.SH "EXIT STATUS"
+Normally, the exit status is 0.  If emacsclient shuts down due to
+Emacs signaling an error, the exit status is 1.
 .SH "SEE ALSO"
 The program is documented fully in
 .IR "Using Emacs as a Server"