[release-notes/gnome-3-6] add really basic ibus section

[Olav Vitters <ovitters src gnome org>]

commit 7f44a87c4422fc42f221a1f8a1703335dc88a4ea
Author: Olav Vitters <olav vitters nl>
Date:   Mon Sep 3 14:25:09 2012 +0200

    add really basic ibus section

 help/C/i18n-ibus.page |   39 +++++++++++++++++++++++++++++++++++++++
 help/Makefile.am      |    1 +
 2 files changed, 40 insertions(+), 0 deletions(-)
---
diff --git a/help/C/i18n-ibus.page b/help/C/i18n-ibus.page
new file mode 100644
index 0000000..26aaf3b
--- /dev/null
+++ b/help/C/i18n-ibus.page
@@ -0,0 +1,39 @@
+<page xmlns="http://projectmallard.org/1.0/";
+      xmlns:e="http://projectmallard.org/experimental/";
+      type="topic"
+      id="users-font-viewer">
+
+  <info>
+    <link type="guide" xref="index#i18n"/>
+    <desc>Integrated Input Method.</desc>
+    <credit type="author">
+      <name>Olav Vitters</name>
+      <email>olav vitters nl</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+  </info>
+
+  <title>Combining Input Methods and Keyboard Layouts</title>
+
+  <p>
+    ...
+  </p>
+
+  <note style="important">
+    <title>Controverial Topic, Feedback Welcome!</title>
+    <p>
+      The plan to integrate this support into 3.6 resulted in a lot of
+      discussion. We welcome to send in your experiences.
+    </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 is possible as the
+      support for this feature is <link
+      href="https://live.gnome.org/ThreePointFive/Features/IBus#How_to_use_other_IM_frameworks";>entirely
+      optional</link>.
+    </p>
+  </note>
+
+</page>
diff --git a/help/Makefile.am b/help/Makefile.am
index fe2a1df..28a7bb1 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -7,6 +7,7 @@ HELP_FILES = \
  admins-xdg.page \
  developers-glib.page \
  i18n.page \
+ i18n-ibus.page \
  index.page \
  installation-live-images.page \
  installation-sources.page \