Update some cedet template copyrights to GPLv3+.

* etc/srecode/default.srt (COPYRIGHT):
* lisp/cedet/semantic/grammar.el (semantic-grammar-header-template):
Update template copyright to GPLv3+.

4 files changed, 17 insertions, 12 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 5c5e62d4e33..b45e48a7edb 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-06  Glenn Morris  <rgm@gnu.org>
+
+	* srecode/default.srt (COPYRIGHT): Update template copyright to GPLv3+.
+
 2010-03-05  Glenn Morris  <rgm@gnu.org>
 
 	* refcards/orgcard.tex: Use pdflayout.sty.
diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt
index 7d83d550f10..b42de2f7835 100644
--- a/etc/srecode/default.srt
+++ b/etc/srecode/default.srt
@@ -25,8 +25,8 @@ set comment_start  "#"
 
 set COPYRIGHT "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) any later version.
+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, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,9 +34,7 @@ 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; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA."
+along with this program.  If not, see http://www.gnu.org/licenses/."
 
 set DOLLAR "$"
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c5dd5cc0f7..8ec6003744d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-06  Glenn Morris  <rgm@gnu.org>
+
+	* cedet/semantic/grammar.el (semantic-grammar-header-template):
+	Update template copyright to GPLv3+.
+
 2010-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* man.el (Man-files-regexp): Tighten up the regexp (bug#5686).
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 2538026a1e3..8f5d1cd3e14 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -573,21 +573,19 @@ Typically a DEFINE expression should look like this:
 ;; X-RCS: " vcid "
 
 ;; This file is not part of GNU Emacs.
-;;
+
 ;; 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) any later version.
-;;
+;; published by the Free Software Foundation, either version 3 of
+;; the License, or (at your option) any later version.
+
 ;; This software 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.
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;