Merge from mainline.

[bpt/emacs.git] / leim / quail / vntelex.el

diff --git a/leim/quail/vntelex.el b/leim/quail/vntelex.el
index 09d4daf..40380ee 100644 (file)
--- a/leim/quail/vntelex.el
+++ b/leim/quail/vntelex.el
@@ -1,16 +1,16 @@
 ;;; vntelex.el --- Quail package for Vietnamese by Telex method
 
-;; Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
 ;; Author:   Werner Lemberg <wl@gnu.org>
 ;; Keywords: multilingual, input method, Vietnamese
 
 ;; 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 2, 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:
 
@@ -54,7 +52,7 @@ Other diacritics:
   acute         s      as -> \e,1a\e(B
   grave         f      af -> \e,1`\e(B
   hook above    r      ar -> \e,1d\e(B
-  tilde         x      ax  -> \e,1c\e(B
+  tilde         x      ax -> \e,1c\e(B
   dot below     j      aj -> \e,1U\e(B
 
   d bar                dd -> \e,1p\e(B
@@ -286,7 +284,7 @@ and postfix: Eee -> Ee, ajj -> aj, etc.
  ("Dd" ?\e,2p\e(B)
 ;("$$" ?\e$,1tK\e(B)     ; U+20AB DONG SIGN (#### check)
 
- ("aff" ["aff"])
+ ("aff" ["af"])
  ("AFF" ["AF"])
  ("Aff" ["Af"])
  ("ass" ["as"])
@@ -427,5 +425,4 @@ and postfix: Eee -> Ee, ajj -> aj, etc.
 ;; coding: iso-2022-7bit
 ;; End:
 
-;;; arch-tag: 60db6880-0c9f-4456-b9fe-628de053a5ab
 ;;; vntelex.el ends here