From 9afac62064df735fa4667f61ce4fbda5289c94d9 Mon Sep 17 00:00:00 2001
From: Jerome Pasion <jerome.pasion@nokia.com>
Date: Mon, 21 Feb 2011 18:19:13 +0100
Subject: Removed GestureArea link from the elements page.

Additional merge conflicts fix.

Reviewed-by: David Boddie
---
 doc/src/declarative/elements.qdoc  | 1 -
 doc/src/examples/qml-examples.qdoc | 9 +--------
 doc/src/index.qdoc                 | 6 +++---
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index ff8e201..873d0de 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -77,7 +77,6 @@ To see the QML elements listed by functional area, see the
 \o \l {FocusScope} - Element that mediate keyboard focus changes
 \o \l {Flickable} - Provides a surface that can be "flicked"
 \o \l {Flipable} - Provides a surface that produces "flipping" effects
-\o \l {GestureArea} - Enables simple gesture handling
 \endlist
 
 \section1 Positioners and Repeater
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 85b87ea..f77464f 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -283,7 +283,7 @@
     \title Positioners: Layout Direction Example
     \example declarative/positioners/layoutdirection
 
-    This example shows how to control the horizontal layout direction of 
+    This example shows how to control the horizontal layout direction of
     \l Row, \l Grid and \l Flow positioners.
 
     \image qml-positioners-layoutdirection-example.png
@@ -583,13 +583,6 @@
 */
 
 /*!
-    \title Touch Interaction: Gestures Example
-    \example declarative/touchinteraction/gestures
-
-    This example shows how to use the GestureArea element.
-*/
-
-/*!
     \title Touch Interaction: MouseArea Example
     \example declarative/touchinteraction/mousearea
 
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 45f142d..3f629bf 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -38,7 +38,7 @@
     \div {indexboxcont indexboxbar }
         \div {sectionlist normallist}
             \div {heading}
-                \bold{What is Qt}
+                What is Qt
             \enddiv
             \image qt-logo.png
             \list
@@ -57,7 +57,7 @@
         \enddiv
         \div {sectionlist normallist}
             \div {heading}
-                \bold{Develop with Qt}
+                Develop with Qt
             \enddiv
             \image qml.png
             \list
@@ -72,7 +72,7 @@
         \enddiv
         \div {sectionlist normallist}
             \div {heading}
-                \bold{See Qt}
+                See Qt
             \enddiv
             \image mobile.png
             \list
-- 
cgit v0.12