Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.

3 files changed, 9 insertions, 6 deletions

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 6f55095aac7..7334fa991c9 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * quail/ethiopic.el ("ethiopic"): Fix tpo in docstring.
+
 2011-01-28  Paul Eggert  <eggert@cs.ucla.edu>
 
         Redo spelling of Makefile variables to conform to POSIX.
@@ -27,8 +31,8 @@
 
 2010-08-28  Kenichi Handa  <handa@m17n.org>
 
-        * quail/japanese.el (quail-japanese-update-translation): Fix
-        handling of invalid key.
+        * quail/japanese.el (quail-japanese-update-translation):
+        Fix handling of invalid key.
 
 2010-08-15  Andreas Schwab  <schwab@linux-m68k.org>
 
@@ -46,8 +50,7 @@
 
 2010-08-13  Kenichi Handa  <handa@m17n.org>
 
-        * quail/greek.el ("greek-postfix"): Add rules for Greek style
-        quotes.
+        * quail/greek.el ("greek-postfix"): Add rules for Greek style quotes.
 
 2010-08-09  Kenichi Handa  <handa@m17n.org>
 
diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index 7eaaab4aebc..824048534e0 100644
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -39,7 +39,7 @@
 ;; This was `cyrillic-jcuken'.  Alexander Mikhailian
 ;; <mikhailian@altern.org> says:  "cyrillic-jcuken" is actually
 ;; russian.  It is ok but a bit outdated.  This layout has been used
-;; in typewriters for ages but it has been superceeded on desktops by
+;; in typewriters for ages but it has been superseded on desktops by
 ;; a variation of this layout, implemented in M$ Windows software.
 ;; The Windows layout is greatly preferred because of the comma and
 ;; period being placed more conviniently and, of course, because of
diff --git a/leim/quail/ethiopic.el b/leim/quail/ethiopic.el
index bdbb214723e..210aeea7e62 100644
--- a/leim/quail/ethiopic.el
+++ b/leim/quail/ethiopic.el
@@ -62,7 +62,7 @@ S-SPC or `M-x ethio-insert-ethio-space'
 
 C-' or `M-x ethio-gemination'
   Compose the character before the point with the Ethiopic gemination mark.
-  If the characater is already composed, decompose it and remove the
+  If the character is already composed, decompose it and remove the
   gemination mark."
 
  ;; The following keys should work as defined in lisp/language/ethio-util,