Merge changes from emacs-23 branch

[bpt/emacs.git] / lisp / language / cyril-util.el

diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index 2b16e1e..0968746 100644 (file)
--- a/lisp/language/cyril-util.el
+++ b/lisp/language/cyril-util.el
@@ -1,16 +1,16 @@
 ;;; cyril-util.el --- utilities for Cyrillic scripts
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008  Free Software Foundation, Inc.
+;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Keywords: mule, multilingual, Cyrillic
 
 ;; 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
@@ -18,9 +18,7 @@
 ;; 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/>.
 
 ;;; Commentary:
 
@@ -194,5 +192,5 @@ If the argument is nil, we return the display table to its standard state."
 ;; coding: iso-2022-7bit
 ;; End:
 
-;;; arch-tag: f6d9dd5d-685c-45d6-a5d8-1e2178228b7e
+;; arch-tag: f6d9dd5d-685c-45d6-a5d8-1e2178228b7e
 ;;; cyril-util.el ends here