Merge from emacs-24; up to 2014-06-26T06:55:15Z!rgm@gnu.org

2 files changed, 10 insertions, 4 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d78543183df..261f81f8b2f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-28  Stephen Berman  <stephen.berman@gmx.net>
+
+        * todo-mode.texi (Marked Items): Correct omission of item deletion
+        from commands applying to both todo and done items.
+
 2014-07-18  Albert Krewinkel  <albert+gnus@zeitkraut.de>
 
         * gnus.texi (Posting Styles): Document the possibility to perform
diff --git a/doc/misc/todo-mode.texi b/doc/misc/todo-mode.texi
index bb2aea21ac2..8b9903419ab 100644
--- a/doc/misc/todo-mode.texi
+++ b/doc/misc/todo-mode.texi
@@ -1323,10 +1323,11 @@ If you use @kbd{m}, @kbd{d}, @kbd{A d} or @kbd{u} on multiple
 noncontiguous marked items, the relocated items retain their relative
 order but are now listed consecutively en bloc.
 
-You can mark both todo and done items, but note that only @kbd{m} can apply
-to both; other commands only affect either marked todo or marked done
-items, so if both types of items are marked, invoking these commands
-has no effect and informs you of your erroneous attempt.
+You can mark both todo and done items, but note that only @kbd{m} and
+@kbd{k} can apply to both; other commands only affect either marked
+todo or marked done items, so if both types of items are marked,
+invoking these commands has no effect and informs you of your
+erroneous attempt.
 
 @node Todo Categories Mode, Searching for Items, Marked Items, Top
 @chapter Todo Categories Mode