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

2 files changed, 6 insertions, 6 deletions

diff --git a/doc/src/declarative/qtbinding.qdoc b/doc/src/declarative/qtbinding.qdoc
index cd50503..c3ce6d0 100644
--- a/doc/src/declarative/qtbinding.qdoc
+++ b/doc/src/declarative/qtbinding.qdoc
@@ -448,7 +448,8 @@ now be used from QML:
 \snippet doc/src/snippets/declarative/qtbinding/enums/standalone.qml 0
 
 The C++ type must be registered with QML to use its enums. If your C++ type is not instantiable, it
-can be registered using qmlRegisterUncreatableType().
+can be registered using qmlRegisterUncreatableType().  To be accessible from QML, the names of enum values
+must begin with a capital letter.
 
 See the \l {Tutorial: Writing QML extensions with C++}{Writing QML extensions with C++} tutorial and
 the \l {Extending QML in C++} reference documentation for more information.
diff --git a/doc/src/frameworks-technologies/threads.qdoc b/doc/src/frameworks-technologies/threads.qdoc
index 3e0204f..2a0cc1a 100644
--- a/doc/src/frameworks-technologies/threads.qdoc
+++ b/doc/src/frameworks-technologies/threads.qdoc
@@ -469,11 +469,10 @@
 
     \list
 
-    \o \l{Qt::AutoConnection}{Auto Connection} (default) The behavior
-       is the same as the Direct Connection, if the emitter and
-       receiver are in the same thread. The behavior is the same as
-       the Queued Connection, if the emitter and receiver are in
-       different threads.
+    \o \l{Qt::AutoConnection}{Auto Connection} (default) If the signal is
+       emitted in the thread which the receiving object has affinity then
+       the behavior is the same as the Direct Connection. Otherwise,
+       the behavior is the same as the Queued Connection."
 
     \o \l{Qt::DirectConnection}{Direct Connection} The slot is invoked
        immediately, when the signal is emitted. The slot is executed