summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@digia.com>2013-05-15 15:11:30 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-16 10:42:34 +0200
commitdaacd49edce12da2d863d3b7bd53c23bd16e930e (patch)
treef8ea1f60737f3cb651eb81a89497a2c776835b8d
parent7e659586a1fbc7d44a2ccd0d4e750c2ba9790ca0 (diff)
downloadqtdoc-daacd49edce12da2d863d3b7bd53c23bd16e930e.tar.gz
Doc: fixed several minor doc issues
- \brief statements - snippet specification syntax - folder specification issue Task-number: QTBUG-31177 Change-Id: I853d08775c8eb43441a1edefed1a40d55b673a66 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--doc/src/getting-started/examples.qdoc1
-rw-r--r--doc/src/getting-started/installer-README.qdoc6
-rw-r--r--doc/src/qmlapp/firststepsqml.qdoc4
-rw-r--r--doc/src/qmlapp/porting.qdoc4
4 files changed, 8 insertions, 7 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 1e2760f9..0d4530c0 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -28,6 +28,7 @@
/*!
\page qtexamplesandtutorials.html
\title Qt Examples And Tutorials
+ \brief Explains step by step basic Qt programming
\section1 Tutorials
diff --git a/doc/src/getting-started/installer-README.qdoc b/doc/src/getting-started/installer-README.qdoc
index b9636c39..7a005571 100644
--- a/doc/src/getting-started/installer-README.qdoc
+++ b/doc/src/getting-started/installer-README.qdoc
@@ -86,9 +86,9 @@ tools, for example:
The development tools are located in the directory
\e{<install_dir>}/\e{<version>}/\e{<compiler>}/bin. For Windows, the MinGW
-toolchain is placed in \e{<install_dir>}\Tools. You can run them from Qt Creator
-or from the command line. You can also launch some of them as standalone
-applications.
+toolchain is placed in \e{<install_dir>}\\Tools. You can run
+them from Qt Creator or from the command line. You can also launch some of
+them as standalone applications.
\section1 Running Example Applications
diff --git a/doc/src/qmlapp/firststepsqml.qdoc b/doc/src/qmlapp/firststepsqml.qdoc
index f37cb4f1..78a5f8af 100644
--- a/doc/src/qmlapp/firststepsqml.qdoc
+++ b/doc/src/qmlapp/firststepsqml.qdoc
@@ -42,9 +42,9 @@ import.
To use the \l{Qt Quick} module, a QML document needs to
import it. The import syntax looks like this:
-\qml
+\code
import QtQuick 2.0
-\endqml
+\endcode
The types and functionality that \l{Qt Quick} provides can now
be used in the QML document!
diff --git a/doc/src/qmlapp/porting.qdoc b/doc/src/qmlapp/porting.qdoc
index 7d972002..d0e32884 100644
--- a/doc/src/qmlapp/porting.qdoc
+++ b/doc/src/qmlapp/porting.qdoc
@@ -52,9 +52,9 @@ There are very few changes in the QML language that affect the porting of existi
The \c QtQuick module has been updated to version 2.0. All QML applications should update their import
statements to use the new version:
-\qml
+\code
import QtQuick 2.0
-\endqml
+\endcode
\section2 Property and Method Changes