Switch to recommended form of GPLv3 permissions notice.

diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index 4d3527eba972ebe32657a77067643d4e2184db16..075ecc800ec15a101b018350e43cdc61aa200713 100644 (file)
--- 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 2970ee08f0cd372561d5eeba04d76f9c459ab59e..815448495477cbb03ffaa710ee49de6eda8f7ab6 100644 (file)
--- 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 3a955bf654529079ecfc54b4931d0bfb69b219e1..89399ba403bc63561a37cb0f99df0d486c0b53d4 100644 (file)
--- 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 d29c61698523b9739ef70c40ff4d81b59000e429..1138e0bdd1f6b562a432d348c01c387e14473f1b 100644 (file)
--- 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 a4c7248a1d0cff71a871f11256e2530770b94dfa..664cb64fe36582100c5bc392940d9bf37f2f1c34 100644 (file)
--- 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 6cfbd08f6494c85dbed1b52d6983425bdc409656..2d824c9919d9a6bc1e6cdb4894d6c05eb71fd224 100644 (file)
--- 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 e633bb50428db75091ff1878cff2c79b86500b3c..12903acb7ff086c0f24f0952a9148bb9af94ed79 100644 (file)
--- 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 43e773090ffb12eeed98d2e73b0641abe72141a3..ff3a94daa6ddb6500a7d91ce8551a8cb3fb04d87 100644 (file)
--- 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 f310e89220fee4a488f787a81191dc2784e855e5..298b422a9ad1c745b0402a2017a30743f92fa5fd 100644 (file)
--- 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 add709816fe4ed17567619b8f47576a0969c8ce9..312917209c3a0702d4959da6c7bbfc65d174e17d 100644 (file)
--- 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 6a784ed57f8c66a25165cec7132c02e42800a93e..34976c107638e7210b715f07cf97b0b2b362732a 100644 (file)
--- 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 9ee83cd187bb1c519f9e63613b2f3b0e291a8bcf..681f9f44c7ad1e1a9114e9411554a86b2c6beb70 100644 (file)
--- 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 79300163908b07e814653506937f4fcb0d8d84c2..c315868a7adb2597ce00f1815d7be69dee529189 100644 (file)
--- 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 33b19216f9b2344fbd5e06fc2a8bee73cf8446c2..31764f3f1895e2344ca25eccd479696ef370208e 100644 (file)
--- 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 8e4d16349416706afb2fd123ff8484d2aecfae1d..048880841fea698212e227b509c0edd4b6ce0003 100644 (file)
--- 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 1507259f2b8758fb27049be57b70cf4b4b703418..e53666c5c023d5a66967d35423e6a28ad9923d11 100644 (file)
--- 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 b673232e3d84b1dd8afda40e78c0b190a6706203..9e71602a39442d6365280c53871fbea55b3b3601 100644 (file)
--- 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 bdd0375e5ce6ef8e518e1d3e6356dd61a7abb4b7..b05e4120d6a4cdd1e0fce84bbdb475ac8e9242ab 100644 (file)
--- 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 3706e2348ca6a1234ed1927c1d59801d69d05cf5..8434d8762d8df434fb0955f479f85800ec5164d5 100644 (file)
--- 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 ab57dd6b7365190290f6f10c1f74a23956701803..037d728cf0f76b4cdd98c25e452b2a9f44de9d4e 100644 (file)
--- 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 9db150e9c0ccae7d99557bec0bc9893379d19dae..8d5c25b263eb5985afb6c4ae018b40ee1b677036 100644 (file)
--- 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).
 %