[Emacs-diffs] Changes to emacs/doc/emacs/entering.texi,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/10/10 18:21:34

Index: entering.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/entering.texi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- entering.texi       15 Jul 2008 20:57:39 -0000      1.5
+++ entering.texi       10 Oct 2008 18:21:33 -0000      1.6
@@ -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
address@hidden save-buffers-kill-emacs
address@hidden 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}.
 
address@hidden kill-emacs
+  To kill Emacs without being prompted about saving, type @kbd{M-x
+kill-emacs}.
+
 @cindex minimizing a frame
 @cindex iconifying
 @cindex suspending