Switch to recommended form of GPLv3 permissions notice.

1 files changed, 7 insertions, 9 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 2214ee0afa6..308cb386aa6 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,6 +1,6 @@
 2008-05-03  Eric S. Raymond  <esr@golux>
 
-        * keymaps.texi: Clarify that (current-local-map) and 
+        * keymaps.texi: Clarify that (current-local-map) and
         (current-global-map) return references, not copies.
 
 2008-05-02  Juri Linkov  <juri@jurta.org>
@@ -6592,15 +6592,15 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+    Copyright (C) 1998, 1999, 2000, 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 3, 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
@@ -6608,8 +6608,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: 985ae0ce-df29-475b-b3f8-4bbcbf6f7fda