5 files changed, 38 insertions, 16 deletions
diff --git a/doc/src/declarative/qmlviewer.qdoc b/doc/src/declarative/qmlviewer.qdoc
index cfb762c..585b402 100644
--- a/doc/src/declarative/qmlviewer.qdoc
+++ b/doc/src/declarative/qmlviewer.qdoc
@@ -192,6 +192,9 @@ Rectangle {
 }
 \endqml
 
+\note Since Qt Quick 1.1 this information is accessible outside of the QML Viewer,
+through the \c active property of the \l {QML:Qt::application}{Qt.application} object.
+
 \row
 
 \o \c runtime.orientation
diff --git a/doc/src/declarative/whatsnew.qdoc b/doc/src/declarative/whatsnew.qdoc
index 4b94d51..f4359f9 100644
--- a/doc/src/declarative/whatsnew.qdoc
+++ b/doc/src/declarative/whatsnew.qdoc
@@ -69,7 +69,7 @@ Added the following properties and methods:
 \o moveCursorSelection(int pos, SelectionMode mode) to enable selection by word
 \endlist
 
-\section2 Image and BorderImage
+\section2 Image, BorderImage and AnimatedImage
 
 Added the following properties:
 \list
@@ -109,21 +109,31 @@ Added the following properties:
 
 \section2 Repeater
 
-Added the following methods:
+Added the following methods and signal handlers:
 \list
 \o onItemAdded()
 \o onItemRemoved()
-\o itemAt()
+\o itemAt(int index)
 \endlist
 
+\section2 Component
+
+The createObject() method now accepts a map of initial property values for the created object.
+
 \section2 Qt
 
-Added the following properties:
+Added the following properties and methods:
 \list
 \o application.layoutDirection
 \o application.active
 \endlist
 
+\section2 Other changes
+
+\list
+\o Functions can be assigned to properties from JavaScript to create property bindings
+\endlist
+
 
 \section1 Qt 4.7.1
 
diff --git a/doc/src/examples/qml-folderlistmodel.qdoc b/doc/src/examples/qml-folderlistmodel.qdoc
index c9d248e..0a01ce0 100644
--- a/doc/src/examples/qml-folderlistmodel.qdoc
+++ b/doc/src/examples/qml-folderlistmodel.qdoc
@@ -41,10 +41,15 @@ making the model available to QML.
 
 \section1 Usage from QML
 
-The type we are creating can be used from QML like this:
+The FolderListModel can be used from QML like this:
 
 \snippet doc/src/snippets/declarative/folderlistmodel.qml 0
 
+This displays a list of all subfolders and QML files in the current folder.
+
+The FolderListModel \c folder property can be set to change the folder that
+is currently displayed.
+
 \section1 Defining the Model
 
 We are subclassing QAbstractListModel which will allow us to give data to QML and
diff --git a/doc/src/snippets/declarative/application.qml b/doc/src/snippets/declarative/application.qml
index 2820ff2..06f83f2 100644
--- a/doc/src/snippets/declarative/application.qml
+++ b/doc/src/snippets/declarative/application.qml
@@ -42,12 +42,12 @@
 import QtQuick 1.1
 
 Rectangle {
-  width: 300; height: 55
-  color: Qt.application.active ? "white" : "lightgray"
-  Text {
-      text: "Application " + (Qt.application.active ? "active" : "inactive")
-      opacity: Qt.application.active ? 1.0 : 0.5
-      anchors.centerIn: parent
-  }
+    width: 300; height: 55
+    color: Qt.application.active ? "white" : "lightgray"
+    Text {
+        text: "Application " + (Qt.application.active ? "active" : "inactive")
+        opacity: Qt.application.active ? 1.0 : 0.5
+        anchors.centerIn: parent
+    }
 }
 //! [document]
diff --git a/doc/src/snippets/declarative/folderlistmodel.qml b/doc/src/snippets/declarative/folderlistmodel.qml
index 3bddefb..8aeb72c 100644
--- a/doc/src/snippets/declarative/folderlistmodel.qml
+++ b/doc/src/snippets/declarative/folderlistmodel.qml
@@ -43,15 +43,19 @@ import QtQuick 1.0
 import Qt.labs.folderlistmodel 1.0
 
 ListView {
+    width: 200; height: 400
+
     FolderListModel {
-        id: foldermodel
+        id: folderModel
         nameFilters: ["*.qml"]
     }
+
     Component {
-        id: filedelegate
+        id: fileDelegate
         Text { text: fileName }
     }
-    model: foldermodel
-    delegate: filedelegate
+
+    model: folderModel
+    delegate: fileDelegate
 }
 //![0]