merge trunk

2 files changed, 6 insertions, 1 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 68d6d3c8f00..3e723cd8c83 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Expunging mailboxes): Update name of the expunging
+        command.
+
 2010-09-20  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * emacs-mime.texi (rfc2047): Update description for
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 841cf8c510c..52c8bb642f0 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -18384,7 +18384,7 @@ INBOX.mailbox).
 @cindex expunge
 @cindex manual expunging
 @kindex G x (Group)
-@findex gnus-group-nnimap-expunge
+@findex gnus-group-expunge-group
 
 If you're using the @code{never} setting of @code{nnimap-expunge-on-close},
 you may want the option of expunging all deleted articles in a mailbox