Doc: Fixed warnings and other problems found while fixing markup.

12 files changed, 26 insertions, 25 deletions

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index c33e777..9a46ea8 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -555,7 +555,8 @@
         \c qmake output will be a Makefile.
     \o \c -project \BR
         \c qmake output will be a project file. \BR
-\bold{Note:} It is likely that the created file will need to be edited for example adding the \c QT variable to suit what modules are required for the project.
+    \bold{Note:} It is likely that the created file will need to be edited; for example,
+    adding the \c QT variable to suit what modules are required for the project.
     \endlist
 
     The following \c options are used to specify both general and mode-specific
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc
index 34429ae..8924bdb 100644
--- a/doc/src/development/qtestlib.qdoc
+++ b/doc/src/development/qtestlib.qdoc
@@ -130,7 +130,7 @@
 
     \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 1
 
-    If you are using other buildtools, make sure that you add the location
+    If you are using other build tools, make sure that you add the location
     of the QTestLib header files to your include path (usually \c{include/QtTest}
     under your Qt installation directory). If you are using a release build
     of Qt, link your test to the \c QtTest library. For debug builds, use
diff --git a/doc/src/examples/basicgraphicslayouts.qdoc b/doc/src/examples/basicgraphicslayouts.qdoc
index 11b99f3..0110e29 100644
--- a/doc/src/examples/basicgraphicslayouts.qdoc
+++ b/doc/src/examples/basicgraphicslayouts.qdoc
@@ -133,19 +133,19 @@
 
     \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.cpp 2
 
-    The reimplementation of {QGraphicsItem::boundingRect()}{boundingRect()}
+    The reimplementation of \l{QGraphicsItem::}{boundingRect()}
     will set the top left corner at (0,0), and the size of it will be
     the size of the layout items
-    {QGraphicsLayoutItem::geometry()}{geometry()}. This is the area that
+    \l{QGraphicsLayoutItem::}{geometry()}. This is the area that
     we paint within.
 
     \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.cpp 3
 
 
-    The reimplementation of {QGraphicsLayoutItem::setGeometry()}{setGeometry()}
+    The reimplementation of \l{QGraphicsLayoutItem::setGeometry()}{setGeometry()}
     simply calls its baseclass implementation. However, since this will change
     the boundingRect we must also call
-    {QGraphicsItem::prepareGeometryChange()}{prepareGeometryChange()}.
+    \l{QGraphicsItem::prepareGeometryChange()}{prepareGeometryChange()}.
     Finally, we move the item according to \c geom.topLeft().
 
     \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.cpp 4
diff --git a/doc/src/examples/concentriccircles.qdoc b/doc/src/examples/concentriccircles.qdoc
index dc17871..315469b 100644
--- a/doc/src/examples/concentriccircles.qdoc
+++ b/doc/src/examples/concentriccircles.qdoc
@@ -192,7 +192,7 @@
 
     \snippet examples/painting/concentriccircles/window.h 0
 
-    We declare the various components of the main window, i.e the text
+    We declare the various components of the main window, i.e., the text
     labels and a double array that will hold reference to the four \c
     {CircleWidget}s. In addition we declare the private \c
     createLabel() function to simplify the constructor.
diff --git a/doc/src/examples/drilldown.qdoc b/doc/src/examples/drilldown.qdoc
index bc45db3..8739270 100644
--- a/doc/src/examples/drilldown.qdoc
+++ b/doc/src/examples/drilldown.qdoc
@@ -444,7 +444,7 @@
     Finally, we store the location ID that this particular record is
     associated with as well as a z-value. In the \l {Graphics View
     Framework}, an item's z-value determines its position in the item
-    stack. An item of high Z-value will be drawn on top of an item
+    stack. An item of high z-value will be drawn on top of an item
     with a lower z-value if they share the same parent item. We also
     provide an \c updateItemPosition() function to refresh the view
     when required.
diff --git a/doc/src/examples/elasticnodes.qdoc b/doc/src/examples/elasticnodes.qdoc
index d6676e8..bba6d90 100644
--- a/doc/src/examples/elasticnodes.qdoc
+++ b/doc/src/examples/elasticnodes.qdoc
@@ -77,12 +77,12 @@
     function is called to calculate the forces that push and pull on this node
     and its neighbors.
 
-   The \c Node class also reimplements
-   \l{QGraphicsItem::itemChange()}{itemChange()} to react to state changes (in
-   this case, position changes), and
-   \l{QGraphicsItem::mousePressEvent()}{mousePressEvent()} and
-   \l{QGraphicsItem::mouseReleaseEvent()}{mouseReleaseEvent()} to update the
-   item's visual appearance.
+    The \c Node class also reimplements
+    \l{QGraphicsItem::itemChange()}{itemChange()} to react to state changes (in
+    this case, position changes), and
+    \l{QGraphicsItem::mousePressEvent()}{mousePressEvent()} and
+    \l{QGraphicsItem::mouseReleaseEvent()}{mouseReleaseEvent()} to update the
+    item's visual appearance.
 
     We will start reviewing the \c Node implementation by looking at its
     constructor:
@@ -242,7 +242,7 @@
 
     The \c adjust() function repositions the edge, and the item also implements
     \l{QGraphicsItem::boundingRect()}{boundingRect()} and
-    \{QGraphicsItem::paint()}{paint()}.
+    \l{QGraphicsItem::paint()}{paint()}.
 
     We will now review its implementation.
 
