@c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 2001-2013 Free Software
+@c Copyright (C) 1985-1987, 1993-1995, 2001-2016 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@iftex
information about @file{site-start.el}.}
You can also force Emacs to display a file or directory at startup
-by setting the variable @code{initial-buffer-choice} to a a string
+by setting the variable @code{initial-buffer-choice} to a string
naming that file or directory. The value of
-@code{initial-buffer-choice} may also be a function which should
-return a buffer which is then displayed. @code{initial-buffer-choice}
-may also be @code{t} in which case the @file{*scratch*} buffer will be
-shown. In any case, even if you specify one or more files on the
-command line, Emacs opens but does not display them if
-@code{initial-buffer-choice} is non-nil.
+@code{initial-buffer-choice} may also be a function (of no arguments)
+that should return a buffer which is then displayed.
+@ignore
+@c I do not think this should be mentioned. AFAICS it is just a dodge
+@c around inhibit-startup-screen not being settable on a site-wide basis.
+@code{initial-buffer-choice} may also be @code{t} in which case the
+@file{*scratch*} buffer will be shown.
+@end ignore
+If @code{initial-buffer-choice} is non-@code{nil}, then if you specify
+any files on the command line, Emacs still visits them, but does not
+display them initially.
@node Exiting
@section Exiting Emacs
Kill Emacs (@code{save-buffers-kill-terminal}).
@item C-z
On a text terminal, suspend Emacs; on a graphical display,
-``minimize'' the selected frame (@code{suspend-emacs}).
+iconify (or ``minimize'') the selected frame (@code{suspend-emacs}).
@end table
@kindex C-x C-c
subprocesses (@pxref{Shell}).
@kbd{C-x C-c} behaves specially if you are using Emacs as a server.
-If you type it from a ``client frame'', it closes the client
+If you type it from a client frame, it closes the client
connection. @xref{Emacs Server}.
Emacs can, optionally, record certain session information when you