3 files changed, 10 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5be521b8ca4..c4ec297cb30 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2012-02-18  Glenn Morris  <rgm@gnu.org>
 
+        * mail/rmail.el (rmail-dont-reply-to-names): Mark as obsolete.
+
+        * mail/undigest.el (unforward-rmail-message): Doc fix.
+
         * saveplace.el (save-place-ignore-files-regexp): Add :version.
 
 2012-02-18  Eli Zaretskii  <eliz@gnu.org>
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 2ed54aa8d86..49e23a3b2f6 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -285,8 +285,10 @@ Setting this variable has an effect only before reading a mail."
   :version "21.1")
 
 ;;;###autoload
-(defvaralias 'rmail-dont-reply-to-names 'mail-dont-reply-to-names)
+(define-obsolete-variable-alias 'rmail-dont-reply-to-names
+  'mail-dont-reply-to-names "24.1")
 
+;; Prior to 24.1, this used to contain "\\`info-".
 ;;;###autoload
 (defvar rmail-default-dont-reply-to-names nil
   "Regexp specifying part of the default value of `mail-dont-reply-to-names'.
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index ee44cc72051..e34a3a4d71e 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -228,8 +228,9 @@ Leaves original message, deleted, before the undigestified messages."
 ;;;###autoload
 (defun unforward-rmail-message ()
   "Extract a forwarded message from the containing message.
-This puts the forwarded message into a separate rmail message
-following the containing message."
+This puts the forwarded message into a separate rmail message following
+the containing message.  This command is only useful when messages are
+forwarded with `rmail-enable-mime-composing' set to nil."
   (interactive)
   (set-buffer rmail-buffer)
   (let ((buff (current-buffer))