; Merge from origin/emacs-25

[gnu-emacs] / doc / emacs / entering.texi

diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi
index de143516ce8dd70028741fea5a4cd5d69fc92d95..66817e3067f3b581aef709ceeac8f14bcefde7e1 100644 (file)
--- a/doc/emacs/entering.texi
+++ b/doc/emacs/entering.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 2001-2012
-@c   Free Software Foundation, Inc.
+@c Copyright (C) 1985-1987, 1993-1995, 2001-2016 Free Software
+@c Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @iftex
 @chapter Entering and Exiting Emacs
@@ -74,16 +74,19 @@ up before reading @file{site-start.el}.  @xref{Init File}, for
 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
-non-@code{nil} value.  (In that case, even if you specify one or more
-files on the command line, Emacs opens but does not display them.)
-The value of @code{initial-buffer-choice} should be the name of
-the desired file or directory.
+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 (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.
-or @code{t}, which means to display the @file{*scratch*} buffer.
+@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
@@ -97,7 +100,7 @@ or @code{t}, which means to display the @file{*scratch*} buffer.
 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
@@ -113,7 +116,7 @@ subprocesses are still running, since killing Emacs will also kill the
 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
@@ -130,6 +133,9 @@ run.  One convenient function to use as the value of
 @code{confirm-kill-emacs} is the function @code{yes-or-no-p}.  The
 default value of @code{confirm-kill-emacs} is @code{nil}.
 
+  To further customize what happens when Emacs is exiting, see
+@ref{Killing Emacs,,, elisp, The GNU Emacs Lisp Reference Manual}.
+
 @findex kill-emacs
   To kill Emacs without being prompted about saving, type @kbd{M-x
 kill-emacs}.