Mercurial > emacs

changeset 82140:b98604865ea0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 70-73) - Update from CVS 2007-07-25 Glenn Morris <rgm@gnu.org> * Relicense all FSF files to GPLv3 or later. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
author Miles Bader <miles@gnu.org>
date Thu, 26 Jul 2007 05:28:10 +0000
parents fe7fdfee34ac (current diff) 9510a7231ed7 (diff)
children b5f8f65b3576
files ChangeLog INSTALL Makefile.in README admin/ChangeLog admin/admin.el admin/notes/copyright configure.in etc/ChangeLog etc/DEBUG etc/MORE.STUFF etc/NEWS.22 etc/TODO etc/compilation.txt etc/emacs.1 etc/orgcard.tex leim/ChangeLog lib-src/ChangeLog lib-src/etags.c lib-src/makefile.w32-in lisp/ChangeLog lisp/ChangeLog.12 lisp/Makefile.in lisp/add-log.el lisp/autoinsert.el lisp/autorevert.el lisp/bindings.el lisp/bookmark.el lisp/calc/calc-aent.el lisp/calc/calc-bin.el lisp/calc/calc-comb.el lisp/calc/calc-embed.el lisp/calc/calc-ext.el lisp/calc/calc-forms.el lisp/calc/calc-funcs.el lisp/calc/calc-help.el lisp/calc/calc-lang.el lisp/calc/calc-math.el lisp/calc/calc-misc.el lisp/calc/calc-poly.el lisp/calc/calc-prog.el lisp/calc/calc-yank.el lisp/calc/calc.el lisp/calc/calccomp.el lisp/calculator.el lisp/calendar/cal-bahai.el lisp/calendar/cal-hebrew.el lisp/calendar/cal-islam.el lisp/calendar/cal-menu.el lisp/calendar/cal-x.el lisp/calendar/calendar.el lisp/calendar/diary-lib.el lisp/calendar/timeclock.el lisp/cmuscheme.el lisp/comint.el lisp/complete.el lisp/completion.el lisp/composite.el lisp/cus-dep.el lisp/cus-edit.el lisp/cus-start.el lisp/custom.el lisp/dabbrev.el lisp/delsel.el lisp/desktop.el lisp/dframe.el lisp/diff-mode.el lisp/diff.el lisp/dired-aux.el lisp/dired.el lisp/disp-table.el lisp/ediff-init.el lisp/ediff-mult.el lisp/ediff-ptch.el lisp/ediff-util.el lisp/ediff.el lisp/edmacro.el lisp/emacs-lisp/advice.el lisp/emacs-lisp/autoload.el lisp/emacs-lisp/byte-opt.el lisp/emacs-lisp/bytecomp.el lisp/emacs-lisp/checkdoc.el lisp/emacs-lisp/cl-extra.el lisp/emacs-lisp/cl-macs.el lisp/emacs-lisp/cl-seq.el lisp/emacs-lisp/cl.el lisp/emacs-lisp/copyright.el lisp/emacs-lisp/derived.el lisp/emacs-lisp/easymenu.el lisp/emacs-lisp/edebug.el lisp/emacs-lisp/eldoc.el lisp/emacs-lisp/rx.el lisp/emulation/cua-base.el lisp/emulation/tpu-edt.el lisp/emulation/tpu-mapper.el lisp/emulation/viper-cmd.el lisp/emulation/viper-init.el lisp/emulation/viper-keym.el lisp/emulation/viper-util.el lisp/emulation/viper.el lisp/erc/ChangeLog lisp/erc/erc-goodies.el lisp/faces.el lisp/ffap.el lisp/files.el lisp/filesets.el lisp/follow.el lisp/font-lock.el lisp/frame.el lisp/gnus/ChangeLog lisp/gnus/gnus-art.el lisp/gnus/message.el lisp/gnus/nndiary.el lisp/help-fns.el lisp/help-mode.el lisp/image-dired.el lisp/image-mode.el lisp/image.el lisp/indent.el lisp/info.el lisp/international/utf-8.el lisp/isearch.el lisp/kmacro.el lisp/log-edit.el lisp/log-view.el lisp/longlines.el lisp/ls-lisp.el lisp/mail/mail-extr.el lisp/makefile.w32-in lisp/menu-bar.el lisp/mh-e/ChangeLog lisp/mh-e/mh-compat.el lisp/mouse.el lisp/net/ange-ftp.el lisp/net/rcirc.el lisp/net/rcompile.el lisp/net/socks.el lisp/net/tramp-ftp.el lisp/net/tramp-smb.el lisp/net/tramp-uu.el lisp/net/tramp.el lisp/net/trampver.el lisp/net/webjump.el lisp/newcomment.el lisp/novice.el lisp/pcomplete.el lisp/pgg.el lisp/play/gamegrid.el lisp/printing.el lisp/progmodes/compile.el lisp/progmodes/flymake.el lisp/progmodes/grep.el lisp/progmodes/gud.el lisp/progmodes/hideshow.el lisp/progmodes/python.el lisp/progmodes/sh-script.el lisp/progmodes/vera-mode.el lisp/progmodes/which-func.el lisp/ps-mule.el lisp/recentf.el lisp/replace.el lisp/savehist.el lisp/server.el lisp/shell.el lisp/simple.el lisp/startup.el lisp/subr.el lisp/t-mouse.el lisp/tar-mode.el lisp/term/mac-win.el lisp/term/x-win.el lisp/term/xterm.el lisp/textmodes/bibtex.el lisp/textmodes/css-mode.el lisp/textmodes/nroff-mode.el lisp/textmodes/org.el lisp/textmodes/reftex.el lisp/textmodes/sgml-mode.el lisp/textmodes/tex-mode.el lisp/textmodes/texinfmt.el lisp/thingatpt.el lisp/thumbs.el lisp/tutorial.el lisp/uniquify.el lisp/url/ChangeLog lisp/url/url-cookie.el lisp/url/url.el lisp/vc-arch.el lisp/vc-cvs.el lisp/vc-hooks.el lisp/vc-mcvs.el lisp/vc-rcs.el lisp/vc-sccs.el lisp/vc-svn.el lisp/vc.el lisp/version.el lisp/wdired.el lisp/wid-edit.el lisp/window.el lisp/x-dnd.el lisp/xt-mouse.el lispref/ChangeLog lwlib/ChangeLog mac/ChangeLog mac/src/Emacs.r man/ChangeLog nt/ChangeLog nt/configure.bat nt/inc/sys/socket.h oldXMenu/ChangeLog src/ChangeLog src/Makefile.in src/abbrev.c src/alloc.c src/buffer.c src/callint.c src/casetab.c src/coding.c src/composite.c src/config.in src/data.c src/dispextern.h src/doc.c src/editfns.c src/emacs.c src/eval.c src/fileio.c src/fns.c src/fontset.c src/frame.c src/frame.h src/image.c src/keyboard.c src/keymap.c src/keymap.h src/lisp.h src/lread.c src/m/alpha.h src/mac.c src/macfns.c src/macgui.h src/macmenu.c src/macselect.c src/macterm.c src/macterm.h src/minibuf.c src/process.c src/process.h src/search.c src/sunfns.c src/sysdep.c src/term.c src/termhooks.h src/w32.c src/w32term.c src/window.c src/xdisp.c src/xfaces.c src/xfns.c src/xmenu.c src/xselect.c src/xterm.c src/xterm.h
diffstat 1599 files changed, 1899 insertions(+), 1711 deletions(-) [+]
line wrap: on
line diff
--- a/CONTRIBUTE	Thu Jul 26 05:25:19 2007 +0000
+++ b/CONTRIBUTE	Thu Jul 26 05:28:10 2007 +0000
@@ -207,7 +207,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,
--- a/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -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-20  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* configure.in: Complain if X seems to be installed but no
@@ -6561,7 +6567,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,
--- a/INSTALL	Thu Jul 26 05:25:19 2007 +0000
+++ b/INSTALL	Thu Jul 26 05:28:10 2007 +0000
@@ -911,7 +911,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,
--- a/INSTALL.CVS	Thu Jul 26 05:25:19 2007 +0000
+++ b/INSTALL.CVS	Thu Jul 26 05:28:10 2007 +0000
@@ -88,7 +88,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,
--- a/Makefile.in	Thu Jul 26 05:25:19 2007 +0000
+++ b/Makefile.in	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/README	Thu Jul 26 05:28:10 2007 +0000
@@ -98,7 +98,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,
--- a/admin/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/admin/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -1,3 +1,7 @@
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+	* Relicense all FSF files to GPLv3 or later.
+
 2007-06-07  Glenn Morris  <rgm@gnu.org>
 
 	* admin.el (set-copyright): New function.
@@ -433,7 +437,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,
--- a/admin/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/admin/README	Thu Jul 26 05:28:10 2007 +0000
@@ -71,7 +71,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,
--- a/admin/admin.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/admin/admin.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/admin/alloc-colors.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/admin/alloc-colors.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/admin/build-configs	Thu Jul 26 05:25:19 2007 +0000
+++ b/admin/build-configs	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/admin/cus-test.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/admin/cus-test.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/admin/diff-tar-files	Thu Jul 26 05:25:19 2007 +0000
+++ b/admin/diff-tar-files	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/admin/make-announcement	Thu Jul 26 05:25:19 2007 +0000
+++ b/admin/make-announcement	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/admin/make-emacs	Thu Jul 26 05:25:19 2007 +0000
+++ b/admin/make-emacs	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/admin/notes/copyright	Thu Jul 26 05:25:19 2007 +0000
+++ b/admin/notes/copyright	Thu Jul 26 05:28:10 2007 +0000
@@ -603,7 +603,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,
--- a/admin/nt/makedist.bat	Thu Jul 26 05:25:19 2007 +0000
+++ b/admin/nt/makedist.bat	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,7 @@
 rem
 rem GNU Emacs is free software; you can redistribute it and/or modify
 rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; either version 2, or (at your option)
+rem the Free Software Foundation; either version 3, or (at your option)
 rem any later version.
 rem
 rem GNU Emacs is distributed in the hope that it will be useful,
--- a/admin/quick-install-emacs	Thu Jul 26 05:25:19 2007 +0000
+++ b/admin/quick-install-emacs	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/admin/revdiff	Thu Jul 26 05:25:19 2007 +0000
+++ b/admin/revdiff	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/config.bat	Thu Jul 26 05:25:19 2007 +0000
+++ b/config.bat	Thu Jul 26 05:28:10 2007 +0000
@@ -8,7 +8,7 @@
 
 rem   GNU Emacs is free software; you can redistribute it and/or modify
 rem   it under the terms of the GNU General Public License as published by
-rem   the Free Software Foundation; either version 2, or (at your option)
+rem   the Free Software Foundation; either version 3, or (at your option)
 rem   any later version.
 
 rem   GNU Emacs is distributed in the hope that it will be useful,
--- a/configure.in	Thu Jul 26 05:25:19 2007 +0000
+++ b/configure.in	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,7 @@
 dnl
 dnl  GNU Emacs is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
-dnl  the Free Software Foundation; either version 2, or (at your option)
+dnl  the Free Software Foundation; either version 3, or (at your option)
 dnl  any later version.
 dnl
 dnl  GNU Emacs is distributed in the hope that it will be useful,
@@ -3041,7 +3041,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,
--- a/etc/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -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-07-24  Michael Albinus  <michael.albinus@gmx.de>
 
 	* NEWS: New functions `start-file-process-shell-command' and
@@ -3691,7 +3697,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,
--- a/etc/DEBUG	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/DEBUG	Thu Jul 26 05:28:10 2007 +0000
@@ -748,7 +748,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,
--- a/etc/DISTRIB	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/DISTRIB	Thu Jul 26 05:28:10 2007 +0000
@@ -101,7 +101,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,
--- a/etc/ERC-NEWS	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/ERC-NEWS	Thu Jul 26 05:28:10 2007 +0000
@@ -1089,7 +1089,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,
--- a/etc/ETAGS.EBNF	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/ETAGS.EBNF	Thu Jul 26 05:28:10 2007 +0000
@@ -101,8 +101,8 @@
 
     This document 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 of the License, or
-    (at your option) any later version.
+    the Free Software Foundation; either version 3, or (at your option)
+    any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -110,5 +110,6 @@
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    along with this program; see the file COPYING.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+    Boston, MA 02110-1301 USA.
--- a/etc/ETAGS.README	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/ETAGS.README	Thu Jul 26 05:28:10 2007 +0000
@@ -36,8 +36,8 @@
 
 This program 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 of the License, or
-(at your option) any later version.
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,5 +45,6 @@
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+along with this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
--- a/etc/GNUS-NEWS	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/GNUS-NEWS	Thu Jul 26 05:28:10 2007 +0000
@@ -524,7 +524,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,
--- a/etc/HELLO	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/HELLO	Thu Jul 26 05:28:10 2007 +0000
@@ -70,7 +70,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,
--- a/etc/MACHINES	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/MACHINES	Thu Jul 26 05:28:10 2007 +0000
@@ -1506,7 +1506,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,
--- a/etc/MH-E-NEWS	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/MH-E-NEWS	Thu Jul 26 05:28:10 2007 +0000
@@ -3122,7 +3122,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,
--- a/etc/MORE.STUFF	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/MORE.STUFF	Thu Jul 26 05:28:10 2007 +0000
@@ -284,7 +284,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,
--- a/etc/Makefile	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/Makefile	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/etc/NEWS.1-17	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/NEWS.1-17	Thu Jul 26 05:28:10 2007 +0000
@@ -2515,7 +2515,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,
--- a/etc/NEWS.18	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/NEWS.18	Thu Jul 26 05:28:10 2007 +0000
@@ -1605,7 +1605,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,
--- a/etc/NEWS.19	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/NEWS.19	Thu Jul 26 05:28:10 2007 +0000
@@ -6524,7 +6524,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,
--- a/etc/NEWS.20	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/NEWS.20	Thu Jul 26 05:28:10 2007 +0000
@@ -4498,7 +4498,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,
--- a/etc/NEWS.21	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/NEWS.21	Thu Jul 26 05:28:10 2007 +0000
@@ -4885,7 +4885,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,
--- a/etc/NEWS.22	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/NEWS.22	Thu Jul 26 05:28:10 2007 +0000
@@ -36,6 +36,8 @@
 
 * Installation Changes in Emacs 22.2
 
+** Emacs is now licensed under the GNU GPL version 3 (or later).
+
 * Changes in Emacs 22.2
 
 ** The values of `dired-recursive-deletes' and `dired-recursive-copies'
