Switch to recommended form of GPLv3 permissions notice.

21 files changed, 91 insertions, 133 deletions

diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index 4d3527eba97..075ecc800ec 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -1,14 +1,14 @@
 ### Makefile for Emacs refcards
 
-## Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
-##   2007, 2008 Free Software Foundation, Inc.
+## Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+##   2008  Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
-
-## GNU Emacs is free software; you can redistribute it and/or modify
+#
+## GNU Emacs is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3, or (at your option)
-## any later version.
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
 
 ## GNU Emacs is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,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
-## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-## Boston, MA 02110-1301, USA.
+## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 
 ## Top-level targets.
diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex
index 2970ee08f0c..81544849547 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -25,10 +25,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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -36,9 +36,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 Free Software Foundation, 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex
index 3a955bf6545..89399ba403b 100644
--- a/etc/refcards/cs-dired-ref.tex
+++ b/etc/refcards/cs-dired-ref.tex
@@ -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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index d29c6169852..1138e0bdd1f 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -23,10 +23,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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,9 +34,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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index a4c7248a1d0..664cb64fe36 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -32,10 +32,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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -43,9 +43,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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % Czech hyphenation rules applied
 \chyph
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index 6cfbd08f649..2d824c9919d 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -28,10 +28,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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -39,9 +39,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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex
index e633bb50428..12903acb7ff 100644
--- a/etc/refcards/dired-ref.tex
+++ b/etc/refcards/dired-ref.tex
@@ -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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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
-% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.  
diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex
index 43e773090ff..ff3a94daa6d 100644
--- a/etc/refcards/fr-dired-ref.tex
+++ b/etc/refcards/fr-dired-ref.tex
@@ -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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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
-% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index f310e89220f..298b422a9ad 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -19,10 +19,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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,9 +30,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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex
index add709816fe..312917209c3 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -33,10 +33,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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -44,9 +44,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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % Translated to french by \'Eric Jacoboni <jaco@teaser.fr> in November 2001
 
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 6a784ed57f8..34976c10763 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -18,15 +18,15 @@
 \letterpaper=0
 
 % Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
-%   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007, 2008  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% GNU Emacs is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,9 +34,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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
diff --git a/etc/refcards/pdflayout.sty b/etc/refcards/pdflayout.sty
index 9ee83cd187b..681f9f44c7a 100644
--- a/etc/refcards/pdflayout.sty
+++ b/etc/refcards/pdflayout.sty
@@ -2,10 +2,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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,9 +13,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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file defines `\pdflayout':
 %  - \pdflayout=(0) is A4 portrait,
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index 79300163908..c315868a7ad 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -44,10 +44,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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -55,9 +55,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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index 33b19216f9b..31764f3f189 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -25,10 +25,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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -36,9 +36,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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index 8e4d1634941..048880841fe 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -25,10 +25,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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -36,9 +36,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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex
index 1507259f2b8..e53666c5c02 100644
--- a/etc/refcards/sk-dired-ref.tex
+++ b/etc/refcards/sk-dired-ref.tex
@@ -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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index b673232e3d8..9e71602a394 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -23,10 +23,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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,9 +34,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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index bdd0375e5ce..b05e4120d6a 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -32,10 +32,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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -43,9 +43,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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % Slovak hyphenation rules applied
 \shyph
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex
index 3706e2348ca..8434d8762d8 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -33,10 +33,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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -44,9 +44,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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 \def\versionnumber{1.0}
 \def\versionemacs{21}
diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex
index ab57dd6b736..037d728cf0f 100644
--- a/etc/refcards/vipcard.tex
+++ b/etc/refcards/vipcard.tex
@@ -19,10 +19,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)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,9 +30,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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex
index 9db150e9c0c..8d5c25b263e 100644
--- a/etc/refcards/viperCard.tex
+++ b/etc/refcards/viperCard.tex
@@ -14,15 +14,15 @@
 \pdflayout=(1)
 
 % Nothing else needs to be changed.
-% Copyright (C) 1995, 1996, 1997, 2001, 2002, 2003, 2004,
-%   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+% Copyright (C) 1995, 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006,
+%   2007, 2008  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% GNU Emacs is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 3, or (at your option)
-% any later version.
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,9 +30,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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %