*** empty log message ***

[gnu-emacs] / lisp / erc / ChangeLog.05

diff --git a/lisp/erc/ChangeLog.05 b/lisp/erc/ChangeLog.05
index 12a51bb44ed15c3773c3a40a0ab7e7807b0a901a..041f2d5ad87c509e1878c0db7676bd8cf0ddea62 100644 (file)
--- a/lisp/erc/ChangeLog.05
+++ b/lisp/erc/ChangeLog.05
@@ -831,7 +831,7 @@
        `require-final-newline'.
 
        * erc-viper.el: New file. This is where all ERC/Viper
-       compatiibilty code should live. When and if ERC is bundled with
+       compatibility code should live. When and if ERC is bundled with
        Emacs, some of the hacks in this file should be merged into Viper
        itself.
 
@@ -1217,14 +1217,14 @@
 
 See ChangeLog.04 for earlier changes.
 
-    Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+    Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
-  GNU Emacs is free software; you can redistribute it and/or modify
+  GNU Emacs is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
-  any later version.
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -1232,9 +1232,7 @@ See ChangeLog.04 for earlier changes.
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;; Local Variables:
 ;; coding: utf-8