Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

5 files changed, 13 insertions, 10 deletions

diff --git a/doc/src/declarative/javascriptblocks.qdoc b/doc/src/declarative/javascriptblocks.qdoc
index 7ef7f9a..f78f3c2 100644
--- a/doc/src/declarative/javascriptblocks.qdoc
+++ b/doc/src/declarative/javascriptblocks.qdoc
@@ -205,7 +205,7 @@ component destruction.
 Property bindings can be created in JavaScript by assigning the property with a \c function
 that returns the required value.
 
-See \l {Binding Properties from JavaScript} for details.
+See \l {qml-javascript-assignment}{Property Assignment versus Property Binding} for details.
 
 
 \section1 Receiving QML Signals in JavaScript
@@ -293,8 +293,8 @@ To run code after the environment setup has completed, refer to
 
 \o The value of \c this is currently undefined in QML in the majority of contexts
 
-The \c this keyword is supported when \l {Binding Properties from JavaScript}
-{binding properties from JavaScript}. In all other situations, the value of
+The \c this keyword is supported when binding properties from JavaScript. 
+In all other situations, the value of
 \c this is undefined in QML.
 
 To refer to any element, provide an \c id.  For example:
diff --git a/doc/src/declarative/propertybinding.qdoc b/doc/src/declarative/propertybinding.qdoc
index afbbe4f..88ec5c3 100644
--- a/doc/src/declarative/propertybinding.qdoc
+++ b/doc/src/declarative/propertybinding.qdoc
@@ -78,6 +78,7 @@ overly complex - such as involving multiple lines, or imperative loops - it may
 to refactor the component entirely, or at least factor the binding out into a separate
 function.
 
+\keyword qml-javascript-assignment
 \section1 Property Assignment versus Property Binding
 
 When working with both QML and JavaScript, it is important to differentiate between
diff --git a/doc/src/declarative/qmlviews.qdoc b/doc/src/declarative/qmlviews.qdoc
index 4071d5d..53ce4b9 100644
--- a/doc/src/declarative/qmlviews.qdoc
+++ b/doc/src/declarative/qmlviews.qdoc
@@ -67,8 +67,9 @@ For more information, consult the \l {QML Data Models} article.
 \section1 View Delegates
 
 Views need a \e delegate to visually represent an item in a list. A view will
-visual each item list according to the template defined by the delegate.
-Properties of the model are accessible as well as an \c index property.
+visualize each item list according to the template defined by the delegate.
+Items in a model are accessible through the \c index property as well as the
+item's properties.
 \snippet doc/src/snippets/declarative/listview.qml delegate
 \image listview-setup.png
 
@@ -94,7 +95,7 @@ The club may decorate the members list by binding visual objects to the
 \section1 ListView Sections
 
 \l {ListView} contents may be grouped into \e sections, where related list items
-are labelled according to their sections. Further, the sections may be decorated
+are labeled according to their sections. Further, the sections may be decorated
 with \l{qml-view-delegate}{delegates}.
 
 A list may contain a list indicating people's names and the team on which team
diff --git a/doc/src/getting-started/tutorials.qdoc b/doc/src/getting-started/tutorials.qdoc
index 881e5f5..9fc6699 100644
--- a/doc/src/getting-started/tutorials.qdoc
+++ b/doc/src/getting-started/tutorials.qdoc
@@ -61,7 +61,7 @@
     \o{2,1} \l{A Quick Start to Qt Designer}{\bold{Qt Designer}}
     \o{2,1} \l{Qt Linguist Manual: Programmers#Tutorials}{\bold {Qt Linguist}}
     \row
-    \o \image  QtDesigner
+    \o \image designer-examples.png
     \o
     A quick guide through \QD showing the basic steps to create a
     form with this interactive tool.
diff --git a/src/gui/inputmethod/qinputcontext.cpp b/src/gui/inputmethod/qinputcontext.cpp
index 063aefd..f083e51 100644
--- a/src/gui/inputmethod/qinputcontext.cpp
+++ b/src/gui/inputmethod/qinputcontext.cpp
@@ -355,9 +355,10 @@ void QInputContext::widgetDestroyed(QWidget *widget)
     in complex input method. In the case, call QInputContext::reset()
     to ensure proper termination of inputting.
 
-    You must not send any QInputMethodEvent except empty InputMethodEnd event using
-    QInputContext::reset() at reimplemented reset(). It will break
-    input state consistency.
+    In a reimplementation of reset(), you must not send any
+    QInputMethodEvent containing preedit text. You can only commit
+    string and attributes; otherwise, you risk breaking input state
+    consistency.
 */