; Merge from origin/emacs-25

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

diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 09c766be50404f4393232e5f9e3a16188917d191..dd47532e7ed78b435f4c05f6bbd028bf4233e802 100644 (file)
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2016 Free Software
 @c Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Mark
@@ -286,10 +286,13 @@ instead signal an error if the mark is inactive.
 @findex delete-selection-mode
   By default, text insertion occurs normally even if the mark is
 active---for example, typing @kbd{a} inserts the character @samp{a},
-then deactivates the mark.  If you enable Delete Selection mode, a
-minor mode, then inserting text while the mark is active causes the
-text in the region to be deleted first.  To toggle Delete Selection
-mode on or off, type @kbd{M-x delete-selection-mode}.
+then deactivates the mark.  Delete Selection mode, a minor mode,
+modifies this behavior: if you enable that mode, then inserting text
+while the mark is active causes the text in the region to be deleted
+first.  Also, commands that normally delete just one character, such
+as @kbd{C-d} or @kbd{@key{DEL}}, will delete the entire region
+instead.  To toggle Delete Selection mode on or off, type @kbd{M-x
+delete-selection-mode}.
 
 @node Mark Ring
 @section The Mark Ring