28 files changed, 34 insertions, 28 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog
index 5413a1f04bb..c25d89a83ba 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+	* Relicense all FSF files to GPLv3 or later.
+
+	* COPYING: Switch to GPLv3.
+
 2007-06-02  Chong Yidong  <cyd@stupidchicken.com>
 
 	* Version 22.1 released.
@@ -910,7 +916,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/mac/Emacs.app/Contents/Info.plist b/mac/Emacs.app/Contents/Info.plist
index c27500678b8..ed2c4a8bf7c 100644
--- a/mac/Emacs.app/Contents/Info.plist
+++ b/mac/Emacs.app/Contents/Info.plist
@@ -6,7 +6,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) any
+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
diff --git a/mac/INSTALL b/mac/INSTALL
index 302317b025f..7cdf0de4940 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -220,7 +220,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/mac/README b/mac/README
index 1d8cc40e545..f02527d6383 100644
--- a/mac/README
+++ b/mac/README
@@ -49,7 +49,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/mac/cw6-mcp.xml b/mac/cw6-mcp.xml
index 38f12ba2e74..410f512e37a 100644
--- a/mac/cw6-mcp.xml
+++ b/mac/cw6-mcp.xml
@@ -6,7 +6,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) any
+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
diff --git a/mac/inc/alloca.h b/mac/inc/alloca.h
index 9ce323d0f77..f0c47e1f7ba 100644
--- a/mac/inc/alloca.h
+++ b/mac/inc/alloca.h
@@ -5,7 +5,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) any
+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
diff --git a/mac/inc/config.h b/mac/inc/config.h
index b9fb9a6d8cf..ae741b0681f 100644
--- a/mac/inc/config.h
+++ b/mac/inc/config.h
@@ -8,7 +8,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/mac/inc/defs-cw6.h b/mac/inc/defs-cw6.h
index e72cd9e5f73..05dfa901a24 100644
--- a/mac/inc/defs-cw6.h
+++ b/mac/inc/defs-cw6.h
@@ -5,7 +5,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) any
+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
diff --git a/mac/inc/dirent.h b/mac/inc/dirent.h
index 40ec3467081..0efaf879466 100644
--- a/mac/inc/dirent.h
+++ b/mac/inc/dirent.h
@@ -6,7 +6,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/mac/inc/epaths.h b/mac/inc/epaths.h
index 2c29f98f5c8..e9ee0a9fb70 100644
--- a/mac/inc/epaths.h
+++ b/mac/inc/epaths.h
@@ -8,7 +8,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/mac/inc/grp.h b/mac/inc/grp.h
index b4311f5ee1c..f8e93b5d2c1 100755
--- a/mac/inc/grp.h
+++ b/mac/inc/grp.h
@@ -5,7 +5,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/mac/inc/m-mac.h b/mac/inc/m-mac.h
index 544e5d0187d..a5a26cd000c 100644
--- a/mac/inc/m-mac.h
+++ b/mac/inc/m-mac.h
@@ -6,7 +6,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/mac/inc/pwd.h b/mac/inc/pwd.h
index 239b915430b..c992b5c4ea9 100644
--- a/mac/inc/pwd.h
+++ b/mac/inc/pwd.h
@@ -6,7 +6,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/mac/inc/s-mac.h b/mac/inc/s-mac.h
index 83715a7ea06..4798fb9c3bd 100644
--- a/mac/inc/s-mac.h
+++ b/mac/inc/s-mac.h
@@ -6,7 +6,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/mac/inc/sys/file.h b/mac/inc/sys/file.h
index 4b320eaea2f..e720fc1c0ce 100644
--- a/mac/inc/sys/file.h
+++ b/mac/inc/sys/file.h
@@ -6,7 +6,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/mac/inc/sys/ioctl.h b/mac/inc/sys/ioctl.h
index e2fca68f021..d0caa4b0eb7 100644
--- a/mac/inc/sys/ioctl.h
+++ b/mac/inc/sys/ioctl.h
@@ -6,7 +6,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/mac/inc/sys/param.h b/mac/inc/sys/param.h
index b4f93fa924e..265f5384c9c 100644
--- a/mac/inc/sys/param.h
+++ b/mac/inc/sys/param.h
@@ -6,7 +6,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/mac/inc/sys/stat.h b/mac/inc/sys/stat.h
index 4a9cd5fcdc1..0e352211e16 100644
--- a/mac/inc/sys/stat.h
+++ b/mac/inc/sys/stat.h
@@ -6,7 +6,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/mac/inc/sys/time.h b/mac/inc/sys/time.h
index 14579bea4e4..057ecca42be 100644
--- a/mac/inc/sys/time.h
+++ b/mac/inc/sys/time.h
@@ -6,7 +6,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/mac/inc/sys/types.h b/mac/inc/sys/types.h
index 27c85643124..bec6e4c773b 100644
--- a/mac/inc/sys/types.h
+++ b/mac/inc/sys/types.h
@@ -6,7 +6,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/mac/inc/termio.h b/mac/inc/termio.h
index 26f4d0a975a..34e034c2fd1 100644
--- a/mac/inc/termio.h
+++ b/mac/inc/termio.h
@@ -6,7 +6,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/mac/inc/utime.h b/mac/inc/utime.h
index 66fb3cf3afd..2deefbb9617 100644
--- a/mac/inc/utime.h
+++ b/mac/inc/utime.h
@@ -6,7 +6,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/mac/inc/utsname.h b/mac/inc/utsname.h
index e34e2ebbd1b..174d9cffe85 100644
--- a/mac/inc/utsname.h
+++ b/mac/inc/utsname.h
@@ -6,7 +6,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/mac/make-package b/mac/make-package
index 1db34d2046c..2d10710da80 100755
--- a/mac/make-package
+++ b/mac/make-package
@@ -24,7 +24,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/mac/makefile.MPW b/mac/makefile.MPW
index cbfbff76b72..9c03942effa 100644
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -8,7 +8,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/mac/src/Emacs.r b/mac/src/Emacs.r
index 27d91b59ea0..21204ea22bb 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -6,7 +6,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/mac/src/EmacsMPW.r b/mac/src/EmacsMPW.r
index 4d6faa25a84..f017f2bec78 100644
--- a/mac/src/EmacsMPW.r
+++ b/mac/src/EmacsMPW.r
@@ -8,7 +8,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/mac/src/chdir.c b/mac/src/chdir.c
index e1b112c7bf4..eb0670f3fd5 100644
--- a/mac/src/chdir.c
+++ b/mac/src/chdir.c
@@ -6,7 +6,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,