Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-58

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-7
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-8
 - miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-11
   Update from CVS

2005-01-28  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (gnus-article-setup-buffer): Kill and re-create the
   article buffer when editing of the article is discarded.
   (gnus-article-prepare): Revert.

2005-01-28  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (gnus-article-prepare): Remove
   message-strip-forbidden-properties from the local hook.

2005-01-24  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/mml.el (mml-generate-mime-1): Convert string into unibyte when
   inserting " *mml*" buffer's contents into a unibyte temp buffer.

2005-01-28  Lars Magne Ingebrigtsen  <larsi@gnus.org>

   * man/gnus.texi: Some edits based on comments from David Abrahams.

2005-01-24  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (RSS): Fix the keystroke.

1 files changed, 8 insertions, 0 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 0e4f2a88bbf..5f69fc7d856 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-28  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi: Some edits based on comments from David Abrahams.
+
+2005-01-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (RSS): Fix the keystroke.
+
 2005-01-26  Lute Kamstra  <lute@gnu.org>
 
         * cmdargs.texi (Initial Options): Add a cross reference to `Init