From df5662fb8b447f067d2dfa6b37e4d798899d1ebb Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Wed, 19 Aug 2009 15:56:56 +1000
Subject: update documentation

---
 doc/src/declarative/elements.qdoc   | 16 +++++++++-------
 src/declarative/util/qmlpalette.cpp |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 3f74ff5..c71ac1b 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -1,4 +1,4 @@
-/*! 
+/*!
 \page elements.html
 \target elements
 \title Qml Elements
@@ -71,11 +71,12 @@ The following table lists the Qml elements provided by the Qt Declarative module
 \o
 \list
 \o \l Item
+\o \l Rect
 \o \l Image
+\o \l BorderImage
 \o \l Text
+\o \l TextInput
 \o \l TextEdit
-\o \l Rect
-\o \l AnimatedImage
 \endlist
 
 \o
@@ -96,13 +97,14 @@ The following table lists the Qml elements provided by the Qt Declarative module
 \list
 \o \l Loader
 \o \l Repeater
+\o \l Palette
 \o \l ComponentInstance
 \o \l GraphicsObjectContainer
 \endlist
 
 \header
 \o \bold {Views}
-\o \bold {Layouts}
+\o \bold {Positioners}
 \o \bold {Transforms}
 \o \bold {Effects}
 
@@ -128,9 +130,9 @@ The following table lists the Qml elements provided by the Qt Declarative module
 
 \o
 \list
-\o \l VerticalLayout
-\o \l HorizontalLayout
-\o \l GridLayout
+\o \l VerticalPositioner
+\o \l HorizontalPositioner
+\o \l GridPositioner
 \endlist
 
 \o
diff --git a/src/declarative/util/qmlpalette.cpp b/src/declarative/util/qmlpalette.cpp
index e714bc7..d500986 100644
--- a/src/declarative/util/qmlpalette.cpp
+++ b/src/declarative/util/qmlpalette.cpp
@@ -62,7 +62,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Palette,QmlPalette)
 
     Example:
     \code
-    Palette { id: MyPalette; colorGroup: "Active" }
+    Palette { id: MyPalette; colorGroup: Qt.Active }
 
     Rect {
         width: 640; height: 480
-- 
cgit v0.12