Merge from emacs--rel--22

[gnu-emacs] / etc / TERMS

diff --git a/etc/TERMS b/etc/TERMS
index c26c38ab6e4aafab1082b8cab2b563d8e86b694b..926d6130aaee20d464038316b05d9fb2a8659f78 100644 (file)
--- a/etc/TERMS
+++ b/etc/TERMS
@@ -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
-    the Free Software Foundation; either version 3, or (at your option)
-    any later version.
+    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
@@ -246,6 +246,5 @@ COPYING PERMISSIONS:
     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 St, Fifth Floor,
-    Boston, MA 02110-1301 USA.
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA