Rename duiviewer to qmlviewer.

5 files changed, 15 insertions, 17 deletions

diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index e65808f..fa9f05b 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -3,18 +3,18 @@
 \target qmlexamples
 \title QML Examples
 
-A viewer application is included that allows you to quickly explore many of the
+A \l {qmlviewer}{viewer} application is included that allows you to quickly explore many of the
 examples.  It has some useful options, revealed by:
 
 \code
-    bin/duiviewer -help
+    bin/qmlviewer -help
 \endcode
 
-There are several illustrative XML examples available.  From your build 
+There are several illustrative QML examples available.  From your build 
 directory, 
 
 \code
-    bin/duiviewer $QT_SOURCE_DIR/examples/declarative/mediabrowser/mediabrowser.qml
+    bin/qmlviewer $QT_SOURCE_DIR/demos/declarative/phonebrowser/phonebrowser.qml
 \endcode
 
 Many other simple examples can be found under the \c examples/declarative sub 
@@ -32,5 +32,4 @@ own QML-based applications.
 software rasterizer, a simple canvas backend is used by default. To use 
 Graphics View instead, set \c QML_USE_GRAPHICSVIEW=1.
 
-
 */
diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index e0d4ca3..fc747a9 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -48,7 +48,7 @@ element whose text is determined by whether or not it has \e {active focus}.
 An \l Item requests focus by setting the \c {Item::focus} property to true.  
 
 For very simple cases simply setting the \c {Item::focus} property is sometimes
-sufficient.  If we run the following example in the \c duiviewer, we see that
+sufficient.  If we run the following example in the \c qmlviewer, we see that
 the \c {<KeyActions/>} element has \e {active focus} and pressing the
 \e A, \e B, or \e C keys modifies the text appropriately.
 
diff --git a/doc/src/declarative/tutorial1.qdoc b/doc/src/declarative/tutorial1.qdoc
index caadbf5..aa94c06 100644
--- a/doc/src/declarative/tutorial1.qdoc
+++ b/doc/src/declarative/tutorial1.qdoc
@@ -43,10 +43,10 @@ The \c anchors.horizontalCenter property refers to the horizontal center of an e
 
 \section2 Viewing the example
 
-To view what you have created, run the duiviewer (located in the \c bin directory) with your filename as the first argument. For example, to run the provided completed Tutorial 1 example from the install location, you would type:
+To view what you have created, run the qmlviewer (located in the \c bin directory) with your filename as the first argument. For example, to run the provided completed Tutorial 1 example from the install location, you would type:
 
 \code
-bin/duiviewer examples/tutorials/t1/tutorial1.qml
+bin/qmlviewer examples/tutorials/t1/tutorial1.qml
 \endcode
 
 [\l tutorial] [Next: \l tutorial2]
diff --git a/doc/src/duiviewer.qdoc b/doc/src/qmlviewer.qdoc
index f967f87..e8fdec4 100644
--- a/doc/src/duiviewer.qdoc
+++ b/doc/src/qmlviewer.qdoc
@@ -40,23 +40,22 @@
 ****************************************************************************/
 
 /*!
-    \page duiviewer.html
-    \title Declarative UI Viewer (duiviewer)
+    \page qmlviewer.html
+    \title Qt Declarative UI Viewer (qmlviewer)
     \ingroup qttools
-    \keyword duiviewer
+    \keyword qmlviewer
 
     This page documents the \e{Declarative UI Viewer} for the Qt GUI
-    toolkit. The \c duiviewer reads an XML format declarative user interface definition
-    (\c .qml) file
-    and displays the user interface it describes.
+    toolkit. The \c qmlviewer reads a declarative user interface definition
+    (\c .qml) file and displays the user interface it describes.
 
     \section1 Options
 
-    When run with the \c -help option, duiviewer shows available options.
+    When run with the \c -help option, qmlviewer shows available options.
 
     \section1 Dummy Data
 
-    One use of duiviewer is to allow QML files to be viewed stand-alone,
+    One use of qmlviewer is to allow QML files to be viewed stand-alone,
     rather than being loaded from within a Qt program. Qt applications will
     usually bind objects and properties into the execution context before
     running the QML. To stand-in for such bindings, you can provide dummy
diff --git a/doc/src/tutorials/declarative.qdoc b/doc/src/tutorials/declarative.qdoc
index 3724b10..16dad6e 100644
--- a/doc/src/tutorials/declarative.qdoc
+++ b/doc/src/tutorials/declarative.qdoc
@@ -77,7 +77,7 @@
     sub directory the files are numbered in an order of increasing features.
 
     The code in this example is not compiled, but interpreted at run time.
-    This means you should use the duiviewer application provided with
+    This means you should use the qmlviewer application provided with
     Qt to run the examples.
 
     \list