Merge changes made in Gnus trunk.

[gnu-emacs] / lisp / gnus / ChangeLog.1

diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1
index fbdd09bdfe51490ff0f9b081a63857742ecf42cb..7448808b20f07eef032d928fd814f224848d917e 100644 (file)
--- a/lisp/gnus/ChangeLog.1
+++ b/lisp/gnus/ChangeLog.1
@@ -28,10 +28,10 @@
 
        * gnus-start.el (gnus-slave-save-newsrc):
        * gnus-uu.el (gnus-uu-tmp-dir, gnus-uu-decode-binhex)
-         (gnus-uu-decode-binhex-view, gnus-uu-digest-mail-forward)
-         (gnus-uu-initialize):
+       (gnus-uu-decode-binhex-view, gnus-uu-digest-mail-forward)
+       (gnus-uu-initialize):
        * nnmail.el (nnmail-make-complex-temp-name, nnmail-get-new-mail):
-         Use make-temp-file.
+       Use make-temp-file.
 
 1999-09-07  Eli Zaretskii  <eliz@gnu.org>
 
@@ -506,10 +506,10 @@
 
 1998-08-13  Simon Josefsson  <jas@pdc.kth.se>
 
-       * gnus-msg.el (gnus-setup-message): use message-setup-hook
-       instead
-       (gnus-configure-posting-styles): new posting-style 'body
-       (gnus-configure-posting-styles): insert headers immediately
+       * gnus-msg.el (gnus-setup-message): Use message-setup-hook
+       instead.
+       (gnus-configure-posting-styles): New posting-style 'body.
+       (gnus-configure-posting-styles): Insert headers immediately
 
 1998-08-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -524,9 +524,9 @@
 
 1998-08-12  Simon Josefsson  <jas@pdc.kth.se>
 
-       * gnus-cache.el (gnus-uncacheable-groups): doc change
-       (gnus-cacheable-groups): new variable
-       (gnus-cache-possibly-enter-article): use it
+       * gnus-cache.el (gnus-uncacheable-groups): Doc change.
+       (gnus-cacheable-groups): New variable.
+       (gnus-cache-possibly-enter-article): Use it.
 
 1998-08-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -3708,8 +3708,7 @@
        * gnus.el: Quassia Gnus v0.1 is released.
 
 
-    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+  Copyright (C) 1997-2011 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -3725,5 +3724,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; arch-tag: c2f4e9c8-94fb-4c63-bdfd-4ab680cc9db7