14 files changed, 37 insertions, 13 deletions
diff --git a/lispintro/ChangeLog b/lispintro/ChangeLog
index 2e08725df69..2452be826fc 100644
--- a/lispintro/ChangeLog
+++ b/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+	* Relicense all FSF files to GPLv3 or later.
+
 2007-06-02  Chong Yidong  <cyd@stupidchicken.com>
 
 	* Version 22.1 released.
@@ -246,7 +250,7 @@
 
   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)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/Makefile.in b/lispintro/Makefile.in
index 13ff68fbb16..fc263c2095c 100644
--- a/lispintro/Makefile.in
+++ b/lispintro/Makefile.in
@@ -7,7 +7,7 @@
 
 # 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)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/README b/lispintro/README
index df8cdc5241e..5edd38af3ee 100644
--- a/lispintro/README
+++ b/lispintro/README
@@ -70,7 +70,7 @@ This file is part of GNU Emacs.
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/cons-1.eps b/lispintro/cons-1.eps
index ea2c4168956..95a74dcf298 100644
--- a/lispintro/cons-1.eps
+++ b/lispintro/cons-1.eps
@@ -14,7 +14,7 @@
 %
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/cons-2.eps b/lispintro/cons-2.eps
index b6fb796b452..b8537d28ea8 100644
--- a/lispintro/cons-2.eps
+++ b/lispintro/cons-2.eps
@@ -14,7 +14,7 @@
 %
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/cons-2a.eps b/lispintro/cons-2a.eps
index 2efbb4b1697..1ec78c46f0b 100644
--- a/lispintro/cons-2a.eps
+++ b/lispintro/cons-2a.eps
@@ -7,6 +7,26 @@
 %	Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% 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.
+%
+% 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 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/cons-3.eps b/lispintro/cons-3.eps
index ea3f8d4c80d..795fa2b18f4 100644
--- a/lispintro/cons-3.eps
+++ b/lispintro/cons-3.eps
@@ -14,7 +14,7 @@
 %
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/cons-4.eps b/lispintro/cons-4.eps
index 80947b45a8e..68b0a296c36 100644
--- a/lispintro/cons-4.eps
+++ b/lispintro/cons-4.eps
@@ -14,7 +14,7 @@
 %
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/cons-5.eps b/lispintro/cons-5.eps
index a49bb062c16..e03815a4403 100644
--- a/lispintro/cons-5.eps
+++ b/lispintro/cons-5.eps
@@ -14,7 +14,7 @@
 %
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/drawers.eps b/lispintro/drawers.eps
index b0f2f64e0a9..0e5a222ae45 100644
--- a/lispintro/drawers.eps
+++ b/lispintro/drawers.eps
@@ -16,7 +16,7 @@
 %
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/lambda-1.eps b/lispintro/lambda-1.eps
index 14780fefe76..5b1b5d04299 100644
--- a/lispintro/lambda-1.eps
+++ b/lispintro/lambda-1.eps
@@ -14,7 +14,7 @@
 %
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/lambda-2.eps b/lispintro/lambda-2.eps
index 5d2717342ac..6288283abce 100644
--- a/lispintro/lambda-2.eps
+++ b/lispintro/lambda-2.eps
@@ -14,7 +14,7 @@
 %
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/lambda-3.eps b/lispintro/lambda-3.eps
index 4f16e9d9185..26f7d5d9644 100644
--- a/lispintro/lambda-3.eps
+++ b/lispintro/lambda-3.eps
@@ -14,7 +14,7 @@
 %
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/makefile.w32-in b/lispintro/makefile.w32-in
index 579d93481b6..07d51d24620 100644
--- a/lispintro/makefile.w32-in
+++ b/lispintro/makefile.w32-in
@@ -6,7 +6,7 @@
 
 # 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)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,