diff --git a/doc/src/examples/fancybrowser.qdoc b/doc/src/examples/fancybrowser.qdoc
index 4121904..b46903d 100644
--- a/doc/src/examples/fancybrowser.qdoc
+++ b/doc/src/examples/fancybrowser.qdoc
@@ -118,7 +118,7 @@
     using CSS. 
 
     \snippet examples/webkit/fancybrowser/mainwindow.cpp 8
-    
+
     The \c rotateImages() function rotates the images on the current
     web page. Webkit supports CSS transforms and this JavaScript code 
     looks up all \e {img} elements and rotates the images 180 degrees
@@ -127,7 +127,7 @@
     \snippet examples/webkit/fancybrowser/mainwindow.cpp 9
 
     The remaining four methods remove different elements from the current web 
-    page. \c removeGifImages() removes all Gif images on the page by looking up 
+    page. \c removeGifImages() removes all GIF images on the page by looking up 
     the \e {src} attribute of all the elements on the web page. Any element with 
     a \e {gif} file as its source is removed. \c removeInlineFrames() removes all 
     \e {iframe} or inline elements. \c removeObjectElements() removes all 
diff --git a/doc/src/porting/porting4.qdoc b/doc/src/porting/porting4.qdoc
index b5fdbee..862d22b 100644
--- a/doc/src/porting/porting4.qdoc
+++ b/doc/src/porting/porting4.qdoc
@@ -3609,7 +3609,7 @@
     \row \o \c PE_WindowFrame               \o QStyle::PE_FrameWindow
     \row \o \c PE_CheckListController       \o QStyle::PE_Q3CheckListController
     \row \o \c PE_CheckListIndicator        \o QStyle::PE_Q3CheckListIndicator
-    \row \o \c PE_CheckListExclusiveIndicato\o QStyle::PE_Q3CheckListExclusiveIndicator
+    \row \o \c PE_CheckListExclusiveIndicator \o QStyle::PE_Q3CheckListExclusiveIndicator
     \row \o \c PE_PanelGroupBox             \o QStyle::PE_FrameGroupBox
     \row \o \c PE_TreeBranch                \o QStyle::PE_IndicatorBranch
     \row \o \c PE_RubberBand                \o QStyle::CE_RubberBand \o uses QStyle::drawControl()
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 6effbfa..3cabb1c 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -328,7 +328,7 @@
 
     With Qt 4, the Qt class has become the Qt namespace. If you want
     to access a constant that is part of the Qt namespace, prefix it
-    with \c Qt:: (e.g., \c{Qt::yellow}), or add the directive
+    with \c{Qt::} (e.g., \c{Qt::yellow}), or add the directive
 
     \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 7
 
@@ -341,7 +341,7 @@
     in Qt 3, it was legal to write \c QWidget::yellow instead of \c
     Qt::yellow, because QWidget inherited from Qt. This won't work in
     Qt 4; you must write \c Qt::yellow or add the "using namespace"
-    directive and drop the \c Qt:: prefix.
+    directive and drop the \c{Qt::} prefix.
 
     The \l{qt3to4 - The Qt 3 to 4 Porting Tool}{qt3to4} porting tool
     automates this conversion.
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
index 2494eb2..11f5163 100644
--- a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
+++ b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
@@ -75,7 +75,7 @@ QString result = future.result();
 
 //! [4]
 // call 'QList<QByteArray>  QByteArray::split(char sep) const' in a separate thread
-QByteArray bytearray = "hello world;
+QByteArray bytearray = "hello world";
 QFuture<QList<QByteArray> > future = QtConcurrent::run(bytearray, &QByteArray::split), ',');
 ...
 QList<QByteArray> result = future.result();
diff --git a/doc/src/snippets/qabstractsliderisnippet.cpp b/doc/src/snippets/qabstractsliderisnippet.cpp
index 6b684e9..cb0f8cc 100644
--- a/doc/src/snippets/qabstractsliderisnippet.cpp
+++ b/doc/src/snippets/qabstractsliderisnippet.cpp
@@ -50,7 +50,7 @@ QAbstractSliderPrivate::~QAbstractSliderPrivate()
 {
 }
 
-oid QAbstractSlider::setRange(int min, int max)
+void QAbstractSlider::setRange(int min, int max)
 {
     Q_D(QAbstractSlider);
     int oldMin = d->minimum;
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 5e5077b..16f92f2 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -130,7 +130,7 @@
     item on the scene gains focus, the scene automatically gains focus. If the
     scene has focus, hasFocus() will return true, and key events will be
     forwarded to the focus item, if any. If the scene loses focus, (i.e.,
-    someone calls clearFocus(),) while an item has focus, the scene will
+    someone calls clearFocus()) while an item has focus, the scene will
     maintain its item focus information, and once the scene regains focus, it
     will make sure the last focus item regains focus.
 
@@ -3104,8 +3104,8 @@ bool QGraphicsScene::stickyFocus() const
     \list
     \o If the item receives a mouse release event when there are no other
     buttons pressed, it loses the mouse grab.
-    \o If the item becomes invisible (i.e., someone calls \c {item->setVisible(false))},
-    or if it becomes disabled (i.e., someone calls \c {item->setEnabled(false))},
+    \o If the item becomes invisible (i.e., someone calls \c {item->setVisible(false)}),
+    or if it becomes disabled (i.e., someone calls \c {item->setEnabled(false)}),
     it loses the mouse grab.
     \o If the item is removed from the scene, it loses the mouse grab.
     \endlist