Merge changes made in Gnus trunk.

[bpt/emacs.git] / doc / misc / ChangeLog

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 587bbba..f1401cc 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus.texi (Client-Side IMAP Splitting): Mention
+       nnimap-unsplittable-articles.
+
+2010-10-29  Julien Danjou  <julien@danjou.info>
+
+       * gnus.texi (Finding the News): Remove references to obsoletes
+       variables `gnus-nntp-server' and `gnus-secondary-servers'.
+
 2010-10-29  Eli Zaretskii  <eliz@gnu.org>
 
        * makefile.w32-in (MAKEINFO): Add -I$(emacsdir).
@@ -19,7 +29,7 @@
 
 2010-10-24  Jay Belanger  <jay.p.belanger@gmail.com>
 
-       * calc.texi:  Use emacsver.texi to determine Emacs version.
+       * calc.texi: Use emacsver.texi to determine Emacs version.
 
 2010-10-24  Juanma Barranquero  <lekktu@gmail.com>