@@ -5419,7 +5421,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,
--- a/etc/PROBLEMS	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/PROBLEMS	Thu Jul 26 05:28:10 2007 +0000
@@ -3863,7 +3863,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,
--- a/etc/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/README	Thu Jul 26 05:28:10 2007 +0000
@@ -40,7 +40,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,
--- a/etc/TERMS	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/TERMS	Thu Jul 26 05:28:10 2007 +0000
@@ -237,8 +237,8 @@
 
     This document 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 of the License, or
-    (at your option) any later version.
+    the Free Software Foundation; either version 3, or (at your option)
+    any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -246,5 +246,6 @@
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    along with this program; see the file COPYING.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+    Boston, MA 02110-1301 USA.
--- a/etc/TODO	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/TODO	Thu Jul 26 05:28:10 2007 +0000
@@ -620,7 +620,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,
--- a/etc/TUTORIAL	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/TUTORIAL	Thu Jul 26 05:28:10 2007 +0000
@@ -1111,7 +1111,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,
--- a/etc/TUTORIAL.eo	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/TUTORIAL.eo	Thu Jul 26 05:28:10 2007 +0000
@@ -1096,7 +1096,7 @@
  
    "GNU Emacs" estas libera programverko; vi povas øin pludistribui
    kaj/aý modifi je la kondiæoj de la GNUa Øenerala Publika Permesilo,
-   eldonita de "Free Software Foundation", laý la versio 2 de tiu
+   eldonita de "Free Software Foundation", laý la versio 3 de tiu
    Permesilo aý, se vi preferas, ajna posta versio.
  
    Ni distribuas æi tiun programon esperante ke øi estos utila, tamen
--- a/etc/calccard.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/calccard.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -20,7 +20,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,
--- a/etc/compilation.txt	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/compilation.txt	Thu Jul 26 05:28:10 2007 +0000
@@ -414,8 +414,8 @@
 
     This document 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 of the License, or
-    (at your option) any later version.
+    the Free Software Foundation; either version 3, or (at your option)
+    any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -423,5 +423,6 @@
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    along with this program; see the file COPYING.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+    Boston, MA 02110-1301 USA.
--- a/etc/cs-dired-ref.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/cs-dired-ref.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/etc/cs-refcard.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/cs-refcard.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -18,7 +18,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,
--- a/etc/cs-survival.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/cs-survival.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -28,7 +28,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,
--- a/etc/de-refcard.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/de-refcard.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -30,7 +30,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,
--- a/etc/dired-ref.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/dired-ref.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/etc/edt-user.doc	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/edt-user.doc	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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) any later version.
+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
@@ -832,7 +832,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,
--- a/etc/emacs-buffer.gdb	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/emacs-buffer.gdb	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/etc/emacs.1	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/emacs.1	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/etc/emacs.bash	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/emacs.bash	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/etc/emacs.py	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/emacs.py	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/etc/enriched.doc	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/enriched.doc	Thu Jul 26 05:28:10 2007 +0000
@@ -263,8 +263,8 @@
 
     This document 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 of the License, or
-    (at your option) any later version.
+    the Free Software Foundation; either version 3, or (at your option)
+    any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -272,6 +272,6 @@
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+    along with this program; see the file COPYING.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+    Boston, MA 02110-1301 USA.
--- a/etc/fr-drdref.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/fr-drdref.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/etc/fr-refcard.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/fr-refcard.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -21,7 +21,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,
--- a/etc/fr-survival.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/fr-survival.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -29,7 +29,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,
--- a/etc/gnus-tut.txt	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/gnus-tut.txt	Thu Jul 26 05:28:10 2007 +0000
@@ -34,7 +34,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,
--- a/etc/grep.txt	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/grep.txt	Thu Jul 26 05:28:10 2007 +0000
@@ -91,8 +91,8 @@
 
     This document 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 of the License, or
-    (at your option) any later version.
+    the Free Software Foundation; either version 3, or (at your option)
+    any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -100,8 +100,9 @@
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    along with this program; see the file COPYING.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+    Boston, MA 02110-1301 USA.
 
 
 ;;; Local Variables:
--- a/etc/images/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/images/README	Thu Jul 26 05:28:10 2007 +0000
@@ -21,7 +21,7 @@
 File: mh-logo.xpm
 Author: Satyaki Das
 Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
 
 
 The following icons are from GTK+ 2.x and GNOME 2.x.  They are not
@@ -32,7 +32,7 @@
   Tor Lillqvist, Garrett LeSage, Dennis Cranston, Jody Goldberg, Luca
   Ferretti, Mark Finlay, Lapo Calamandrei, Andreas Nilsson and Marco
   Pesenti Gritti
-  License: GNU General Public License version 2 (see COPYING)
+  License: GNU General Public License version 2
 
 * From GTK+ 2.x:
 
--- a/etc/images/ezimage/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/images/ezimage/README	Thu Jul 26 05:28:10 2007 +0000
@@ -9,4 +9,4 @@
 Author: Eric M. Ludlam
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
--- a/etc/images/gnus/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/images/gnus/README	Thu Jul 26 05:28:10 2007 +0000
@@ -4,7 +4,7 @@
 Author: Simon Josefsson <simon@josefsson.org>
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
 
 Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm
   describe-group.pbm describe-group.xpm exit-gnus.pbm exit-gnus.xpm
@@ -20,7 +20,7 @@
 Author: Luis Fernandes <elf@ee.ryerson.ca>
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
 
 The following icons are from GNOME 2.x. They are not part of Emacs,
 but distributed and used by Emacs.
@@ -30,7 +30,7 @@
   Tor Lillqvist, Garrett LeSage, Dennis Cranston, Jody Goldberg, Luca
   Ferretti, Mark Finlay, Lapo Calamandrei, Andreas Nilsson and Marco
   Pesenti Gritti
-  License: GNU General Public License version 2 (see COPYING)
+  License: GNU General Public License version 2
 
 toggle-subscription.xpm       (GNOME stock/document/stock_task-recurring)
 kill-group.pbm and kill-group.xpm are converted from close.xpm
--- a/etc/images/gud/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/images/gud/README	Thu Jul 26 05:28:10 2007 +0000
@@ -3,7 +3,7 @@
 The following icons were created by Nick Roberts <nickrob@snap.net.nz>.
 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
   
   break.pbm, nexti.pbm, go.pbm, pp.pbm, print.pbm, pstar.pbm, remove.pbm
   break.xpm, nexti.xpm, go.xpm, pp.xpm, print.xpm, pstar.xpm, remove.xpm
@@ -33,7 +33,7 @@
 
 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
 
   cont.pbm and cont.xpm were converted from continue.gif
   down.pbm and down.xpm were converted from down.gif
--- a/etc/images/icons/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/images/icons/README	Thu Jul 26 05:28:10 2007 +0000
@@ -3,4 +3,4 @@
 Files: emacs_16.png emacs_24.png emacs_32.png emacs_48.png
 Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
 Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
--- a/etc/images/mail/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/images/mail/README	Thu Jul 26 05:28:10 2007 +0000
@@ -8,7 +8,7 @@
   Tor Lillqvist, Garrett LeSage, Dennis Cranston, Jody Goldberg, Luca
   Ferretti, Mark Finlay, Lapo Calamandrei, Andreas Nilsson and Marco
   Pesenti Gritti
-  License: GNU General Public License version 2 (see COPYING)
+  License: GNU General Public License version 2
 
 Emacs images and their GNOME source (GNOME icons are from stock/net/
 directory unless otherwise stated):
--- a/etc/images/smilies/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/images/smilies/README	Thu Jul 26 05:28:10 2007 +0000
@@ -5,4 +5,4 @@
          Schroeder, Oliver Scholz, Per Abrahamsen, Kim F. Storm.
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
--- a/etc/orgcard.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/orgcard.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -25,7 +25,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,
--- a/etc/pl-refcard.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/pl-refcard.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -39,7 +39,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,
--- a/etc/ps-prin0.ps	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/ps-prin0.ps	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/etc/ps-prin1.ps	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/ps-prin1.ps	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/etc/pt-br-refcard.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/pt-br-refcard.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -21,7 +21,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,
--- a/etc/refcard.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/refcard.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -21,7 +21,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,
--- a/etc/ses-example.ses	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/ses-example.ses	Thu Jul 26 05:28:10 2007 +0000
@@ -213,8 +213,8 @@
 ;;; 
 ;;;   This document 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 of the License, or
-;;;   (at your option) any later version.
+;;;   the Free Software Foundation; either version 3, or (at your option)
+;;;   any later version.
 ;;;
 ;;;   This program is distributed in the hope that it will be useful,
 ;;;   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -222,8 +222,8 @@
 ;;;   GNU General Public License for more details.
 ;;;
 ;;;   You should have received a copy of the GNU General Public License
-;;;   along with this program; if not, write to the Free Software
-;;;   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+;;;   along with this program; see the file COPYING.  If not, write to the 
+;;;   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+;;;   Boston, MA 02110-1301, USA.
 
 ;;; arch-tag: 4fcb0843-e3f9-4270-b8fb-998129190765
--- a/etc/sk-dired-ref.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/sk-dired-ref.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/etc/sk-refcard.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/sk-refcard.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -18,7 +18,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,
--- a/etc/sk-survival.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/sk-survival.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -28,7 +28,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,
--- a/etc/splash.xpm	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/splash.xpm	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/etc/splash8.xpm	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/splash8.xpm	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/etc/survival.tex	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/survival.tex	Thu Jul 26 05:28:10 2007 +0000
@@ -32,7 +32,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,
--- a/etc/tree-widget/default/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/tree-widget/default/README	Thu Jul 26 05:28:10 2007 +0000
@@ -6,4 +6,4 @@
        open.xpm
 Author: David Ponce <david.ponce@wanadoo.fr>
 Copyright (C) 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
--- a/etc/tree-widget/folder/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/etc/tree-widget/folder/README	Thu Jul 26 05:28:10 2007 +0000
@@ -6,4 +6,4 @@
         no-handle.xpm open.png open.xpm
 Author: David Ponce <david.ponce@wanadoo.fr>
 Copyright (C) 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
--- a/leim/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -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-07-16  Eli Zaretskii  <eliz@gnu.org>
 
 	* makefile.w32-in (extraclean): Don't delete *~.
@@ -1701,7 +1707,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,
--- a/leim/Makefile.in	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/Makefile.in	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/leim/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/README	Thu Jul 26 05:28:10 2007 +0000
@@ -45,7 +45,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,
--- a/leim/leim-ext.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/leim-ext.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/leim/makefile.w32-in	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/makefile.w32-in	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/leim/quail/croatian.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/croatian.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/leim/quail/cyril-jis.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/cyril-jis.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/leim/quail/cyrillic.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/cyrillic.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/leim/quail/czech.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/czech.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/leim/quail/ethiopic.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/ethiopic.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/leim/quail/georgian.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/georgian.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,
--- a/leim/quail/greek.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/greek.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/leim/quail/hangul.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/hangul.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/leim/quail/hangul3.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/hangul3.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/leim/quail/hanja-jis.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/hanja-jis.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/leim/quail/hanja.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/hanja.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/leim/quail/hanja3.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/hanja3.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/leim/quail/hebrew.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/hebrew.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/leim/quail/indian.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/indian.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/leim/quail/ipa.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/ipa.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/leim/quail/japanese.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/japanese.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/leim/quail/lao.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/lao.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/leim/quail/latin-alt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/latin-alt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/leim/quail/latin-ltx.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/latin-ltx.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/leim/quail/latin-post.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/latin-post.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/leim/quail/latin-pre.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/latin-pre.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/leim/quail/lrt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/lrt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/leim/quail/py-punct.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/py-punct.el	Thu Jul 26 05:28:10 2007 +0000
@@ -15,7 +15,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,
--- a/leim/quail/pypunct-b5.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/pypunct-b5.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
Binary file leim/quail/rfc1345.el has changed
--- a/leim/quail/sgml-input.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/sgml-input.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,
--- a/leim/quail/sisheng.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/sisheng.el	Thu Jul 26 05:28:10 2007 +0000
@@ -8,7 +8,7 @@
 
 ;; This program 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.
 
 ;; This program is distributed in the hope that it will be useful,
