Switch to recommended form of GPLv3 permissions notice.

2025-12-15 10:30:25 -08:00 · 2008-05-06 08:06:51 +00:00 · 2008-05-06 08:06:51 +00:00 · eb3fa2cfcf
commit eb3fa2cfcf
parent 874a927a02
308 changed files with 2999 additions and 3305 deletions
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@ -24561,10 +24561,10 @@ See ChangeLog.12 for earlier changes.
  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)
+  the Free Software Foundation, either version 3 of the License, or
-  any later version.
+  (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
@ -24572,8 +24572,6 @@ See ChangeLog.12 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
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.
 ;; arch-tag: 1e8aa93a-fc6c-4ac3-9b10-1f445e1840af
--- a/lisp/ChangeLog.1
+++ b/lisp/ChangeLog.1
@ -3251,10 +3251,10 @@
  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)
+  the Free Software Foundation, either version 3 of the License, or
-  any later version.
+  (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
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.
 ;;; arch-tag: b6060738-7fac-4c9c-80ae-67995bae78a7
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@ -23539,10 +23539,10 @@ See ChangeLog.9 for earlier changes.
  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)
+  the Free Software Foundation, either version 3 of the License, or
-  any later version.
+  (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
@ -23550,9 +23550,6 @@ See ChangeLog.9 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
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.
 ;;; arch-tag: 5fcf8004-6f58-452a-b9d6-6950323a19c1
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@ -14341,10 +14341,10 @@ See ChangeLog.10 for earlier changes.
  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)
+  the Free Software Foundation, either version 3 of the License, or
-  any later version.
+  (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
@ -14352,8 +14352,6 @@ See ChangeLog.10 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
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.
 ;; arch-tag: 2fe8d7b0-27e3-4634-a0b7-db70ff071825
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@ -33353,10 +33353,10 @@ See ChangeLog.11 for earlier changes.
  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)
+  the Free Software Foundation, either version 3 of the License, or
-  any later version.
+  (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
@ -33364,8 +33364,6 @@ See ChangeLog.11 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
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.
 ;;; arch-tag: e39939be-dab3-400e-86f5-0e2701a883c1
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@ -3997,10 +3997,10 @@ See ChangeLog.1 for earlier changes.
  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)
+  the Free Software Foundation, either version 3 of the License, or
-  any later version.
+  (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
@ -4008,8 +4008,6 @@ See ChangeLog.1 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
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.
 ;;; arch-tag: c315ba16-14ba-4b07-86e6-013a18f11be7
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@ -12443,10 +12443,10 @@ See ChangeLog.2 for earlier changes.
  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)
+  the Free Software Foundation, either version 3 of the License, or
-  any later version.
+  (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
@ -12454,8 +12454,6 @@ See ChangeLog.2 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
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.
 ;;; arch-tag: f07a3446-5672-464a-8fdc-2ca92e8e7b2a
--- a/lisp/ChangeLog.4
+++ b/lisp/ChangeLog.4
@ -8941,10 +8941,10 @@ See ChangeLog.3 for earlier changes.
  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)
+  the Free Software Foundation, either version 3 of the License, or
-  any later version.
+  (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
@ -8952,8 +8952,6 @@ See ChangeLog.3 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
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.
 ;;; arch-tag: 91035822-35c7-44a9-8417-2454b88c3db2
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@ -9270,10 +9270,10 @@ See ChangeLog.4 for earlier changes.
  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)
+  the Free Software Foundation, either version 3 of the License, or
-  any later version.
+  (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
@ -9281,8 +9281,6 @@ See ChangeLog.4 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
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.
 ;;; arch-tag: 1a8fbb45-25d0-48e2-a926-29ca4e3d343a
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@ -8027,10 +8027,10 @@ See ChangeLog.5 for earlier changes.
  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)
+  the Free Software Foundation, either version 3 of the License, or
-  any later version.
+  (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
@ -8038,9 +8038,6 @@ See ChangeLog.5 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
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.
 ;;; arch-tag: f90e8ffe-6bd0-4423-97d9-637ac4382520
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@ -23116,10 +23116,10 @@ See ChangeLog.6 for earlier changes.
  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)
+  the Free Software Foundation, either version 3 of the License, or
-  any later version.
+  (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
@ -23127,8 +23127,6 @@ See ChangeLog.6 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
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.
 ;;; arch-tag: 0995d517-13da-45ab-9c2d-7911aa25512b
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@ -9998,10 +9998,10 @@ See ChangeLog.7 for earlier changes.
  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)
+  the Free Software Foundation, either version 3 of the License, or
-  any later version.
+  (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
@ -10009,8 +10009,6 @@ See ChangeLog.7 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
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.
 ;;; arch-tag: efdc1531-ed46-4e14-be59-bee4b23088f3
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@ -20699,10 +20699,10 @@ See ChangeLog.8 for earlier changes.
  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)
