changeset 95007:e666d114df11

Switch to recommended form of GPLv3 permissions notice.
author Glenn Morris <rgm@gnu.org>
date Thu, 15 May 2008 07:32:14 +0000
parents 96a5a9eaf628
children 2d16a387dca5
files etc/tutorials/TUTORIAL
diffstat 1 files changed, 9 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/etc/tutorials/TUTORIAL	Thu May 15 07:31:52 2008 +0000
+++ b/etc/tutorials/TUTORIAL	Thu May 15 07:32:14 2008 +0000
@@ -1097,25 +1097,23 @@
 This version of the tutorial is a part of GNU Emacs.  It is copyrighted
 and comes with permission to distribute copies on certain conditions:
 
-  Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
-    2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+  Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, 2005, 2006,
+    2007, 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
-  
-  GNU Emacs 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 3, or (at your option)
-  any later version.
-  
+  the Free Software Foundation, either version 3 of the License, 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.
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 Please read the file COPYING and then do give copies of GNU Emacs to
 your friends.  Help stamp out software obstructionism ("ownership") by