Merge from gnus--devo--0

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

1 files changed, 13 insertions, 4 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ff2f0292c3f..578abef1051 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,16 @@
+2008-06-05  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (nnmairix): Markup and othe minor fixes.
+
+2008-06-05  David Engster  <dengste@eml.cc>
+
+        * gnus.texi (nnmairix): New nodes describing nnmairix.el.
+
+2008-06-05  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Group Parameters): Change ~/.gnus to ~/.gnus.el
+        (Searching, nnir, nnmairix): New stub nodes.
+
 2008-05-30  "Felix -"  <felix.1@canids.net>  (tiny change)
 
         * cl.texi (Iteration Clauses): Fix incorrect "identical" examples.
@@ -42,10 +55,6 @@
 
 2008-04-13  Reiner Steib  <Reiner.Steib@gmx.de>
 
-        * gnus.texi (Searching, nnir.el, nnmairix.el): New nodes.
-
-2008-04-13  Reiner Steib  <Reiner.Steib@gmx.de>
-
         * gnus.texi (Oort Gnus): Add message-fill-column.
 
 2008-04-12  Adrian Aichner  <adrian@xemacs.org>