diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-29 10:17:53 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-29 11:33:35 +0100 |
| commit | 3eb588078e7f4d62053584a70f7600b19ec99a0f (patch) | |
| tree | 432c6bfcabf44b8fdbc4a8e1ab58054e548a77bf /src/tools/qdoc/doc/qdoc-guide/qdoc-guide.qdoc | |
| parent | 7b8ab4204417844e72bb66696227a422f4ef3e2d (diff) | |
| parent | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/tools/qdoc/doc/qdoc-guide/qdoc-guide.qdoc')
| -rw-r--r-- | src/tools/qdoc/doc/qdoc-guide/qdoc-guide.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/qdoc/doc/qdoc-guide/qdoc-guide.qdoc b/src/tools/qdoc/doc/qdoc-guide/qdoc-guide.qdoc index 0c5845a794..d2a2a66beb 100644 --- a/src/tools/qdoc/doc/qdoc-guide/qdoc-guide.qdoc +++ b/src/tools/qdoc/doc/qdoc-guide/qdoc-guide.qdoc @@ -533,7 +533,7 @@ A QML type belongs to a \e module. The module may include all the related types for a platform or contain a certain version of \l{Qt Quick}. For example, the Qt Quick 2 \l{QML Elements} belong - to the QtQuick2 module while there is also a QtQuick1 module for the older + to the Qt Quick 2 module while there is also a Qt Quick 1 module for the older types introduced in Qt 4. QML modules allow grouping QML types. The \l{qmltype-command} @@ -575,7 +575,7 @@ point for readers to find instructional and reference materials that do, such as tutorials, examples and class documentation. An example of an overview might be a product page, such as a top level discussion of - QtQuick, individual modules, design principles, or tools. + Qt Quick, individual modules, design principles, or tools. To signify that a document is an article, you append the article keyword to the \\page command: |