--- a/leim/quail/slovak.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/slovak.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/leim/quail/symbol-ksc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/symbol-ksc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/leim/quail/thai.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/thai.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/leim/quail/tibetan.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/tibetan.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/leim/quail/uni-input.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/uni-input.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,
--- a/leim/quail/viqr.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/viqr.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/leim/quail/vntelex.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/vntelex.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/leim/quail/welsh.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/leim/quail/welsh.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,
--- a/lib-src/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -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-07-17  Francesco Potort,Al(B  <pot@gnu.org>
 
 	* etags.c (C_entries): Reset the fvdef machine when out of function.
@@ -6257,7 +6263,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,
--- a/lib-src/Makefile.in	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/Makefile.in	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/b2m.pl	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/b2m.pl	Thu Jul 26 05:28:10 2007 +0000
@@ -7,8 +7,8 @@
 
 # This program 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 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
 
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,9 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-# USA.
+# along with this program; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA.
 
 # Maintained by Jonathan Kamens <jik@kamens.brookline.ma.us>.
 
--- a/lib-src/cvtmail.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/cvtmail.c	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/lib-src/digest-doc.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/digest-doc.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/ebrowse.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/ebrowse.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/emacsclient.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/emacsclient.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/emacstool.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/emacstool.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/etags.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/etags.c	Thu Jul 26 05:28:10 2007 +0000
@@ -36,8 +36,8 @@
 
 This program 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 of the License, or
-(at your option) any later version.
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,8 +45,9 @@
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+along with this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
 
 
 /* NB To comply with the above BSD license, copyright information is
--- a/lib-src/fakemail.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/fakemail.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/getopt.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/getopt.c	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,7 @@
 
    This program 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.
 
    This program is distributed in the hope that it will be useful,
--- a/lib-src/getopt1.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/getopt1.c	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,7 @@
 
    This program 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.
 
    This program is distributed in the hope that it will be useful,
--- a/lib-src/getopt_.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/getopt_.h	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,7 @@
 
    This program 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.
 
    This program is distributed in the hope that it will be useful,
--- a/lib-src/getopt_int.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/getopt_int.h	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,7 @@
 
    This program 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.
 
    This program is distributed in the hope that it will be useful,
--- a/lib-src/gettext.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/gettext.h	Thu Jul 26 05:28:10 2007 +0000
@@ -4,7 +4,7 @@
 
    This program 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.
 
    This program is distributed in the hope that it will be useful,
--- a/lib-src/grep-changelog	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/grep-changelog	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/hexl.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/hexl.c	Thu Jul 26 05:28:10 2007 +0000
@@ -6,8 +6,8 @@
 
 This program 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 of the License, or
-(at your option) any later version.
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,9 @@
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+along with this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lib-src/make-docfile.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/make-docfile.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/makefile.w32-in	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/makefile.w32-in	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/movemail.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/movemail.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/ntlib.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/ntlib.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/ntlib.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/ntlib.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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) any later
+   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
--- a/lib-src/pop.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/pop.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/pop.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/pop.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/profile.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/profile.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/rcs-checkin	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/rcs-checkin	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lib-src/rcs2log	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/rcs2log	Thu Jul 26 05:28:10 2007 +0000
@@ -59,7 +59,7 @@
 
 # This program 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.
 #
 # This program is distributed in the hope that it will be useful,
--- a/lib-src/sorted-doc.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/sorted-doc.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/test-distrib.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/test-distrib.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lib-src/update-game-score.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/update-game-score.c	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/lib-src/vcdiff	Thu Jul 26 05:25:19 2007 +0000
+++ b/lib-src/vcdiff	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -1,3 +1,42 @@
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+	* Relicense all FSF files to GPLv3 or later.
+
+	* COPYING: Switch to GPLv3.
+
+2007-07-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* pcvs.el (cvs-temp-buffer): Undo last ill-conceived change.
+	Replace it with another one which disables undo before calling
+	erase-buffer and then turns it back on if needed.
+
+2007-07-24  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+	* ps-print.el: Problem with foreground and background color when
+	printing a buffer with and without faces.  Reported by Christian
+	Schlauer <cs-muelleimer-rubbish.bin@arcor.de>.
+	(ps-print-version): New version 6.7.5.
+	(ps-default-fg): Change default value to nil, so black color is used
+	when a face does not specify a foreground color.
+	(ps-default-bg): Change default value to nil, so white color is used
+	for background color.
+	(ps-begin-job): Fix code.
+
+2007-07-24  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* vc-hg.el (vc-hg-revision-completion-table): Temporarily comment out.
+
+2007-07-24  Glenn Morris  <rgm@gnu.org>
+
+	* calendar/cal-tex.el (cal-tex-holidays, cal-tex-diary)
+	(cal-tex-rules, cal-tex-buffer, cal-tex-24)
+	(cal-tex-cursor-month-landscape, cal-tex-cursor-month)
+	(cal-tex-cursor-week, cal-tex-cursor-week2)
+	(cal-tex-cursor-week-iso, cal-tex-week-hours)
+	(cal-tex-cursor-week-monday, cal-tex-weekly4-box)
+	(cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week)
+	(cal-tex-cursor-filofax-daily, cal-tex-daily-page): Doc fix.
+
 2007-07-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* calendar/calendar.el (calendar-mode-map): Move initialization
@@ -78,6 +117,10 @@
 
 	* net/webjump.el (webjump-url-encode): Fix for non-ASCII characters.
 
+2007-07-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* pcvs.el (cvs-temp-buffer): Disable undo in temp buffers.
+
 2007-07-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* dired.el (dired-mode-map): Bind wdired-change-to-wdired-mode to
@@ -2952,7 +2995,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,
--- a/lisp/ChangeLog.1	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ChangeLog.1	Thu Jul 26 05:28:10 2007 +0000
@@ -3253,7 +3253,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,
--- a/lisp/ChangeLog.10	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ChangeLog.10	Thu Jul 26 05:28:10 2007 +0000
@@ -23541,7 +23541,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,
--- a/lisp/ChangeLog.11	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ChangeLog.11	Thu Jul 26 05:28:10 2007 +0000
@@ -14343,7 +14343,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,
--- a/lisp/ChangeLog.12	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ChangeLog.12	Thu Jul 26 05:28:10 2007 +0000
@@ -33358,7 +33358,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,
--- a/lisp/ChangeLog.2	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ChangeLog.2	Thu Jul 26 05:28:10 2007 +0000
@@ -4001,7 +4001,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,
--- a/lisp/ChangeLog.3	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ChangeLog.3	Thu Jul 26 05:28:10 2007 +0000
@@ -12622,7 +12622,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,
--- a/lisp/ChangeLog.4	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ChangeLog.4	Thu Jul 26 05:28:10 2007 +0000
@@ -8946,7 +8946,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,
--- a/lisp/ChangeLog.5	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ChangeLog.5	Thu Jul 26 05:28:10 2007 +0000
@@ -9268,7 +9268,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,
--- a/lisp/ChangeLog.6	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ChangeLog.6	Thu Jul 26 05:28:10 2007 +0000
@@ -8029,7 +8029,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,
--- a/lisp/ChangeLog.7	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ChangeLog.7	Thu Jul 26 05:28:10 2007 +0000
@@ -23146,7 +23146,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,
--- a/lisp/ChangeLog.8	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ChangeLog.8	Thu Jul 26 05:28:10 2007 +0000
@@ -9995,7 +9995,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,
--- a/lisp/ChangeLog.9	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ChangeLog.9	Thu Jul 26 05:28:10 2007 +0000
@@ -20702,7 +20702,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,
--- a/lisp/Makefile.in	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/Makefile.in	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/abbrev.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/abbrev.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/abbrevlist.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/abbrevlist.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/add-log.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/add-log.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/align.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/align.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/allout.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/allout.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/ansi-color.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ansi-color.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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) 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
--- a/lisp/apropos.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/apropos.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/arc-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/arc-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/array.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/array.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/autoarg.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/autoarg.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/autoinsert.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/autoinsert.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/autorevert.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/autorevert.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/avoid.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/avoid.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/battery.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/battery.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/bindings.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/bindings.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/bookmark.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/bookmark.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/bs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/bs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/buff-menu.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/buff-menu.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/button.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/button.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/README	Thu Jul 26 05:28:10 2007 +0000
@@ -233,7 +233,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,
--- a/lisp/calc/README.prev	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/README.prev	Thu Jul 26 05:28:10 2007 +0000
@@ -987,7 +987,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,
--- a/lisp/calc/calc-aent.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-aent.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-alg.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-alg.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-arith.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-arith.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-bin.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-bin.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-comb.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-comb.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-cplx.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-cplx.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-embed.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-embed.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-ext.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-ext.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-fin.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-fin.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-forms.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-forms.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-frac.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-frac.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-funcs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-funcs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-graph.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-graph.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-help.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-help.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-incom.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-incom.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-keypd.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-keypd.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-lang.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-lang.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-macs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-macs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-map.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-map.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-math.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-math.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-misc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-misc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-mtx.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-mtx.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-poly.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-poly.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-prog.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-prog.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-rewr.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-rewr.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-rules.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-rules.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-sel.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-sel.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-stat.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-stat.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-store.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-store.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-stuff.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-stuff.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-trail.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-trail.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-undo.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-undo.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-units.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-units.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-vec.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-vec.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc-yank.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc-yank.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/calc/calcalg2.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calcalg2.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calcalg3.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calcalg3.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calccomp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calccomp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calc/calcsel2.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calc/calcsel2.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calculator.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calculator.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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) 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
--- a/lisp/calendar/appt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/appt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/calendar/cal-bahai.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/cal-bahai.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/calendar/cal-china.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/cal-china.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/calendar/cal-coptic.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/cal-coptic.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/calendar/cal-dst.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/cal-dst.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/calendar/cal-french.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/cal-french.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/calendar/cal-hebrew.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/cal-hebrew.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/calendar/cal-html.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/cal-html.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/calendar/cal-islam.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/cal-islam.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/calendar/cal-iso.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/cal-iso.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/calendar/cal-julian.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/cal-julian.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/calendar/cal-mayan.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/cal-mayan.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/calendar/cal-menu.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/cal-menu.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/calendar/cal-move.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/cal-move.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/calendar/cal-persia.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/cal-persia.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/calendar/cal-x.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/cal-x.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/calendar/calendar.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/calendar.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/calendar/diary-lib.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/diary-lib.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/calendar/holidays.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/holidays.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/calendar/icalendar.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/icalendar.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/calendar/lunar.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/lunar.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/calendar/parse-time.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/parse-time.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/calendar/solar.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/solar.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/calendar/time-date.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/time-date.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/calendar/timeclock.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/timeclock.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/calendar/todo-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/calendar/todo-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/case-table.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/case-table.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/cdl.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/cdl.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/chistory.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/chistory.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/cmuscheme.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/cmuscheme.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/comint.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/comint.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/compare-w.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/compare-w.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/complete.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/complete.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/completion.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/completion.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/composite.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/composite.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/cus-dep.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/cus-dep.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/cus-edit.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/cus-edit.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/cus-face.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/cus-face.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/cus-start.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/cus-start.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/cus-theme.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/cus-theme.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/custom.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/custom.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/cvs-status.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/cvs-status.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/dabbrev.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/dabbrev.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/delim-col.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/delim-col.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/delsel.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/delsel.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/descr-text.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/descr-text.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/desktop.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/desktop.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/dframe.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/dframe.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/diff-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/diff-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/diff.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/diff.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/dired-aux.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/dired-aux.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/dired-x.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/dired-x.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/dired.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/dired.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/dirtrack.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/dirtrack.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/disp-table.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/disp-table.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/dnd.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/dnd.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/dos-fns.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/dos-fns.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/dos-vars.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/dos-vars.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/dos-w32.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/dos-w32.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/double.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/double.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/ebuff-menu.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ebuff-menu.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/echistory.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/echistory.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/ediff-diff.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ediff-diff.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/ediff-help.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ediff-help.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/ediff-hook.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ediff-hook.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/ediff-init.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ediff-init.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/ediff-merg.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ediff-merg.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/ediff-mult.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ediff-mult.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/ediff-ptch.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ediff-ptch.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/ediff-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ediff-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/ediff-vers.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ediff-vers.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/ediff-wind.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ediff-wind.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/ediff.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ediff.el	Thu Jul 26 05:28:10 2007 +0000
@@ -15,7 +15,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,
--- a/lisp/edmacro.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/edmacro.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/ehelp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ehelp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/electric.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/electric.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/elide-head.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/elide-head.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/advice.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/advice.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/emacs-lisp/assoc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/assoc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/authors.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/authors.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/autoload.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/autoload.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/backquote.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/backquote.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/benchmark.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/benchmark.el	Thu Jul 26 05:28:10 2007 +0000
@@ -7,7 +7,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,
--- a/lisp/emacs-lisp/bindat.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/bindat.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/byte-opt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/byte-opt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/emacs-lisp/byte-run.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/byte-run.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/emacs-lisp/bytecomp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/bytecomp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/emacs-lisp/checkdoc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/checkdoc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/cl-compat.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/cl-compat.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/cl-extra.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/cl-extra.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/cl-indent.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/cl-indent.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/emacs-lisp/cl-macs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/cl-macs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/cl-seq.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/cl-seq.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/cl-specs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/cl-specs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/emacs-lisp/cl.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/cl.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/copyright.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/copyright.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/crm.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/crm.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/cust-print.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/cust-print.el	Thu Jul 26 05:28:10 2007 +0000
@@ -15,7 +15,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,
--- a/lisp/emacs-lisp/debug.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/debug.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/derived.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/derived.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/emacs-lisp/disass.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/disass.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/emacs-lisp/easy-mmode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/easy-mmode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/emacs-lisp/easymenu.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/easymenu.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/edebug.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/edebug.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/eldoc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/eldoc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/emacs-lisp/elint.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/elint.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/elp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/elp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/emacs-lisp/ewoc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/ewoc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/emacs-lisp/find-func.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/find-func.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/emacs-lisp/find-gc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/find-gc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/emacs-lisp/float-sup.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/float-sup.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/generic.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/generic.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/gulp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/gulp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/helper.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/helper.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/levents.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/levents.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/lisp-mnt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/lisp-mnt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/emacs-lisp/lisp-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/lisp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/lisp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/lmenu.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/lmenu.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/emacs-lisp/lselect.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/lselect.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/emacs-lisp/lucid.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/lucid.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/macroexp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/macroexp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/emacs-lisp/map-ynp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/map-ynp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/pp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/pp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/re-builder.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/re-builder.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/regexp-opt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/regexp-opt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/regi.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/regi.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/emacs-lisp/ring.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/ring.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/rx.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/rx.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/shadow.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/shadow.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/sregex.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/sregex.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emacs-lisp/syntax.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/syntax.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/tcover-ses.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/tcover-ses.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/emacs-lisp/tcover-unsafep.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/tcover-unsafep.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/testcover.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/testcover.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/timer.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/timer.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/emacs-lisp/tq.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/tq.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/emacs-lisp/trace.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/trace.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/emacs-lisp/unsafep.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/unsafep.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emacs-lisp/warnings.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lisp/warnings.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/emacs-lock.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emacs-lock.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emulation/crisp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/crisp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emulation/cua-base.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/cua-base.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emulation/cua-gmrk.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/cua-gmrk.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emulation/cua-rect.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/cua-rect.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emulation/edt-lk201.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/edt-lk201.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emulation/edt-mapper.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/edt-mapper.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emulation/edt-pc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/edt-pc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emulation/edt-vt100.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/edt-vt100.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emulation/edt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/edt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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
+;; 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
--- a/lisp/emulation/keypad.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/keypad.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emulation/pc-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/pc-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emulation/pc-select.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/pc-select.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/emulation/tpu-edt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/tpu-edt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/emulation/tpu-extras.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/tpu-extras.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emulation/tpu-mapper.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/tpu-mapper.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/emulation/vip.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/vip.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/emulation/viper-cmd.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/viper-cmd.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/emulation/viper-ex.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/viper-ex.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/emulation/viper-init.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/viper-init.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/emulation/viper-keym.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/viper-keym.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/emulation/viper-macs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/viper-macs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/emulation/viper-mous.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/viper-mous.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/emulation/viper-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/viper-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/emulation/viper.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/viper.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/emulation/ws-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/emulation/ws-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/env.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/env.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/erc/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -1,3 +1,7 @@
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+	* Relicense all FSF files to GPLv3 or later.
+
 2007-06-14  Juanma Barranquero  <lekktu@gmail.com>
 
 	* erc-goodies.el (erc-scroll-to-bottom): Remove redundant check.
@@ -367,7 +371,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,
--- a/lisp/erc/ChangeLog.01	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/ChangeLog.01	Thu Jul 26 05:28:10 2007 +0000
@@ -1041,7 +1041,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,
--- a/lisp/erc/ChangeLog.02	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/ChangeLog.02	Thu Jul 26 05:28:10 2007 +0000
@@ -2602,7 +2602,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,
--- a/lisp/erc/ChangeLog.03	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/ChangeLog.03	Thu Jul 26 05:28:10 2007 +0000
@@ -2146,7 +2146,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,
--- a/lisp/erc/ChangeLog.04	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/ChangeLog.04	Thu Jul 26 05:28:10 2007 +0000
@@ -2075,7 +2075,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,
--- a/lisp/erc/ChangeLog.05	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/ChangeLog.05	Thu Jul 26 05:28:10 2007 +0000
@@ -1223,7 +1223,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,
--- a/lisp/erc/ChangeLog.06	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/ChangeLog.06	Thu Jul 26 05:28:10 2007 +0000
@@ -1436,7 +1436,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,
--- a/lisp/erc/erc-autoaway.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-autoaway.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/erc/erc-backend.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-backend.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/erc/erc-button.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-button.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/erc/erc-capab.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-capab.el	Thu Jul 26 05:28:10 2007 +0000
@@ -4,7 +4,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,
--- a/lisp/erc/erc-compat.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-compat.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/erc/erc-dcc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-dcc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/erc/erc-ezbounce.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-ezbounce.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/erc/erc-fill.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-fill.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/erc/erc-goodies.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-goodies.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/erc/erc-hecomplete.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-hecomplete.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/erc/erc-ibuffer.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-ibuffer.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/erc/erc-identd.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-identd.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/erc/erc-imenu.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-imenu.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/erc/erc-join.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-join.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/erc/erc-lang.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-lang.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/erc/erc-log.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-log.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/erc/erc-match.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-match.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/erc/erc-menu.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-menu.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/erc/erc-netsplit.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-netsplit.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/erc/erc-networks.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-networks.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/erc/erc-nicklist.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-nicklist.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/erc/erc-notify.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-notify.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/erc/erc-page.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-page.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/erc/erc-pcomplete.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-pcomplete.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/erc/erc-replace.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-replace.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/erc/erc-ring.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-ring.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/erc/erc-services.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-services.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/erc/erc-sound.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-sound.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/erc/erc-speedbar.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-speedbar.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/erc/erc-spelling.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-spelling.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/erc/erc-stamp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-stamp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/erc/erc-track.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-track.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/erc/erc-truncate.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-truncate.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/erc/erc-xdcc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc-xdcc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/erc/erc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/erc/erc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -17,7 +17,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,
--- a/lisp/eshell/em-alias.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-alias.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/em-banner.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-banner.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/em-basic.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-basic.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/em-cmpl.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-cmpl.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/em-dirs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-dirs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/em-glob.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-glob.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/em-hist.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-hist.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/em-ls.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-ls.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/em-pred.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-pred.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/em-prompt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-prompt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/em-rebind.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-rebind.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/em-script.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-script.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/em-smart.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-smart.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/em-term.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-term.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/em-unix.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-unix.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/em-xtra.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/em-xtra.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/esh-arg.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/esh-arg.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/esh-cmd.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/esh-cmd.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/esh-ext.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/esh-ext.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/esh-io.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/esh-io.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/esh-maint.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/esh-maint.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/esh-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/esh-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/esh-module.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/esh-module.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/eshell/esh-opt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/esh-opt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/esh-proc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/esh-proc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/esh-test.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/esh-test.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/esh-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/esh-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/esh-var.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/esh-var.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/eshell/eshell.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/eshell/eshell.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
@@ -77,7 +77,7 @@
 ;;
 ;; Eshell 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.
 ;;
 ;; This program is distributed in the hope that it will be useful, but
--- a/lisp/expand.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/expand.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/ezimage.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ezimage.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/facemenu.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/facemenu.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/faces.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/faces.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/ffap.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ffap.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/filecache.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/filecache.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/files.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/files.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/filesets.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/filesets.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; This program 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.
 
 ;; This program is distributed in the hope that it will be useful,
--- a/lisp/find-dired.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/find-dired.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/find-file.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/find-file.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/find-lisp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/find-lisp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/finder.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/finder.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/flow-ctrl.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/flow-ctrl.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/foldout.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/foldout.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/follow.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/follow.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/font-core.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/font-core.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/font-lock.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/font-lock.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/format.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/format.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/forms-d2.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/forms-d2.el	Thu Jul 26 05:28:10 2007 +0000
@@ -8,6 +8,21 @@
 
 ;; 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.
+
 ;;; Commentary:
 
 ;; This sample forms exploit most of the features of forms mode.
--- a/lisp/forms.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/forms.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/frame.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/frame.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/fringe.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/fringe.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/generic-x.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/generic-x.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -1,3 +1,7 @@
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+	* Relicense all FSF files to GPLv3 or later.
+
 2007-07-21  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc
@@ -4901,7 +4905,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,
--- a/lisp/gnus/ChangeLog.1	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/ChangeLog.1	Thu Jul 26 05:28:10 2007 +0000
@@ -3733,7 +3733,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,
--- a/lisp/gnus/ChangeLog.2	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/ChangeLog.2	Thu Jul 26 05:28:10 2007 +0000
@@ -18864,7 +18864,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,
--- a/lisp/gnus/binhex.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/binhex.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/canlock.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/canlock.el	Thu Jul 26 05:28:10 2007 +0000
@@ -8,7 +8,7 @@
 
 ;; This program 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.
 
 ;; This program is distributed in the hope that it will be useful,
--- a/lisp/gnus/compface.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/compface.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/deuglify.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/deuglify.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/gnus/dig.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/dig.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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
+;; 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
--- a/lisp/gnus/dns.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/dns.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/earcon.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/earcon.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/flow-fill.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/flow-fill.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/format-spec.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/format-spec.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gmm-utils.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gmm-utils.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/gnus-agent.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-agent.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/gnus/gnus-art.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-art.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-async.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-async.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-audio.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-audio.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-bcklg.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-bcklg.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-cache.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-cache.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-cite.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-cite.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/gnus-cus.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-cus.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-delay.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-delay.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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
+;; 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
--- a/lisp/gnus/gnus-demon.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-demon.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-diary.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-diary.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,8 +12,8 @@
 
 ;; 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 of the License,
-;; or (at your option) any later version.
+;; 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
@@ -21,9 +21,9 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-;; MA 02110-1301, USA.
+;; 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.
 
 
 ;;; Commentary:
--- a/lisp/gnus/gnus-dired.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-dired.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/gnus-draft.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-draft.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-dup.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-dup.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-eform.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-eform.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-ems.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-ems.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-fun.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-fun.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/gnus-gl.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-gl.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-group.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-group.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-int.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-int.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-kill.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-kill.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/gnus-logic.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-logic.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-mh.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-mh.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/gnus-ml.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-ml.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-mlspl.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-mlspl.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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
+;; 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
--- a/lisp/gnus/gnus-move.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-move.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-msg.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-msg.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/gnus-nocem.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-nocem.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-picon.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-picon.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-range.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-range.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-registry.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-registry.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-salt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-salt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-score.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-score.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/gnus-setup.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-setup.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-sieve.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-sieve.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/gnus-soup.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-soup.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/gnus-spec.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-spec.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-srvr.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-srvr.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-start.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-start.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-sum.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-sum.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-topic.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-topic.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/gnus-undo.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-undo.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-uu.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-uu.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/gnus-vm.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-vm.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus-win.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus-win.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/gnus.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/gnus.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/hex-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/hex-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; This program 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
+;; published by the Free Software Foundation; either version 3, or
 ;; (at your option) any later version.
 
 ;; This program is distributed in the hope that it will be useful,
--- a/lisp/gnus/html2text.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/html2text.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/gnus/ietf-drums.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/ietf-drums.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/gnus/imap.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/imap.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/legacy-gnus-agent.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/legacy-gnus-agent.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/mail-parse.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mail-parse.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/gnus/mail-prsvr.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mail-prsvr.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/gnus/mail-source.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mail-source.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/mailcap.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mailcap.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/message.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/message.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/messcompat.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/messcompat.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/mm-bodies.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mm-bodies.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/mm-decode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mm-decode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/mm-encode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mm-encode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/mm-extern.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mm-extern.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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
+;; 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
--- a/lisp/gnus/mm-partial.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mm-partial.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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
+;; 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
--- a/lisp/gnus/mm-url.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mm-url.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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
+;; 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
--- a/lisp/gnus/mm-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mm-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/mm-uu.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mm-uu.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/mm-view.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mm-view.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/gnus/mml-sec.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mml-sec.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/mml-smime.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mml-smime.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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
+;; 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
--- a/lisp/gnus/mml.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mml.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/gnus/mml1991.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mml1991.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/mml2015.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/mml2015.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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
+;; 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
--- a/lisp/gnus/nnagent.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnagent.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/nnbabyl.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnbabyl.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/nndb.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nndb.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/gnus/nndiary.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nndiary.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,8 +12,8 @@
 
 ;; 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 of the License, or
-;; (at your option) any later version.
+;; 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
@@ -21,9 +21,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-;; MA 02110-1301, USA.
+;; 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.
 
 
 ;;; Commentary:
--- a/lisp/gnus/nndir.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nndir.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/nndoc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nndoc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/nndraft.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nndraft.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/nneething.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nneething.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/nnfolder.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnfolder.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/gnus/nngateway.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nngateway.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/nnheader.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnheader.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/gnus/nnimap.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnimap.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/nnkiboze.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnkiboze.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/nnlistserv.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnlistserv.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/nnmail.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnmail.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/nnmaildir.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnmaildir.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/gnus/nnmbox.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnmbox.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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.
 
 ;; You should have received a copy of the GNU General Public License
--- a/lisp/gnus/nnmh.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnmh.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/nnml.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnml.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/gnus/nnnil.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnnil.el	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/lisp/gnus/nnoo.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnoo.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/nnrss.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnrss.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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
+;; 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
--- a/lisp/gnus/nnslashdot.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnslashdot.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/nnsoup.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnsoup.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/nnspool.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnspool.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/nntp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nntp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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
+;; 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
--- a/lisp/gnus/nnultimate.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnultimate.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/nnvirtual.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnvirtual.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/gnus/nnwarchive.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnwarchive.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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
+;; 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
--- a/lisp/gnus/nnweb.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnweb.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/nnwfm.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/nnwfm.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/pop3.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/pop3.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/qp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/qp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/rfc1843.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/rfc1843.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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
+;; 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
--- a/lisp/gnus/rfc2045.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/rfc2045.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/gnus/rfc2047.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/rfc2047.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/rfc2104.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/rfc2104.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/rfc2231.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/rfc2231.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/gnus/score-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/score-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/sha1.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/sha1.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; This program 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
+;; published by the Free Software Foundation; either version 3, or
 ;; (at your option) any later version.
 
 ;; This program is distributed in the hope that it will be useful,
--- a/lisp/gnus/sieve-manage.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/sieve-manage.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/sieve-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/sieve-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/sieve.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/sieve.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/gnus/smiley.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/smiley.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/smime.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/smime.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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
+;; 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
--- a/lisp/gnus/spam-report.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/spam-report.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/spam-stat.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/spam-stat.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; This 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.
 
 ;; This is distributed in the hope that it will be useful, but WITHOUT
--- a/lisp/gnus/spam.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/spam.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gnus/starttls.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/starttls.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/gnus/utf7.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/utf7.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/gnus/uudecode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/uudecode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/gnus/webmail.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/webmail.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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
+;; 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
--- a/lisp/gnus/yenc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gnus/yenc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/gs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/gs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/help-at-pt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/help-at-pt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/help-fns.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/help-fns.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/help-macro.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/help-macro.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/help-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/help-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/help.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/help.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/hexl.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/hexl.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/hi-lock.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/hi-lock.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/hilit-chg.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/hilit-chg.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/hippie-exp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/hippie-exp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/hl-line.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/hl-line.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/ibuf-ext.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ibuf-ext.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; This program 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
+;; published by the Free Software Foundation; either version 3, or (at
 ;; your option) any later version.
 
 ;; This program is distributed in the hope that it will be useful, but
--- a/lisp/ibuf-macs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ibuf-macs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; This program 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
+;; published by the Free Software Foundation; either version 3, or (at
 ;; your option) any later version.
 
 ;; This program is distributed in the hope that it will be useful, but
--- a/lisp/ibuffer.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ibuffer.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; This program 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
+;; published by the Free Software Foundation; either version 3, or (at
 ;; your option) any later version.
 
 ;; This program is distributed in the hope that it will be useful, but
--- a/lisp/icomplete.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/icomplete.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/ido.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ido.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/ielm.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ielm.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/iimage.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/iimage.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/image-dired.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/image-dired.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/image-file.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/image-file.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/image-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/image-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/image.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/image.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/imenu.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/imenu.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/indent.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/indent.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/info-look.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/info-look.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/info-xref.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/info-xref.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/info.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/info.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/informat.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/informat.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/international/ccl.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/ccl.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/international/characters.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/characters.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/international/code-pages.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/code-pages.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/international/codepage.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/codepage.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/international/encoded-kb.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/encoded-kb.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/international/fontset.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/fontset.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/international/isearch-x.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/isearch-x.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/international/iso-ascii.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/iso-ascii.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/international/iso-cvt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/iso-cvt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/international/iso-transl.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/iso-transl.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/international/ja-dic-cnv.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/ja-dic-cnv.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/international/ja-dic-utl.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/ja-dic-utl.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/international/kinsoku.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/kinsoku.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/international/kkc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/kkc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/international/latexenc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/latexenc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/international/latin-1.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/latin-1.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/international/latin-2.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/latin-2.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/international/latin-3.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/latin-3.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/international/latin-4.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/latin-4.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/international/latin-5.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/latin-5.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/international/latin-8.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/latin-8.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/international/latin-9.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/latin-9.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/international/latin1-disp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/latin1-disp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/international/mule-cmds.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/mule-cmds.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/international/mule-conf.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/mule-conf.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/international/mule-diag.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/mule-diag.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/international/mule-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/mule-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/international/mule.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/mule.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/international/ogonek.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/ogonek.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/international/quail.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/quail.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/international/subst-big5.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/subst-big5.el	Thu Jul 26 05:28:10 2007 +0000
@@ -7,7 +7,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,
--- a/lisp/international/subst-gb2312.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/subst-gb2312.el	Thu Jul 26 05:28:10 2007 +0000
@@ -7,7 +7,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,
--- a/lisp/international/subst-jis.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/subst-jis.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,
--- a/lisp/international/subst-ksc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/subst-ksc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -7,7 +7,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,
--- a/lisp/international/titdic-cnv.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/titdic-cnv.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/international/ucs-tables.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/ucs-tables.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/international/utf-16.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/utf-16.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/international/utf-7.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/utf-7.el	Thu Jul 26 05:28:10 2007 +0000
@@ -7,7 +7,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,
--- a/lisp/international/utf-8.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/international/utf-8.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/isearch.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/isearch.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/isearchb.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/isearchb.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/iswitchb.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/iswitchb.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/jit-lock.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/jit-lock.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/jka-cmpr-hook.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/jka-cmpr-hook.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/jka-compr.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/jka-compr.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/kermit.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/kermit.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/kmacro.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/kmacro.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/language/china-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/china-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/language/chinese.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/chinese.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/language/cyril-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/cyril-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/language/cyrillic.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/cyrillic.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/language/czech.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/czech.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/language/devan-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/devan-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/language/devanagari.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/devanagari.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/language/english.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/english.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/language/ethio-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/ethio-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/language/ethiopic.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/ethiopic.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/language/european.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/european.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/language/georgian.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/georgian.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/language/greek.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/greek.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/language/hebrew.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/hebrew.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/language/ind-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/ind-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/language/indian.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/indian.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/language/japan-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/japan-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/language/japanese.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/japanese.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/language/kannada.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/kannada.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/language/knd-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/knd-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/language/korea-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/korea-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/language/korean.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/korean.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/language/lao-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/lao-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/language/lao.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/lao.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/language/malayalam.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/malayalam.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/language/misc-lang.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/misc-lang.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/language/mlm-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/mlm-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/language/romanian.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/romanian.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/language/slovak.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/slovak.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/language/tamil.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/tamil.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/language/thai-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/thai-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/language/thai-word.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/thai-word.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; This program 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.
 
 ;; This program is distributed in the hope that it will be useful,
--- a/lisp/language/thai.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/thai.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/language/tibet-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/tibet-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/language/tibetan.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/tibetan.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/language/tml-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/tml-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/language/utf-8-lang.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/utf-8-lang.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/language/viet-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/viet-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/language/vietnamese.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/language/vietnamese.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/ledit.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ledit.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/loadhist.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/loadhist.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/loadup.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/loadup.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/locate.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/locate.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/log-edit.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/log-edit.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/log-view.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/log-view.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/longlines.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/longlines.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/lpr.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/lpr.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/ls-lisp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ls-lisp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/macros.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/macros.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/blessmail.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/blessmail.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/emacsbug.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/emacsbug.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/mail/footnote.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/footnote.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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, but
--- a/lisp/mail/mail-extr.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/mail-extr.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mail/mail-hist.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/mail-hist.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mail/mail-utils.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/mail-utils.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/mailabbrev.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/mailabbrev.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/mail/mailalias.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/mailalias.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/mailclient.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/mailclient.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/mail/mailheader.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/mailheader.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/metamail.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/metamail.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/mspools.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/mspools.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/mail/reporter.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/reporter.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/mail/rfc2368.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/rfc2368.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/rfc822.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/rfc822.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mail/rmail-spam-filter.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/rmail-spam-filter.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/mail/rmail.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/rmail.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/rmailedit.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/rmailedit.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/rmailkwd.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/rmailkwd.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/rmailmsc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/rmailmsc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/rmailout.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/rmailout.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/rmailsort.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/rmailsort.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mail/rmailsum.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/rmailsum.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/sendmail.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/sendmail.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/smtpmail.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/smtpmail.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/mail/supercite.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/supercite.el	Thu Jul 26 05:28:10 2007 +0000
@@ -15,7 +15,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,
--- a/lisp/mail/uce.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/uce.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mail/undigest.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/undigest.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/unrmail.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/unrmail.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mail/vms-pmail.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mail/vms-pmail.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/makefile.w32-in	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/makefile.w32-in	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/makesum.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/makesum.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/man.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/man.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/master.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/master.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/menu-bar.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/menu-bar.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mh-e/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -1,3 +1,7 @@
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+	* Relicense all FSF files to GPLv3 or later.
+
 2007-07-11  Bill Wohler  <wohler@newt.com>
 
 	* mh-compat.el (mh-display-color-cells): Fix on XEmacs 21.5b28.
@@ -2883,7 +2887,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,
--- a/lisp/mh-e/ChangeLog.1	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/ChangeLog.1	Thu Jul 26 05:28:10 2007 +0000
@@ -11413,7 +11413,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,
--- a/lisp/mh-e/mh-acros.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-acros.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mh-e/mh-alias.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-alias.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/mh-e/mh-buffers.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-buffers.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/mh-e/mh-comp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-comp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/mh-e/mh-compat.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-compat.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mh-e/mh-e.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-e.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/mh-e/mh-folder.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-folder.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mh-e/mh-funcs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-funcs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/mh-e/mh-gnus.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-gnus.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mh-e/mh-identity.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-identity.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mh-e/mh-inc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-inc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mh-e/mh-junk.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-junk.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mh-e/mh-letter.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-letter.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/mh-e/mh-limit.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-limit.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mh-e/mh-mime.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-mime.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/mh-e/mh-print.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-print.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mh-e/mh-scan.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-scan.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/mh-e/mh-search.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-search.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/mh-e/mh-seq.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-seq.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/mh-e/mh-show.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-show.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/mh-e/mh-speed.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-speed.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mh-e/mh-thread.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-thread.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mh-e/mh-tool-bar.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-tool-bar.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/mh-e/mh-utils.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-utils.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/mh-e/mh-xface.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mh-e/mh-xface.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/midnight.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/midnight.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/minibuf-eldef.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/minibuf-eldef.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/misc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/misc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mouse-copy.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mouse-copy.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mouse-drag.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mouse-drag.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mouse-sel.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mouse-sel.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/mouse.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mouse.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/msb.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/msb.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/mwheel.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/mwheel.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/net/ange-ftp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/ange-ftp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/net/browse-url.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/browse-url.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/net/eudc-bob.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/eudc-bob.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/net/eudc-export.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/eudc-export.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/net/eudc-hotlist.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/eudc-hotlist.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/net/eudc-vars.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/eudc-vars.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/net/eudc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/eudc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/net/eudcb-bbdb.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/eudcb-bbdb.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/net/eudcb-ldap.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/eudcb-ldap.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/net/eudcb-mab.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/eudcb-mab.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; This program 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
+;; published by the Free Software Foundation; either version 3, or (at
 ;; your option) any later version.
 
 ;; This program is distributed in the hope that it will be useful, but
--- a/lisp/net/eudcb-ph.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/eudcb-ph.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/net/goto-addr.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/goto-addr.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/net/ldap.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/ldap.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/net/net-utils.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/net-utils.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/net/netrc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/netrc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/net/newsticker.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/newsticker.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,10 +13,10 @@
 
 ;; ======================================================================
 
-;; This program 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 of the License, or (at
-;; your option) any later version.
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
 
 ;; This program is distributed in the hope that it will be useful, but
 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,8 +24,9 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software Foundation,
-;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+;; 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.
 
 (defconst newsticker-version "1.10" "Version number of newsticker.el.")
 
--- a/lisp/net/quickurl.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/quickurl.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/net/rcirc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/rcirc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,
--- a/lisp/net/rcompile.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/rcompile.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/net/rlogin.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/rlogin.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/net/snmp-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/snmp-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/net/socks.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/socks.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/net/telnet.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/telnet.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/net/tls.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/tls.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/net/tramp-ftp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/tramp-ftp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,8 +10,8 @@
 
 ;; 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 of the License, or
-;; (at your option) any later version.
+;; 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
--- a/lisp/net/tramp-smb.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/tramp-smb.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,8 +10,8 @@
 
 ;; 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 of the License, or
-;; (at your option) any later version.
+;; 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
--- a/lisp/net/tramp-uu.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/tramp-uu.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,8 +9,8 @@
 
 ;; This file 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 of the License, or
-;; (at your option) any later version.
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
 
 ;; This file is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/lisp/net/tramp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/tramp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -14,8 +14,8 @@
 
 ;; 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 of the License, or
-;; (at your option) any later version.
+;; 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
--- a/lisp/net/trampver.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/trampver.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,8 +11,8 @@
 
 ;; 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 of the License, or
-;; (at your option) any later version.
+;; 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
--- a/lisp/net/webjump.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/net/webjump.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/newcomment.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/newcomment.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/novice.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/novice.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/obsolete/awk-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/awk-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/obsolete/bg-mouse.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/bg-mouse.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/obsolete/fast-lock.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/fast-lock.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/obsolete/float.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/float.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/obsolete/hilit19.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/hilit19.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/obsolete/hscroll.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/hscroll.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/obsolete/iso-acc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/iso-acc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/obsolete/iso-insert.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/iso-insert.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/obsolete/iso-swed.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/iso-swed.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/obsolete/keyswap.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/keyswap.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/obsolete/lazy-lock.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/lazy-lock.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/obsolete/mlsupport.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/mlsupport.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/obsolete/ooutline.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/ooutline.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/obsolete/options.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/options.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/obsolete/profile.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/profile.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/obsolete/rnews.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/rnews.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/obsolete/rnewspost.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/rnewspost.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/obsolete/rsz-mini.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/rsz-mini.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/obsolete/scribe.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/scribe.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/obsolete/sun-curs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/sun-curs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/obsolete/sun-fns.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/sun-fns.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/obsolete/swedish.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/swedish.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/obsolete/uncompress.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/uncompress.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/obsolete/x-apollo.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/x-apollo.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/obsolete/x-menu.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/obsolete/x-menu.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/outline.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/outline.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/paren.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/paren.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/paths.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/paths.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/pcmpl-cvs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pcmpl-cvs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/pcmpl-gnu.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pcmpl-gnu.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/pcmpl-linux.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pcmpl-linux.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/pcmpl-rpm.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pcmpl-rpm.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/pcmpl-unix.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pcmpl-unix.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/pcomplete.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pcomplete.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/pcvs-defs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pcvs-defs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/pcvs-info.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pcvs-info.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/pcvs-parse.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pcvs-parse.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/pcvs-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pcvs-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/pgg-def.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pgg-def.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/pgg-gpg.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pgg-gpg.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/pgg-parse.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pgg-parse.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/pgg-pgp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pgg-pgp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/pgg-pgp5.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pgg-pgp5.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/pgg.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/pgg.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/play/5x5.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/5x5.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/play/animate.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/animate.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/play/blackbox.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/blackbox.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/play/bruce.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/bruce.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/play/cookie1.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/cookie1.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/play/decipher.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/decipher.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/play/dissociate.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/dissociate.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/play/doctor.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/doctor.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/play/dunnet.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/dunnet.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/play/fortune.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/fortune.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/play/gamegrid.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/gamegrid.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/play/gametree.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/gametree.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/play/gomoku.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/gomoku.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/play/handwrite.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/handwrite.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/play/landmark.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/landmark.el	Thu Jul 26 05:28:10 2007 +0000
@@ -17,7 +17,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,
--- a/lisp/play/life.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/life.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/play/morse.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/morse.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/play/mpuz.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/mpuz.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/play/pong.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/pong.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/play/snake.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/snake.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/play/solitaire.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/solitaire.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/play/spook.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/spook.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/play/tetris.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/tetris.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/play/yow.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/yow.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/play/zone.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/play/zone.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/printing.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/printing.el	Thu Jul 26 05:28:10 2007 +0000
@@ -20,7 +20,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) any later
+;; 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
--- a/lisp/progmodes/ada-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/ada-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/progmodes/ada-prj.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/ada-prj.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/ada-stmt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/ada-stmt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -3,12 +3,27 @@
 ;; Copyright (C) 1987, 1993, 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 ;;              2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
-;; This file is part of GNU Emacs.
-
 ;; Authors: Daniel Pfeiffer, Markus Heritsch, Rolf Ebert <ebert@waporo.muc.de>
 ;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
 ;; Keywords: languages, ada
 
+;; 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.
+
 ;;; Commentary:
 ;; This file is now automatically loaded from ada-mode.el, and creates a submenu
 ;; in Ada/ on the menu bar.
--- a/lisp/progmodes/ada-xref.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/ada-xref.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/progmodes/antlr-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/antlr-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/asm-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/asm-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/autoconf.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/autoconf.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/progmodes/cc-align.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cc-align.el	Thu Jul 26 05:28:10 2007 +0000
@@ -18,7 +18,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,
--- a/lisp/progmodes/cc-awk.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cc-awk.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/cc-bytecomp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cc-bytecomp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/progmodes/cc-cmds.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cc-cmds.el	Thu Jul 26 05:28:10 2007 +0000
@@ -18,7 +18,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,
--- a/lisp/progmodes/cc-compat.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cc-compat.el	Thu Jul 26 05:28:10 2007 +0000
@@ -15,7 +15,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,
--- a/lisp/progmodes/cc-defs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cc-defs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -18,7 +18,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,
--- a/lisp/progmodes/cc-engine.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cc-engine.el	Thu Jul 26 05:28:10 2007 +0000
@@ -18,7 +18,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,
--- a/lisp/progmodes/cc-fonts.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cc-fonts.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/progmodes/cc-langs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cc-langs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -18,7 +18,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,
--- a/lisp/progmodes/cc-menus.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cc-menus.el	Thu Jul 26 05:28:10 2007 +0000
@@ -17,7 +17,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,
--- a/lisp/progmodes/cc-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cc-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -17,7 +17,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,
--- a/lisp/progmodes/cc-styles.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cc-styles.el	Thu Jul 26 05:28:10 2007 +0000
@@ -18,7 +18,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,
--- a/lisp/progmodes/cc-subword.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cc-subword.el	Thu Jul 26 05:28:10 2007 +0000
@@ -6,7 +6,7 @@
 
 ;; This program 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.
 
 ;; This program is distributed in the hope that it will be useful,
--- a/lisp/progmodes/cc-vars.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cc-vars.el	Thu Jul 26 05:28:10 2007 +0000
@@ -18,7 +18,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,
--- a/lisp/progmodes/cfengine.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cfengine.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/progmodes/cmacexp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cmacexp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/compile.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/compile.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/cperl-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cperl-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/cpp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cpp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/progmodes/cwarn.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/cwarn.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/dcl-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/dcl-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/delphi.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/delphi.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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) any later
+;; 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
--- a/lisp/progmodes/ebnf-abn.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/ebnf-abn.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/ebnf-bnf.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/ebnf-bnf.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/ebnf-dtd.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/ebnf-dtd.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/ebnf-ebx.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/ebnf-ebx.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/ebnf-iso.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/ebnf-iso.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/ebnf-otz.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/ebnf-otz.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/ebnf-yac.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/ebnf-yac.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/ebnf2ps.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/ebnf2ps.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/progmodes/ebrowse.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/ebrowse.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/etags.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/etags.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/executable.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/executable.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/progmodes/f90.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/f90.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/flymake.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/flymake.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/fortran.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/fortran.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/gdb-ui.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/gdb-ui.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/glasses.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/glasses.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/grep.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/grep.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/gud.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/gud.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/hideif.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/hideif.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/hideshow.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/hideshow.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/progmodes/icon.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/icon.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/idlw-complete-structtag.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/idlw-complete-structtag.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/idlw-help.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/idlw-help.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,
--- a/lisp/progmodes/idlw-shell.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/idlw-shell.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/progmodes/idlw-toolbar.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/idlw-toolbar.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/idlwave.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/idlwave.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/progmodes/inf-lisp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/inf-lisp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/progmodes/ld-script.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/ld-script.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; This program 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.
 
 ;; This program is distributed in the hope that it will be useful,
--- a/lisp/progmodes/m4-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/m4-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/make-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/make-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/progmodes/mantemp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/mantemp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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
+;; 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
--- a/lisp/progmodes/meta-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/meta-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/mixal-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/mixal-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -3,27 +3,29 @@
 ;; Copyright (C) 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
-;; This program 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 of
-;; the License, or (at your option) any later version.
-
-;; This program 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 this program; if not, write to the Free
-;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-;; MA 02110-1301 USA
-
 ;; Author: Pieter E.J. Pareit <pieter.pareit@gmail.com>
 ;; Maintainer: Pieter E.J. Pareit <pieter.pareit@gmail.com>
 ;; Created: 09 Nov 2002
 ;; Version: 0.1
 ;; Keywords: Knuth mix mixal asm mixvm "The Art Of Computer Programming"
 
+;; 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.
+
 ;;; Commentary:
 ;; Major mode for the mix asm language.
 ;; The mix asm language is described in "The Art Of Computer Programming".
--- a/lisp/progmodes/octave-hlp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/octave-hlp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/octave-inf.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/octave-inf.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/octave-mod.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/octave-mod.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/pascal.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/pascal.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/progmodes/perl-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/perl-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -15,7 +15,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,
--- a/lisp/progmodes/prolog.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/prolog.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/progmodes/ps-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/ps-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/progmodes/python.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/python.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/scheme.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/scheme.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/sh-script.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/sh-script.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/simula.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/simula.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/sql.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/sql.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/progmodes/tcl.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/tcl.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/progmodes/vera-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/vera-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -19,7 +19,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,
--- a/lisp/progmodes/vhdl-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/vhdl-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -19,7 +19,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,
--- a/lisp/progmodes/which-func.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/which-func.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/progmodes/xscheme.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/progmodes/xscheme.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/ps-bdf.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ps-bdf.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/ps-mule.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ps-mule.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/recentf.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/recentf.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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
+;; 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,
--- a/lisp/rect.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/rect.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/register.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/register.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/repeat.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/repeat.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/replace.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/replace.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/reposition.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/reposition.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/resume.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/resume.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/reveal.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/reveal.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/rfn-eshadow.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/rfn-eshadow.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/rot13.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/rot13.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/ruler-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ruler-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; This program 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
+;; published by the Free Software Foundation; either version 3, or (at
 ;; your option) any later version.
 
 ;; This program is distributed in the hope that it will be useful, but
--- a/lisp/s-region.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/s-region.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/savehist.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/savehist.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/saveplace.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/saveplace.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/sb-image.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/sb-image.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/scroll-all.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/scroll-all.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/scroll-bar.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/scroll-bar.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/scroll-lock.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/scroll-lock.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/select.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/select.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/server.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/server.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/ses.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/ses.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/shadowfile.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/shadowfile.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/shell.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/shell.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/simple.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/simple.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/skeleton.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/skeleton.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/smerge-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/smerge-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/sort.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/sort.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/soundex.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/soundex.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/speedbar.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/speedbar.el	Thu Jul 26 05:28:10 2007 +0000
@@ -17,7 +17,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,
--- a/lisp/startup.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/startup.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/strokes.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/strokes.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/subr.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/subr.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/t-mouse.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/t-mouse.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/tabify.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/tabify.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/talk.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/talk.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/tar-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/tar-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/tempo.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/tempo.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/term.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/term/AT386.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/AT386.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/term/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/README	Thu Jul 26 05:28:10 2007 +0000
@@ -228,7 +228,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,
--- a/lisp/term/internal.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/internal.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/term/iris-ansi.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/iris-ansi.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/term/mac-win.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/mac-win.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/term/news.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/news.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/term/pc-win.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/pc-win.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/term/rxvt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/rxvt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/term/sun-mouse.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/sun-mouse.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/term/sun.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/sun.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/term/sup-mouse.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/sup-mouse.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/term/tty-colors.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/tty-colors.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/term/tvi970.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/tvi970.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/term/vt100.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/vt100.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/term/w32-win.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/w32-win.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/term/wyse50.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/wyse50.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/term/x-win.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/x-win.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/term/xterm.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/term/xterm.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/terminal.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/terminal.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/artist.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/artist.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/textmodes/bib-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/bib-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/textmodes/bibtex.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/bibtex.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/textmodes/conf-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/conf-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/textmodes/css-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/css-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -7,7 +7,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,
--- a/lisp/textmodes/dns-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/dns-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/textmodes/enriched.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/enriched.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/textmodes/fill.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/fill.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/textmodes/flyspell.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/flyspell.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/ispell.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/ispell.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/textmodes/makeinfo.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/makeinfo.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/nroff-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/nroff-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/textmodes/org.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/org.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/page-ext.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/page-ext.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/textmodes/page.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/page.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/textmodes/paragraphs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/paragraphs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/textmodes/picture.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/picture.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/po.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/po.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/textmodes/refbib.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/refbib.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/refer.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/refer.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/textmodes/refill.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/refill.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/reftex-auc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/reftex-auc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/reftex-cite.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/reftex-cite.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/reftex-dcr.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/reftex-dcr.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/reftex-global.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/reftex-global.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/reftex-index.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/reftex-index.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/reftex-parse.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/reftex-parse.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/reftex-ref.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/reftex-ref.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/reftex-sel.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/reftex-sel.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/reftex-toc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/reftex-toc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/textmodes/reftex-vars.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/reftex-vars.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/reftex.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/reftex.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/sgml-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/sgml-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/textmodes/spell.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/spell.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/textmodes/table.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/table.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/textmodes/tex-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/tex-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/textmodes/texinfmt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/texinfmt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/texinfo.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/texinfo.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/textmodes/texnfo-upd.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/texnfo-upd.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/text-mode.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/text-mode.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/textmodes/tildify.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/tildify.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/textmodes/two-column.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/two-column.el	Thu Jul 26 05:28:10 2007 +0000
@@ -18,7 +18,7 @@
 ;; ^gin sub  la  kondi^coj  de  la  GNU	 under the terms of the GNU General
 ;; ^Generala  Publika Licenco kiel pub-	 Public License as published by the
 ;; likigita far la Liberprogramara Fon-	 Free Software Foundation; either
-;; da^jo; a^u eldono 2a,  a^u (la^u via	 version 2, or (at your option) any
+;; da^jo; a^u eldono 2a,  a^u (la^u via	 version 3, or (at your option) any
 ;; elekto) ajna posta eldono.		 later version.
 
 ;; GNU  Emacs  estas  disdonata  en  la	 GNU Emacs is distributed in the hope
--- a/lisp/textmodes/underline.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/textmodes/underline.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/thingatpt.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/thingatpt.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/thumbs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/thumbs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/time-stamp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/time-stamp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/time.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/time.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/timezone.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/timezone.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/tmm.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/tmm.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/tool-bar.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/tool-bar.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/tooltip.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/tooltip.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/tree-widget.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/tree-widget.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; This program 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
+;; published by the Free Software Foundation; either version 3, or (at
 ;; your option) any later version.
 
 ;; This program is distributed in the hope that it will be useful, but
--- a/lisp/tutorial.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/tutorial.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/type-break.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/type-break.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/uniquify.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/uniquify.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/url/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -1,3 +1,7 @@
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+	* Relicense all FSF files to GPLv3 or later.
+
 2007-06-12  Tom Tromey  <tromey@redhat.com>
 
 	* url.el (url-configuration-directory): Use user-emacs-directory.
@@ -1833,7 +1837,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,
--- a/lisp/url/url-about.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-about.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/url/url-auth.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-auth.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-cache.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-cache.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-cid.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-cid.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/url/url-cookie.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-cookie.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-dav.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-dav.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/url/url-dired.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-dired.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-expand.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-expand.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/url/url-file.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-file.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-ftp.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-ftp.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-gw.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-gw.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-handlers.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-handlers.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-history.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-history.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-http.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-http.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-imap.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-imap.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-irc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-irc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-ldap.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-ldap.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/url/url-mailto.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-mailto.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-methods.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-methods.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-misc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-misc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-news.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-news.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-nfs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-nfs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-ns.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-ns.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-parse.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-parse.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-privacy.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-privacy.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url-proxy.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-proxy.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/url/url-util.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-util.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/url/url-vars.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url-vars.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/url/url.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/url.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/url/vc-dav.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/url/vc-dav.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/userlock.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/userlock.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/vc-arch.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/vc-arch.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/vc-cvs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/vc-cvs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/vc-hooks.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/vc-hooks.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/vc-mcvs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/vc-mcvs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/vc-rcs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/vc-rcs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/vc-sccs.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/vc-sccs.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/vc-svn.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/vc-svn.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/vc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/vc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/lisp/vcursor.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/vcursor.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/version.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/version.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/view.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/view.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/vms-patch.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/vms-patch.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/vmsproc.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/vmsproc.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/vt-control.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/vt-control.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/vt100-led.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/vt100-led.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/w32-fns.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/w32-fns.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/w32-vars.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/w32-vars.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/lisp/wdired.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/wdired.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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
+;; published by the Free Software Foundation; either version 3, or (at
 ;; your option) any later version.
 
 ;; This program is distributed in the hope that it will be useful, but
--- a/lisp/whitespace.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/whitespace.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/wid-browse.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/wid-browse.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/wid-edit.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/wid-edit.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/widget.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/widget.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/windmove.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/windmove.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/window.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/window.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/winner.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/winner.el	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/lisp/woman.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/woman.el	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lisp/x-dnd.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/x-dnd.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lisp/xml.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/xml.el	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/lisp/xt-mouse.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lisp/xt-mouse.el	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/lispintro/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispintro/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lispintro/Makefile.in	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispintro/Makefile.in	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lispintro/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispintro/README	Thu Jul 26 05:28:10 2007 +0000
@@ -70,7 +70,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,
--- a/lispintro/cons-1.eps	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispintro/cons-1.eps	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lispintro/cons-2.eps	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispintro/cons-2.eps	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lispintro/cons-2a.eps	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispintro/cons-2a.eps	Thu Jul 26 05:28:10 2007 +0000
@@ -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
 
--- a/lispintro/cons-3.eps	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispintro/cons-3.eps	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lispintro/cons-4.eps	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispintro/cons-4.eps	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lispintro/cons-5.eps	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispintro/cons-5.eps	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lispintro/drawers.eps	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispintro/drawers.eps	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lispintro/lambda-1.eps	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispintro/lambda-1.eps	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lispintro/lambda-2.eps	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispintro/lambda-2.eps	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lispintro/lambda-3.eps	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispintro/lambda-3.eps	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lispintro/makefile.w32-in	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispintro/makefile.w32-in	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lispref/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispref/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -1,3 +1,9 @@
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+	* gpl.texi (GPL): Replace license with GPLv3.
+
+	* Relicense all FSF files to GPLv3 or later.
+
 2007-07-24  Michael Albinus  <michael.albinus@gmx.de>
 
 	* processes.texi (Synchronous Processes): Add
@@ -6213,7 +6219,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,
--- a/lispref/Makefile.in	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispref/Makefile.in	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lispref/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispref/README	Thu Jul 26 05:28:10 2007 +0000
@@ -58,7 +58,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,
--- a/lispref/makefile.w32-in	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispref/makefile.w32-in	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lispref/tindex.pl	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispref/tindex.pl	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/lispref/tips.texi	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispref/tips.texi	Thu Jul 26 05:28:10 2007 +0000
@@ -274,7 +274,7 @@
 
 ;; This program 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 of
+;; published by the Free Software Foundation; either version 3 of
 ;; the License, or (at your option) any later version.
 
 ;; This program is distributed in the hope that it will be
--- a/lispref/two-volume-cross-refs.txt	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispref/two-volume-cross-refs.txt	Thu Jul 26 05:28:10 2007 +0000
@@ -308,7 +308,7 @@
 
 This file 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.
 
 This file is distributed in the hope that it will be useful,
--- a/lispref/two-volume.make	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispref/two-volume.make	Thu Jul 26 05:28:10 2007 +0000
@@ -211,7 +211,7 @@
 # 
 # This file 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.
 # 
 # This file is distributed in the hope that it will be useful,
--- a/lispref/two.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispref/two.el	Thu Jul 26 05:28:10 2007 +0000
@@ -7,7 +7,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,
--- a/lispref/vol1.texi	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispref/vol1.texi	Thu Jul 26 05:28:10 2007 +0000
@@ -26,7 +26,7 @@
 @c Version of the manual and of Emacs.
 @c Please remember to update the edition number in README as well.
 @set VERSION  2.9
-@set EMACSVER 22.0.99
+@set EMACSVER 22
 
 @dircategory Emacs
 @direntry
@@ -48,7 +48,6 @@
 @tex
 @ifset smallbook
 @fonttextsize 10
-@set EMACSVER 22
 \global\let\urlcolor=\Black % don't print links in grayscale
 \global\let\linkcolor=\Black
 @end ifset
--- a/lispref/vol2.texi	Thu Jul 26 05:25:19 2007 +0000
+++ b/lispref/vol2.texi	Thu Jul 26 05:28:10 2007 +0000
@@ -26,7 +26,7 @@
 @c Version of the manual and of Emacs.
 @c Please remember to update the edition number in README as well.
 @set VERSION  2.9
-@set EMACSVER 22.0.99
+@set EMACSVER 22
 
 @dircategory Emacs
 @direntry
@@ -48,7 +48,6 @@
 @tex
 @ifset smallbook
 @fonttextsize 10
-@set EMACSVER 22
 \global\let\urlcolor=\Black % don't print links in grayscale
 \global\let\linkcolor=\Black
 @end ifset
--- a/lwlib/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/lwlib/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -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-13  Chong Yidong  <cyd@stupidchicken.com>
 
 	* lwlib-Xaw.c, lwlib.c: Link to xaw3d if available.
@@ -1354,7 +1360,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,
--- a/mac/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/Emacs.app/Contents/Info.plist	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/Emacs.app/Contents/Info.plist	Thu Jul 26 05:28:10 2007 +0000
@@ -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) 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
--- a/mac/INSTALL	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/INSTALL	Thu Jul 26 05:28:10 2007 +0000
@@ -220,7 +220,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,
--- a/mac/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/README	Thu Jul 26 05:28:10 2007 +0000
@@ -49,7 +49,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,
--- a/mac/cw6-mcp.xml	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/cw6-mcp.xml	Thu Jul 26 05:28:10 2007 +0000
@@ -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) 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
--- a/mac/inc/alloca.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/alloca.h	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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) 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
--- a/mac/inc/config.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/config.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/inc/defs-cw6.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/defs-cw6.h	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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) 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
--- a/mac/inc/dirent.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/dirent.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/inc/epaths.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/epaths.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/inc/grp.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/grp.h	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/mac/inc/m-mac.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/m-mac.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/inc/pwd.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/pwd.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/inc/s-mac.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/s-mac.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/inc/sys/file.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/sys/file.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/inc/sys/ioctl.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/sys/ioctl.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/inc/sys/param.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/sys/param.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/inc/sys/stat.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/sys/stat.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/inc/sys/time.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/sys/time.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/inc/sys/types.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/sys/types.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/inc/termio.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/termio.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/inc/utime.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/utime.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/inc/utsname.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/inc/utsname.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/make-package	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/make-package	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/makefile.MPW	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/makefile.MPW	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/src/Emacs.r	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/src/Emacs.r	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/src/EmacsMPW.r	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/src/EmacsMPW.r	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/mac/src/chdir.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/mac/src/chdir.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/make-dist	Thu Jul 26 05:25:19 2007 +0000
+++ b/make-dist	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/man/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/man/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -2,6 +2,13 @@
 
 	* dired.texi (Wdired): Mention C-x C-q key binding.
 
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+	* calc.texi (Copying)
+	* emacs.texi (Copying): Replace license with GPLv3.
+
+	* Relicense all FSF files to GPLv3 or later.
+
 2007-07-24  Glenn Morris  <rgm@gnu.org>
 
 	* calendar.texi (Writing Calendar Files): cal-tex-diary etc only work
@@ -8100,7 +8107,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,
--- a/man/Makefile.in	Thu Jul 26 05:25:19 2007 +0000
+++ b/man/Makefile.in	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/man/makefile.w32-in	Thu Jul 26 05:25:19 2007 +0000
+++ b/man/makefile.w32-in	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/man/mh-e.texi	Thu Jul 26 05:25:19 2007 +0000
+++ b/man/mh-e.texi	Thu Jul 26 05:28:10 2007 +0000
@@ -39,7 +39,7 @@
 
 @item
 the GNU General Public License as published by the Free Software
-Foundation; either version 2, or (at your option) any later version.
+Foundation; either version 3, or (at your option) any later version.
 @end enumerate
 
 The MH-E manual is distributed in the hope that it will be useful, but
@@ -9638,7 +9638,7 @@
 
 This program 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
+as published by the Free Software Foundation; either version 3
 of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
--- a/msdos/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/msdos/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -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.
@@ -647,7 +653,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,
--- a/msdos/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/msdos/README	Thu Jul 26 05:28:10 2007 +0000
@@ -31,7 +31,8 @@
 
 As distributed with GNU Emacs, the files is_exec.c and sigaction.c are
 Copyright (C) 1995 DJ Delorie, and are licensed under the terms of the
-GNU General Public License version 2 or later (see COPYING).
+GNU General Public License version 3 (see COPYING), or (at your
+option) any later version.
 
 Here we record the details of the legal history of these files.
 
@@ -152,7 +153,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,
--- a/msdos/is_exec.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/msdos/is_exec.c	Thu Jul 26 05:28:10 2007 +0000
@@ -8,7 +8,7 @@
  *
  * This file 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.
  *
  * This file is distributed in the hope that it will be useful,
--- a/msdos/mainmake	Thu Jul 26 05:25:19 2007 +0000
+++ b/msdos/mainmake	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/msdos/mainmake.v2	Thu Jul 26 05:25:19 2007 +0000
+++ b/msdos/mainmake.v2	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/msdos/sigaction.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/msdos/sigaction.c	Thu Jul 26 05:28:10 2007 +0000
@@ -7,7 +7,7 @@
  *
  * This file 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.
  *
  * This file is distributed in the hope that it will be useful,
--- a/nt/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -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-07-16  Eli Zaretskii  <eliz@gnu.org>
 
 	* makefile.w32-in (bootstrap, bootstrap-nmake, bootstrap-gmake):
@@ -1411,7 +1417,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,
--- a/nt/INSTALL	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/INSTALL	Thu Jul 26 05:28:10 2007 +0000
@@ -453,7 +453,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,
--- a/nt/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/README	Thu Jul 26 05:28:10 2007 +0000
@@ -74,7 +74,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,
--- a/nt/addpm.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/addpm.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/nt/addsection.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/addsection.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/nt/cmdproxy.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/cmdproxy.c	Thu Jul 26 05:28:10 2007 +0000
@@ -17,7 +17,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,
--- a/nt/config.nt	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/config.nt	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/nt/configure.bat	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/configure.bat	Thu Jul 26 05:28:10 2007 +0000
@@ -8,7 +8,7 @@
 
 rem   GNU Emacs is free software; you can redistribute it and/or modify
 rem   it under the terms of the GNU General Public License as published by
-rem   the Free Software Foundation; either version 2, or (at your option)
+rem   the Free Software Foundation; either version 3, or (at your option)
 rem   any later version.
 
 rem   GNU Emacs is distributed in the hope that it will be useful,
--- a/nt/ddeclient.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/ddeclient.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/nt/envadd.bat	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/envadd.bat	Thu Jul 26 05:28:10 2007 +0000
@@ -7,7 +7,7 @@
 rem
 rem  GNU Emacs is free software; you can redistribute it and/or modify
 rem  it under the terms of the GNU General Public License as published by
-rem  the Free Software Foundation; either version 2, or (at your option)
+rem  the Free Software Foundation; either version 3, or (at your option)
 rem  any later version.
 rem
 rem  GNU Emacs is distributed in the hope that it will be useful,
--- a/nt/gmake.defs	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/gmake.defs	Thu Jul 26 05:28:10 2007 +0000
@@ -4,7 +4,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,
--- a/nt/icons/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/icons/README	Thu Jul 26 05:28:10 2007 +0000
@@ -3,7 +3,7 @@
 File: emacs.ico
 Author: Andrew Zhilin
 Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
 
 
 Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico
@@ -13,7 +13,7 @@
 Author: Rob Davenport <rgd at bigfoot.com>
 Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
 
   <http://users.adelphia.net/~rob.davenport/gnuicons.html>
   "These are some images of a 3D stylized gnu head that I created back
@@ -30,4 +30,4 @@
 Lillqvist, Garrett LeSage, Dennis Cranston, Jody Goldberg, Luca
 Ferretti, Mark Finlay, Lapo Calamandrei, Andreas Nilsson and Marco
 Pesenti Gritti
-License: GNU General Public License version 2 (see COPYING)
+License: GNU General Public License version 2
--- a/nt/inc/grp.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/inc/grp.h	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/nt/inc/langinfo.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/inc/langinfo.h	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/nt/inc/nl_types.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/inc/nl_types.h	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/nt/inc/sys/socket.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/inc/sys/socket.h	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/nt/makefile.w32-in	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/makefile.w32-in	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/nt/multi-install-info.bat	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/multi-install-info.bat	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,7 @@
 rem
 rem  GNU Emacs is free software; you can redistribute it and/or modify
 rem  it under the terms of the GNU General Public License as published by
-rem  the Free Software Foundation; either version 2, or (at your option)
+rem  the Free Software Foundation; either version 3, or (at your option)
 rem  any later version.
 rem
 rem  GNU Emacs is distributed in the hope that it will be useful,
--- a/nt/nmake.defs	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/nmake.defs	Thu Jul 26 05:28:10 2007 +0000
@@ -4,7 +4,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,
--- a/nt/paths.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/paths.h	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/nt/preprep.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/preprep.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/nt/runemacs.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/nt/runemacs.c	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/oldXMenu/Activate.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/oldXMenu/Activate.c	Thu Jul 26 05:28:10 2007 +0000
@@ -8,7 +8,7 @@
 
 This program 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.
 
 This program is distributed in the hope that it will be useful,
--- a/oldXMenu/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/oldXMenu/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -1,3 +1,7 @@
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+	* Relicense all FSF files to GPLv3 or later.
+
 2007-06-04  Ulrich Mueller  <ulm@gentoo.org>  (tiny change)
 
 	* ChgPane.c, ChgSel.c: Quiet --with-x-toolkit=no
@@ -475,7 +479,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,
--- a/oldXMenu/Create.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/oldXMenu/Create.c	Thu Jul 26 05:28:10 2007 +0000
@@ -8,7 +8,7 @@
 
 This program 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.
 
 This program is distributed in the hope that it will be useful,
--- a/oldXMenu/Internal.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/oldXMenu/Internal.c	Thu Jul 26 05:28:10 2007 +0000
@@ -8,7 +8,7 @@
 
 This program 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.
 
 This program is distributed in the hope that it will be useful,
--- a/oldXMenu/Makefile.in	Thu Jul 26 05:25:19 2007 +0000
+++ b/oldXMenu/Makefile.in	Thu Jul 26 05:28:10 2007 +0000
@@ -20,7 +20,7 @@
 
 ## This program 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.
 ## 
 ## This program is distributed in the hope that it will be useful,
--- a/oldXMenu/descrip.mms	Thu Jul 26 05:25:19 2007 +0000
+++ b/oldXMenu/descrip.mms	Thu Jul 26 05:28:10 2007 +0000
@@ -7,7 +7,7 @@
 
 ## This program 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.
 
 ## This program is distributed in the hope that it will be useful,
--- a/src/.gdbinit	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/.gdbinit	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/src/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -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-07-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* eval.c (Fcommandp): Pay attention to the `interactive-form' property.
@@ -8,6 +14,15 @@
 	* data.c (Finteractive_form): Use an `interactive-form' property if
 	present, analogous to the function-documentation property.
 
+2007-07-24  Jason Rumney  <jasonr@gnu.org>
+
+	* w32fns.c (x_real_positions): Get real position from OS instead of
+	calculating it.
+
+2007-07-23  Jason Rumney  <jasonr@gnu.org>
+
+	* filelock.c (current_lock_owner): Allow for @ sign in username.
+
 2007-07-22  Nick Roberts  <nickrob@snap.net.nz>
 
 	* xdisp.c (decode_mode_spec): Add case 'R' for to test for
@@ -28726,7 +28741,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,
--- a/src/ChangeLog.1	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/ChangeLog.1	Thu Jul 26 05:28:10 2007 +0000
@@ -3528,7 +3528,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,
--- a/src/ChangeLog.2	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/ChangeLog.2	Thu Jul 26 05:28:10 2007 +0000
@@ -4778,7 +4778,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,
--- a/src/ChangeLog.3	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/ChangeLog.3	Thu Jul 26 05:28:10 2007 +0000
@@ -16531,7 +16531,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,
--- a/src/ChangeLog.4	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/ChangeLog.4	Thu Jul 26 05:28:10 2007 +0000
@@ -6910,7 +6910,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,
--- a/src/ChangeLog.5	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/ChangeLog.5	Thu Jul 26 05:28:10 2007 +0000
@@ -7151,7 +7151,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,
--- a/src/ChangeLog.6	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/ChangeLog.6	Thu Jul 26 05:28:10 2007 +0000
@@ -1643,9 +1643,9 @@
 	* emacs.c (main) [DJGPP v2]: Make standard streams use binary mode.
 	Call `tzset' instead of `init_gettimeofday'.
 
-	* fileio.c [MSDOS]: If DJGPP version 2, include fcntl.h and string.h.
-
-	* lread.c [MSDOS]: If DJGPP version 2, include unistd.h.
+	* fileio.c [MSDOS]: If DJGPP version 3, include fcntl.h and string.h.
+
+	* lread.c [MSDOS]: If DJGPP version 3, include unistd.h.
 	Include msdos.h somewhat earlier.  For X_OK.
 
 	* unexec.c [DJGPP v2]: Include fcntl.h.
@@ -1664,7 +1664,7 @@
 	(LIBS_SYSTEM, chdir, NO_MODE_T, TEXT_START, NO_MATHERR)
 	(LOCALTIME_CACHE, tzset): Don't define if DJGPP v2.
 
-	* msdos.c [MSDOS]: If DJGPP version 2, include fcntl.h.
+	* msdos.c [MSDOS]: If DJGPP version 3, include fcntl.h.
 	(_crt0_startup_flags): Initialize to work
 	correctly both with and without GNU `malloc' and `ralloc'.
 	(internal_terminal_init): Use only 3 bits when setting background
@@ -5361,7 +5361,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,
--- a/src/ChangeLog.7	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/ChangeLog.7	Thu Jul 26 05:28:10 2007 +0000
@@ -11102,7 +11102,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,
--- a/src/ChangeLog.8	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/ChangeLog.8	Thu Jul 26 05:28:10 2007 +0000
@@ -13998,7 +13998,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,
--- a/src/ChangeLog.9	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/ChangeLog.9	Thu Jul 26 05:28:10 2007 +0000
@@ -13301,7 +13301,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,
--- a/src/Makefile.in	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/Makefile.in	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/README	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/README	Thu Jul 26 05:28:10 2007 +0000
@@ -37,7 +37,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,
--- a/src/abbrev.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/abbrev.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/alloc.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/alloc.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/atimer.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/atimer.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/atimer.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/atimer.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/blockinput.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/blockinput.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/buffer.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/buffer.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/buffer.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/buffer.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/bytecode.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/bytecode.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/callint.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/callint.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/callproc.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/callproc.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/casefiddle.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/casefiddle.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/casetab.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/casetab.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/category.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/category.c	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/src/category.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/category.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/ccl.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/ccl.c	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/src/ccl.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/ccl.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/charset.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/charset.c	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/src/charset.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/charset.h	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/src/cm.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/cm.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/cm.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/cm.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/cmds.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/cmds.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/coding.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/coding.c	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/src/coding.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/coding.h	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/src/commands.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/commands.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/composite.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/composite.c	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/src/composite.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/composite.h	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/src/config.in	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/config.in	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/cxux-crt0.s	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/cxux-crt0.s	Thu Jul 26 05:28:10 2007 +0000
@@ -4,21 +4,21 @@
  *               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.  No author or distributor
- * accepts responsibility to anyone for the consequences of using it
- * or for whether it serves any particular purpose or works at all,
- * unless he says so in writing.  Refer to the GNU Emacs General Public
- * License for full details.
- *
- * Everyone is granted permission to copy, modify and redistribute
- * GNU Emacs, but only under the conditions described in the
- * GNU Emacs General Public License.   A copy of this license is
- * supposed to have been given to you along with GNU Emacs so you
- * can know your rights and responsibilities.  It should be in a
- * file named COPYING.  Among other things, the copyright notice
- * and this notice must be preserved on all copies.
+ * 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.
  */
 
 /*
--- a/src/data.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/data.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/dired.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/dired.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/dispextern.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/dispextern.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/dispnew.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/dispnew.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/disptab.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/disptab.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/doc.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/doc.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/doprnt.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/doprnt.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/dosfns.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/dosfns.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/dosfns.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/dosfns.h	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/src/ecrt0.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/ecrt0.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/editfns.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/editfns.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/emacs.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/emacs.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/epaths.in	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/epaths.in	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/eval.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/eval.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/fileio.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/fileio.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/filemode.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/filemode.c	Thu Jul 26 05:28:10 2007 +0000
@@ -4,7 +4,7 @@
 
    This program 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.
 
    This program is distributed in the hope that it will be useful,
--- a/src/firstfile.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/firstfile.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/floatfns.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/floatfns.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/fns.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/fns.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/fontset.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/fontset.c	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/src/fontset.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/fontset.h	Thu Jul 26 05:28:10 2007 +0000
@@ -10,7 +10,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,
--- a/src/frame.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/frame.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/frame.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/frame.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/fringe.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/fringe.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/getpagesize.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/getpagesize.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/gnu.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/gnu.h	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/src/gtkutil.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/gtkutil.c	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/src/gtkutil.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/gtkutil.h	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/src/image.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/image.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/indent.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/indent.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/indent.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/indent.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/insdel.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/insdel.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/intervals.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/intervals.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/intervals.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/intervals.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/keyboard.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/keyboard.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/keyboard.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/keyboard.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/keymap.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/keymap.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/keymap.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/keymap.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/lastfile.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/lastfile.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/lisp.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/lisp.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/lread.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/lread.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/7300.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/7300.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/acorn.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/acorn.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/alliant-2800.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/alliant-2800.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/alliant.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/alliant.h	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/src/m/alpha.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/alpha.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/altos.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/altos.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/amdahl.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/amdahl.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/amdx86-64.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/amdx86-64.h	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/src/m/apollo.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/apollo.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/arm.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/arm.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/att3b.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/att3b.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/aviion.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/aviion.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/celerity.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/celerity.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/clipper.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/clipper.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/cnvrgnt.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/cnvrgnt.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/convex.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/convex.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/cydra5.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/cydra5.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/delta88k.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/delta88k.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/dpx2.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/dpx2.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/dual.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/dual.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/elxsi.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/elxsi.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/ews4800.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/ews4800.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/gould-np1.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/gould-np1.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/gould.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/gould.h	Thu Jul 26 05:28:10 2007 +0000
@@ -12,7 +12,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,
--- a/src/m/hp800.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/hp800.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/hp9000s300.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/hp9000s300.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/i860.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/i860.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/ia64.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/ia64.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/ibm370aix.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/ibm370aix.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/ibmps2-aix.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/ibmps2-aix.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/ibmrs6000.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/ibmrs6000.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/ibmrt-aix.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/ibmrt-aix.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/ibmrt.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/ibmrt.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/ibms390.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/ibms390.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/ibms390x.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/ibms390x.h	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/src/m/intel386.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/intel386.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/iris4d.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/iris4d.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/irist.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/irist.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/isi-ov.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/isi-ov.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/m68k.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/m68k.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/macppc.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/macppc.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/masscomp.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/masscomp.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/mega68.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/mega68.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/mg1.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/mg1.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/mips-siemens.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/mips-siemens.h	Thu Jul 26 05:28:10 2007 +0000
@@ -11,7 +11,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,
--- a/src/m/mips.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/mips.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/mips4.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/mips4.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/news-risc.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/news-risc.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/news.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/news.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/next.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/next.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/nh3000.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/nh3000.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/nh4000.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/nh4000.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/ns16000.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/ns16000.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/ns32000.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/ns32000.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/nu.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/nu.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/orion.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/orion.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/orion105.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/orion105.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/pfa50.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/pfa50.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/plexus.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/plexus.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/pmax.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/pmax.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/powermac.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/powermac.h	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/src/m/powerpcle.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/powerpcle.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/pyramid.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/pyramid.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/sequent-ptx.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/sequent-ptx.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/sequent.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/sequent.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/sh3el.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/sh3el.h	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/src/m/sparc.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/sparc.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/sps7.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/sps7.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/sr2k.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/sr2k.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/stride.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/stride.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/sun1.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/sun1.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/sun2.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/sun2.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/sun386.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/sun386.h	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/src/m/symmetry.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/symmetry.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/tad68k.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/tad68k.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/tahoe.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/tahoe.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/targon31.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/targon31.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/tek4300.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/tek4300.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/tekxd88.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/tekxd88.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/template.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/template.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/tower32.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/tower32.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/tower32v3.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/tower32v3.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/ustation.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/ustation.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/vax.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/vax.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/wicat.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/wicat.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/windowsnt.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/windowsnt.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/m/xps100.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/m/xps100.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/mac.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/mac.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/macfns.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/macfns.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/macgui.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/macgui.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/macmenu.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/macmenu.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/macros.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/macros.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/macros.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/macros.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/macselect.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/macselect.c	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/src/macterm.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/macterm.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/macterm.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/macterm.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/makefile.w32-in	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/makefile.w32-in	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/marker.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/marker.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/mem-limits.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/mem-limits.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/minibuf.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/minibuf.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/msdos.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/msdos.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/msdos.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/msdos.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/prefix-args.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/prefix-args.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/print.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/print.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/process.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/process.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/process.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/process.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/puresize.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/puresize.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/ralloc.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/ralloc.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/region-cache.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/region-cache.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/region-cache.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/region-cache.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/aix3-1.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/aix3-1.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/aix3-2.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/aix3-2.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/aix4-1.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/aix4-1.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/bsd386.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/bsd386.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/bsd4-1.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/bsd4-1.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/bsd4-2.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/bsd4-2.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/bsd4-3.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/bsd4-3.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/cxux.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/cxux.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/cygwin.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/cygwin.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/darwin.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/darwin.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/dgux.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/dgux.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/dgux4.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/dgux4.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/dgux5-4-3.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/dgux5-4-3.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/dgux5-4r2.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/dgux5-4r2.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/freebsd.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/freebsd.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/gnu-linux.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/gnu-linux.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/gnu.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/gnu.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/hiuxmpp.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/hiuxmpp.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/hiuxwe2.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/hiuxwe2.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/hpux.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/hpux.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/hpux10.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/hpux10.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/hpux8.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/hpux8.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/hpux9.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/hpux9.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/iris3-5.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/iris3-5.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/iris3-6.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/iris3-6.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/irix3-3.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/irix3-3.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/irix4-0.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/irix4-0.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/irix5-0.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/irix5-0.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/irix6-0.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/irix6-0.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/irix6-5.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/irix6-5.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/isc2-2.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/isc2-2.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/isc3-0.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/isc3-0.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/lynxos.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/lynxos.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/ms-w32.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/ms-w32.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/msdos.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/msdos.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/netbsd.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/netbsd.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/newsos5.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/newsos5.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/nextstep.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/nextstep.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/osf1.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/osf1.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/ptx.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/ptx.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/ptx4.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/ptx4.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/riscix1-1.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/riscix1-1.h	Thu Jul 26 05:28:10 2007 +0000
@@ -1,24 +1,4 @@
-/* Definitions file for GNU Emacs running on RISCiX 1.1 (bsd 4.3)
-   Copyright (C) 1994, 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 2, 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.  */
-
+/* Definitions file for GNU Emacs running on RISCiX 1.1 (bsd 4.3) */
 
 #define  RISCiX_1_1	1
 #define  RISCiX		11
--- a/src/s/riscix12.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/riscix12.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/rtu.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/rtu.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/sco4.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/sco4.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/sco5.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/sco5.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/sol2-3.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/sol2-3.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/sol2.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/sol2.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/sunos4-0.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/sunos4-0.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/sunos4shr.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/sunos4shr.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/template.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/template.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/umax.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/umax.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/unipl5-2.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/unipl5-2.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/usg5-0.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/usg5-0.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/usg5-2-2.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/usg5-2-2.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/usg5-2.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/usg5-2.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/usg5-3.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/usg5-3.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/usg5-4-2.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/usg5-4-2.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/usg5-4.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/usg5-4.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/vms.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/vms.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/s/xenix.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/s/xenix.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/scroll.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/scroll.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/search.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/search.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/sheap.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/sheap.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/sound.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/sound.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/sunfns.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/sunfns.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/syntax.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/syntax.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/syntax.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/syntax.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/sysdep.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/sysdep.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/sysselect.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/sysselect.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/syssignal.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/syssignal.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/systime.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/systime.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/systty.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/systty.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/syswait.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/syswait.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/term.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/term.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/termchar.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/termchar.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/termhooks.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/termhooks.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/terminfo.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/terminfo.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/termopts.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/termopts.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/textprop.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/textprop.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/uaf.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/uaf.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/undo.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/undo.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/unexaix.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/unexaix.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/unexalpha.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/unexalpha.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/unexapollo.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/unexapollo.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/unexconvex.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/unexconvex.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/unexcw.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/unexcw.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/unexec.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/unexec.c	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/src/unexelf.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/unexelf.c	Thu Jul 26 05:28:10 2007 +0000
@@ -5,7 +5,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,
--- a/src/unexenix.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/unexenix.c	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/src/unexmacosx.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/unexmacosx.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/unexmips.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/unexmips.c	Thu Jul 26 05:28:10 2007 +0000
@@ -13,7 +13,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,
--- a/src/unexnext.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/unexnext.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/unexsni.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/unexsni.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/unexsunos4.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/unexsunos4.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/unexw32.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/unexw32.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/vm-limit.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/vm-limit.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w16select.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w16select.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32.h	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,
--- a/src/w32bdf.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32bdf.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32bdf.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32bdf.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32console.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32console.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32gui.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32gui.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32heap.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32heap.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32heap.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32heap.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32inevt.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32inevt.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32inevt.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32inevt.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32menu.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32menu.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32proc.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32proc.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32reg.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32reg.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32select.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32select.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32term.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32term.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32term.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32term.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/w32xfns.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/w32xfns.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/widget.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/widget.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/widget.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/widget.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/widgetprv.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/widgetprv.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/window.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/window.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/window.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/window.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/xdisp.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/xdisp.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/xfaces.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/xfaces.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/xfns.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/xfns.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/xmenu.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/xmenu.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/xrdb.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/xrdb.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/xselect.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/xselect.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/xsmfns.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/xsmfns.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/xterm.c	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/xterm.c	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/src/xterm.h	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/xterm.h	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/update-subdirs	Thu Jul 26 05:25:19 2007 +0000
+++ b/update-subdirs	Thu Jul 26 05:28:10 2007 +0000
@@ -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,
--- a/vms/make-mms-derivative.el	Thu Jul 26 05:25:19 2007 +0000
+++ b/vms/make-mms-derivative.el	Thu Jul 26 05:28:10 2007 +0000
@@ -9,7 +9,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,