(define-ccl-program): Move `doc-string' decl down.

[bpt/emacs.git] / lisp / ChangeLog.1

diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1
index e068ee4..3a4cb19 100644 (file)
--- a/lisp/ChangeLog.1
+++ b/lisp/ChangeLog.1
@@ -2700,7 +2700,7 @@
 
        * view.el:
        (provide 'view)
-       defined unadvertized c-m-a, c-m-e, c-m-b, c-m-f
+       defined unadvertised c-m-a, c-m-e, c-m-b, c-m-f
        at end of buffer says how to exit.
 
 1985-06-06  K. Shane Hartman  (shane@mit-prep)
@@ -3246,15 +3246,15 @@
                Set current buffer variables from defaults
                in case user's init file has changed them.
 
-    Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+    Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 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
@@ -3262,8 +3262,6 @@
   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/>.
 
 ;;; arch-tag: b6060738-7fac-4c9c-80ae-67995bae78a7