[release-notes/gnome-3-6] input methods - don't use the word controversy; add notes on changes to preferences

[Allan Day <allanday src gnome org>]

commit b7d6fb8bda7f3a6406407e83baf00c63ebc1b017
Author: Allan Day <allanpday gmail com>
Date:   Mon Sep 17 17:19:04 2012 +0100

    input methods - don't use the word controversy; add notes on changes to preferences

 help/C/i18n-ibus.page |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 deletions(-)
---
diff --git a/help/C/i18n-ibus.page b/help/C/i18n-ibus.page
index d960aac..54a2ea2 100644
--- a/help/C/i18n-ibus.page
+++ b/help/C/i18n-ibus.page
@@ -6,7 +6,7 @@
 
   <info>
     <link type="guide" xref="index#i18n"/>
-    <desc>Integrated Input Methods.</desc>
+    <desc>Fully integrated input methods have arrived.</desc>
     <credit type="author">
       <name its:translate="no">Olav Vitters</name>
       <email its:translate="no">olav vitters nl</email>
@@ -20,13 +20,14 @@
     </license>
   </info>
 
-  <title>Combining Input Methods and Keyboard Layouts</title>
+  <title>Integrated Input Methods</title>
 
   <note style="sidebar">
-    <title>Controversial Topic, Feedback Welcome!</title>
+    <title>Feedback Wanted!</title>
     <p>
-      The plan to integrate this support into 3.6 resulted in a lot of
-      discussion. We welcome to send in your experiences.
+      Integrated input methods is a major new feature, and changes functionality that is 
+      important to many users. We recognise this and want to hear about how you want the 
+      new feature to develop in the future.
     </p>
     <p>
       If you do not wish to make use of this functionality, or prefer to use
@@ -37,6 +38,8 @@
     </p>
   </note>
 
+ <!-- TODO - add screenshots -->
+
   <p>
     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
@@ -52,6 +55,28 @@
     of whether you are typing in an application window or in the GNOME
     shell search entry.
   </p>
+
+  <note>
+    <title>Changes to Existing Keyboard Settings</title>
+    <p>
+      The integrated input methods feature has resulted in the rearrangement of some 
+      existing keyboard preferences. If you customize your keyboard layout, there are 
+      changes you need to be aware of.
+    </p>
+    <list>
+    <item><p>
+      The keyboard combination to change the input source or keyboard layout can now be
+      customized by using the <gui>Shortcuts</gui> tab of the <gui>Keyboard</gui> settings.
+    </p></item>
+    <item><p>
+      Options for the <gui>Compose Key</gui>, as well as the <gui>Alternative Characters Key</gui> (also known as the 3rd level chooser key) can also be found in the <gui>Shortcuts</gui> tab of the <gui>Keyboard</gui> settings.
+    </p></item>
+    <item><p>
+      Other keyboard layout customisation options can now be found in <gui>GNOME Tweak Tool</gui>.
+    </p></item>
+   </list>
+   </note>
+
   <p>
     The input method support in GNOME 3.6 is based on <link
     href="http://code.google.com/p/ibus/";>IBus</link>.