Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd@stupidchicken.com.

[bpt/emacs.git] / doc / emacs / rmail.texi

diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 82e6b32..ad22ae9 100644 (file)
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -1,6 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2011
 @c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Rmail, Dired, Sending Mail, Top
@@ -1228,7 +1227,8 @@ specification, or because the specification was inaccurate.  For
 example, a misconfigured mailer could send a message with a
 @samp{charset=iso-8859-1} header when the message is actually encoded
 in @code{koi8-r}.  When you see the message text garbled, or some of
-its characters displayed as empty boxes, this may have happened.
+its characters displayed as hex codes or empty boxes, this may have
+happened.
 
 @findex rmail-redecode-body
   You can correct the problem by decoding the message again using the
@@ -1515,7 +1515,3 @@ include the following in the Rmail inbox list:
 @smallexample
 maildir://var/spool/mail/in
 @end smallexample
-
-@ignore
-   arch-tag: 034965f6-38df-47a2-a9f1-b8bc8ab37e23
-@end ignore