From d82c96ded2df80e5e923544dd7b2ce3ea722b7ff Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Mon, 23 Nov 2009 17:01:23 +1000
Subject: Doc.

---
 doc/src/declarative/qmlintro.qdoc     | 24 +++++++++++++++++++++---
 doc/src/declarative/qmlreference.qdoc | 16 ++++++++++++----
 doc/src/declarative/qmlviewer.qdoc    |  2 +-
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/doc/src/declarative/qmlintro.qdoc b/doc/src/declarative/qmlintro.qdoc
index f84d614..ab9416b 100644
--- a/doc/src/declarative/qmlintro.qdoc
+++ b/doc/src/declarative/qmlintro.qdoc
@@ -239,8 +239,8 @@ Image {
 
 \section2 Default properties
 
-Each object type can specify one of its list properties as its default property.
-If a list property has been declared as the default property, the property tag can be omitted.
+Each object type can specify one of its list or object properties as its default property.
+If a property has been declared as the default property, the property tag can be omitted.
 
 For example this code:
 \code
@@ -263,9 +263,27 @@ State {
 
 because \c changes is the default property of the \c State type.
 
-\section2 Dot Properties
+\section2 Grouped Properties
 
+In some cases properties form a logical group and use a 'dot' or grouped notation
+to show this.
 
+Grouped properties can be written like this:
+\qml
+Text {
+    font.pixelSize: 12
+    font.bold: true
+}
+\endqml
+
+or like this:
+\qml
+Text {
+    font { pixelSize: 12; bold: true }
+}
+\endqml
+
+In the element documentation grouped properties are shown using the 'dot' notation.
 
 \section2 Attached Properties
 \target attached-properties
diff --git a/doc/src/declarative/qmlreference.qdoc b/doc/src/declarative/qmlreference.qdoc
index f17e9d7..2c79aeb 100644
--- a/doc/src/declarative/qmlreference.qdoc
+++ b/doc/src/declarative/qmlreference.qdoc
@@ -45,16 +45,22 @@
 
     \target qtdeclarativemainpage
 
-    QML is a language for building highly dynamic and fluid applications. It is targetted at the sorts of user
-    interface (and the sorts of hardware) in embedded devices such as phones, media
-    players, and set-top boxes. It is also appropriate for highly custom desktop
+    QML is a language for building the animation rich,
+    highly fluid user interfaces that are becoming common in portable consumer
+    electronics devices such as mobile phones, media players, set-top boxes and
+    netbooks. It is also appropriate for highly custom desktop
     user interfaces, or special elements in more traditional desktop user interfaces.
 
     Building fluid applications is done declaratively, rather than procedurally.
     That is, you specify \e what the UI should look like and how it should behave
     rather than specifying step-by-step \e how to build it. Specifying a UI declaratively
     does not just include the layout of the interface items, but also the way each
-    individual item looks and behaves and the overall flow of the application.
+    individual item looks and behaves and the overall flow of the application.    
+
+    The QML elements provide a sophisticated set of graphical and behavioral building
+    blocks.  These different elements are combined together in \l {QML Documents}{QML documents} to build components
+    ranging in complexity from simple buttons and sliders, to complete
+    internet-enabled applications like a \l {http://www.flickr.com}{Flickr} photo browser.
 
     Getting Started:
     \list
@@ -69,6 +75,7 @@
     \o \l {QML Documents}
     \o \l {Property Binding}
     \o \l {ECMAScript Blocks}
+    \o \l {QML Scope}
     \o \l {Network Transparency}
     \o \l {qmlmodels}{Data Models}
     \o \l {anchor-layout}{Anchor-based Layout}
@@ -82,5 +89,6 @@
     QML Reference:
     \list
     \o \l {elements}{QML Elements}
+    \o \l {QML Global Object}
     \endlist
 */
diff --git a/doc/src/declarative/qmlviewer.qdoc b/doc/src/declarative/qmlviewer.qdoc
index f153df2..df96535 100644
--- a/doc/src/declarative/qmlviewer.qdoc
+++ b/doc/src/declarative/qmlviewer.qdoc
@@ -71,7 +71,7 @@
     that is a qreal from 0 to 86400 representing the number of seconds since
     midnight, dummy data for this could be provided by \c dummydata/clock.qml:
     \code
-    Object { property real time: 12345 }
+    QtObject { property real time: 12345 }
     \endcode
     Any QML can be used in the dummy data files. You could even animate the
     fictional data!
-- 
cgit v0.12