summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorartoka <arto.katajasalo@digia.com>2011-11-01 12:47:09 (GMT)
committerCasper van Donderen <casper.vandonderen@nokia.com>2011-11-01 13:07:05 (GMT)
commitcb7ec7c0a6bca8a49809fbbcf6082e34184d8f88 (patch)
treeb07acd25f1617de9451b8c4738d10b5d8286618b /doc
parentc0b59df7488281598d750fe6dcf69d578bc81ff4 (diff)
downloadQt-cb7ec7c0a6bca8a49809fbbcf6082e34184d8f88.zip
Qt-cb7ec7c0a6bca8a49809fbbcf6082e34184d8f88.tar.gz
Qt-cb7ec7c0a6bca8a49809fbbcf6082e34184d8f88.tar.bz2
Fix multiple typos in documentation.
Link typo in the forum nokia icon article. Typo in the Symbian qt introduction document. Typos in the Diagram Scene example documentation. The link url was ending with a slash character in the icon article. Slash characted removed. In the symbian introduction doc there was a missing "p" character in the environment variables listing (QT_SIS_OPTIONS). There was 6 typos in the Diagram Scene example documentation. Task-numbers: QTBUG-13983, QTBUG-11820, QTBUG-14732 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/examples/diagramscene.qdoc12
-rw-r--r--doc/src/howtos/appicon.qdoc2
-rw-r--r--doc/src/platforms/symbian-introduction.qdoc2
3 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/examples/diagramscene.qdoc b/doc/src/examples/diagramscene.qdoc
index c7b4bfe..0518a33 100644
--- a/doc/src/examples/diagramscene.qdoc
+++ b/doc/src/examples/diagramscene.qdoc
@@ -149,11 +149,11 @@
Example}{application example} if you need a high-level
introduction to actions.
- The is the \c createMenus() function:
+ Here is the \c createMenus() function:
\snippet examples/graphicsview/diagramscene/mainwindow.cpp 24
- We create the three menus' of the example.
+ We create the three menus of the example.
The \c createToolbars() function sets up the examples tool
bars. The three \l{QToolButton}s in the \c colorToolBar, the \c
@@ -199,7 +199,7 @@
each button; we store the diagram's type, i.e., the
DiagramItem::DiagramType enum. We use the stored diagram type when
we create new diagram items for the scene. The widgets created
- with this function is used in the tool box.
+ with this function are used in the tool box.
Here is the \c createColorMenu() function:
@@ -443,7 +443,7 @@
In the \c DiagramScene a mouse click can give three different
actions: the item under the mouse can be moved, an item may be
- inserted, or an arrow may be connected between to diagram items.
+ inserted, or an arrow may be connected between two diagram items.
Which action a mouse click has depends on the mode, given by the
Mode enum, the scene is in. The mode is set with the \c setMode()
function.
@@ -456,7 +456,7 @@
inserted is set with the \c setItemType() slot.
The \c MainWindow and \c DiagramScene share responsibility for
- the examples functionality. \c MainWindow handles the following
+ the example's functionality. \c MainWindow handles the following
tasks: the deletion of items, text, and arrows; moving diagram
items to the back and front; and setting the scale of the scene.
@@ -624,7 +624,7 @@
\snippet examples/graphicsview/diagramscene/diagramitem.cpp 0
- In the constructor we create the items polygon according to
+ In the constructor we create the item's polygon according to
\a diagramType. \l{QGraphicsItem}s are not movable or selectable
by default, so we must set these properties.
diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc
index 8e7601f..2879b05 100644
--- a/doc/src/howtos/appicon.qdoc
+++ b/doc/src/howtos/appicon.qdoc
@@ -205,7 +205,7 @@
In order to set the application icon for Symbian platform applications, you need
an SVG-T icon. For information on how to create SVG-T compliant icons,
please refer to
- \l{http://wiki.forum.nokia.com/index.php/How_to_create_application_icon(SVG)_in_S60_3rd_edition/}
+ \l{http://wiki.forum.nokia.com/index.php/How_to_create_application_icon(SVG)_in_S60_3rd_edition}
Once the icon is available in the correct format and assuming you are
using \c qmake to generate your makefiles, you only need to add a single
diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc
index bacdbc8..f6979ef 100644
--- a/doc/src/platforms/symbian-introduction.qdoc
+++ b/doc/src/platforms/symbian-introduction.qdoc
@@ -205,7 +205,7 @@
\table
\row \o \c QT_SIS_OPTIONS \o Options accepted by \c .sis creation. See
\l{Supported options for QT_SIS_OPTIONS}{Supported options}
- below. By default no otions are given.
+ below. By default no options are given.
\row \o \c QT_SIS_TARGET \o Target for which \c .sis file is created.
Accepted values are build targets listed in
previous table. By default last build target.