(Exiting): Document change of C-x C-c to save-buffers-kill-terminal.

Document kill-emacs.

1 files changed, 11 insertions, 3 deletions

diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi
index bb8fa1f3029..8cf04bc9fbc 100644
--- a/doc/emacs/entering.texi
+++ b/doc/emacs/entering.texi
@@ -72,16 +72,16 @@ features exist mainly for advanced users.  @xref{Emacs Invocation}.
 
 @table @kbd
 @item C-x C-c
-Kill Emacs (@code{save-buffers-kill-emacs}).
+Kill Emacs (@code{save-buffers-kill-terminal}).
 @item C-z
 Suspend Emacs (@code{suspend-emacs}) or iconify a frame
 (@code{iconify-or-deiconify-frame}).
 @end table
 
 @kindex C-x C-c
-@findex save-buffers-kill-emacs
+@findex save-buffers-kill-terminal
   @dfn{Killing} Emacs means terminating the Emacs program.  To do
-this, type @kbd{C-x C-c} (@code{save-buffers-kill-emacs}).  A
+this, type @kbd{C-x C-c} (@code{save-buffers-kill-terminal}).  A
 two-character key is used to make it harder to type by accident.  If
 there are any modified file-visiting buffers when you type @kbd{C-x
 C-c}, Emacs first offers to save these buffers.  If you do not save
@@ -90,6 +90,10 @@ will be lost.  Emacs also asks for confirmation if any 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
+connection.  @xref{Emacs Server}.
+
   Emacs can, optionally, record certain session information when you
 kill it, such as the files you were visiting at the time.  This
 information is then available the next time you start Emacs.
@@ -104,6 +108,10 @@ 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}.
 
+@findex kill-emacs
+  To kill Emacs without being prompted about saving, type @kbd{M-x
+kill-emacs}.
+
 @cindex minimizing a frame
 @cindex iconifying
 @cindex suspending