# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1263425716 0
# Node ID 2afe12cb88f428e0d32655bd3b4922ddef37572e
# Parent  91a0123d19931b8bd7756fc7aee5989176b51016# Parent  203a882ff4c0648a36442619b909c670a8ed3118
Merge from mainline.

diff -r 91a0123d1993 -r 2afe12cb88f4 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jan 13 22:04:10 2010 +0000
+++ b/lisp/ChangeLog	Wed Jan 13 23:35:16 2010 +0000
@@ -1,3 +1,7 @@
+2010-01-13  Karl Fogel  <kfogel@red-bean.com>
+
+	* bookmark.el (bookmark-bmenu-execute-deletions): Doc fix (Bug#5276).
+
 2010-01-12  Michael Albinus  <michael.albinus@gmx.de>
 
 	* files.el (copy-directory): Compute target for recursive
diff -r 91a0123d1993 -r 2afe12cb88f4 lisp/bookmark.el
--- a/lisp/bookmark.el	Wed Jan 13 22:04:10 2010 +0000
+++ b/lisp/bookmark.el	Wed Jan 13 23:35:16 2010 +0000
@@ -1960,7 +1960,7 @@
 
 
 (defun bookmark-bmenu-execute-deletions ()
-  "Delete bookmarks marked with \\<Buffer-menu-mode-map>\\[Buffer-menu-delete] commands."
+  "Delete bookmarks flagged `D'."
   (interactive)
   (message "Deleting bookmarks...")
   (let ((o-point  (point))