Switch license to GPLv3 or later.

diff --git a/etc/NEWS b/etc/NEWS
index b471e7fdf38c68968e5d578d285dd23b08c87fce..8b81b0f7ca26118a00b78d2c06154f5f6d62e502 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -223,7 +223,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/mb-depth.el b/lisp/mb-depth.el
index 256c7ee6a99a7107eca590dffeb3923420797842..1d125e45d9564ae44e29fe5ba80aeb96ac20e159 100644 (file)
--- a/lisp/mb-depth.el
+++ b/lisp/mb-depth.el
@@ -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,

diff --git a/lisp/textmodes/bibtex-style.el b/lisp/textmodes/bibtex-style.el
index 8afc92968d9b4937904bf403ba539c90a4f9d9b6..99c2f92cab0abda9a752aed94f72c86caeb0b349 100644 (file)
--- a/lisp/textmodes/bibtex-style.el
+++ b/lisp/textmodes/bibtex-style.el
@@ -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,

diff --git a/lisp/textmodes/org-publish.el b/lisp/textmodes/org-publish.el
index 1afcee0182becc522d42f554d7326ced31e4e0b1..5a2a146dbaa4a52ad08c2e15894059a4cb4babd2 100644 (file)
--- a/lisp/textmodes/org-publish.el
+++ b/lisp/textmodes/org-publish.el
@@ -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,

diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index dc8004c25a837445f9e0254591e1d26a53e5c61f..6a8f930f00f7004d6783bf5addc795d857131c40 100644 (file)
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -4,7 +4,7 @@
 
 ;; NOTE: THIS IS A MODIFIED VERSION OF Dave Love's vc-bzr.el,
 ;; which you can find at: http://www.loveshack.ukfsn.org/emacs/vc-bzr.el
-;; I could not get in touch with Dave Love by email, so 
+;; I could not get in touch with Dave Love by email, so
 ;; I am releasing my changes separately. -- Riccardo
 
 ;; Author: Dave Love <fx@gnu.org>, Riccardo Murri <riccardo.murri@gmail.com>
@@ -15,7 +15,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,

diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c
index 66b442ea29b49f97dab9cd5e0184a5f7b6d0e910..ec7aa88dbbf6432fec0094b3d149bf7880e1ed98 100644 (file)
--- a/oldXMenu/insque.c
+++ b/oldXMenu/insque.c
@@ -3,7 +3,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,

diff --git a/src/regex.c b/src/regex.c
index 1e80b9bbeef285c1467a49d25990d5fd300e267f..64bfef15c4e30fdd4ef81b1f3433659c0dc56d4c 100644 (file)
--- a/src/regex.c
+++ b/src/regex.c
@@ -3,11 +3,12 @@
    internationalization features.)
 
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
+                 2002, 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, 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,

diff --git a/src/regex.h b/src/regex.h
index dd57ba36f574024b93cc8ccba6d5202668266325..580b1369489cc080e5f06e781eb99d8985b350bb 100644 (file)
--- a/src/regex.h
+++ b/src/regex.h
@@ -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,