Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka@jpl.org.

[gnu-emacs] / admin / notes / unicode

diff --git a/admin/notes/unicode b/admin/notes/unicode
index 0f76a3d36f9989b80cb576d720a2584b2d07ec81..ce7d3732f03f0035040a4b84c795838d0131cad1 100644 (file)
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -1,7 +1,6 @@
                                             -*-mode: text; coding: latin-1;-*-
 
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
-  Free Software Foundation, Inc.
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Problems, fixmes and other unicode-related issues
@@ -130,10 +129,10 @@ regard to completeness.
 \f
 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
@@ -141,6 +140,4 @@ 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/>.