# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1223662893 0
# Node ID 11d68e001d21e02007e9cd4fce6dd0dbc02bb603
# Parent  2f7ac1ab3e9ed8b9cc7131ae48d28f50830330fb
(Exiting): Document change of C-x C-c to save-buffers-kill-terminal.
Document kill-emacs.

diff -r 2f7ac1ab3e9e -r 11d68e001d21 doc/emacs/entering.texi
--- a/doc/emacs/entering.texi	Fri Oct 10 18:20:34 2008 +0000
+++ b/doc/emacs/entering.texi	Fri Oct 10 18:21:33 2008 +0000
@@ -72,16 +72,16 @@
 
 @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 @@
 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 @@
 @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