Merge from emacs--devo--0, gnus--rel--5.10

[gnus] / lisp / ChangeLog.2

diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index c80508a..6834cc0 100644 (file)
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -2456,7 +2456,7 @@
 
 2003-05-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-       * gnus.el (gnus-logo-color-alist): Added no colours.
+       * gnus.el (gnus-logo-color-alist): Added no colors.
 
 2003-05-09  Dave Love  <fx@gnu.org>
 
@@ -12530,7 +12530,7 @@
        * mm-encode.el (mm-encode-content-transfer-encoding): Fix error
        message.  (Gnus does not "default" to using 8bit for the message,
        it default to use 8bit encoding and the user-supplied CTE
-       value.  Calling this behaviour "treating it as 8bit" is perhaps
+       value.  Calling this behavior "treating it as 8bit" is perhaps
        better.)
 
        * mm-bodies.el (mm-body-encoding): Intern encoding if needed
@@ -12815,7 +12815,7 @@
        (imap-remassoc): Copied from `gnus-remassoc'.
        (imap-add-callback): New function.
        (imap-mailbox-expunge, imap-mailbox-close): Support asynchronous
-       behaviour.
+       behavior.
        (imap-parse-response): Call the callback.
 
        * message.el (message-insert-canlock): New variable.