Remove "All rights reserved" line from license headers.

[profile/ivi/qtdeclarative.git] / doc / src / declarative / qtquick-intro.qdoc

diff --git a/doc/src/declarative/qtquick-intro.qdoc b/doc/src/declarative/qtquick-intro.qdoc
index 4cd5db3..f456111 100644 (file)
--- a/doc/src/declarative/qtquick-intro.qdoc
+++ b/doc/src/declarative/qtquick-intro.qdoc
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -21,12 +20,14 @@
 **
 **
 **
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
 /*!
 \page qml-intro.html
+\inqmlmodule QtQuick 2
 \title Introduction to Qt Quick
 
 Qt Quick is a collection of technologies that are designed to help developers
@@ -44,7 +45,7 @@ environment (IDE) introduces tools for developing Qt Quick applications.
 \section1 The QML Language
 
 QML is a high level, scripted language. Its commands, more correctly
-\e elements, leverage the power and efficiency of the Qt libraries to make easy
+\i elements, leverage the power and efficiency of the Qt libraries to make easy
 to use commands that perform intuitive functions. Drawing a rectangle,
 displaying an image, and application events -- all are possible with declarative
 programming.
@@ -53,7 +54,7 @@ The language also allows more flexibility of these commands by using
 \l{About JavaScript}{JavaScript} to implement the high level user interface
 logic.
 
-A QML element usually has various \e properties that help define the element.
+A QML element usually has various \i properties that help define the element.
 For example, if we created an element called Circle then the radius of the
 circle would be a property. Building user interfaces by importing these elements
 is one of the great feature of QML and Qt Quick.
@@ -93,13 +94,12 @@ to export the design to Qt Quick Designer.
 features for completing code snippets, refactoring code, and viewing the element
 hierarchy of QML files.
 \o Build and deploy Qt Quick applications that target multiple desktop and
-mobile platforms, such as Microsoft Windows, Mac OS X, Linux, Symbian, and
-Maemo.
+mobile platforms, such as Microsoft Windows, Mac OS X, Linux, and Maemo.
 \o Debug JavaScript functions and execute JavaScript expressions in the current
 context, and inspect QML at runtime to explore the object structure, debug
 animations, and inspect colors.
 \o Deploy applications to mobile devices and create application installation
-packages for Symbian and Maemo devices that can be published in the Ovi Store
+packages for Maemo devices that can be published in the Ovi Store
 and other channels.
 \o Easily access information with the integrated context-sensitive Qt Help
 system.