Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1125

diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 8dc1fc1de6d59702b7d126165d2cf68568a01729..fb908fafc3da3e4a4f2114c8b9f3322b502469a8 100644 (file)
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -16694,7 +16694,7 @@
        (message-distribution-function, message-auto-save-directory): Fix
        :type.
 
-       * gnus/mml.el (mml-parse-1): Frob mml-confirmation-set when
+       * mml.el (mml-parse-1): Frob mml-confirmation-set when
        proceeding after warnings.  Amend multipart warning message.
 
 2001-01-04  Dave Love  <fx@gnu.org>