+  the Free Software Foundation, either version 3 of the License, or
-  any later version.
+  (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
@ -20710,9 +20710,6 @@ See ChangeLog.8 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
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.
 ;;; arch-tag: a7cd2b86-43eb-409b-883f-3700fa85334f
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@ -4,10 +4,10 @@
 # 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)
+# the Free Software Foundation, either version 3 of the License, or
-# any later version.
+# (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
@ -15,9 +15,7 @@
 # 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
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 SHELL = /bin/sh
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/abbrevlist.el
+++ b/lisp/abbrevlist.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/align.el
+++ b/lisp/align.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/allout.el
+++ b/lisp/allout.el
@ -12,10 +12,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -23,9 +23,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@ -10,20 +10,18 @@
 ;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify it
+;; GNU Emacs is free software: you can redistribute it and/or modify
-;; under the terms of the GNU General Public License as published by the
+;; it under the terms of the GNU General Public License as published by
-;; Free Software Foundation; either version 3, or (at your option) any
+;; the Free Software Foundation, either version 3 of the License, or
-;; later version.
+;; (at your option) any later version.
-;;
+
-;; GNU Emacs is distributed in the hope that it will be useful, but
+;; GNU Emacs is distributed in the hope that it will be useful,
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; General Public License for more details.
+;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/array.el
+++ b/lisp/array.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/autoarg.el
+++ b/lisp/autoarg.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@ -10,10 +10,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -21,9 +21,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@ -10,10 +10,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -21,9 +21,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/battery.el
+++ b/lisp/battery.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@ -10,10 +10,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -21,9 +21,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/bs.el
+++ b/lisp/bs.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/button.el
+++ b/lisp/button.el
@ -8,20 +8,18 @@
 ;;
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
 ;;
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@ -1,27 +1,25 @@
 ;;; calculator.el --- a [not so] simple calculator for Emacs
-;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
+;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,  2005, 2006, 2007,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2008 Free Software Foundation, Inc.
 ;; Author: Eli Barzilay <eli@barzilay.org>
 ;; Keywords: tools, convenience
 ;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify it
+;; GNU Emacs is free software: you can redistribute it and/or modify
-;; under the terms of the GNU General Public License as published by the
+;; it under the terms of the GNU General Public License as published by
-;; Free Software Foundation; either version 3, or (at your option) any
+;; the Free Software Foundation, either version 3 of the License, or
-;; later version.
+;; (at your option) any later version.
-;; GNU Emacs is distributed in the hope that it will be useful, but
+;; GNU Emacs is distributed in the hope that it will be useful,
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; General Public License for more details.
+;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 ;; MA 02110-1301, USA.
 ;;;=====================================================================
 ;;; Commentary:
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/cdl.el
+++ b/lisp/cdl.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/comint.el
+++ b/lisp/comint.el
@ -10,10 +10,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -21,9 +21,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/complete.el
+++ b/lisp/complete.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/completion.el
+++ b/lisp/completion.el
@ -10,10 +10,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -21,9 +21,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/composite.el
+++ b/lisp/composite.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
 ;;
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
 ;;
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
 ;;
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Code:
--- a/lisp/custom.el
+++ b/lisp/custom.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
 ;;
--- a/lisp/cvs-status.el
+++ b/lisp/cvs-status.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@ -11,10 +11,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -22,9 +22,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@ -11,10 +11,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -22,9 +22,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@ -10,10 +10,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -21,9 +21,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@ -11,10 +11,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -22,9 +22,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
 ;;
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/diff.el
+++ b/lisp/diff.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@ -10,10 +10,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -21,9 +21,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/dired.el
+++ b/lisp/dired.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/dirtrack.el
+++ b/lisp/dirtrack.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@ -10,10 +10,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -21,9 +21,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Requirements:
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/dos-vars.el
+++ b/lisp/dos-vars.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/double.el
+++ b/lisp/double.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@ -7,10 +7,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -18,9 +18,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/ediff-help.el
+++ b/lisp/ediff-help.el
@ -7,10 +7,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -18,9 +18,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@ -7,10 +7,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -18,9 +18,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@ -7,10 +7,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -18,9 +18,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@ -7,10 +7,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -18,9 +18,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@ -7,10 +7,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -18,9 +18,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@ -7,10 +7,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -18,9 +18,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@ -7,10 +7,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -18,9 +18,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@ -7,10 +7,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -18,9 +18,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@ -7,10 +7,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -18,9 +18,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@ -18,10 +18,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -29,9 +29,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@ -10,10 +10,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -21,9 +21,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/electric.el
+++ b/lisp/electric.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/env.el
+++ b/lisp/env.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/epa-dired.el
+++ b/lisp/epa-dired.el
@ -6,10 +6,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -17,9 +17,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Code:
--- a/lisp/epa-file-hook.el
+++ b/lisp/epa-file-hook.el
@ -6,10 +6,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -17,9 +17,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Code:
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@ -6,10 +6,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -17,9 +17,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Code:
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@ -6,10 +6,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -17,9 +17,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Code:
--- a/lisp/epa.el
+++ b/lisp/epa.el
@ -6,10 +6,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -17,9 +17,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Code:
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@ -6,10 +6,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -17,9 +17,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Code:
--- a/lisp/epg.el
+++ b/lisp/epg.el
@ -7,10 +7,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -18,9 +18,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Code:
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@ -6,22 +6,20 @@
 ;; Version: 0.1
 ;; Keywords: comm
-;; This file is part of ERC.
+;; This file is part of GNU Emacs.
-;; ERC 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (at your option) any later version.
-;; ERC is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 ;; You should have received a copy of the GNU General Public License
-;; along with ERC; see the file COPYING.  If not, write to the
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/expand.el
+++ b/lisp/expand.el
@ -9,10 +9,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -20,9 +20,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
 ;;
--- a/lisp/ezimage.el
+++ b/lisp/ezimage.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
 ;;
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/lisp/faces.el
+++ b/lisp/faces.el
@ -8,10 +8,10 @@
 ;; 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)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (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
@ -19,9 +19,7 @@
 ;; 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
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
--- a/Show more
+++ b/Show more