Switch to recommended form of GPLv3 permissions notice.

14 files changed, 62 insertions, 87 deletions

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index d9e61677490..efec0dbe881 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -273,15 +273,15 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-        2006, 2007, 2008 Free Software Foundation, Inc.
+    Copyright (C) 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
@@ -289,8 +289,6 @@
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; arch-tag: ee4f8e1f-e14c-4d2e-86de-4dd697e6f1c3
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 1ce6a558110..8511750bd75 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -5,10 +5,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
@@ -16,9 +16,8 @@
 # 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/>.
+
 
 SHELL = @SHELL@
 
diff --git a/doc/lispintro/README b/doc/lispintro/README
index b6a8528448b..42c1b69e204 100644
--- a/doc/lispintro/README
+++ b/doc/lispintro/README
@@ -68,10 +68,10 @@ Robert J. Chassell, bob@gnu.org
 
 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
@@ -79,6 +79,4 @@ 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
-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/>.
diff --git a/doc/lispintro/cons-1.eps b/doc/lispintro/cons-1.eps
index eb144dfba27..55af9e329e1 100644
--- a/doc/lispintro/cons-1.eps
+++ b/doc/lispintro/cons-1.eps
@@ -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)
-% 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
@@ -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 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/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/cons-2.eps b/doc/lispintro/cons-2.eps
index 1f93b4afb11..c59e3d46e7b 100644
--- a/doc/lispintro/cons-2.eps
+++ b/doc/lispintro/cons-2.eps
@@ -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)
-% 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
@@ -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 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/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/cons-2a.eps b/doc/lispintro/cons-2a.eps
index 0c1df6805a8..2bccee015dc 100644
--- a/doc/lispintro/cons-2a.eps
+++ b/doc/lispintro/cons-2a.eps
@@ -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)
-% 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
@@ -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 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/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/cons-3.eps b/doc/lispintro/cons-3.eps
index c469c463712..1ed450febe3 100644
--- a/doc/lispintro/cons-3.eps
+++ b/doc/lispintro/cons-3.eps
@@ -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)
-% 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
@@ -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 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/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/cons-4.eps b/doc/lispintro/cons-4.eps
index a7433372168..a77a1d274c6 100644
--- a/doc/lispintro/cons-4.eps
+++ b/doc/lispintro/cons-4.eps
@@ -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)
-% 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
@@ -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 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/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/cons-5.eps b/doc/lispintro/cons-5.eps
index 26ee898134a..6e3f8be6ac3 100644
--- a/doc/lispintro/cons-5.eps
+++ b/doc/lispintro/cons-5.eps
@@ -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)
-% 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
@@ -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 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/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/drawers.eps b/doc/lispintro/drawers.eps
index 72f6adecf69..ae8624e648d 100644
--- a/doc/lispintro/drawers.eps
+++ b/doc/lispintro/drawers.eps
@@ -14,10 +14,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
@@ -25,9 +25,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/>.
 
 /tgifdict 53 dict def
 tgifdict begin
diff --git a/doc/lispintro/lambda-1.eps b/doc/lispintro/lambda-1.eps
index 55a50ab7d04..b20623bf586 100644
--- a/doc/lispintro/lambda-1.eps
+++ b/doc/lispintro/lambda-1.eps
@@ -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)
-% 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
@@ -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 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/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/lambda-2.eps b/doc/lispintro/lambda-2.eps
index 76990074e9a..7d18059bcf4 100644
--- a/doc/lispintro/lambda-2.eps
+++ b/doc/lispintro/lambda-2.eps
@@ -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)
-% 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
@@ -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 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/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/lambda-3.eps b/doc/lispintro/lambda-3.eps
index 1e7dd130d67..9848b431959 100644
--- a/doc/lispintro/lambda-3.eps
+++ b/doc/lispintro/lambda-3.eps
@@ -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)
-% 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
@@ -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 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/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/makefile.w32-in b/doc/lispintro/makefile.w32-in
index 8d22c821ac2..827cb37c39b 100644
--- a/doc/lispintro/makefile.w32-in
+++ b/doc/lispintro/makefile.w32-in
@@ -1,13 +1,14 @@
 #### -*- Makefile -*- for the Emacs Lisp Introduction manual.
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -15,9 +16,8 @@
 # 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/>.
+
 
 srcdir = .