Merge from emacs--devo--0

[gnu-emacs] / etc / TERMS

diff --git a/etc/TERMS b/etc/TERMS
index 926d6130aaee20d464038316b05d9fb2a8659f78..5a06a826d19bd66215c8d2a84651bbd1511930b9 100644 (file)
--- a/etc/TERMS
+++ b/etc/TERMS
@@ -1,4 +1,4 @@
-Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008

 Free Software Foundation, Inc.
 See the end of the file for copying permissions.
 
 Free Software Foundation, Inc.
 See the end of the file for copying permissions.
 


@@ -237,8 +237,8 @@ COPYING PERMISSIONS:
 
     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
 
     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
 
     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 @@ COPYING PERMISSIONS:
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     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.