; Merge from origin/emacs-25

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

diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi
index fc9ea38fdcd89edc319ccee9cd1a5014bb4d9289..66817e3067f3b581aef709ceeac8f14bcefde7e1 100644 (file)
--- a/doc/emacs/entering.texi
+++ b/doc/emacs/entering.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 2001-2015 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
@@ -100,7 +100,7 @@ display them initially.
 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
@@ -116,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
@@ -133,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}.