[release-notes/gnome-3-6] First cut at input methods

[Matthias Clasen <matthiasc src gnome org>]

commit cb6970241d08fc679ddc2040ebf09a7d1090ff9c
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Sep 15 17:40:24 2012 -0400

    First cut at input methods

 help/C/i18n-ibus.page |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)
---
diff --git a/help/C/i18n-ibus.page b/help/C/i18n-ibus.page
index 55972ce..fd1a74e 100644
--- a/help/C/i18n-ibus.page
+++ b/help/C/i18n-ibus.page
@@ -11,6 +11,10 @@
       <name its:translate="no">Olav Vitters</name>
       <email its:translate="no">olav vitters nl</email>
     </credit>
+    <credit type="author">
+      <name its:translate="no">Matthias Clasen</name>
+      <email its:translate="no">mclasen redha com</email>
+    </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>
@@ -19,7 +23,23 @@
   <title>Combining Input Methods and Keyboard Layouts</title>
 
   <p>
-    TODO: XXX: ...
+    For the very first time, GNOME comes with support for input methods
+    out of the box. It is no longer necessary to manually choose and install
+    an input method framework that may not fit very well into the overall
+    user experience. Input methods are now a part of the core GNOME
+    user experience, just like keyboard layouts.
+  </p>
+  <p>
+    Both keyboard layouts and input methods appear as 'Input Sources' in
+    the 'Region &amp; Language' settings and in the GNOME shell keyboard
+    indicator. 'Candidate windows' that are used by some input methods
+    are presented by GNOME shell, and have the same appearance regardless
+    of whether you are typing in an application window or in the GNOME
+    shell search entry.
+  </p>
+  <p>
+    The input method support in GNOME 3.6 is based on <link
+    href="http://code.google.com/p/ibus/";>IBus</link>.
   </p>
 
   <note style="important">
@@ -30,10 +50,10 @@
     </p>
     <p>
       If you do not wish to make use of this functionality, or prefer to use
-      another method to provide you with input methods, this remains possible as
+      another framework to provide you with input methods, this remains
+      possible as
       <link
-      href="https://live.gnome.org/ThreePointFive/Features/IBus#How_to_use_other_IM_frameworks";>this
-      feature is optional</link>.
+      href="https://live.gnome.org/ThreePointFive/Features/IBus#How_to_use_other_IM_frameworks";>the IBus integration can be disabled</link>.
     </p>
   </note>