Remove the usage of deprecated qdoc macros.

QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: I519bf9c29b14092e3ab6067612f42bf749eeedf5 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
author: Casper van Donderen <casper.vandonderen@nokia.com> 2012-03-01 15:28:31 +0100
committer: Qt by Nokia <qt-info@nokia.com> 2012-03-02 23:16:25 +0100
commit: 95d83cb1b68cc4a415d5d80859b4e74472ad7112 (patch)
tree: 9f6fa892ee78f584224320a195f03419c0fdbc21 /src
parent: 15e136d4e116c1513c106dfbb75e1953a7f3463c (diff)
download: qtbase-95d83cb1b68cc4a415d5d80859b4e74472ad7112.tar.gz
217 files changed, 3581 insertions, 3581 deletions
diff --git a/src/concurrent/qtconcurrentexception.cpp b/src/concurrent/qtconcurrentexception.cpp
index caeaa8d9be..57eb604d39 100644
--- a/src/concurrent/qtconcurrentexception.cpp
+++ b/src/concurrent/qtconcurrentexception.cpp
@@ -69,10 +69,10 @@ QT_BEGIN_NAMESPACE
 
     When using QFuture, transferred exceptions will be thrown when calling the following functions:
     \list
-    \o QFuture::waitForFinished()
-    \o QFuture::result()
-    \o QFuture::resultAt()
-    \o QFuture::results()
+    \li QFuture::waitForFinished()
+    \li QFuture::result()
+    \li QFuture::resultAt()
+    \li QFuture::results()
     \endlist
 */
 
diff --git a/src/concurrent/qtconcurrentrun.cpp b/src/concurrent/qtconcurrentrun.cpp
index e51626ed13..656ecf7370 100644
--- a/src/concurrent/qtconcurrentrun.cpp
+++ b/src/concurrent/qtconcurrentrun.cpp
@@ -121,9 +121,9 @@
     this:
     
     \list
-    \o To call a function that takes more than 5 arguments.
-    \o To simplify calling a function with constant arguments.
-    \o Changing the order of arguments.
+    \li To call a function that takes more than 5 arguments.
+    \li To simplify calling a function with constant arguments.
+    \li Changing the order of arguments.
     \endlist
     
     See the documentation for the relevant functions for details on how to use
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index 35a340836d..2262a3836e 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -98,18 +98,18 @@ QT_BEGIN_NAMESPACE
     supported QVariant types:
 
     \list
-        \o \l{QMetaType::}{Int}
-        \o \l{QMetaType::}{Double}
-        \o \l{QMetaType::}{Float}
-        \o \l{QMetaType::}{QLine}
-        \o \l{QMetaType::}{QLineF}
-        \o \l{QMetaType::}{QPoint}
-        \o \l{QMetaType::}{QPointF}
-        \o \l{QMetaType::}{QSize}
-        \o \l{QMetaType::}{QSizeF}
-        \o \l{QMetaType::}{QRect}
-        \o \l{QMetaType::}{QRectF}
-        \o \l{QMetaType::}{QColor}
+        \li \l{QMetaType::}{Int}
+        \li \l{QMetaType::}{Double}
+        \li \l{QMetaType::}{Float}
+        \li \l{QMetaType::}{QLine}
+        \li \l{QMetaType::}{QLineF}
+        \li \l{QMetaType::}{QPoint}
+        \li \l{QMetaType::}{QPointF}
+        \li \l{QMetaType::}{QSize}
+        \li \l{QMetaType::}{QSizeF}
+        \li \l{QMetaType::}{QRect}
+        \li \l{QMetaType::}{QRectF}
+        \li \l{QMetaType::}{QColor}
     \endlist
 
     If you need to interpolate other variant types, including custom
diff --git a/src/corelib/codecs/codecs.qdoc b/src/corelib/codecs/codecs.qdoc
index 2127a0a4cf..669072f789 100644
--- a/src/corelib/codecs/codecs.qdoc
+++ b/src/corelib/codecs/codecs.qdoc
@@ -77,9 +77,9 @@
     are met:
 
     \list 1
-    \o Redistributions of source code must retain the above copyright
+    \li Redistributions of source code must retain the above copyright
        notice, this list of conditions and the following disclaimer.
-    \o Redistributions in binary form must reproduce the above copyright
+    \li Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
     \endlist
@@ -126,9 +126,9 @@
     Currently, the Big5-HKSCS tables are generated from the following
     sources, and with the Euro character added:
     \list 1
-    \o \l{http://www.microsoft.com/typography/unicode/950.txt}
-    \o \l{http://www.info.gov.hk/digital21/chi/hkscs/download/big5-iso.txt}
-    \o \l{http://www.info.gov.hk/digital21/chi/hkscs/download/big5cmp.txt}
+    \li \l{http://www.microsoft.com/typography/unicode/950.txt}
+    \li \l{http://www.info.gov.hk/digital21/chi/hkscs/download/big5-iso.txt}
+    \li \l{http://www.info.gov.hk/digital21/chi/hkscs/download/big5cmp.txt}
     \endlist
 
     There may be more fine-tuning to the QBig5hkscsCodec to maximize its
@@ -147,9 +147,9 @@
     are met:
 
     \list 1
-    \o Redistributions of source code must retain the above copyright
+    \li Redistributions of source code must retain the above copyright
        notice, this list of conditions and the following disclaimer.
-    \o Redistributions in binary form must reproduce the above copyright
+    \li Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
     \endlist
@@ -195,9 +195,9 @@
     are met:
 
     \list 1
-    \o Redistributions of source code must retain the above copyright
+    \li Redistributions of source code must retain the above copyright
        notice, this list of conditions and the following disclaimer.
-    \o Redistributions in binary form must reproduce the above copyright
+    \li Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
     \endlist
@@ -238,9 +238,9 @@
     are met:
 
     \list 1
-    \o Redistributions of source code must retain the above copyright
+    \li Redistributions of source code must retain the above copyright
        notice, this list of conditions and the following disclaimer.
-    \o Redistributions in binary form must reproduce the above copyright
+    \li Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
     \endlist
@@ -282,9 +282,9 @@
     Some must-read documents are:
 
     \list
-    \o \l{ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/pdf/GB18030_Summary.pdf}
-    \o \l{http://oss.software.ibm.com/cvs/icu/~checkout~/charset/source/gb18030/gb18030.html}
-    \o \l{http://oss.software.ibm.com/cvs/icu/~checkout~/charset/data/xml/gb-18030-2000.xml}
+    \li \l{ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/pdf/GB18030_Summary.pdf}
+    \li \l{http://oss.software.ibm.com/cvs/icu/~checkout~/charset/source/gb18030/gb18030.html}
+    \li \l{http://oss.software.ibm.com/cvs/icu/~checkout~/charset/data/xml/gb-18030-2000.xml}
     \endlist
 
     The GBK codec was contributed to Qt by
@@ -316,9 +316,9 @@
     are met:
 
     \list 1
-    \o Redistributions of source code must retain the above copyright
+    \li Redistributions of source code must retain the above copyright
        notice, this list of conditions and the following disclaimer.
-    \o Redistributions in binary form must reproduce the above copyright
+    \li Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
     \endlist
@@ -354,30 +354,30 @@
 
     \list
 
-    \o "unicode-0.9" or "unicode-0201" for Unicode style. This assumes
+    \li "unicode-0.9" or "unicode-0201" for Unicode style. This assumes
     JISX0201 for 0x00-0x7f. (0.9 is a table version of jisx02xx mapping
     used for Unicode 1.1.)
 
-    \o "unicode-ascii" This assumes US-ASCII for 0x00-0x7f; some
+    \li "unicode-ascii" This assumes US-ASCII for 0x00-0x7f; some
     chars (JISX0208 0x2140 and JISX0212 0x2237) are different from
     Unicode 1.1 to avoid conflict.
 
-    \o "open-19970715-0201" ("open-0201" for convenience) or
+    \li "open-19970715-0201" ("open-0201" for convenience) or
     "jisx0221-1995" for JISX0221-JISX0201 style. JIS X 0221 is JIS
     version of Unicode, but a few chars (0x5c, 0x7e, 0x2140, 0x216f,
     0x2131) are different from Unicode 1.1. This is used when 0x5c is
     treated as YEN SIGN.
 
-    \o "open-19970715-ascii" ("open-ascii" for convenience) for
+    \li "open-19970715-ascii" ("open-ascii" for convenience) for
     JISX0221-ASCII style. This is used when 0x5c is treated as REVERSE
     SOLIDUS.
 
-    \o "open-19970715-ms" ("open-ms" for convenience) or "cp932" for
+    \li "open-19970715-ms" ("open-ms" for convenience) or "cp932" for
     Microsoft Windows style. Windows Code Page 932. Some chars (0x2140,
     0x2141, 0x2142, 0x215d, 0x2171, 0x2172) are different from Unicode
     1.1.
 
-    \o "jdk1.1.7" for Sun's JDK style. Same as Unicode 1.1, except that
+    \li "jdk1.1.7" for Sun's JDK style. Same as Unicode 1.1, except that
     JIS 0x2140 is mapped to UFF3C. Either ASCII or JISX0201 can be used
     for 0x00-0x7f.
 
@@ -405,9 +405,9 @@
     are met:
 
     \list 1
-    \o Redistributions of source code must retain the above copyright
+    \li Redistributions of source code must retain the above copyright
        notice, this list of conditions and the following disclaimer.
-    \o Redistributions in binary form must reproduce the above copyright
+    \li Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
     \endlist
@@ -454,9 +454,9 @@
     are met:
 
     \list 1
-    \o Redistributions of source code must retain the above copyright
+    \li Redistributions of source code must retain the above copyright
        notice, this list of conditions and the following disclaimer.
-    \o Redistributions in binary form must reproduce the above copyright
+    \li Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
     \endlist
@@ -510,9 +510,9 @@
     are met:
 
     \list 1
-    \o Redistributions of source code must retain the above copyright
+    \li Redistributions of source code must retain the above copyright
        notice, this list of conditions and the following disclaimer.
-    \o Redistributions in binary form must reproduce the above copyright
+    \li Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
     \endlist
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index 68866b9000..4cfdfe5966 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -789,38 +789,38 @@ QTextCodec::ConverterState::~ConverterState()
     The supported encodings are:
 
     \list
-    \o Apple Roman
-    \o \l{Big5 Text Codec}{Big5}
-    \o \l{Big5-HKSCS Text Codec}{Big5-HKSCS}
-    \o CP949
-    \o \l{EUC-JP Text Codec}{EUC-JP}
-    \o \l{EUC-KR Text Codec}{EUC-KR}
-    \o \l{GBK Text Codec}{GB18030-0}
-    \o IBM 850
-    \o IBM 866
-    \o IBM 874
-    \o \l{ISO 2022-JP (JIS) Text Codec}{ISO 2022-JP}
-    \o ISO 8859-1 to 10
-    \o ISO 8859-13 to 16
-    \o Iscii-Bng, Dev, Gjr, Knd, Mlm, Ori, Pnj, Tlg, and Tml
-    \o JIS X 0201
-    \o JIS X 0208
-    \o KOI8-R
-    \o KOI8-U
-    \o MuleLao-1
-    \o ROMAN8
-    \o \l{Shift-JIS Text Codec}{Shift-JIS}
-    \o TIS-620
-    \o \l{TSCII Text Codec}{TSCII}
-    \o UTF-8
-    \o UTF-16
-    \o UTF-16BE
-    \o UTF-16LE
-    \o UTF-32
-    \o UTF-32BE
-    \o UTF-32LE
-    \o Windows-1250 to 1258
-    \o WINSAMI2
+    \li Apple Roman
+    \li \l{Big5 Text Codec}{Big5}
+    \li \l{Big5-HKSCS Text Codec}{Big5-HKSCS}
+    \li CP949
+    \li \l{EUC-JP Text Codec}{EUC-JP}
+    \li \l{EUC-KR Text Codec}{EUC-KR}
+    \li \l{GBK Text Codec}{GB18030-0}
+    \li IBM 850
+    \li IBM 866
+    \li IBM 874
+    \li \l{ISO 2022-JP (JIS) Text Codec}{ISO 2022-JP}
+    \li ISO 8859-1 to 10
+    \li ISO 8859-13 to 16
+    \li Iscii-Bng, Dev, Gjr, Knd, Mlm, Ori, Pnj, Tlg, and Tml
+    \li JIS X 0201
+    \li JIS X 0208
+    \li KOI8-R
+    \li KOI8-U
+    \li MuleLao-1
+    \li ROMAN8
+    \li \l{Shift-JIS Text Codec}{Shift-JIS}
+    \li TIS-620
+    \li \l{TSCII Text Codec}{TSCII}
+    \li UTF-8
+    \li UTF-16
+    \li UTF-16BE
+    \li UTF-16LE
+    \li UTF-32
+    \li UTF-32BE
+    \li UTF-32LE
+    \li Windows-1250 to 1258
+    \li WINSAMI2
     \endlist
 
     QTextCodecs can be used as follows to convert some locally encoded
@@ -871,29 +871,29 @@ QTextCodec::ConverterState::~ConverterState()
     QTextCodec and implement the functions listed in the table below.
 
     \table
-    \header \o Function \o Description
+    \header \li Function \li Description
 
-    \row \o name()
-         \o Returns the official name for the encoding. If the
+    \row \li name()
+         \li Returns the official name for the encoding. If the
             encoding is listed in the
             \l{IANA character-sets encoding file}, the name
             should be the preferred MIME name for the encoding.
 
-    \row \o aliases()
-         \o Returns a list of alternative names for the encoding.
+    \row \li aliases()
+         \li Returns a list of alternative names for the encoding.
             QTextCodec provides a default implementation that returns
             an empty list. For example, "ISO-8859-1" has "latin1",
             "CP819", "IBM819", and "iso-ir-100" as aliases.
 
-    \row \o mibEnum()
-         \o Return the MIB enum for the encoding if it is listed in
+    \row \li mibEnum()
+         \li Return the MIB enum for the encoding if it is listed in
             the \l{IANA character-sets encoding file}.
 
-    \row \o convertToUnicode()
-         \o Converts an 8-bit character string to Unicode.
+    \row \li convertToUnicode()
+         \li Converts an 8-bit character string to Unicode.
 
-    \row \o convertFromUnicode()
-         \o Converts a Unicode string to an 8-bit character string.
+    \row \li convertFromUnicode()
+         \li Converts a Unicode string to an 8-bit character string.
     \endtable
 
     \sa QTextStream, QTextDecoder, QTextEncoder, {Codecs Example}
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 6257376b62..a30250df81 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -892,13 +892,13 @@ bool qSharedBuild()
     \brief The QSysInfo class provides information about the system.
 
     \list
-    \o \l WordSize specifies the size of a pointer for the platform
+    \li \l WordSize specifies the size of a pointer for the platform
        on which the application is compiled.
-    \o \l ByteOrder specifies whether the platform is big-endian or
+    \li \l ByteOrder specifies whether the platform is big-endian or
        little-endian.
-    \o \l WindowsVersion specifies the version of the Windows operating
+    \li \l WindowsVersion specifies the version of the Windows operating
        system on which the application is run (Windows only)
-    \o \l MacintoshVersion specifies the version of the Macintosh
+    \li \l MacintoshVersion specifies the version of the Macintosh
        operating system on which the application is run (Mac only).
     \endlist
 
@@ -2462,12 +2462,12 @@ int qrand()
     \a Flags can be one of the following:
 
     \list
-    \o \c Q_PRIMITIVE_TYPE specifies that \a Type is a POD (plain old
+    \li \c Q_PRIMITIVE_TYPE specifies that \a Type is a POD (plain old
        data) type with no constructor or destructor.
-    \o \c Q_MOVABLE_TYPE specifies that \a Type has a constructor
+    \li \c Q_MOVABLE_TYPE specifies that \a Type has a constructor
        and/or a destructor but can be moved in memory using \c
        memcpy().
-    \o \c Q_COMPLEX_TYPE (the default) specifies that \a Type has
+    \li \c Q_COMPLEX_TYPE (the default) specifies that \a Type has
        constructors and/or a destructor and that it may not be moved
        in memory.
     \endlist
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index badccc947d..8cbd4528dc 100644
--- a/src/corelib/global/qlogging.cpp
+++ b/src/corelib/global/qlogging.cpp
@@ -309,7 +309,7 @@ QDebug QMessageLogger::critical()
     message handler has been installed, the message is printed to
     stderr. Under Windows, the message is sent to the debugger.
 
-    If you are using the \bold{default message handler} this function will
+    If you are using the \b{default message handler} this function will
     abort on Unix systems to create a core dump. On Windows, for debug builds,
     this function will report a _CRT_ERROR enabling you to connect a debugger
     to the application.
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 895feb7f53..7d5eec4271 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -266,7 +266,7 @@
     This enum provides shorter names for the keyboard modifier keys
     supported by Qt.
 
-    \bold{Note:} On Mac OS X, the \c CTRL value corresponds to
+    \b{Note:} On Mac OS X, the \c CTRL value corresponds to
     the Command keys on the Macintosh keyboard, and the \c META value
     corresponds to the Control keys.
 
@@ -319,21 +319,21 @@
 
     \table
     \row
-    \o \inlineimage qpen-solid.png
-    \o \inlineimage qpen-dash.png
-    \o \inlineimage qpen-dot.png
+    \li \inlineimage qpen-solid.png
+    \li \inlineimage qpen-dash.png
+    \li \inlineimage qpen-dot.png
     \row
-    \o Qt::SolidLine
-    \o Qt::DashLine
-    \o Qt::DotLine
+    \li Qt::SolidLine
+    \li Qt::DashLine
+    \li Qt::DotLine
     \row
-    \o \inlineimage qpen-dashdot.png
-    \o \inlineimage qpen-dashdotdot.png
-    \o \inlineimage qpen-custom.png
+    \li \inlineimage qpen-dashdot.png
+    \li \inlineimage qpen-dashdotdot.png
+    \li \inlineimage qpen-custom.png
     \row
-    \o Qt::DashDotLine
-    \o Qt::DashDotDotLine
-    \o Qt::CustomDashLine
+    \li Qt::DashDotLine
+    \li Qt::DashDotDotLine
+    \li Qt::CustomDashLine
     \endtable
 
     \value NoPen  no line at all. For example, QPainter::drawRect()
@@ -360,13 +360,13 @@
 
     \table
     \row
-    \o \inlineimage qpen-square.png
-    \o \inlineimage qpen-flat.png
-    \o \inlineimage qpen-roundcap.png
+    \li \inlineimage qpen-square.png
+    \li \inlineimage qpen-flat.png
+    \li \inlineimage qpen-roundcap.png
     \row
-    \o Qt::SquareCap
-    \o Qt::FlatCap
-    \o Qt::RoundCap
+    \li Qt::SquareCap
+    \li Qt::FlatCap
+    \li Qt::RoundCap
     \endtable
 
     \value FlatCap  a square line end that does not cover the end
@@ -388,13 +388,13 @@
 
     \table
     \row
-    \o \inlineimage qpen-bevel.png
-    \o \inlineimage qpen-miter.png
-    \o \inlineimage qpen-roundjoin.png
+    \li \inlineimage qpen-bevel.png
+    \li \inlineimage qpen-miter.png
+    \li \inlineimage qpen-roundjoin.png
     \row
-    \o Qt::BevelJoin
-    \o Qt::MiterJoin
-    \o Qt::RoundJoin
+    \li Qt::BevelJoin
+    \li Qt::MiterJoin
+    \li Qt::RoundJoin
     \endtable
 
     \value MiterJoin  The outer edges of the lines are extended to
@@ -968,7 +968,7 @@
     \value WA_NoSystemBackground Indicates that the widget has no background,
     i.e. when the widget receives paint events, the background is not
     automatically repainted. \note Unlike WA_OpaquePaintEvent, newly exposed
-    areas are \bold never filled with the background (e.g., after showing a
+    areas are \b never filled with the background (e.g., after showing a
     window for the first time the user can see "through" it until the
     application processes the paint events). This flag is set or cleared by the
     widget's author.
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp
index f3fe91427a..1fe2a793a6 100644
--- a/src/corelib/io/qdatastream.cpp
+++ b/src/corelib/io/qdatastream.cpp
@@ -184,7 +184,7 @@ QT_BEGIN_NAMESPACE
     \endcode
 
     To see if your favorite Qt class has similar stream operators
-    defined, check the \bold {Related Non-Members} section of the
+    defined, check the \b {Related Non-Members} section of the
     class's documentation page.
 
     \sa QTextStream QVariant
@@ -571,19 +571,19 @@ void QDataStream::setByteOrder(ByteOrder bo)
     serialization format used by QDataStream.
 
     \table
-    \header \i Qt Version       \i QDataStream Version
-    \row \i Qt 4.6                  \i 12
-    \row \i Qt 4.5                  \i 11
-    \row \i Qt 4.4                  \i 10
-    \row \i Qt 4.3                  \i 9
-    \row \i Qt 4.2                  \i 8
-    \row \i Qt 4.0, 4.1            \i 7
-    \row \i Qt 3.3                  \i 6
-    \row \i Qt 3.1, 3.2             \i 5
-    \row \i Qt 3.0                  \i 4
-    \row \i Qt 2.1, 2.2, 2.3      \i 3
-    \row \i Qt 2.0                  \i 2
-    \row \i Qt 1.x                  \i 1
+    \header \li Qt Version       \li QDataStream Version
+    \row \li Qt 4.6                  \li 12
+    \row \li Qt 4.5                  \li 11
+    \row \li Qt 4.4                  \li 10
+    \row \li Qt 4.3                  \li 9
+    \row \li Qt 4.2                  \li 8
+    \row \li Qt 4.0, 4.1            \li 7
+    \row \li Qt 3.3                  \li 6
+    \row \li Qt 3.1, 3.2             \li 5
+    \row \li Qt 3.0                  \li 4
+    \row \li Qt 2.1, 2.2, 2.3      \li 3
+    \row \li Qt 2.0                  \li 2
+    \row \li Qt 1.x                  \li 1
     \endtable
 
     The \l Version enum provides symbolic constants for the different
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index afd402d019..1dedc7c5c8 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -451,11 +451,11 @@ inline void QDirPrivate::initFileEngine()
     for these that return strings:
 
     \table
-    \header \o QDir      \o QString         \o Return Value
-    \row    \o current() \o currentPath()   \o The application's working directory
-    \row    \o home()    \o homePath()      \o The user's home directory
-    \row    \o root()    \o rootPath()      \o The root directory
-    \row    \o temp()    \o tempPath()      \o The system's temporary directory
+    \header \li QDir      \li QString         \li Return Value
+    \row    \li current() \li currentPath()   \li The application's working directory
+    \row    \li home()    \li homePath()      \li The user's home directory
+    \row    \li root()    \li rootPath()      \li The root directory
+    \row    \li temp()    \li tempPath()      \li The system's temporary directory
     \endtable
 
     The setCurrent() static function can also be used to set the application's
@@ -1878,13 +1878,13 @@ QString QDir::currentPath()
     the given order) until an existing and available path is found:
 
     \list 1
-    \o The path specified by the \c USERPROFILE environment variable.
-    \o The path formed by concatenating the \c HOMEDRIVE and \c HOMEPATH
+    \li The path specified by the \c USERPROFILE environment variable.
+    \li The path formed by concatenating the \c HOMEDRIVE and \c HOMEPATH
     environment variables.
-    \o The path specified by the \c HOME environment variable.
-    \o The path returned by the rootPath() function (which uses the \c SystemDrive
+    \li The path specified by the \c HOME environment variable.
+    \li The path returned by the rootPath() function (which uses the \c SystemDrive
     environment variable)
-    \o  The \c{C:/} directory.
+    \li  The \c{C:/} directory.
     \endlist
 
     Under non-Windows operating systems the \c HOME environment
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index fc0c90cf69..6640dca70b 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -1034,13 +1034,13 @@ bool QFile::open(OpenMode mode)
     then calling close() closes the adopted handle.
     Otherwise, close() does not actually close the file, but only flushes it.
 
-    \bold{Warning:}
+    \b{Warning:}
     \list 1
-        \o If \a fh does not refer to a regular file, e.g., it is \c stdin,
+        \li If \a fh does not refer to a regular file, e.g., it is \c stdin,
            \c stdout, or \c stderr, you may not be able to seek(). size()
            returns \c 0 in those cases. See QIODevice::isSequential() for
            more information.
-        \o Since this function opens the file without specifying the file name,
+        \li Since this function opens the file without specifying the file name,
            you cannot use this QFile with a QFileInfo.
     \endlist
 
@@ -1048,7 +1048,7 @@ bool QFile::open(OpenMode mode)
 
     \sa close(), {qmake Variable Reference#CONFIG}{qmake Variable Reference}
 
-    \bold{Note for the Windows Platform}
+    \b{Note for the Windows Platform}
 
     \a fh must be opened in binary mode (i.e., the mode string must contain
     'b', as in "rb" or "wb") when accessing files and other random-access
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index a7fb0fb6c7..044c71d00a 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -812,7 +812,7 @@ QString QFileInfo::suffix() const
 /*!
     Returns the path of the object's parent directory as a QDir object.
 
-    \bold{Note:} The QDir returned always corresponds to the object's
+    \b{Note:} The QDir returned always corresponds to the object's
     parent directory, even if the QFileInfo represents a directory.
 
     For each of the following, dir() returns a QDir for
@@ -901,7 +901,7 @@ bool QFileInfo::isExecutable() const
 /*!
     Returns true if this is a `hidden' file; otherwise returns false.
 
-    \bold{Note:} This function returns true for the special entries
+    \b{Note:} This function returns true for the special entries
     "." and ".." on Unix, even though QDir::entryList threats them as shown.
 */
 bool QFileInfo::isHidden() const
@@ -923,7 +923,7 @@ bool QFileInfo::isHidden() const
     Returns false if the file is otherwise supported by a virtual file system
     inside Qt, such as \l{the Qt Resource System}.
 
-    \bold{Note:} Native paths may still require conversion of path separators
+    \b{Note:} Native paths may still require conversion of path separators
     and character encoding, depending on platform and input requirements of the
     native API.
 
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index 3d9391ebaa..1cdfc61627 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -163,12 +163,12 @@ QIODevicePrivate::~QIODevicePrivate()
     random-access devices and sequential devices.
 
     \list
-    \o Random-access devices support seeking to arbitrary
+    \li Random-access devices support seeking to arbitrary
     positions using seek(). The current position in the file is
     available by calling pos(). QFile and QBuffer are examples of
     random-access devices.
 
-    \o Sequential devices don't support seeking to arbitrary
+    \li Sequential devices don't support seeking to arbitrary
     positions. The data must be read in one pass. The functions
     pos() and size() don't work for sequential devices.
     QTcpSocket and QProcess are examples of sequential devices.
@@ -199,14 +199,14 @@ QIODevicePrivate::~QIODevicePrivate()
     a separate thread:
 
     \list
-    \o waitForReadyRead() - This function suspends operation in the
+    \li waitForReadyRead() - This function suspends operation in the
     calling thread until new data is available for reading.
 
-    \o waitForBytesWritten() - This function suspends operation in the
+    \li waitForBytesWritten() - This function suspends operation in the
     calling thread until one payload of data has been written to the
     device.
 
-    \o waitFor....() - Subclasses of QIODevice implement blocking
+    \li waitFor....() - Subclasses of QIODevice implement blocking
     functions for device-specific operations. For example, QProcess
     has a function called waitForStarted() which suspends operation in
     the calling thread until the process has started.
@@ -1038,9 +1038,9 @@ QByteArray QIODevice::readAll()
     Data is read until either of the following conditions are met:
 
     \list
-    \o The first '\n' character is read.
-    \o \a maxSize - 1 bytes are read.
-    \o The end of the device data is detected.
+    \li The first '\n' character is read.
+    \li \a maxSize - 1 bytes are read.
+    \li The end of the device data is detected.
     \endlist
 
     For example, the following code reads a line of characters from a
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 7a81313fa0..640704ec86 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -532,15 +532,15 @@ void QProcessPrivate::Channel::clear()
     certain signals are emitted:
 
     \list
-    \o waitForStarted() blocks until the process has started.
+    \li waitForStarted() blocks until the process has started.
 
-    \o waitForReadyRead() blocks until new data is
+    \li waitForReadyRead() blocks until new data is
     available for reading on the current read channel.
 
-    \o waitForBytesWritten() blocks until one payload of
+    \li waitForBytesWritten() blocks until one payload of
     data has been written to the process.
 
-    \o waitForFinished() blocks until the process has finished.
+    \li waitForFinished() blocks until the process has finished.
     \endlist
 
     Calling these functions from the main thread (the thread that
@@ -1910,7 +1910,7 @@ QByteArray QProcess::readAllStandardError()
 
     \note No further splitting of the arguments is performed.
 
-    \bold{Windows:} Arguments that contain spaces are wrapped in quotes.
+    \b{Windows:} Arguments that contain spaces are wrapped in quotes.
 
     \sa pid(), started(), waitForStarted()
 */
@@ -2149,10 +2149,10 @@ int QProcess::execute(const QString &program)
     Note that arguments that contain spaces are not passed to the
     process as separate arguments.
 
-    \bold{Unix:} The started process will run in its own session and act
+    \b{Unix:} The started process will run in its own session and act
     like a daemon.
 
-    \bold{Windows:} Arguments that contain spaces are wrapped in quotes.
+    \b{Windows:} Arguments that contain spaces are wrapped in quotes.
     The started process will run as a regular standalone process.
 
     The process will be started in the directory \a workingDirectory.
@@ -2183,10 +2183,10 @@ bool QProcess::startDetached(const QString &program,
     \note Arguments that contain spaces are not passed to the
     process as separate arguments.
 
-    \bold{Unix:} The started process will run in its own session and act
+    \b{Unix:} The started process will run in its own session and act
     like a daemon.
 
-    \bold{Windows:} Arguments that contain spaces are wrapped in quotes.
+    \b{Windows:} Arguments that contain spaces are wrapped in quotes.
     The started process will run as a regular standalone process.
 */
 bool QProcess::startDetached(const QString &program,
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index 2021c42c4d..e4d90e000a 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -2112,15 +2112,15 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
     avoid portability problems, follow these simple rules:
 
     \list 1
-    \o Always refer to the same key using the same case. For example,
+    \li Always refer to the same key using the same case. For example,
        if you refer to a key as "text fonts" in one place in your
        code, don't refer to it as "Text Fonts" somewhere else.
 
-    \o Avoid key names that are identical except for the case. For
+    \li Avoid key names that are identical except for the case. For
        example, if you have a key called "MainWindow", don't try to
        save another key as "mainwindow".
 
-    \o Do not use slashes ('/' and '\\') in section or key names; the
+    \li Do not use slashes ('/' and '\\') in section or key names; the
        backslash character is used to separate sub keys (see below). On
        windows '\\' are converted by QSettings to '/', which makes
        them identical.
@@ -2156,10 +2156,10 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
     that order:
 
     \list 1
-    \o a user-specific location for the Star Runner application
-    \o a user-specific location for all applications by MySoft
-    \o a system-wide location for the Star Runner application
-    \o a system-wide location for all applications by MySoft
+    \li a user-specific location for the Star Runner application
+    \li a user-specific location for all applications by MySoft
+    \li a system-wide location for the Star Runner application
+    \li a system-wide location for all applications by MySoft
     \endlist
 
     (See \l{Platform-Specific Notes} below for information on what
@@ -2184,17 +2184,17 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
     \snippet doc/src/snippets/settings/settings.cpp 14
 
     The table below summarizes which QSettings objects access
-    which location. "\bold{X}" means that the location is the main
+    which location. "\b{X}" means that the location is the main
     location associated to the QSettings object and is used both
     for reading and for writing; "o" means that the location is used
     as a fallback when reading.
 
     \table
-    \header \o Locations               \o \c{obj1} \o \c{obj2} \o \c{obj3} \o \c{obj4}
-    \row    \o 1. User, Application    \o \bold{X} \o          \o          \o
-    \row    \o 2. User, Organization   \o o        \o \bold{X} \o          \o
-    \row    \o 3. System, Application  \o o        \o          \o \bold{X} \o
-    \row    \o 4. System, Organization \o o        \o o        \o o        \o \bold{X}
+    \header \li Locations               \li \c{obj1} \li \c{obj2} \li \c{obj3} \li \c{obj4}
+    \row    \li 1. User, Application    \li \b{X} \li          \li          \li
+    \row    \li 2. User, Organization   \li o        \li \b{X} \li          \li
+    \row    \li 3. System, Application  \li o        \li          \li \b{X} \li
+    \row    \li 4. System, Organization \li o        \li o        \li o        \li \b{X}
     \endtable
 
     The beauty of this mechanism is that it works on all platforms
@@ -2276,30 +2276,30 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
     following files are used by default:
 
     \list 1
-    \o \c{$HOME/.config/MySoft/Star Runner.conf} (Qt for Embedded Linux: \c{$HOME/Settings/MySoft/Star Runner.conf})
-    \o \c{$HOME/.config/MySoft.conf} (Qt for Embedded Linux: \c{$HOME/Settings/MySoft.conf})
-    \o \c{/etc/xdg/MySoft/Star Runner.conf}
-    \o \c{/etc/xdg/MySoft.conf}
+    \li \c{$HOME/.config/MySoft/Star Runner.conf} (Qt for Embedded Linux: \c{$HOME/Settings/MySoft/Star Runner.conf})
+    \li \c{$HOME/.config/MySoft.conf} (Qt for Embedded Linux: \c{$HOME/Settings/MySoft.conf})
+    \li \c{/etc/xdg/MySoft/Star Runner.conf}
+    \li \c{/etc/xdg/MySoft.conf}
     \endlist
 
     On Mac OS X versions 10.2 and 10.3, these files are used by
     default:
 
     \list 1
-    \o \c{$HOME/Library/Preferences/com.MySoft.Star Runner.plist}
-    \o \c{$HOME/Library/Preferences/com.MySoft.plist}
-    \o \c{/Library/Preferences/com.MySoft.Star Runner.plist}
-    \o \c{/Library/Preferences/com.MySoft.plist}
+    \li \c{$HOME/Library/Preferences/com.MySoft.Star Runner.plist}
+    \li \c{$HOME/Library/Preferences/com.MySoft.plist}
+    \li \c{/Library/Preferences/com.MySoft.Star Runner.plist}
+    \li \c{/Library/Preferences/com.MySoft.plist}
     \endlist
 
     On Windows, NativeFormat settings are stored in the following
     registry paths:
 
     \list 1
-    \o \c{HKEY_CURRENT_USER\Software\MySoft\Star Runner}
-    \o \c{HKEY_CURRENT_USER\Software\MySoft}
-    \o \c{HKEY_LOCAL_MACHINE\Software\MySoft\Star Runner}
-    \o \c{HKEY_LOCAL_MACHINE\Software\MySoft}
+    \li \c{HKEY_CURRENT_USER\Software\MySoft\Star Runner}
+    \li \c{HKEY_CURRENT_USER\Software\MySoft}
+    \li \c{HKEY_LOCAL_MACHINE\Software\MySoft\Star Runner}
+    \li \c{HKEY_LOCAL_MACHINE\Software\MySoft}
     \endlist
 
     \note On Windows, for 32-bit programs running in WOW64 mode, settings are
@@ -2310,19 +2310,19 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
     used on Unix and Mac OS X:
 
     \list 1
-    \o \c{$HOME/.config/MySoft/Star Runner.ini} (Qt for Embedded Linux: \c{$HOME/Settings/MySoft/Star Runner.ini})
-    \o \c{$HOME/.config/MySoft.ini} (Qt for Embedded Linux: \c{$HOME/Settings/MySoft.ini})
-    \o \c{/etc/xdg/MySoft/Star Runner.ini}
-    \o \c{/etc/xdg/MySoft.ini}
+    \li \c{$HOME/.config/MySoft/Star Runner.ini} (Qt for Embedded Linux: \c{$HOME/Settings/MySoft/Star Runner.ini})
+    \li \c{$HOME/.config/MySoft.ini} (Qt for Embedded Linux: \c{$HOME/Settings/MySoft.ini})
+    \li \c{/etc/xdg/MySoft/Star Runner.ini}
+    \li \c{/etc/xdg/MySoft.ini}
     \endlist
 
     On Windows, the following files are used:
 
     \list 1
-    \o \c{%APPDATA%\MySoft\Star Runner.ini}
-    \o \c{%APPDATA%\MySoft.ini}
-    \o \c{%COMMON_APPDATA%\MySoft\Star Runner.ini}
-    \o \c{%COMMON_APPDATA%\MySoft.ini}
+    \li \c{%APPDATA%\MySoft\Star Runner.ini}
+    \li \c{%APPDATA%\MySoft.ini}
+    \li \c{%COMMON_APPDATA%\MySoft\Star Runner.ini}
+    \li \c{%COMMON_APPDATA%\MySoft.ini}
     \endlist
 
     The \c %APPDATA% path is usually \tt{C:\\Documents and
@@ -2395,20 +2395,20 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
     application:
 
     \list
-    \o  The Windows system registry has the following limitations: A
+    \li  The Windows system registry has the following limitations: A
         subkey may not exceed 255 characters, an entry's value may
         not exceed 16,383 characters, and all the values of a key may
         not exceed 65,535 characters. One way to work around these
         limitations is to store the settings using the IniFormat
         instead of the NativeFormat.
 
-    \o  On Mac OS X, allKeys() will return some extra keys for global
+    \li  On Mac OS X, allKeys() will return some extra keys for global
         settings that apply to all applications. These keys can be
         read using value() but cannot be changed, only shadowed.
         Calling setFallbacksEnabled(false) will hide these global
         settings.
 
-    \o  On Mac OS X, the CFPreferences API used by QSettings expects
+    \li  On Mac OS X, the CFPreferences API used by QSettings expects
         Internet domain names rather than organization names. To
         provide a uniform API, QSettings derives a fake domain name
         from the organization name (unless the organization name
@@ -2425,7 +2425,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
 
         \snippet doc/src/snippets/code/src_corelib_io_qsettings.cpp 7
 
-    \o On Unix and Mac OS X systems, the advisory file locking is disabled
+    \li On Unix and Mac OS X systems, the advisory file locking is disabled
        if NFS (or AutoFS or CacheFS) is detected to work around a bug in the
        NFS fcntl() implementation, which hangs forever if statd or lockd aren't
        running. Also, the locking isn't performed when accessing \c .plist
@@ -2485,7 +2485,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
     follow what Microsoft does, with the following exceptions:
 
     \list
-    \o  If you store types that QVariant can't convert to QString
+    \li  If you store types that QVariant can't convert to QString
         (e.g., QPoint, QRect, and QSize), Qt uses an \c{@}-based
         syntax to encode the type. For example:
 
@@ -2496,7 +2496,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
         followed by a Qt type (\c Point, \c Rect, \c Size, etc.) is
         treated as a normal character.
 
-    \o  Although backslash is a special character in INI files, most
+    \li  Although backslash is a special character in INI files, most
         Windows applications don't escape backslashes (\c{\}) in file
         paths:
 
@@ -2505,7 +2505,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
         QSettings always treats backslash as a special character and
         provides no API for reading or writing such entries.
 
-    \o  The INI file format has severe restrictions on the syntax of
+    \li  The INI file format has severe restrictions on the syntax of
         a key. Qt works around this by using \c % as an escape
         character in keys. In addition, if you save a top-level
         setting (a key with no slashes in it, e.g., "someKey"), it
@@ -2514,7 +2514,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
         such as "General/someKey", the key will be located in the
         "%General" section, \e not in the "General" section.
 
-    \o  Following the philosophy that we should be liberal in what
+    \li  Following the philosophy that we should be liberal in what
         we accept and conservative in what we generate, QSettings
         will accept Latin-1 encoded INI files, but generate pure
         ASCII files, where non-ASCII values are encoded using standard
@@ -2632,10 +2632,10 @@ QSettings::QSettings(Format format, Scope scope, const QString &organization,
     be aware of the following limitations:
 
     \list
-    \o QSettings provides no way of reading INI "path" entries, i.e., entries
+    \li QSettings provides no way of reading INI "path" entries, i.e., entries
        with unescaped slash characters. (This is because these entries are
        ambiguous and cannot be resolved automatically.)
-    \o In INI files, QSettings uses the \c @ character as a metacharacter in some
+    \li In INI files, QSettings uses the \c @ character as a metacharacter in some
        contexts, to encode Qt-specific data types (e.g., \c @Rect), and might
        therefore misinterpret it when it occurs in pure INI files.
     \endlist
@@ -2933,9 +2933,9 @@ QSettings::Status QSettings::status() const
     This will set the value of three settings:
 
     \list
-    \o \c mainwindow/size
-    \o \c mainwindow/fullScreen
-    \o \c outputpanel/visible
+    \li \c mainwindow/size
+    \li \c mainwindow/fullScreen
+    \li \c outputpanel/visible
     \endlist
 
     Call endGroup() to reset the current group to what it was before
@@ -3021,14 +3021,14 @@ int QSettings::beginReadArray(const QString &prefix)
     The generated keys will have the form
 
     \list
-    \o \c logins/size
-    \o \c logins/1/userName
-    \o \c logins/1/password
-    \o \c logins/2/userName
-    \o \c logins/2/password
-    \o \c logins/3/userName
-    \o \c logins/3/password
-    \o ...
+    \li \c logins/size
+    \li \c logins/1/userName
+    \li \c logins/1/password
+    \li \c logins/2/userName
+    \li \c logins/2/password
+    \li \c logins/3/userName
+    \li \c logins/3/password
+    \li ...
     \endlist
 
     To read back an array, use beginReadArray().
@@ -3412,15 +3412,15 @@ void QSettings::setUserIniPath(const QString &dir)
     The table below summarizes the default values:
 
     \table
-    \header \o Platform         \o Format                       \o Scope       \o Path
-    \row    \o{1,2} Windows     \o{1,2} IniFormat               \o UserScope   \o \c %APPDATA%
-    \row                                                        \o SystemScope \o \c %COMMON_APPDATA%
-    \row    \o{1,2} Unix        \o{1,2} NativeFormat, IniFormat \o UserScope   \o \c $HOME/.config
-    \row                                                        \o SystemScope \o \c /etc/xdg
-    \row    \o{1,2} Qt for Embedded Linux \o{1,2} NativeFormat, IniFormat \o UserScope   \o \c $HOME/Settings
-    \row                                                        \o SystemScope \o \c /etc/xdg
-    \row    \o{1,2} Mac OS X    \o{1,2} IniFormat               \o UserScope   \o \c $HOME/.config
-    \row                                                        \o SystemScope \o \c /etc/xdg
+    \header \li Platform         \li Format                       \li Scope       \li Path
+    \row    \li{1,2} Windows     \li{1,2} IniFormat               \li UserScope   \li \c %APPDATA%
+    \row                                                        \li SystemScope \li \c %COMMON_APPDATA%
+    \row    \li{1,2} Unix        \li{1,2} NativeFormat, IniFormat \li UserScope   \li \c $HOME/.config
+    \row                                                        \li SystemScope \li \c /etc/xdg
+    \row    \li{1,2} Qt for Embedded Linux \li{1,2} NativeFormat, IniFormat \li UserScope   \li \c $HOME/Settings
+    \row                                                        \li SystemScope \li \c /etc/xdg
+    \row    \li{1,2} Mac OS X    \li{1,2} IniFormat               \li UserScope   \li \c $HOME/.config
+    \row                                                        \li SystemScope \li \c /etc/xdg
     \endtable
 
     The default UserScope paths on Unix and Mac OS X (\c
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp
index dd0ab85119..cb703df8c6 100644
--- a/src/corelib/io/qtextstream.cpp
+++ b/src/corelib/io/qtextstream.cpp
@@ -90,13 +90,13 @@ static const int QTEXTSTREAM_BUFFERSIZE = 16384;
 
     \list
 
-    \o Chunk by chunk, by calling readLine() or readAll().
+    \li Chunk by chunk, by calling readLine() or readAll().
 
-    \o Word by word. QTextStream supports streaming into QStrings,
+    \li Word by word. QTextStream supports streaming into QStrings,
     QByteArrays and char* buffers. Words are delimited by space, and
     leading white space is automatically skipped.
 
-    \o Character by character, by streaming into QChar or char types.
+    \li Character by character, by streaming into QChar or char types.
     This method is often used for convenient input handling when
     parsing files, independent of character encoding and end-of-line
     semantics. To skip white space, call skipWhiteSpace().
@@ -134,31 +134,31 @@ static const int QTEXTSTREAM_BUFFERSIZE = 16384;
     defines several global manipulator functions:
 
     \table
-    \header \o Manipulator        \o Description
-    \row    \o \c bin             \o Same as setIntegerBase(2).
-    \row    \o \c oct             \o Same as setIntegerBase(8).
-    \row    \o \c dec             \o Same as setIntegerBase(10).
-    \row    \o \c hex             \o Same as setIntegerBase(16).
-    \row    \o \c showbase        \o Same as setNumberFlags(numberFlags() | ShowBase).
-    \row    \o \c forcesign       \o Same as setNumberFlags(numberFlags() | ForceSign).
-    \row    \o \c forcepoint      \o Same as setNumberFlags(numberFlags() | ForcePoint).
-    \row    \o \c noshowbase      \o Same as setNumberFlags(numberFlags() & ~ShowBase).
-    \row    \o \c noforcesign     \o Same as setNumberFlags(numberFlags() & ~ForceSign).
-    \row    \o \c noforcepoint    \o Same as setNumberFlags(numberFlags() & ~ForcePoint).
-    \row    \o \c uppercasebase   \o Same as setNumberFlags(numberFlags() | UppercaseBase).
-    \row    \o \c uppercasedigits \o Same as setNumberFlags(numberFlags() | UppercaseDigits).
-    \row    \o \c lowercasebase   \o Same as setNumberFlags(numberFlags() & ~UppercaseBase).
-    \row    \o \c lowercasedigits \o Same as setNumberFlags(numberFlags() & ~UppercaseDigits).
-    \row    \o \c fixed           \o Same as setRealNumberNotation(FixedNotation).
-    \row    \o \c scientific      \o Same as setRealNumberNotation(ScientificNotation).
-    \row    \o \c left            \o Same as setFieldAlignment(AlignLeft).
-    \row    \o \c right           \o Same as setFieldAlignment(AlignRight).
-    \row    \o \c center          \o Same as setFieldAlignment(AlignCenter).
-    \row    \o \c endl            \o Same as operator<<('\n') and flush().
-    \row    \o \c flush           \o Same as flush().
-    \row    \o \c reset           \o Same as reset().
-    \row    \o \c ws              \o Same as skipWhiteSpace().
-    \row    \o \c bom             \o Same as setGenerateByteOrderMark(true).
+    \header \li Manipulator        \li Description
+    \row    \li \c bin             \li Same as setIntegerBase(2).
+    \row    \li \c oct             \li Same as setIntegerBase(8).
+    \row    \li \c dec             \li Same as setIntegerBase(10).
+    \row    \li \c hex             \li Same as setIntegerBase(16).
+    \row    \li \c showbase        \li Same as setNumberFlags(numberFlags() | ShowBase).
+    \row    \li \c forcesign       \li Same as setNumberFlags(numberFlags() | ForceSign).
+    \row    \li \c forcepoint      \li Same as setNumberFlags(numberFlags() | ForcePoint).
+    \row    \li \c noshowbase      \li Same as setNumberFlags(numberFlags() & ~ShowBase).
+    \row    \li \c noforcesign     \li Same as setNumberFlags(numberFlags() & ~ForceSign).
+    \row    \li \c noforcepoint    \li Same as setNumberFlags(numberFlags() & ~ForcePoint).
+    \row    \li \c uppercasebase   \li Same as setNumberFlags(numberFlags() | UppercaseBase).
+    \row    \li \c uppercasedigits \li Same as setNumberFlags(numberFlags() | UppercaseDigits).
+    \row    \li \c lowercasebase   \li Same as setNumberFlags(numberFlags() & ~UppercaseBase).
+    \row    \li \c lowercasedigits \li Same as setNumberFlags(numberFlags() & ~UppercaseDigits).
+    \row    \li \c fixed           \li Same as setRealNumberNotation(FixedNotation).
+    \row    \li \c scientific      \li Same as setRealNumberNotation(ScientificNotation).
+    \row    \li \c left            \li Same as setFieldAlignment(AlignLeft).
+    \row    \li \c right           \li Same as setFieldAlignment(AlignRight).
+    \row    \li \c center          \li Same as setFieldAlignment(AlignCenter).
+    \row    \li \c endl            \li Same as operator<<('\n') and flush().
+    \row    \li \c flush           \li Same as flush().
+    \row    \li \c reset           \li Same as reset().
+    \row    \li \c ws              \li Same as skipWhiteSpace().
+    \row    \li \c bom             \li Same as setGenerateByteOrderMark(true).
     \endtable
 
     In addition, Qt provides three global manipulators that take a
@@ -2065,12 +2065,12 @@ QTextStream &QTextStream::operator>>(char &c)
     number using the following rules:
 
     \table
-    \header \o Prefix                \o Base
-    \row    \o "0b" or "0B"          \o 2 (binary)
-    \row    \o "0" followed by "0-7" \o 8 (octal)
-    \row    \o "0" otherwise         \o 10 (decimal)
-    \row    \o "0x" or "0X"          \o 16 (hexadecimal)
-    \row    \o "1" to "9"            \o 10 (decimal)
+    \header \li Prefix                \li Base
+    \row    \li "0b" or "0B"          \li 2 (binary)
+    \row    \li "0" followed by "0-7" \li 8 (octal)
+    \row    \li "0" otherwise         \li 10 (decimal)
+    \row    \li "0x" or "0X"          \li 16 (hexadecimal)
+    \row    \li "1" to "9"            \li 10 (decimal)
     \endtable
 
     By calling setIntegerBase(), you can specify the integer base
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index eeeca1bf77..0659053937 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -112,7 +112,7 @@
     dealing with URLs and strings:
 
     \list
-    \o When creating an QString to contain a URL from a QByteArray or a
+    \li When creating an QString to contain a URL from a QByteArray or a
        char*, always use QString::fromUtf8().
     \endlist
 
@@ -135,15 +135,15 @@
 
     \list
 
-    \o Spaces and "%20": If an encoded URL contains a space, this will be
+    \li Spaces and "%20": If an encoded URL contains a space, this will be
     replaced with "%20". If a decoded URL contains "%20", this will be
     replaced with a single space before the URL is parsed.
 
-    \o Single "%" characters: Any occurrences of a percent character "%" not
+    \li Single "%" characters: Any occurrences of a percent character "%" not
     followed by exactly two hexadecimal characters (e.g., "13% coverage.html")
     will be replaced by "%25".
 
-    \o Reserved and unreserved characters: An encoded URL should only
+    \li Reserved and unreserved characters: An encoded URL should only
     contain a few characters as literals; all other characters should
     be percent-encoded. In TolerantMode, these characters will be
     automatically percent-encoded where they are not allowed:
@@ -6335,10 +6335,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     \section1 Examples:
 
     \list
-    \o qt.nokia.com becomes http://qt.nokia.com
-    \o ftp.qt.nokia.com becomes ftp://ftp.qt.nokia.com
-    \o hostname becomes http://hostname
-    \o /home/user/test.html becomes file:///home/user/test.html
+    \li qt.nokia.com becomes http://qt.nokia.com
+    \li ftp.qt.nokia.com becomes ftp://ftp.qt.nokia.com
+    \li hostname becomes http://hostname
+    \li /home/user/test.html becomes file:///home/user/test.html
     \endlist
 */
 QUrl QUrl::fromUserInput(const QString &userInput)
diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp
index a8c3921f45..7a1357959e 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.cpp
+++ b/src/corelib/itemmodels/qabstractitemmodel.cpp
@@ -1161,16 +1161,16 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     \e before and \e after they occur:
 
     \list
-        \o An insertRows() implementation must call beginInsertRows() \e before
+        \li An insertRows() implementation must call beginInsertRows() \e before
            inserting new rows into the data structure, and endInsertRows()
            \e{immediately afterwards}.
-        \o An insertColumns() implementation must call beginInsertColumns()
+        \li An insertColumns() implementation must call beginInsertColumns()
            \e before inserting new columns into the data structure, and
            endInsertColumns() \e{immediately afterwards}.
-        \o A removeRows() implementation must call beginRemoveRows() \e before
+        \li A removeRows() implementation must call beginRemoveRows() \e before
            the rows are removed from the data structure, and endRemoveRows()
            \e{immediately afterwards}.
-        \o A removeColumns() implementation must call beginRemoveColumns()
+        \li A removeColumns() implementation must call beginRemoveColumns()
            \e before the columns are removed from the data structure, and
            endRemoveColumns() \e{immediately afterwards}.
     \endlist
@@ -1179,7 +1179,7 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     the chance to take action before any data becomes unavailable. The
     encapsulation of the insert and remove operations with these begin and end
     functions also enables the model to manage \l{QPersistentModelIndex}
-    {persistent model indexes} correctly. \bold{If you want selections to be
+    {persistent model indexes} correctly. \b{If you want selections to be
     handled properly, you must ensure that you call these functions.} If you
     insert or remove an item with children, you do not need to call these
     functions for the child items. In other words, the parent item will take
@@ -1338,11 +1338,11 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     layoutChanged(). In other words, when the structure changes:
 
     \list
-        \o  emit layoutAboutToBeChanged
-        \o  Remember the QModelIndex that will change
-        \o  Update your internal data
-        \o  Call changePersistentIndex()
-        \o  emit layoutChanged
+        \li  emit layoutAboutToBeChanged
+        \li  Remember the QModelIndex that will change
+        \li  Update your internal data
+        \li  Call changePersistentIndex()
+        \li  emit layoutChanged
     \endlist
 
     \sa layoutAboutToBeChanged(), dataChanged(), headerDataChanged(), modelReset(),
@@ -1500,7 +1500,7 @@ QAbstractItemModel::~QAbstractItemModel()
     inclusive, under the given \a sourceParent item have been moved to \a destinationParent
     starting at the row \a destinationRow.
 
-    \bold{Note:} Components connected to this signal use it to adapt to changes
+    \b{Note:} Components connected to this signal use it to adapt to changes
     in the model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
@@ -1516,7 +1516,7 @@ QAbstractItemModel::~QAbstractItemModel()
     inclusive, under the given \a sourceParent item. They will be moved to \a destinationParent
     starting at the row \a destinationRow.
 
-    \bold{Note:} Components connected to this signal use it to adapt to changes
+    \b{Note:} Components connected to this signal use it to adapt to changes
     in the model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
@@ -1532,7 +1532,7 @@ QAbstractItemModel::~QAbstractItemModel()
     inclusive, under the given \a sourceParent item have been moved to \a destinationParent
     starting at the column \a destinationColumn.
 
-    \bold{Note:} Components connected to this signal use it to adapt to changes
+    \b{Note:} Components connected to this signal use it to adapt to changes
     in the model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
@@ -1548,7 +1548,7 @@ QAbstractItemModel::~QAbstractItemModel()
     inclusive, under the given \a sourceParent item. They will be moved to \a destinationParent
     starting at the column \a destinationColumn.
 
-    \bold{Note:} Components connected to this signal use it to adapt to changes
+    \b{Note:} Components connected to this signal use it to adapt to changes
     in the model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
@@ -1683,7 +1683,7 @@ bool QAbstractItemModel::setData(const QModelIndex &index, const QVariant &value
     Returns the data stored under the given \a role for the item referred to
     by the \a index.
 
-    \note If you do not have a value to return, return an \bold invalid
+    \note If you do not have a value to return, return an \b invalid
     QVariant instead of returning 0.
 
     \sa Qt::ItemDataRole, setData(), headerData()
@@ -2437,8 +2437,8 @@ bool QAbstractItemModel::decodeData(int row, int column, const QModelIndex &pare
 
     \table 80%
     \row
-        \o  \inlineimage modelview-begin-insert-rows.png Inserting rows
-        \o  Specify the first and last row numbers for the span of rows you
+        \li  \inlineimage modelview-begin-insert-rows.png Inserting rows
+        \li  Specify the first and last row numbers for the span of rows you
             want to insert into an item in a model.
 
             For example, as shown in the diagram, we insert three rows before
@@ -2448,8 +2448,8 @@ bool QAbstractItemModel::decodeData(int row, int column, const QModelIndex &pare
 
             This inserts the three new rows as rows 2, 3, and 4.
     \row
-        \o  \inlineimage modelview-begin-append-rows.png Appending rows
-        \o  To append rows, insert them after the last row.
+        \li  \inlineimage modelview-begin-append-rows.png Appending rows
+        \li  To append rows, insert them after the last row.
 
             For example, as shown in the diagram, we append two rows to a
             collection of 4 existing rows (ending in row 3), so \a first is 4
@@ -2503,8 +2503,8 @@ void QAbstractItemModel::endInsertRows()
 
     \table 80%
     \row
-        \o  \inlineimage modelview-begin-remove-rows.png Removing rows
-        \o  Specify the first and last row numbers for the span of rows you
+        \li  \inlineimage modelview-begin-remove-rows.png Removing rows
+        \li  Specify the first and last row numbers for the span of rows you
             want to remove from an item in a model.
 
             For example, as shown in the diagram, we remove the two rows from
@@ -2616,8 +2616,8 @@ bool QAbstractItemModelPrivate::allowMove(const QModelIndex &srcParent, int star
 
     \table 80%
     \row
-        \o  \inlineimage modelview-move-rows-1.png Moving rows to another parent
-        \o  Specify the first and last row numbers for the span of rows in
+        \li  \inlineimage modelview-move-rows-1.png Moving rows to another parent
+        \li  Specify the first and last row numbers for the span of rows in
             the source parent you want to move in the model. Also specify
             the row in the destination parent to move the span to.
 
@@ -2630,8 +2630,8 @@ bool QAbstractItemModelPrivate::allowMove(const QModelIndex &srcParent, int star
             This moves the three rows rows 2, 3, and 4 in the source to become 2, 3 and 4 in
             the destination. Other affected siblings are displaced accordingly.
     \row
-        \o  \inlineimage modelview-move-rows-2.png Moving rows to append to another parent
-        \o  To append rows to another parent, move them to after the last row.
+        \li  \inlineimage modelview-move-rows-2.png Moving rows to append to another parent
+        \li  To append rows to another parent, move them to after the last row.
 
             For example, as shown in the diagram, we move three rows to a
             collection of 6 existing rows (ending in row 5), so \a destinationChild is 6:
@@ -2640,8 +2640,8 @@ bool QAbstractItemModelPrivate::allowMove(const QModelIndex &srcParent, int star
 
             This moves the target rows to the end of the target parent as 6, 7 and 8.
     \row
-        \o  \inlineimage modelview-move-rows-3.png Moving rows in the same parent up
-        \o  To move rows within the same parent, specify the row to move them to.
+        \li  \inlineimage modelview-move-rows-3.png Moving rows in the same parent up
+        \li  To move rows within the same parent, specify the row to move them to.
 
             For example, as shown in the diagram, we move one item from row 2 to row 0,
             so \a sourceFirst and \a sourceLast are 2 and \a destinationChild is 0.
@@ -2655,8 +2655,8 @@ bool QAbstractItemModelPrivate::allowMove(const QModelIndex &srcParent, int star
             it is already)
 
     \row
-        \o  \inlineimage modelview-move-rows-4.png Moving rows in the same parent down
-        \o  To move rows within the same parent, specify the row to move them to.
+        \li  \inlineimage modelview-move-rows-4.png Moving rows in the same parent down
+        \li  To move rows within the same parent, specify the row to move them to.
 
             For example, as shown in the diagram, we move one item from row 2 to row 4,
             so \a sourceFirst and \a sourceLast are 2 and \a destinationChild is 4.
@@ -2737,8 +2737,8 @@ void QAbstractItemModel::endMoveRows()
 
     \table 80%
     \row
-        \o  \inlineimage modelview-begin-insert-columns.png Inserting columns
-        \o  Specify the first and last column numbers for the span of columns
+        \li  \inlineimage modelview-begin-insert-columns.png Inserting columns
+        \li  Specify the first and last column numbers for the span of columns
             you want to insert into an item in a model.
 
             For example, as shown in the diagram, we insert three columns
@@ -2748,8 +2748,8 @@ void QAbstractItemModel::endMoveRows()
 
             This inserts the three new columns as columns 4, 5, and 6.
     \row
-        \o  \inlineimage modelview-begin-append-columns.png Appending columns
-        \o  To append columns, insert them after the last column.
+        \li  \inlineimage modelview-begin-append-columns.png Appending columns
+        \li  To append columns, insert them after the last column.
 
             For example, as shown in the diagram, we append three columns to a
             collection of six existing columns (ending in column 5), so
@@ -2805,8 +2805,8 @@ void QAbstractItemModel::endInsertColumns()
 
     \table 80%
     \row
-        \o  \inlineimage modelview-begin-remove-columns.png Removing columns
-        \o  Specify the first and last column numbers for the span of columns
+        \li  \inlineimage modelview-begin-remove-columns.png Removing columns
+        \li  Specify the first and last column numbers for the span of columns
             you want to remove from an item in a model.
 
             For example, as shown in the diagram, we remove the three columns
@@ -3135,16 +3135,16 @@ QModelIndexList QAbstractItemModel::persistentIndexList() const
     are aware of any changes:
 
     \list
-    \o An insertRows() implementation must call beginInsertRows()
+    \li An insertRows() implementation must call beginInsertRows()
        \e before inserting new rows into the data structure, and it must
        call endInsertRows() \e{immediately afterwards}.
-    \o An insertColumns() implementation must call beginInsertColumns()
+    \li An insertColumns() implementation must call beginInsertColumns()
        \e before inserting new columns into the data structure, and it must
        call endInsertColumns() \e{immediately afterwards}.
-    \o A removeRows() implementation must call beginRemoveRows()
+    \li A removeRows() implementation must call beginRemoveRows()
        \e before the rows are removed from the data structure, and it must
        call endRemoveRows() \e{immediately afterwards}.
-    \o A removeColumns() implementation must call beginRemoveColumns()
+    \li A removeColumns() implementation must call beginRemoveColumns()
        \e before the columns are removed from the data structure, and it must
        call endRemoveColumns() \e{immediately afterwards}.
     \endlist
@@ -3271,10 +3271,10 @@ bool QAbstractTableModel::hasChildren(const QModelIndex &parent) const
     functions so that all connected views are aware of any changes:
 
     \list
-    \o An insertRows() implementation must call beginInsertRows()
+    \li An insertRows() implementation must call beginInsertRows()
        \e before inserting new rows into the data structure, and it must
        call endInsertRows() \e{immediately afterwards}.
-    \o A removeRows() implementation must call beginRemoveRows()
+    \li A removeRows() implementation must call beginRemoveRows()
        \e before the rows are removed from the data structure, and it must
        call endRemoveRows() \e{immediately afterwards}.
     \endlist
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index b7ef69423f..ae9affb862 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -2531,16 +2531,16 @@ void QSortFilterProxyModel::invalidateFilter()
     the following QVariant types:
 
     \list
-    \o QVariant::Int
-    \o QVariant::UInt
-    \o QVariant::LongLong
-    \o QVariant::ULongLong
-    \o QVariant::Double
-    \o QVariant::Char
-    \o QVariant::Date
-    \o QVariant::Time
-    \o QVariant::DateTime
-    \o QVariant::String
+    \li QVariant::Int
+    \li QVariant::UInt
+    \li QVariant::LongLong
+    \li QVariant::ULongLong
+    \li QVariant::Double
+    \li QVariant::Char
+    \li QVariant::Date
+    \li QVariant::Time
+    \li QVariant::DateTime
+    \li QVariant::String
     \endlist
 
     Any other type will be converted to a QString using
diff --git a/src/corelib/json/qjsonarray.cpp b/src/corelib/json/qjsonarray.cpp
index 0eb1974147..cdf9192b27 100644
--- a/src/corelib/json/qjsonarray.cpp
+++ b/src/corelib/json/qjsonarray.cpp
@@ -559,7 +559,7 @@ bool QJsonArray::operator!=(const QJsonArray &other) const
 
 /*! \typedef QJsonArray::iterator::iterator_category
 
-  A synonym for \i {std::random_access_iterator_tag} indicating
+  A synonym for \e {std::random_access_iterator_tag} indicating
   this iterator is a random access iterator.
 */
 
@@ -793,7 +793,7 @@ bool QJsonArray::operator!=(const QJsonArray &other) const
 
 /*! \typedef QJsonArray::const_iterator::iterator_category
 
-  A synonym for \i {std::random_access_iterator_tag} indicating
+  A synonym for \e {std::random_access_iterator_tag} indicating
   this iterator is a random access iterator.
 */
 
diff --git a/src/corelib/json/qjsonobject.cpp b/src/corelib/json/qjsonobject.cpp
index b7af8c22cf..a854f73c7e 100644
--- a/src/corelib/json/qjsonobject.cpp
+++ b/src/corelib/json/qjsonobject.cpp
@@ -568,7 +568,7 @@ QJsonObject::const_iterator QJsonObject::constFind(const QString &key) const
 
 /*! \typedef QJsonObject::iterator::iterator_category
 
-  A synonym for \i {std::bidirectional_iterator_tag} indicating
+  A synonym for \e {std::bidirectional_iterator_tag} indicating
   this iterator is a bidirectional iterator.
 */
 
@@ -757,7 +757,7 @@ QJsonObject::const_iterator QJsonObject::constFind(const QString &key) const
 
 /*! \typedef QJsonObject::const_iterator::iterator_category
 
-  A synonym for \i {std::bidirectional_iterator_tag} indicating
+  A synonym for \e {std::bidirectional_iterator_tag} indicating
   this iterator is a bidirectional iterator.
 */
 
diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp
index 603cba8897..b4a689da60 100644
--- a/src/corelib/json/qjsonvalue.cpp
+++ b/src/corelib/json/qjsonvalue.cpp
@@ -64,12 +64,12 @@ QT_BEGIN_NAMESPACE
     JSON is a format to store structured data. It has 6 basic data types:
 
     \list
-    \o bool QJsonValue::Bool
-    \o double QJsonValue::Double
-    \o string QJsonValue::String
-    \o array QJsonValue::Array
-    \o object QJsonValue::Object
-    \o null QJsonValue::Null
+    \li bool QJsonValue::Bool
+    \li double QJsonValue::Double
+    \li string QJsonValue::String
+    \li array QJsonValue::Array
+    \li object QJsonValue::Object
+    \li null QJsonValue::Null
     \endlist
 
     A value can represent any of the above data types. In addition, QJsonValue has one special
@@ -260,16 +260,16 @@ QJsonValue &QJsonValue::operator =(const QJsonValue &other)
     The conversion will convert QVariant types as follows:
 
     \list
-    \o QVariant::Bool to Bool
-    \o QVariant::Int
-    \o QVariant::Double
-    \o QVariant::LongLong
-    \o QVariant::ULongLong
-    \o QVariant::UInt to Double
-    \o QVariant::String to String
-    \o QVariant::StringList
-    \o QVariant::VariantList to Array
-    \o QVariant::VariantMap to Object
+    \li QVariant::Bool to Bool
+    \li QVariant::Int
+    \li QVariant::Double
+    \li QVariant::LongLong
+    \li QVariant::ULongLong
+    \li QVariant::UInt to Double
+    \li QVariant::String to String
+    \li QVariant::StringList
+    \li QVariant::VariantList to Array
+    \li QVariant::VariantMap to Object
     \endlist
 
     For all other QVariant types a conversion to a QString will be attempted. If the returned string
diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp
index 3075eab753..b98f3f4a30 100644
--- a/src/corelib/kernel/qabstracteventdispatcher.cpp
+++ b/src/corelib/kernel/qabstracteventdispatcher.cpp
@@ -167,7 +167,7 @@ QAbstractEventDispatcher::~QAbstractEventDispatcher()
     event dispatcher exists for the specified thread, this function
     returns 0.
 
-    \bold{Note:} If Qt is built without thread support, the \a thread
+    \b{Note:} If Qt is built without thread support, the \a thread
     argument is ignored.
  */
 QAbstractEventDispatcher *QAbstractEventDispatcher::instance(QThread *thread)
@@ -192,10 +192,10 @@ QAbstractEventDispatcher *QAbstractEventDispatcher::instance(QThread *thread)
 
     \list
 
-    \i If events are available, this function returns after processing
+    \li If events are available, this function returns after processing
     them.
 
-    \i If no events are available, this function will wait until more
+    \li If no events are available, this function will wait until more
     are available and return after processing newly available events.
 
     \endlist
@@ -204,7 +204,7 @@ QAbstractEventDispatcher *QAbstractEventDispatcher::instance(QThread *thread)
     and no events are available, this function will return
     immediately.
 
-    \bold{Note:} This function does not process events continuously; it
+    \b{Note:} This function does not process events continuously; it
     returns after all available events are processed.
 
     \sa hasPendingEvents()
@@ -349,17 +349,17 @@ void QAbstractEventDispatcher::closingDown()
 
     \table
         \header
-            \o Platform
-            \o type
+            \li Platform
+            \li type
         \row
-            \o Windows
-            \o MSG
+            \li Windows
+            \li MSG
         \row
-            \o X11
-            \o XEvent
+            \li X11
+            \li XEvent
         \row
-            \o Mac
-            \o NSEvent
+            \li Mac
+            \li NSEvent
     \endtable
 
     
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 2d49b271ce..515732bc68 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -715,13 +715,13 @@ bool QCoreApplication::notifyInternal(QObject *receiver, QEvent *event)
   reimplementing this virtual function is just one of them. All five
   approaches are listed below:
   \list 1
-  \i Reimplementing paintEvent(), mousePressEvent() and so
+  \li Reimplementing paintEvent(), mousePressEvent() and so
   on. This is the commonest, easiest and least powerful way.
 
-  \i Reimplementing this function. This is very powerful, providing
+  \li Reimplementing this function. This is very powerful, providing
   complete control; but only one subclass can be active at a time.
 
-  \i Installing an event filter on QCoreApplication::instance(). Such
+  \li Installing an event filter on QCoreApplication::instance(). Such
   an event filter is able to process all events for all widgets, so
   it's just as powerful as reimplementing notify(); furthermore, it's
   possible to have more than one application-global event filter.
@@ -730,11 +730,11 @@ bool QCoreApplication::notifyInternal(QObject *receiver, QEvent *event)
   event filters are only called for objects that live in the main
   thread.
 
-  \i Reimplementing QObject::event() (as QWidget does). If you do
+  \li Reimplementing QObject::event() (as QWidget does). If you do
   this you get Tab key presses, and you get to see the events before
   any widget-specific event filters.
 
-  \i Installing an event filter on the object. Such an event filter gets all
+  \li Installing an event filter on the object. Such an event filter gets all
   the events, including Tab and Shift+Tab key press events, as long as they
   do not change the focus widget.
   \endlist
diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp
index dfdd178c35..58e2c5cd2f 100644
--- a/src/corelib/kernel/qeventloop.cpp
+++ b/src/corelib/kernel/qeventloop.cpp
@@ -222,11 +222,11 @@ int QEventLoop::exec(ProcessEventsFlags flags)
     operation and want to show its progress without allowing user
     input, i.e. by using the \l ExcludeUserInputEvents flag.
 
-    \bold{Notes:}
+    \b{Notes:}
     \list
-    \o This function does not process events continuously; it
+    \li This function does not process events continuously; it
        returns after all available events are processed.
-    \o Specifying the \l WaitForMoreEvents flag makes no sense
+    \li Specifying the \l WaitForMoreEvents flag makes no sense
        and will be ignored.
     \endlist
 */
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index d53ba707f7..f962fb7831 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -86,16 +86,16 @@ QT_BEGIN_NAMESPACE
 
     The functions you are most likely to find useful are these:
     \list
-    \o className() returns the name of a class.
-    \o superClass() returns the superclass's meta-object.
-    \o method() and methodCount() provide information
+    \li className() returns the name of a class.
+    \li superClass() returns the superclass's meta-object.
+    \li method() and methodCount() provide information
        about a class's meta-methods (signals, slots and other
        \l{Q_INVOKABLE}{invokable} member functions).
-    \o enumerator() and enumeratorCount() and provide information about
+    \li enumerator() and enumeratorCount() and provide information about
        a class's enumerators.
-    \o propertyCount() and property() provide information about a
+    \li propertyCount() and property() provide information about a
        class's properties.
-    \o constructor() and constructorCount() provide information
+    \li constructor() and constructorCount() provide information
        about a class's meta-constructors.
     \endlist
 
@@ -1051,18 +1051,18 @@ enum { MaximumParamCount = 11 }; // up to 10 arguments + 1 return value
     depending on \a type:
 
     \list
-    \o If \a type is Qt::DirectConnection, the member will be invoked immediately.
+    \li If \a type is Qt::DirectConnection, the member will be invoked immediately.
 
-    \o If \a type is Qt::QueuedConnection,
+    \li If \a type is Qt::QueuedConnection,
        a QEvent will be sent and the member is invoked as soon as the application
        enters the main event loop.
 
-    \o If \a type is Qt::BlockingQueuedConnection, the method will be invoked in
+    \li If \a type is Qt::BlockingQueuedConnection, the method will be invoked in
        the same way as for Qt::QueuedConnection, except that the current thread
        will block until the event is delivered. Using this connection type to
        communicate between objects in the same thread will lead to deadlocks.
 
-    \o If \a type is Qt::AutoConnection, the member is invoked
+    \li If \a type is Qt::AutoConnection, the member is invoked
        synchronously if \a obj lives in the same thread as the
        caller; otherwise it will invoke the member asynchronously.
     \endlist
@@ -1456,13 +1456,13 @@ QMetaMethod::MethodType QMetaMethod::methodType() const
     \a connectionType:
 
     \list
-    \o If \a connectionType is Qt::DirectConnection, the member will be invoked immediately.
+    \li If \a connectionType is Qt::DirectConnection, the member will be invoked immediately.
 
-    \o If \a connectionType is Qt::QueuedConnection,
+    \li If \a connectionType is Qt::QueuedConnection,
        a QEvent will be posted and the member is invoked as soon as the application
        enters the main event loop.
 
-    \o If \a connectionType is Qt::AutoConnection, the member is invoked
+    \li If \a connectionType is Qt::AutoConnection, the member is invoked
        synchronously if \a object lives in the same thread as the
        caller; otherwise it will invoke the member asynchronously.
     \endlist
diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp
index cfe985da26..3a3464e43e 100644
--- a/src/corelib/kernel/qmimedata.cpp
+++ b/src/corelib/kernel/qmimedata.cpp
@@ -246,12 +246,12 @@ QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QVariant::Ty
     functions to access the data:
 
     \table
-    \header \o Tester       \o Getter       \o Setter           \o MIME Types
-    \row    \o hasText()    \o text()       \o setText()        \o \c text/plain
-    \row    \o hasHtml()    \o html()       \o setHtml()        \o \c text/html
-    \row    \o hasUrls()    \o urls()       \o setUrls()        \o \c text/uri-list
-    \row    \o hasImage()   \o imageData()  \o setImageData()   \o \c image/ *
-    \row    \o hasColor()   \o colorData()  \o setColorData()   \o \c application/x-color
+    \header \li Tester       \li Getter       \li Setter           \li MIME Types
+    \row    \li hasText()    \li text()       \li setText()        \li \c text/plain
+    \row    \li hasHtml()    \li html()       \li setHtml()        \li \c text/html
+    \row    \li hasUrls()    \li urls()       \li setUrls()        \li \c text/uri-list
+    \row    \li hasImage()   \li imageData()  \li setImageData()   \li \c image/ *
+    \row    \li hasColor()   \li colorData()  \li setColorData()   \li \c application/x-color
     \endtable
 
     For example, if your write a widget that accepts URL drags, you
@@ -263,15 +263,15 @@ QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QVariant::Ty
     object:
 
     \list 1
-    \o  Custom data can be stored directly in a QMimeData object as a
+    \li  Custom data can be stored directly in a QMimeData object as a
         QByteArray using setData(). For example:
 
         \snippet doc/src/snippets/code/src_corelib_kernel_qmimedata.cpp 1
 
-    \o  We can subclass QMimeData and reimplement hasFormat(),
+    \li  We can subclass QMimeData and reimplement hasFormat(),
         formats(), and retrieveData().
 
-    \o  If the drag and drop operation occurs within a single
+    \li  If the drag and drop operation occurs within a single
         application, we can subclass QMimeData and add extra data in
         it, and use a qobject_cast() in the receiver's drop event
         handler. For example:
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 8fa5dcdcff..530ddb3f13 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -1805,7 +1805,7 @@ void QObject::removeEventFilter(QObject *obj)
     deleted, the control must return to the event loop from which
     deleteLater() was called.
 
-    \bold{Note:} It is safe to call this function more than once; when the
+    \b{Note:} It is safe to call this function more than once; when the
     first deferred deletion event is delivered, any pending events for the
     object are removed from the event queue.
 
@@ -2123,9 +2123,9 @@ int QObject::receivers(const char *signal) const
     member in the specified class.
 
     \list
-    \o If member.mobj is 0 then both signalIndex and methodIndex are set to -1.
+    \li If member.mobj is 0 then both signalIndex and methodIndex are set to -1.
 
-    \o If specified member is not a member of obj instance class (or one of
+    \li If specified member is not a member of obj instance class (or one of
     its parent classes) then both signalIndex and methodIndex are set to -1.
     \endlist
 
@@ -2505,7 +2505,7 @@ QMetaObject::Connection QObject::connect(const QObject *sender, const QMetaMetho
     disconnect() is typically used in three ways, as the following
     examples demonstrate.
     \list 1
-    \i Disconnect everything connected to an object's signals:
+    \li Disconnect everything connected to an object's signals:
 
        \snippet doc/src/snippets/code/src_corelib_kernel_qobject.cpp 26
 
@@ -2513,7 +2513,7 @@ QMetaObject::Connection QObject::connect(const QObject *sender, const QMetaMetho
 
        \snippet doc/src/snippets/code/src_corelib_kernel_qobject.cpp 27
 
-    \i Disconnect everything connected to a specific signal:
+    \li Disconnect everything connected to a specific signal:
 
        \snippet doc/src/snippets/code/src_corelib_kernel_qobject.cpp 28
 
@@ -2521,7 +2521,7 @@ QMetaObject::Connection QObject::connect(const QObject *sender, const QMetaMetho
 
        \snippet doc/src/snippets/code/src_corelib_kernel_qobject.cpp 29
 
-    \i Disconnect a specific receiver:
+    \li Disconnect a specific receiver:
 
        \snippet doc/src/snippets/code/src_corelib_kernel_qobject.cpp 30
 
@@ -2663,11 +2663,11 @@ bool QObject::disconnect(const QObject *sender, const char *signal,
     if:
     \list 1
 
-        \i \a signal is not a member of sender class or one of its parent classes.
+        \li \a signal is not a member of sender class or one of its parent classes.
 
-        \i \a method is not a member of receiver class or one of its parent classes.
+        \li \a method is not a member of receiver class or one of its parent classes.
 
-        \i \a signal instance represents not a signal.
+        \li \a signal instance represents not a signal.
 
     \endlist
 
@@ -3339,7 +3339,7 @@ int QObjectPrivate::signalIndex(const char *signalName) const
   Changing the value of a dynamic property causes a QDynamicPropertyChangeEvent
   to be sent to the object.
 
-  \bold{Note:} Dynamic properties starting with "_q_" are reserved for internal
+  \b{Note:} Dynamic properties starting with "_q_" are reserved for internal
   purposes.
 
   \sa property(), metaObject(), dynamicPropertyNames()
@@ -4091,19 +4091,19 @@ bool QObject::disconnect(const QMetaObject::Connection &connection)
     disconnect() is typically used in three ways, as the following
     examples demonstrate.
     \list 1
-    \i Disconnect everything connected to an object's signals:
+    \li Disconnect everything connected to an object's signals:
 
        \snippet doc/src/snippets/code/src_corelib_kernel_qobject.cpp 26
 
-    \i Disconnect everything connected to a specific signal:
+    \li Disconnect everything connected to a specific signal:
 
        \snippet doc/src/snippets/code/src_corelib_kernel_qobject.cpp 47
 
-    \i Disconnect a specific receiver:
+    \li Disconnect a specific receiver:
 
        \snippet doc/src/snippets/code/src_corelib_kernel_qobject.cpp 30
 
-    \i Disconnect a connection from one specific signal to a specific slot:
+    \li Disconnect a connection from one specific signal to a specific slot:
 
        \snippet doc/src/snippets/code/src_corelib_kernel_qobject.cpp 48
 
diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp
index 936a933d2d..b983bef5fe 100644
--- a/src/corelib/kernel/qpointer.cpp
+++ b/src/corelib/kernel/qpointer.cpp
@@ -61,13 +61,13 @@
 
     \list
 
-    \i When using QPointer on a QWidget (or a subclass of QWidget), previously
+    \li When using QPointer on a QWidget (or a subclass of QWidget), previously
     the QPointer would be cleared by the QWidget destructor. Now, the QPointer
     is cleared by the QObject destructor (since this is when QWeakPointers are
     cleared). Any QPointers tracking a widget will \b NOT be cleared before the
     QWidget destructor destroys the children for the widget being tracked.
 
-    \i When constructing a QSharedPointer to take ownership of an object after a
+    \li When constructing a QSharedPointer to take ownership of an object after a
     QPointer is already tracking the object. Previously, the shared pointer
     construction would not be affected by the QPointer, but now that QPointer
     is implemented using QWeakPoiner, constructing the QSharedPointer will
diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp
index 640dfc0f94..d8578a8059 100644
--- a/src/corelib/kernel/qsharedmemory.cpp
+++ b/src/corelib/kernel/qsharedmemory.cpp
@@ -100,13 +100,13 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &key,
 
   \list
 
-  \o Windows: QSharedMemory does not "own" the shared memory segment.
+  \li Windows: QSharedMemory does not "own" the shared memory segment.
   When all threads or processes that have an instance of QSharedMemory
   attached to a particular shared memory segment have either destroyed
   their instance of QSharedMemory or exited, the Windows kernel
   releases the shared memory segment automatically.
 
-  \o Unix: QSharedMemory "owns" the shared memory segment. When the
+  \li Unix: QSharedMemory "owns" the shared memory segment. When the
   last thread or process that has an instance of QSharedMemory
   attached to a particular shared memory segment detaches from the
   segment by destroying its instance of QSharedMemory, the Unix kernel
@@ -114,7 +114,7 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &key,
   process crashes without running the QSharedMemory destructor, the
   shared memory segment survives the crash.
 
-  \o HP-UX: Only one attach to a shared memory segment is allowed per
+  \li HP-UX: Only one attach to a shared memory segment is allowed per
   process. This means that QSharedMemory should not be used across
   multiple threads in the same process in HP-UX.
 
diff --git a/src/corelib/kernel/qsocketnotifier.cpp b/src/corelib/kernel/qsocketnotifier.cpp
index d7689bb7b1..0a2a66b6b2 100644
--- a/src/corelib/kernel/qsocketnotifier.cpp
+++ b/src/corelib/kernel/qsocketnotifier.cpp
@@ -111,9 +111,9 @@ QT_BEGIN_NAMESPACE
     follow these steps when you receive a notification:
 
     \list 1
-    \o Disable the notifier.
-    \o Read data from the socket.
-    \o Re-enable the notifier if you are interested in more data (such as after
+    \li Disable the notifier.
+    \li Read data from the socket.
+    \li Re-enable the notifier if you are interested in more data (such as after
        having written a new command to a remote server).
     \endlist
 
@@ -121,12 +121,12 @@ QT_BEGIN_NAMESPACE
     follow these steps when you receive a notification:
 
     \list 1
-    \o Disable the notifier.
-    \o Write as much data as you can (before \c EWOULDBLOCK is returned).
-    \o Re-enable notifier if you have more data to write.
+    \li Disable the notifier.
+    \li Write as much data as you can (before \c EWOULDBLOCK is returned).
+    \li Re-enable notifier if you have more data to write.
     \endlist
 
-    \bold{Further information:}
+    \b{Further information:}
     On Windows, Qt always disables the notifier after getting a notification,
     and only re-enables it if more data is expected. For example, if data is
     read from the socket and it can be used to read more, or if reading or
@@ -162,7 +162,7 @@ QT_BEGIN_NAMESPACE
     It is generally advisable to explicitly enable or disable the
     socket notifier, especially for write notifiers.
 
-    \bold{Note for Windows users:} The socket passed to QSocketNotifier
+    \b{Note for Windows users:} The socket passed to QSocketNotifier
     will become non-blocking, even if it was created as a blocking socket.
 
     \sa setEnabled(), isEnabled()
diff --git a/src/corelib/kernel/qsystemsemaphore.cpp b/src/corelib/kernel/qsystemsemaphore.cpp
index d0a67834dd..0558f3cb59 100644
--- a/src/corelib/kernel/qsystemsemaphore.cpp
+++ b/src/corelib/kernel/qsystemsemaphore.cpp
@@ -90,16 +90,16 @@ QT_BEGIN_NAMESPACE
   When using this class, be aware of the following platform
   differences:
 
-  \bold{Windows:} QSystemSemaphore does not own its underlying system
+  \b{Windows:} QSystemSemaphore does not own its underlying system
   semaphore. Windows owns it. This means that when all instances of
   QSystemSemaphore for a particular key have been destroyed, either by
   having their destructors called, or because one or more processes
   crash, Windows removes the underlying system semaphore.
 
-  \bold{Unix:}
+  \b{Unix:}
 
   \list
-  \o QSystemSemaphore owns the underlying system semaphore
+  \li QSystemSemaphore owns the underlying system semaphore
   in Unix systems. This means that the last process having an instance of
   QSystemSemaphore for a particular key must remove the underlying
   system semaphore in its destructor. If the last process crashes
@@ -117,7 +117,7 @@ QT_BEGIN_NAMESPACE
   {QSystemSemaphore::} {Create}, which will force Unix to reset the
   resource count in the underlying system semaphore.
 
-  \o When a process using QSystemSemaphore terminates for
+  \li When a process using QSystemSemaphore terminates for
   any reason, Unix automatically reverses the effect of all acquire
   operations that were not released. Thus if the process acquires a
   resource and then exits without releasing it, Unix will release that
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index a11bcb26c9..dad3318870 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -279,9 +279,9 @@ public:
     up to three parameters:
 
     \list
-    \o The \e context - usually the class name for the tr() caller.
-    \o The \e {source text} - usually the argument to tr().
-    \o The \e disambiguation - an optional string that helps disambiguate
+    \li The \e context - usually the class name for the tr() caller.
+    \li The \e {source text} - usually the argument to tr().
+    \li The \e disambiguation - an optional string that helps disambiguate
        different uses of the same text in the same context.
     \endlist
 
@@ -361,12 +361,12 @@ QTranslator::~QTranslator()
     in the following order:
 
     \list 1
-    \o File name without \a suffix appended.
-    \o File name with text after a character in \a search_delimiters
+    \li File name without \a suffix appended.
+    \li File name with text after a character in \a search_delimiters
        stripped ("_." is the default for \a search_delimiters if it is
        an empty string) and \a suffix.
-    \o File name stripped without \a suffix appended.
-    \o File name stripped further, etc.
+    \li File name stripped without \a suffix appended.
+    \li File name stripped further, etc.
     \endlist
 
     For example, an application running in the fr_CA locale
@@ -375,12 +375,12 @@ QTranslator::~QTranslator()
     readable file from this list:
 
     \list 1
-    \o \c /opt/foolib/foo.fr_ca.qm
-    \o \c /opt/foolib/foo.fr_ca
-    \o \c /opt/foolib/foo.fr.qm
-    \o \c /opt/foolib/foo.fr
-    \o \c /opt/foolib/foo.qm
-    \o \c /opt/foolib/foo
+    \li \c /opt/foolib/foo.fr_ca.qm
+    \li \c /opt/foolib/foo.fr_ca
+    \li \c /opt/foolib/foo.fr.qm
+    \li \c /opt/foolib/foo.fr
+    \li \c /opt/foolib/foo.qm
+    \li \c /opt/foolib/foo
     \endlist
 */
 
@@ -599,10 +599,10 @@ static QString find_translation(const QLocale & locale,
     in the following order:
 
     \list 1
-    \o File name without \a suffix appended.
-    \o File name with ui language part after a "_" character stripped and \a suffix.
-    \o File name with ui language part stripped without \a suffix appended.
-    \o File name with ui language part stripped further, etc.
+    \li File name without \a suffix appended.
+    \li File name with ui language part after a "_" character stripped and \a suffix.
+    \li File name with ui language part stripped without \a suffix appended.
+    \li File name with ui language part stripped further, etc.
     \endlist
 
     For example, an application running in the locale with the following
@@ -612,17 +612,17 @@ static QString find_translation(const QLocale & locale,
     open the first existing readable file from this list:
 
     \list 1
-    \o \c /opt/foolib/foo.es.qm
-    \o \c /opt/foolib/foo.es
-    \o \c /opt/foolib/foo.fr_CA.qm
-    \o \c /opt/foolib/foo.fr_CA
-    \o \c /opt/foolib/foo.de.qm
-    \o \c /opt/foolib/foo.de
-    \o \c /opt/foolib/foo.fr.qm
-    \o \c /opt/foolib/foo.fr
-    \o \c /opt/foolib/foo.qm
-    \o \c /opt/foolib/foo.
-    \o \c /opt/foolib/foo
+    \li \c /opt/foolib/foo.es.qm
+    \li \c /opt/foolib/foo.es
+    \li \c /opt/foolib/foo.fr_CA.qm
+    \li \c /opt/foolib/foo.fr_CA
+    \li \c /opt/foolib/foo.de.qm
+    \li \c /opt/foolib/foo.de
+    \li \c /opt/foolib/foo.fr.qm
+    \li \c /opt/foolib/foo.fr
+    \li \c /opt/foolib/foo.qm
+    \li \c /opt/foolib/foo.
+    \li \c /opt/foolib/foo
     \endlist
 
     On operating systems where file system is case sensitive, QTranslator also
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 1c18883fde..4f3e4f8b4e 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -2174,7 +2174,7 @@ inline T qNumVariantToHelper(const QVariant::Private &d,
     If \a ok is non-null: \c{*}\a{ok} is set to true if the value could be
     converted to an int; otherwise \c{*}\a{ok} is set to false.
 
-    \bold{Warning:} If the value is convertible to a \l LongLong but is too
+    \b{Warning:} If the value is convertible to a \l LongLong but is too
     large to be represented in an int, the resulting arithmetic overflow will
     not be reflected in \a ok. A simple workaround is to use QString::toInt().
     Fixing this bug has been postponed to Qt 5 in order to avoid breaking existing code.
@@ -2194,7 +2194,7 @@ int QVariant::toInt(bool *ok) const
     If \a ok is non-null: \c{*}\a{ok} is set to true if the value could be
     converted to an unsigned int; otherwise \c{*}\a{ok} is set to false.
 
-    \bold{Warning:} If the value is convertible to a \l ULongLong but is too
+    \b{Warning:} If the value is convertible to a \l ULongLong but is too
     large to be represented in an unsigned int, the resulting arithmetic overflow will
     not be reflected in \a ok. A simple workaround is to use QString::toUInt().
     Fixing this bug has been postponed to Qt 5 in order to avoid breaking existing code.
@@ -2411,28 +2411,28 @@ static const quint32 qCanConvertMatrix[QVariant::LastCoreType + 1] =
     The following casts are done automatically:
 
     \table
-    \header \o Type \o Automatically Cast To
-    \row \o \l Bool \o \l Char, \l Double, \l Int, \l LongLong, \l String, \l UInt, \l ULongLong
-    \row \o \l ByteArray \o \l Double, \l Int, \l LongLong, \l String, \l UInt, \l ULongLong
-    \row \o \l Char \o \l Bool, \l Int, \l UInt, \l LongLong, \l ULongLong
-    \row \o \l Color \o \l String
-    \row \o \l Date \o \l DateTime, \l String
-    \row \o \l DateTime \o \l Date, \l String, \l Time
-    \row \o \l Double \o \l Bool, \l Int, \l LongLong, \l String, \l UInt, \l ULongLong
-    \row \o \l Font \o \l String
-    \row \o \l Int \o \l Bool, \l Char, \l Double, \l LongLong, \l String, \l UInt, \l ULongLong
-    \row \o \l KeySequence \o \l Int, \l String
-    \row \o \l List \o \l StringList (if the list's items can be converted to strings)
-    \row \o \l LongLong \o \l Bool, \l ByteArray, \l Char, \l Double, \l Int, \l String, \l UInt, \l ULongLong
-    \row \o \l Point \o PointF
-    \row \o \l Rect \o RectF
-    \row \o \l String \o \l Bool, \l ByteArray, \l Char, \l Color, \l Date, \l DateTime, \l Double,
+    \header \li Type \li Automatically Cast To
+    \row \li \l Bool \li \l Char, \l Double, \l Int, \l LongLong, \l String, \l UInt, \l ULongLong
+    \row \li \l ByteArray \li \l Double, \l Int, \l LongLong, \l String, \l UInt, \l ULongLong
+    \row \li \l Char \li \l Bool, \l Int, \l UInt, \l LongLong, \l ULongLong
+    \row \li \l Color \li \l String
+    \row \li \l Date \li \l DateTime, \l String
+    \row \li \l DateTime \li \l Date, \l String, \l Time
+    \row \li \l Double \li \l Bool, \l Int, \l LongLong, \l String, \l UInt, \l ULongLong
+    \row \li \l Font \li \l String
+    \row \li \l Int \li \l Bool, \l Char, \l Double, \l LongLong, \l String, \l UInt, \l ULongLong
+    \row \li \l KeySequence \li \l Int, \l String
+    \row \li \l List \li \l StringList (if the list's items can be converted to strings)
+    \row \li \l LongLong \li \l Bool, \l ByteArray, \l Char, \l Double, \l Int, \l String, \l UInt, \l ULongLong
+    \row \li \l Point \li PointF
+    \row \li \l Rect \li RectF
+    \row \li \l String \li \l Bool, \l ByteArray, \l Char, \l Color, \l Date, \l DateTime, \l Double,
                          \l Font, \l Int, \l KeySequence, \l LongLong, \l StringList, \l Time, \l UInt,
                          \l ULongLong
-    \row \o \l StringList \o \l List, \l String (if the list contains exactly one item)
-    \row \o \l Time \o \l String
-    \row \o \l UInt \o \l Bool, \l Char, \l Double, \l Int, \l LongLong, \l String, \l ULongLong
-    \row \o \l ULongLong \o \l Bool, \l Char, \l Double, \l Int, \l LongLong, \l String, \l UInt
+    \row \li \l StringList \li \l List, \l String (if the list contains exactly one item)
+    \row \li \l Time \li \l String
+    \row \li \l UInt \li \l Bool, \l Char, \l Double, \l Int, \l LongLong, \l String, \l ULongLong
+    \row \li \l ULongLong \li \l Bool, \l Char, \l Double, \l Int, \l LongLong, \l String, \l UInt
     \endtable
 
     \sa convert()
diff --git a/src/corelib/kernel/qwineventnotifier.cpp b/src/corelib/kernel/qwineventnotifier.cpp
index 11a2dc83f5..58ca046d9d 100644
--- a/src/corelib/kernel/qwineventnotifier.cpp
+++ b/src/corelib/kernel/qwineventnotifier.cpp
@@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE
     Finally, you can use the setHandle() function to register a new event
     object, and the handle() function to retrieve the event handle.
 
-    \bold{Further information:}
+    \b{Further information:}
     Although the class is called QWinEventNotifier, it can be used for
     certain other objects which are so-called synchronization
     objects, such as Processes, Threads, Waitable timers.
@@ -140,7 +140,7 @@ QWinEventNotifier::~QWinEventNotifier()
     Register the HANDLE \a hEvent. The old HANDLE will be automatically
     unregistered.
 
-    \bold Note: The notifier will be disabled as a side effect and needs
+    \b Note: The notifier will be disabled as a side effect and needs
     to be re-enabled.
 
     \sa handle(), setEnabled()
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index b171577184..216e6e1e7c 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -596,12 +596,12 @@ bool QLibraryPrivate::loadPlugin()
     library; otherwise returns false.
 
     \table
-    \header \i Platform \i Valid suffixes
-    \row \i Windows     \i \c .dll, \c .DLL
-    \row \i Unix/Linux  \i \c .so
-    \row \i AIX  \i \c .a
-    \row \i HP-UX       \i \c .sl, \c .so (HP-UXi)
-    \row \i Mac OS X    \i \c .dylib, \c .bundle, \c .so
+    \header \li Platform \li Valid suffixes
+    \row \li Windows     \li \c .dll, \c .DLL
+    \row \li Unix/Linux  \li \c .so
+    \row \li AIX  \li \c .a
+    \row \li HP-UX       \li \c .sl, \c .so (HP-UXi)
+    \row \li Mac OS X    \li \c .dylib, \c .bundle, \c .so
     \endtable
 
     Trailing versioning numbers on Unix are ignored.
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
index d652b251f1..f198f108da 100644
--- a/src/corelib/plugin/qpluginloader.cpp
+++ b/src/corelib/plugin/qpluginloader.cpp
@@ -66,9 +66,9 @@ QT_BEGIN_NAMESPACE
     using QLibrary:
 
     \list
-    \o QPluginLoader checks that a plugin is linked against the same
+    \li QPluginLoader checks that a plugin is linked against the same
        version of Qt as the application.
-    \o QPluginLoader provides direct access to a root component object
+    \li QPluginLoader provides direct access to a root component object
        (instance()), instead of forcing you to resolve a C function manually.
     \endlist
 
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp
index 3d7988a8fc..26032323e0 100644
--- a/src/corelib/plugin/quuid.cpp
+++ b/src/corelib/plugin/quuid.cpp
@@ -190,34 +190,34 @@ static QUuid createFromName(const QUuid &ns, const QByteArray &baseData, QCrypto
 
     \table
     \header
-    \o msb0
-    \o msb1
-    \o msb2
-    \o Variant 
+    \li msb0
+    \li msb1
+    \li msb2
+    \li Variant
 
     \row
-    \o 0
-    \o x
-    \o x
-    \o NCS (Network Computing System)
+    \li 0
+    \li x
+    \li x
+    \li NCS (Network Computing System)
 
     \row
-    \o 1
-    \o 0
-    \o x
-    \o DCE (Distributed Computing Environment)
+    \li 1
+    \li 0
+    \li x
+    \li DCE (Distributed Computing Environment)
 
     \row
-    \o 1
-    \o 1
-    \o 0
-    \o Microsoft (GUID)
+    \li 1
+    \li 1
+    \li 0
+    \li Microsoft (GUID)
 
     \row
-    \o 1
-    \o 1
-    \o 1
-    \o Reserved for future expansion
+    \li 1
+    \li 1
+    \li 1
+    \li Reserved for future expansion
 
     \endtable
 
@@ -234,46 +234,46 @@ static QUuid createFromName(const QUuid &ns, const QByteArray &baseData, QCrypto
 
     \table
     \header
-    \o msb0
-    \o msb1
-    \o msb2
-    \o msb3
-    \o Version
+    \li msb0
+    \li msb1
+    \li msb2
+    \li msb3
+    \li Version
 
     \row
-    \o 0
-    \o 0
-    \o 0
-    \o 1
-    \o Time
+    \li 0
+    \li 0
+    \li 0
+    \li 1
+    \li Time
 
     \row
-    \o 0
-    \o 0
-    \o 1
-    \o 0
-    \o Embedded POSIX
+    \li 0
+    \li 0
+    \li 1
+    \li 0
+    \li Embedded POSIX
 
     \row
-    \o 0
-    \o 0
-    \o 1
-    \o 1
-    \o Md5(Name)
+    \li 0
+    \li 0
+    \li 1
+    \li 1
+    \li Md5(Name)
 
     \row
-    \o 0
-    \o 1
-    \o 0
-    \o 0
-    \o Random
+    \li 0
+    \li 1
+    \li 0
+    \li 0
+    \li Random
 
     \row
-    \o 0
-    \o 1
-    \o 0
-    \o 1
-    \o Sha1
+    \li 0
+    \li 1
+    \li 0
+    \li 1
+    \li Sha1
 
     \endtable
 
@@ -516,28 +516,28 @@ QUuid QUuid::fromRfc4122(const QByteArray &bytes)
 
     \table
     \header
-    \o Field #
-    \o Source
+    \li Field #
+    \li Source
     
     \row
-    \o 1
-    \o data1
+    \li 1
+    \li data1
     
     \row
-    \o 2
-    \o data2
+    \li 2
+    \li data2
     
     \row
-    \o 3
-    \o data3
+    \li 3
+    \li data3
     
     \row
-    \o 4
-    \o data4[0] .. data4[1]
+    \li 4
+    \li data4[0] .. data4[1]
     
     \row
-    \o 5
-    \o data4[2] .. data4[7]
+    \li 5
+    \li data4[2] .. data4[7]
 
     \endtable
 */
@@ -560,28 +560,28 @@ QString QUuid::toString() const
 
     \table
     \header
-    \o Field #
-    \o Source
+    \li Field #
+    \li Source
 
     \row
-    \o 1
-    \o data1
+    \li 1
+    \li data1
 
     \row
-    \o 2
-    \o data2
+    \li 2
+    \li data2
 
     \row
-    \o 3
-    \o data3
+    \li 3
+    \li data3
 
     \row
-    \o 4
-    \o data4[0] .. data4[1]
+    \li 4
+    \li data4[0] .. data4[1]
 
     \row
-    \o 5
-    \o data4[2] .. data4[7]
+    \li 5
+    \li data4[2] .. data4[7]
 
     \endtable
 
@@ -607,24 +607,24 @@ QByteArray QUuid::toByteArray() const
 
     \table
     \header
-    \o Field #
-    \o Source
+    \li Field #
+    \li Source
 
     \row
-    \o 1
-    \o data1
+    \li 1
+    \li data1
 
     \row
-    \o 2
-    \o data2
+    \li 2
+    \li data2
 
     \row
-    \o 3
-    \o data3
+    \li 3
+    \li data3
 
     \row
-    \o 4
-    \o data4[0] .. data4[7]
+    \li 4
+    \li data4[0] .. data4[7]
 
     \endtable
 
diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp
index 5443d6e1b6..2e3029f3fa 100644
--- a/src/corelib/thread/qatomic.cpp
+++ b/src/corelib/thread/qatomic.cpp
@@ -83,16 +83,16 @@
 
     \list
 
-    \o Relaxed - memory ordering is unspecified, leaving the compiler
+    \li Relaxed - memory ordering is unspecified, leaving the compiler
     and processor to freely reorder memory accesses.
 
-    \o Acquire - memory access following the atomic operation (in
+    \li Acquire - memory access following the atomic operation (in
     program order) may not be re-ordered before the atomic operation.
 
-    \o Release - memory access before the atomic operation (in program
+    \li Release - memory access before the atomic operation (in program
     order) may not be re-ordered after the atomic operation.
 
-    \o Ordered - the same Acquire and Release semantics combined.
+    \li Ordered - the same Acquire and Release semantics combined.
 
     \endlist
 
@@ -180,25 +180,25 @@
 
     \list
 
-    \o Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE
-    \o Q_ATOMIC_INT_REFERENCE_COUNTING_IS_SOMETIMES_NATIVE
-    \o Q_ATOMIC_INT_REFERENCE_COUNTING_IS_NOT_NATIVE
-    \o Q_ATOMIC_INT_REFERENCE_COUNTING_IS_WAIT_FREE
+    \li Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE
+    \li Q_ATOMIC_INT_REFERENCE_COUNTING_IS_SOMETIMES_NATIVE
+    \li Q_ATOMIC_INT_REFERENCE_COUNTING_IS_NOT_NATIVE
+    \li Q_ATOMIC_INT_REFERENCE_COUNTING_IS_WAIT_FREE
 
-    \o Q_ATOMIC_INT_TEST_AND_SET_IS_ALWAYS_NATIVE
-    \o Q_ATOMIC_INT_TEST_AND_SET_IS_SOMETIMES_NATIVE
-    \o Q_ATOMIC_INT_TEST_AND_SET_IS_NOT_NATIVE
-    \o Q_ATOMIC_INT_TEST_AND_SET_IS_WAIT_FREE
+    \li Q_ATOMIC_INT_TEST_AND_SET_IS_ALWAYS_NATIVE
+    \li Q_ATOMIC_INT_TEST_AND_SET_IS_SOMETIMES_NATIVE
+    \li Q_ATOMIC_INT_TEST_AND_SET_IS_NOT_NATIVE
+    \li Q_ATOMIC_INT_TEST_AND_SET_IS_WAIT_FREE
 
-    \o Q_ATOMIC_INT_FETCH_AND_STORE_IS_ALWAYS_NATIVE
-    \o Q_ATOMIC_INT_FETCH_AND_STORE_IS_SOMETIMES_NATIVE
-    \o Q_ATOMIC_INT_FETCH_AND_STORE_IS_NOT_NATIVE
-    \o Q_ATOMIC_INT_FETCH_AND_STORE_IS_WAIT_FREE
+    \li Q_ATOMIC_INT_FETCH_AND_STORE_IS_ALWAYS_NATIVE
+    \li Q_ATOMIC_INT_FETCH_AND_STORE_IS_SOMETIMES_NATIVE
+    \li Q_ATOMIC_INT_FETCH_AND_STORE_IS_NOT_NATIVE
+    \li Q_ATOMIC_INT_FETCH_AND_STORE_IS_WAIT_FREE
 
-    \o Q_ATOMIC_INT_FETCH_AND_ADD_IS_ALWAYS_NATIVE
-    \o Q_ATOMIC_INT_FETCH_AND_ADD_IS_SOMETIMES_NATIVE
-    \o Q_ATOMIC_INT_FETCH_AND_ADD_IS_NOT_NATIVE
-    \o Q_ATOMIC_INT_FETCH_AND_ADD_IS_WAIT_FREE
+    \li Q_ATOMIC_INT_FETCH_AND_ADD_IS_ALWAYS_NATIVE
+    \li Q_ATOMIC_INT_FETCH_AND_ADD_IS_SOMETIMES_NATIVE
+    \li Q_ATOMIC_INT_FETCH_AND_ADD_IS_NOT_NATIVE
+    \li Q_ATOMIC_INT_FETCH_AND_ADD_IS_WAIT_FREE
 
     \endlist
 
@@ -658,16 +658,16 @@
 
     \list
 
-    \o Relaxed - memory ordering is unspecified, leaving the compiler
+    \li Relaxed - memory ordering is unspecified, leaving the compiler
     and processor to freely reorder memory accesses.
 
-    \o Acquire - memory access following the atomic operation (in
+    \li Acquire - memory access following the atomic operation (in
     program order) may not be re-ordered before the atomic operation.
 
-    \o Release - memory access before the atomic operation (in program
+    \li Release - memory access before the atomic operation (in program
     order) may not be re-ordered after the atomic operation.
 
-    \o Ordered - the same Acquire and Release semantics combined.
+    \li Ordered - the same Acquire and Release semantics combined.
 
     \endlist
 
@@ -753,20 +753,20 @@
 
     \list
 
-    \o Q_ATOMIC_POINTER_TEST_AND_SET_IS_ALWAYS_NATIVE
-    \o Q_ATOMIC_POINTER_TEST_AND_SET_IS_SOMETIMES_NATIVE
-    \o Q_ATOMIC_POINTER_TEST_AND_SET_IS_NOT_NATIVE
-    \o Q_ATOMIC_POINTER_TEST_AND_SET_IS_WAIT_FREE
+    \li Q_ATOMIC_POINTER_TEST_AND_SET_IS_ALWAYS_NATIVE
+    \li Q_ATOMIC_POINTER_TEST_AND_SET_IS_SOMETIMES_NATIVE
+    \li Q_ATOMIC_POINTER_TEST_AND_SET_IS_NOT_NATIVE
+    \li Q_ATOMIC_POINTER_TEST_AND_SET_IS_WAIT_FREE
 
-    \o Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_ALWAYS_NATIVE
-    \o Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_SOMETIMES_NATIVE
-    \o Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_NOT_NATIVE
-    \o Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_WAIT_FREE
+    \li Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_ALWAYS_NATIVE
+    \li Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_SOMETIMES_NATIVE
+    \li Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_NOT_NATIVE
+    \li Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_WAIT_FREE
 
-    \o Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_ALWAYS_NATIVE
-    \o Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_SOMETIMES_NATIVE
-    \o Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_NOT_NATIVE
-    \o Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_WAIT_FREE
+    \li Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_ALWAYS_NATIVE
+    \li Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_SOMETIMES_NATIVE
+    \li Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_NOT_NATIVE
+    \li Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_WAIT_FREE
 
     \endlist
 
diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp
index 52f5a1d699..08952eeaa3 100644
--- a/src/corelib/thread/qsemaphore.cpp
+++ b/src/corelib/thread/qsemaphore.cpp
@@ -66,10 +66,10 @@ QT_BEGIN_NAMESPACE
     release():
 
     \list
-    \o acquire(\e{n}) tries to acquire \e n resources. If there aren't
+    \li acquire(\e{n}) tries to acquire \e n resources. If there aren't
        that many resources available, the call will block until this
        is the case.
-    \o release(\e{n}) releases \e n resources.
+    \li release(\e{n}) releases \e n resources.
     \endlist
 
     There's also a tryAcquire() function that returns immediately if
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index a071463178..64fd8776ce 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -658,11 +658,11 @@ QThread::Priority QThread::priority() const
     Blocks the thread until either of these conditions is met:
 
     \list
-    \o The thread associated with this QThread object has finished
+    \li The thread associated with this QThread object has finished
        execution (i.e. when it returns from \l{run()}). This function
        will return true if the thread has finished. It also returns
        true if the thread has not been started yet.
-    \o \a time milliseconds has elapsed. If \a time is ULONG_MAX (the
+    \li \a time milliseconds has elapsed. If \a time is ULONG_MAX (the
         default), then the wait will never timeout (the thread must
         return from \l{run()}). This function will return false if the
         wait timed out.
diff --git a/src/corelib/thread/qthreadstorage.cpp b/src/corelib/thread/qthreadstorage.cpp
index 1dfa3305bc..68db8fe261 100644
--- a/src/corelib/thread/qthreadstorage.cpp
+++ b/src/corelib/thread/qthreadstorage.cpp
@@ -246,11 +246,11 @@ void QThreadStorageData::finish(void **p)
 
     \list
 
-    \o The QThreadStorage destructor does not delete per-thread data.
+    \li The QThreadStorage destructor does not delete per-thread data.
     QThreadStorage only deletes per-thread data when the thread exits
     or when setLocalData() is called multiple times.
 
-    \o QThreadStorage can be used to store data for the \c main()
+    \li QThreadStorage can be used to store data for the \c main()
     thread. QThreadStorage deletes all data set for the \c main()
     thread when QApplication is destroyed, regardless of whether or
     not the \c main() thread has actually finished.
diff --git a/src/corelib/thread/qwaitcondition.qdoc b/src/corelib/thread/qwaitcondition.qdoc
index 7b861f8f7a..8c93bd167d 100644
--- a/src/corelib/thread/qwaitcondition.qdoc
+++ b/src/corelib/thread/qwaitcondition.qdoc
@@ -129,9 +129,9 @@
     calling thread will block until either of these conditions is met:
 
     \list
-    \o Another thread signals it using wakeOne() or wakeAll(). This
+    \li Another thread signals it using wakeOne() or wakeAll(). This
        function will return true in this case.
-    \o \a time milliseconds has elapsed. If \a time is \c ULONG_MAX
+    \li \a time milliseconds has elapsed. If \a time is \c ULONG_MAX
        (the default), then the wait will never timeout (the event
        must be signalled). This function will return false if the
        wait timed out.
@@ -157,9 +157,9 @@
     calling thread will block until either of these conditions is met:
 
     \list
-    \o Another thread signals it using wakeOne() or wakeAll(). This
+    \li Another thread signals it using wakeOne() or wakeAll(). This
        function will return true in this case.
-    \o \a time milliseconds has elapsed. If \a time is \c ULONG_MAX
+    \li \a time milliseconds has elapsed. If \a time is \c ULONG_MAX
        (the default), then the wait will never timeout (the event
        must be signalled). This function will return false if the
        wait timed out.
diff --git a/src/corelib/tools/qalgorithms.qdoc b/src/corelib/tools/qalgorithms.qdoc
index a16ed8b3dc..5a4a278ad0 100644
--- a/src/corelib/tools/qalgorithms.qdoc
+++ b/src/corelib/tools/qalgorithms.qdoc
@@ -159,14 +159,14 @@
     bidirectional iterator, and supports the following operations:
 
     \table
-    \row \i \c{i += n} \i advances iterator \c i by \c n positions
-    \row \i \c{i -= n} \i moves iterator \c i back by \c n positions
-    \row \i \c{i + n} or \c{n + i} \i returns the iterator for the item \c
+    \row \li \c{i += n} \li advances iterator \c i by \c n positions
+    \row \li \c{i -= n} \li moves iterator \c i back by \c n positions
+    \row \li \c{i + n} or \c{n + i} \li returns the iterator for the item \c
        n positions ahead of iterator \c i
-    \row \i \c{i - n} \i returns the iterator for the item \c n positions behind of iterator \c i
-    \row \i \c{i - j} \i returns the number of items between iterators \c i and \c j
-    \row \i \c{i[n]} \i same as \c{*(i + n)}
-    \row \i \c{i < j} \i returns true if iterator \c j comes after iterator \c i
+    \row \li \c{i - n} \li returns the iterator for the item \c n positions behind of iterator \c i
+    \row \li \c{i - j} \li returns the number of items between iterators \c i and \c j
+    \row \li \c{i[n]} \li same as \c{*(i + n)}
+    \row \li \c{i < j} \li returns true if iterator \c j comes after iterator \c i
     \endtable
 
     QList and QVector's non-const iterator types are random access iterators.
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index c74c61999d..445fe5cd81 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -505,7 +505,7 @@ QByteArray qCompress(const uchar* data, int nbytes, int compressionLevel)
     from this and any earlier Qt version, back to Qt 3.1 when this
     feature was added.
 
-    \bold{Note:} If you want to use this function to uncompress external
+    \b{Note:} If you want to use this function to uncompress external
     data that was compressed using zlib, you first need to prepend a four
     byte header to the byte array containing the data. The header must
     contain the expected length (in bytes) of the uncompressed data,
@@ -3687,12 +3687,12 @@ QByteArray &QByteArray::setNum(qulonglong n, int base)
     The format \a f can be any of the following:
 
     \table
-    \header \i Format \i Meaning
-    \row \i \c e \i format as [-]9.9e[+|-]999
-    \row \i \c E \i format as [-]9.9E[+|-]999
-    \row \i \c f \i format as [-]9.9
-    \row \i \c g \i use \c e or \c f format, whichever is the most concise
-    \row \i \c G \i use \c E or \c f format, whichever is the most concise
+    \header \li Format \li Meaning
+    \row \li \c e \li format as [-]9.9e[+|-]999
+    \row \li \c E \li format as [-]9.9E[+|-]999
+    \row \li \c f \li format as [-]9.9
+    \row \li \c g \li use \c e or \c f format, whichever is the most concise
+    \row \li \c G \li use \c E or \c f format, whichever is the most concise
     \endtable
 
     With 'e', 'E', and 'f', \a prec is the number of digits after the
@@ -3816,12 +3816,12 @@ QByteArray QByteArray::number(qulonglong n, int base)
     which is \c g by default, and can be any of the following:
 
     \table
-    \header \i Format \i Meaning
-    \row \i \c e \i format as [-]9.9e[+|-]999
-    \row \i \c E \i format as [-]9.9E[+|-]999
-    \row \i \c f \i format as [-]9.9
-    \row \i \c g \i use \c e or \c f format, whichever is the most concise
-    \row \i \c G \i use \c E or \c f format, whichever is the most concise
+    \header \li Format \li Meaning
+    \row \li \c e \li format as [-]9.9e[+|-]999
+    \row \li \c E \li format as [-]9.9E[+|-]999
+    \row \li \c f \li format as [-]9.9
+    \row \li \c g \li use \c e or \c f format, whichever is the most concise
+    \row \li \c G \li use \c E or \c f format, whichever is the most concise
     \endtable
 
     With 'e', 'E', and 'f', \a prec is the number of digits after the
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 70efb5db22..64ad3121d0 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -306,18 +306,18 @@ int QDate::year() const
     the following convention:
 
     \list
-    \i 1 = "January"
-    \i 2 = "February"
-    \i 3 = "March"
-    \i 4 = "April"
-    \i 5 = "May"
-    \i 6 = "June"
-    \i 7 = "July"
-    \i 8 = "August"
-    \i 9 = "September"
-    \i 10 = "October"
-    \i 11 = "November"
-    \i 12 = "December"
+    \li 1 = "January"
+    \li 2 = "February"
+    \li 3 = "March"
+    \li 4 = "April"
+    \li 5 = "May"
+    \li 6 = "June"
+    \li 7 = "July"
+    \li 8 = "August"
+    \li 9 = "September"
+    \li 10 = "October"
+    \li 11 = "November"
+    \li 12 = "December"
     \endlist
 
     Returns 0 if the date is invalid.
@@ -521,18 +521,18 @@ int QDate::weekNumber(int *yearNumber) const
     The months are enumerated using the following convention:
 
     \list
-    \i 1 = "Jan"
-    \i 2 = "Feb"
-    \i 3 = "Mar"
-    \i 4 = "Apr"
-    \i 5 = "May"
-    \i 6 = "Jun"
-    \i 7 = "Jul"
-    \i 8 = "Aug"
-    \i 9 = "Sep"
-    \i 10 = "Oct"
-    \i 11 = "Nov"
-    \i 12 = "Dec"
+    \li 1 = "Jan"
+    \li 2 = "Feb"
+    \li 3 = "Mar"
+    \li 4 = "Apr"
+    \li 5 = "May"
+    \li 6 = "Jun"
+    \li 7 = "Jul"
+    \li 8 = "Aug"
+    \li 9 = "Sep"
+    \li 10 = "Oct"
+    \li 11 = "Nov"
+    \li 12 = "Dec"
     \endlist
 
     The month names will be localized according to the system's locale
@@ -568,18 +568,18 @@ QString QDate::shortMonthName(int month, QDate::MonthNameType type)
     The months are enumerated using the following convention:
 
     \list
-    \i 1 = "January"
-    \i 2 = "February"
-    \i 3 = "March"
-    \i 4 = "April"
-    \i 5 = "May"
-    \i 6 = "June"
-    \i 7 = "July"
-    \i 8 = "August"
-    \i 9 = "September"
-    \i 10 = "October"
-    \i 11 = "November"
-    \i 12 = "December"
+    \li 1 = "January"
+    \li 2 = "February"
+    \li 3 = "March"
+    \li 4 = "April"
+    \li 5 = "May"
+    \li 6 = "June"
+    \li 7 = "July"
+    \li 8 = "August"
+    \li 9 = "September"
+    \li 10 = "October"
+    \li 11 = "November"
+    \li 12 = "December"
     \endlist
 
     The month names will be localized according to the system's locale
@@ -615,13 +615,13 @@ QString QDate::longMonthName(int month, MonthNameType type)
     The days are enumerated using the following convention:
 
     \list
-    \i 1 = "Mon"
-    \i 2 = "Tue"
-    \i 3 = "Wed"
-    \i 4 = "Thu"
-    \i 5 = "Fri"
-    \i 6 = "Sat"
-    \i 7 = "Sun"
+    \li 1 = "Mon"
+    \li 2 = "Tue"
+    \li 3 = "Wed"
+    \li 4 = "Thu"
+    \li 5 = "Fri"
+    \li 6 = "Sat"
+    \li 7 = "Sun"
     \endlist
 
     The day names will be localized according to the system's locale
@@ -657,13 +657,13 @@ QString QDate::shortDayName(int weekday, MonthNameType type)
     The days are enumerated using the following convention:
 
     \list
-    \i 1 = "Monday"
-    \i 2 = "Tuesday"
-    \i 3 = "Wednesday"
-    \i 4 = "Thursday"
-    \i 5 = "Friday"
-    \i 6 = "Saturday"
-    \i 7 = "Sunday"
+    \li 1 = "Monday"
+    \li 2 = "Tuesday"
+    \li 3 = "Wednesday"
+    \li 4 = "Thursday"
+    \li 5 = "Friday"
+    \li 6 = "Saturday"
+    \li 7 = "Sunday"
     \endlist
 
     The day names will be localized according to the system's locale
@@ -781,25 +781,25 @@ QString QDate::toString(Qt::DateFormat f) const
     These expressions may be used:
 
     \table
-    \header \i Expression \i Output
-    \row \i d \i the day as number without a leading zero (1 to 31)
-    \row \i dd \i the day as number with a leading zero (01 to 31)
-    \row \i ddd
-         \i the abbreviated localized day name (e.g. 'Mon' to 'Sun').
+    \header \li Expression \li Output
+    \row \li d \li the day as number without a leading zero (1 to 31)
+    \row \li dd \li the day as number with a leading zero (01 to 31)
+    \row \li ddd
+         \li the abbreviated localized day name (e.g. 'Mon' to 'Sun').
             Uses QDate::shortDayName().
-    \row \i dddd
-         \i the long localized day name (e.g. 'Monday' to 'Sunday').
+    \row \li dddd
+         \li the long localized day name (e.g. 'Monday' to 'Sunday').
             Uses QDate::longDayName().
-    \row \i M \i the month as number without a leading zero (1 to 12)
-    \row \i MM \i the month as number with a leading zero (01 to 12)
-    \row \i MMM
-         \i the abbreviated localized month name (e.g. 'Jan' to 'Dec').
+    \row \li M \li the month as number without a leading zero (1 to 12)
+    \row \li MM \li the month as number with a leading zero (01 to 12)
+    \row \li MMM
+         \li the abbreviated localized month name (e.g. 'Jan' to 'Dec').
             Uses QDate::shortMonthName().
-    \row \i MMMM
-         \i the long localized month name (e.g. 'January' to 'December').
+    \row \li MMMM
+         \li the long localized month name (e.g. 'January' to 'December').
             Uses QDate::longMonthName().
-    \row \i yy \i the year as two digit number (00 to 99)
-    \row \i yyyy \i the year as four digit number. If the year is negative,
+    \row \li yy \li the year as two digit number (00 to 99)
+    \row \li yyyy \li the year as four digit number. If the year is negative,
             a minus sign is prepended in addition.
     \endtable
 
@@ -812,10 +812,10 @@ QString QDate::toString(Qt::DateFormat f) const
     1969):
 
     \table
-    \header \o Format            \o Result
-    \row    \o dd.MM.yyyy        \o 20.07.1969
-    \row    \o ddd MMMM d yy     \o Sun July 20 69
-    \row    \o 'The day is' dddd \o The day is Sunday
+    \header \li Format            \li Result
+    \row    \li dd.MM.yyyy        \li 20.07.1969
+    \row    \li ddd MMMM d yy     \li Sun July 20 69
+    \row    \li 'The day is' dddd \li The day is Sunday
     \endtable
 
     If the datetime is invalid, an empty string will be returned.
@@ -1191,25 +1191,25 @@ QDate QDate::fromString(const QString& s, Qt::DateFormat f)
     These expressions may be used for the format:
 
     \table
-    \header \i Expression \i Output
-    \row \i d \i The day as a number without a leading zero (1 to 31)
-    \row \i dd \i The day as a number with a leading zero (01 to 31)
-    \row \i ddd
-         \i The abbreviated localized day name (e.g. 'Mon' to 'Sun').
+    \header \li Expression \li Output
+    \row \li d \li The day as a number without a leading zero (1 to 31)
+    \row \li dd \li The day as a number with a leading zero (01 to 31)
+    \row \li ddd
+         \li The abbreviated localized day name (e.g. 'Mon' to 'Sun').
             Uses QDate::shortDayName().
-    \row \i dddd
-         \i The long localized day name (e.g. 'Monday' to 'Sunday').
+    \row \li dddd
+         \li The long localized day name (e.g. 'Monday' to 'Sunday').
             Uses QDate::longDayName().
-    \row \i M \i The month as a number without a leading zero (1 to 12)
-    \row \i MM \i The month as a number with a leading zero (01 to 12)
-    \row \i MMM
-         \i The abbreviated localized month name (e.g. 'Jan' to 'Dec').
+    \row \li M \li The month as a number without a leading zero (1 to 12)
+    \row \li MM \li The month as a number with a leading zero (01 to 12)
+    \row \li MMM
+         \li The abbreviated localized month name (e.g. 'Jan' to 'Dec').
             Uses QDate::shortMonthName().
-    \row \i MMMM
-         \i The long localized month name (e.g. 'January' to 'December').
+    \row \li MMMM
+         \li The long localized month name (e.g. 'January' to 'December').
             Uses QDate::longMonthName().
-    \row \i yy \i The year as two digit number (00 to 99)
-    \row \i yyyy \i The year as four digit number. If the year is negative,
+    \row \li yy \li The year as two digit number (00 to 99)
+    \row \li yyyy \li The year as four digit number. If the year is negative,
             a minus sign is prepended in addition.
     \endtable
 
@@ -1233,10 +1233,10 @@ QDate QDate::fromString(const QString& s, Qt::DateFormat f)
     defaults are used:
 
     \table
-    \header \i Field  \i Default value
-    \row    \i Year   \i 1900
-    \row    \i Month  \i 1
-    \row    \i Day    \i 1
+    \header \li Field  \li Default value
+    \row    \li Year   \li 1900
+    \row    \li Month  \li 1
+    \row    \li Day    \li 1
     \endtable
 
     The following examples demonstrate the default values:
@@ -1543,26 +1543,26 @@ QString QTime::toString(Qt::DateFormat format) const
     These expressions may be used:
 
     \table
-    \header \i Expression \i Output
-    \row \i h
-         \i the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)
-    \row \i hh
-         \i the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)
-    \row \i H
-         \i the hour without a leading zero (0 to 23, even with AM/PM display)
-    \row \i HH
-         \i the hour with a leading zero (00 to 23, even with AM/PM display)
-    \row \i m \i the minute without a leading zero (0 to 59)
-    \row \i mm \i the minute with a leading zero (00 to 59)
-    \row \i s \i the second without a leading zero (0 to 59)
-    \row \i ss \i the second with a leading zero (00 to 59)
-    \row \i z \i the milliseconds without leading zeroes (0 to 999)
-    \row \i zzz \i the milliseconds with leading zeroes (000 to 999)
-    \row \i AP or A
-         \i use AM/PM display. \e AP will be replaced by either "AM" or "PM".
-    \row \i ap or a
-         \i use am/pm display. \e ap will be replaced by either "am" or "pm".
-    \row \i t \i the timezone (for example "CEST")
+    \header \li Expression \li Output
+    \row \li h
+         \li the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)
+    \row \li hh
+         \li the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)
+    \row \li H
+         \li the hour without a leading zero (0 to 23, even with AM/PM display)
+    \row \li HH
+         \li the hour with a leading zero (00 to 23, even with AM/PM display)
+    \row \li m \li the minute without a leading zero (0 to 59)
+    \row \li mm \li the minute with a leading zero (00 to 59)
+    \row \li s \li the second without a leading zero (0 to 59)
+    \row \li ss \li the second with a leading zero (00 to 59)
+    \row \li z \li the milliseconds without leading zeroes (0 to 999)
+    \row \li zzz \li the milliseconds with leading zeroes (000 to 999)
+    \row \li AP or A
+         \li use AM/PM display. \e AP will be replaced by either "AM" or "PM".
+    \row \li ap or a
+         \li use am/pm display. \e ap will be replaced by either "am" or "pm".
+    \row \li t \li the timezone (for example "CEST")
     \endtable
 
     All other input characters will be ignored. Any sequence of characters that
@@ -1573,10 +1573,10 @@ QString QTime::toString(Qt::DateFormat format) const
     Example format strings (assuming that the QTime is 14:13:09.042)
 
     \table
-    \header \i Format \i Result
-    \row \i hh:mm:ss.zzz \i 14:13:09.042
-    \row \i h:m:s ap     \i 2:13:9 pm
-    \row \i H:m:s a      \i 14:13:9 pm
+    \header \li Format \li Result
+    \row \li hh:mm:ss.zzz \li 14:13:09.042
+    \row \li h:m:s ap     \li 2:13:9 pm
+    \row \li H:m:s a      \li 14:13:9 pm
     \endtable
 
     If the datetime is invalid, an empty string will be returned.
@@ -1824,21 +1824,21 @@ QTime QTime::fromString(const QString& s, Qt::DateFormat f)
     These expressions may be used for the format:
 
     \table
-    \header \i Expression \i Output
-    \row \i h
-         \i the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)
-    \row \i hh
-         \i the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)
-    \row \i m \i the minute without a leading zero (0 to 59)
-    \row \i mm \i the minute with a leading zero (00 to 59)
-    \row \i s \i the second without a leading zero (0 to 59)
-    \row \i ss \i the second with a leading zero (00 to 59)
-    \row \i z \i the milliseconds without leading zeroes (0 to 999)
-    \row \i zzz \i the milliseconds with leading zeroes (000 to 999)
-    \row \i AP
-         \i interpret as an AM/PM time. \e AP must be either "AM" or "PM".
-    \row \i ap
-         \i Interpret as an AM/PM time. \e ap must be either "am" or "pm".
+    \header \li Expression \li Output
+    \row \li h
+         \li the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)
+    \row \li hh
+         \li the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)
+    \row \li m \li the minute without a leading zero (0 to 59)
+    \row \li mm \li the minute with a leading zero (00 to 59)
+    \row \li s \li the second without a leading zero (0 to 59)
+    \row \li ss \li the second with a leading zero (00 to 59)
+    \row \li z \li the milliseconds without leading zeroes (0 to 999)
+    \row \li zzz \li the milliseconds with leading zeroes (000 to 999)
+    \row \li AP
+         \li interpret as an AM/PM time. \e AP must be either "AM" or "PM".
+    \row \li ap
+         \li Interpret as an AM/PM time. \e ap must be either "am" or "pm".
     \endtable
 
     All other input characters will be treated as text. Any sequence
@@ -2515,45 +2515,45 @@ QString QDateTime::toString(Qt::DateFormat f) const
     These expressions may be used for the date:
 
     \table
-    \header \i Expression \i Output
-    \row \i d \i the day as number without a leading zero (1 to 31)
-    \row \i dd \i the day as number with a leading zero (01 to 31)
-    \row \i ddd
-            \i the abbreviated localized day name (e.g. 'Mon' to 'Sun').
+    \header \li Expression \li Output
+    \row \li d \li the day as number without a leading zero (1 to 31)
+    \row \li dd \li the day as number with a leading zero (01 to 31)
+    \row \li ddd
+            \li the abbreviated localized day name (e.g. 'Mon' to 'Sun').
             Uses QDate::shortDayName().
-    \row \i dddd
-            \i the long localized day name (e.g. 'Monday' to 'Qt::Sunday').
+    \row \li dddd
+            \li the long localized day name (e.g. 'Monday' to 'Qt::Sunday').
             Uses QDate::longDayName().
-    \row \i M \i the month as number without a leading zero (1-12)
-    \row \i MM \i the month as number with a leading zero (01-12)
-    \row \i MMM
-            \i the abbreviated localized month name (e.g. 'Jan' to 'Dec').
+    \row \li M \li the month as number without a leading zero (1-12)
+    \row \li MM \li the month as number with a leading zero (01-12)
+    \row \li MMM
+            \li the abbreviated localized month name (e.g. 'Jan' to 'Dec').
             Uses QDate::shortMonthName().
-    \row \i MMMM
-            \i the long localized month name (e.g. 'January' to 'December').
+    \row \li MMMM
+            \li the long localized month name (e.g. 'January' to 'December').
             Uses QDate::longMonthName().
-    \row \i yy \i the year as two digit number (00-99)
-    \row \i yyyy \i the year as four digit number
+    \row \li yy \li the year as two digit number (00-99)
+    \row \li yyyy \li the year as four digit number
     \endtable
 
     These expressions may be used for the time:
 
     \table
-    \header \i Expression \i Output
-    \row \i h
-         \i the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)
-    \row \i hh
-         \i the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)
-    \row \i m \i the minute without a leading zero (0 to 59)
-    \row \i mm \i the minute with a leading zero (00 to 59)
-    \row \i s \i the second without a leading zero (0 to 59)
-    \row \i ss \i the second with a leading zero (00 to 59)
-    \row \i z \i the milliseconds without leading zeroes (0 to 999)
-    \row \i zzz \i the milliseconds with leading zeroes (000 to 999)
-    \row \i AP
-            \i use AM/PM display. \e AP will be replaced by either "AM" or "PM".
-    \row \i ap
-            \i use am/pm display. \e ap will be replaced by either "am" or "pm".
+    \header \li Expression \li Output
+    \row \li h
+         \li the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)
+    \row \li hh
+         \li the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)
+    \row \li m \li the minute without a leading zero (0 to 59)
+    \row \li mm \li the minute with a leading zero (00 to 59)
+    \row \li s \li the second without a leading zero (0 to 59)
+    \row \li ss \li the second with a leading zero (00 to 59)
+    \row \li z \li the milliseconds without leading zeroes (0 to 999)
+    \row \li zzz \li the milliseconds with leading zeroes (000 to 999)
+    \row \li AP
+            \li use AM/PM display. \e AP will be replaced by either "AM" or "PM".
+    \row \li ap
+            \li use am/pm display. \e ap will be replaced by either "am" or "pm".
     \endtable
 
     All other input characters will be ignored. Any sequence of characters that
@@ -2565,11 +2565,11 @@ QString QDateTime::toString(Qt::DateFormat f) const
     14:13:09):
 
     \table
-    \header \i Format       \i Result
-    \row \i dd.MM.yyyy      \i 21.05.2001
-    \row \i ddd MMMM d yy   \i Tue May 21 01
-    \row \i hh:mm:ss.zzz    \i 14:13:09.042
-    \row \i h:m:s ap        \i 2:13:9 pm
+    \header \li Format       \li Result
+    \row \li dd.MM.yyyy      \li 21.05.2001
+    \row \li ddd MMMM d yy   \li Tue May 21 01
+    \row \li hh:mm:ss.zzz    \li 14:13:09.042
+    \row \li h:m:s ap        \li 2:13:9 pm
     \endtable
 
     If the datetime is invalid, an empty string will be returned.
@@ -3367,25 +3367,25 @@ QDateTime QDateTime::fromString(const QString& s, Qt::DateFormat f)
     These expressions may be used for the date part of the format string:
 
     \table
-    \header \i Expression \i Output
-    \row \i d \i the day as number without a leading zero (1 to 31)
-    \row \i dd \i the day as number with a leading zero (01 to 31)
-    \row \i ddd
-            \i the abbreviated localized day name (e.g. 'Mon' to 'Sun').
+    \header \li Expression \li Output
+    \row \li d \li the day as number without a leading zero (1 to 31)
+    \row \li dd \li the day as number with a leading zero (01 to 31)
+    \row \li ddd
+            \li the abbreviated localized day name (e.g. 'Mon' to 'Sun').
             Uses QDate::shortDayName().
-    \row \i dddd
-            \i the long localized day name (e.g. 'Monday' to 'Sunday').
+    \row \li dddd
+            \li the long localized day name (e.g. 'Monday' to 'Sunday').
             Uses QDate::longDayName().
-    \row \i M \i the month as number without a leading zero (1-12)
-    \row \i MM \i the month as number with a leading zero (01-12)
-    \row \i MMM
-            \i the abbreviated localized month name (e.g. 'Jan' to 'Dec').
+    \row \li M \li the month as number without a leading zero (1-12)
+    \row \li MM \li the month as number with a leading zero (01-12)
+    \row \li MMM
+            \li the abbreviated localized month name (e.g. 'Jan' to 'Dec').
             Uses QDate::shortMonthName().
-    \row \i MMMM
-            \i the long localized month name (e.g. 'January' to 'December').
+    \row \li MMMM
+            \li the long localized month name (e.g. 'January' to 'December').
             Uses QDate::longMonthName().
-    \row \i yy \i the year as two digit number (00-99)
-    \row \i yyyy \i the year as four digit number
+    \row \li yy \li the year as two digit number (00-99)
+    \row \li yyyy \li the year as four digit number
     \endtable
 
     \note Unlike the other version of this function, day and month names must
@@ -3395,25 +3395,25 @@ QDateTime QDateTime::fromString(const QString& s, Qt::DateFormat f)
     These expressions may be used for the time part of the format string:
 
     \table
-    \header \i Expression \i Output
-    \row \i h
-            \i the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)
-    \row \i hh
-            \i the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)
-    \row \i H
-            \i the hour without a leading zero (0 to 23, even with AM/PM display)
-    \row \i HH
-            \i the hour with a leading zero (00 to 23, even with AM/PM display)
-    \row \i m \i the minute without a leading zero (0 to 59)
-    \row \i mm \i the minute with a leading zero (00 to 59)
-    \row \i s \i the second without a leading zero (0 to 59)
-    \row \i ss \i the second with a leading zero (00 to 59)
-    \row \i z \i the milliseconds without leading zeroes (0 to 999)
-    \row \i zzz \i the milliseconds with leading zeroes (000 to 999)
-    \row \i AP or A
-         \i interpret as an AM/PM time. \e AP must be either "AM" or "PM".
-    \row \i ap or a
-         \i Interpret as an AM/PM time. \e ap must be either "am" or "pm".
+    \header \li Expression \li Output
+    \row \li h
+            \li the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)
+    \row \li hh
+            \li the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)
+    \row \li H
+            \li the hour without a leading zero (0 to 23, even with AM/PM display)
+    \row \li HH
+            \li the hour with a leading zero (00 to 23, even with AM/PM display)
+    \row \li m \li the minute without a leading zero (0 to 59)
+    \row \li mm \li the minute with a leading zero (00 to 59)
+    \row \li s \li the second without a leading zero (0 to 59)
+    \row \li ss \li the second with a leading zero (00 to 59)
+    \row \li z \li the milliseconds without leading zeroes (0 to 999)
+    \row \li zzz \li the milliseconds with leading zeroes (000 to 999)
+    \row \li AP or A
+         \li interpret as an AM/PM time. \e AP must be either "AM" or "PM".
+    \row \li ap or a
+         \li Interpret as an AM/PM time. \e ap must be either "am" or "pm".
     \endtable
 
     All other input characters will be treated as text. Any sequence
@@ -3437,13 +3437,13 @@ QDateTime QDateTime::fromString(const QString& s, Qt::DateFormat f)
     defaults are used:
 
     \table
-    \header \i Field  \i Default value
-    \row    \i Year   \i 1900
-    \row    \i Month  \i 1 (January)
-    \row    \i Day    \i 1
-    \row    \i Hour   \i 0
-    \row    \i Minute \i 0
-    \row    \i Second \i 0
+    \header \li Field  \li Default value
+    \row    \li Year   \li 1900
+    \row    \li Month  \li 1 (January)
+    \row    \li Day    \li 1
+    \row    \li Hour   \li 0
+    \row    \li Minute \li 0
+    \row    \li Second \li 0
     \endtable
 
     For example:
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index 36497c59ff..d5703e8b2a 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -547,11 +547,11 @@ void QHashData::checkSanity()
     differences are:
 
     \list
-    \i QHash provides faster lookups than QMap. (See \l{Algorithmic
+    \li QHash provides faster lookups than QMap. (See \l{Algorithmic
        Complexity} for details.)
-    \i When iterating over a QMap, the items are always sorted by
+    \li When iterating over a QMap, the items are always sorted by
        key. With QHash, the items are arbitrarily ordered.
-    \i The key type of a QMap must provide operator<(). The key
+    \li The key type of a QMap must provide operator<(). The key
        type of a QHash must provide operator==() and a global
        hash function called qHash() (see the related non-member
        functions).
diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp
index 78f1c44263..39ec0ed97c 100644
--- a/src/corelib/tools/qline.cpp
+++ b/src/corelib/tools/qline.cpp
@@ -61,8 +61,8 @@ QT_BEGIN_NAMESPACE
 
     \table
     \row
-        \o \inlineimage qline-point.png
-        \o \inlineimage qline-coordinates.png
+        \li \inlineimage qline-point.png
+        \li \inlineimage qline-coordinates.png
     \endtable
 
     The positions of the line's start and end points can be retrieved
@@ -322,8 +322,8 @@ QDataStream &operator>>(QDataStream &stream, QLine &line)
 
     \table
     \row
-        \o \inlineimage qline-point.png
-        \o \inlineimage qline-coordinates.png
+        \li \inlineimage qline-point.png
+        \li \inlineimage qline-coordinates.png
     \endtable
 
     The positions of the line's start and end points can be retrieved
@@ -360,11 +360,11 @@ QDataStream &operator>>(QDataStream &stream, QLine &line)
 
     \table
     \row
-    \o \inlineimage qlinef-unbounded.png
-    \o \inlineimage qlinef-bounded.png
+    \li \inlineimage qlinef-unbounded.png
+    \li \inlineimage qlinef-bounded.png
     \row
-    \o QLineF::UnboundedIntersection
-    \o QLineF::BoundedIntersection
+    \li QLineF::UnboundedIntersection
+    \li QLineF::BoundedIntersection
     \endtable
 
     \value NoIntersection Indicates that the lines do not intersect;
@@ -795,8 +795,8 @@ qreal QLineF::angleTo(const QLineF &l) const
 
   \table
   \row
-  \o \inlineimage qlinef-angle-identicaldirection.png
-  \o \inlineimage qlinef-angle-oppositedirection.png
+  \li \inlineimage qlinef-angle-identicaldirection.png
+  \li \inlineimage qlinef-angle-oppositedirection.png
   \endtable
 
   When the lines are parallel, this function returns 0 if they have
diff --git a/src/corelib/tools/qlinkedlist.cpp b/src/corelib/tools/qlinkedlist.cpp
index e2efaa3639..b31ef3e5e9 100644
--- a/src/corelib/tools/qlinkedlist.cpp
+++ b/src/corelib/tools/qlinkedlist.cpp
@@ -65,16 +65,16 @@ const QLinkedListData QLinkedListData::shared_null = {
     functionality. Here's an overview:
 
     \list
-    \i For most purposes, QList is the right class to use. Its
+    \li For most purposes, QList is the right class to use. Its
        index-based API is more convenient than QLinkedList's
        iterator-based API, and it is usually faster than
        QVector because of the way it stores its items in
        memory (see \l{Algorithmic Complexity} for details).
        It also expands to less code in your executable.
-    \i If you need a real linked list, with guarantees of \l{constant
+    \li If you need a real linked list, with guarantees of \l{constant
        time} insertions in the middle of the list and iterators to
        items rather than indexes, use QLinkedList.
-    \i If you want the items to occupy adjacent memory positions,
+    \li If you want the items to occupy adjacent memory positions,
        use QVector.
     \endlist
 
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp
index b8c938e216..263045a25d 100644
--- a/src/corelib/tools/qlist.cpp
+++ b/src/corelib/tools/qlist.cpp
@@ -340,15 +340,15 @@ void **QListData::erase(void **xi)
     functionality. Here's an overview:
 
     \list
-    \i For most purposes, QList is the right class to use. Its
+    \li For most purposes, QList is the right class to use. Its
        index-based API is more convenient than QLinkedList's
        iterator-based API, and it is usually faster than
        QVector because of the way it stores its items in
        memory. It also expands to less code in your executable.
-    \i If you need a real linked list, with guarantees of \l{constant
+    \li If you need a real linked list, with guarantees of \l{constant
        time} insertions in the middle of the list and iterators to
        items rather than indexes, use QLinkedList.
-    \i If you want the items to occupy adjacent memory positions,
+    \li If you want the items to occupy adjacent memory positions,
        use QVector.
     \endlist
 
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index 31f776dc2e..086ca7bd38 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -621,10 +621,10 @@ static quint16 localePrivateIndex(const QLocalePrivate *p)
     "language[_script][_country][.codeset][@modifier]" or "C", where:
 
     \list
-    \i language is a lowercase, two-letter, ISO 639 language code,
-    \i script is a titlecase, four-letter, ISO 15924 script code,
-    \i country is an uppercase, two- or three-letter, ISO 3166 country code (also "419" as defined by United Nations),
-    \i and codeset and modifier are ignored.
+    \li language is a lowercase, two-letter, ISO 639 language code,
+    \li script is a titlecase, four-letter, ISO 15924 script code,
+    \li country is an uppercase, two- or three-letter, ISO 3166 country code (also "419" as defined by United Nations),
+    \li and codeset and modifier are ignored.
     \endlist
 
     The separator can be either underscore or a minus sign.
@@ -671,11 +671,11 @@ QLocale::QLocale()
     country.
 
     \list
-    \i If the language/country pair is found in the database, it is used.
-    \i If the language is found but the country is not, or if the country
+    \li If the language/country pair is found in the database, it is used.
+    \li If the language is found but the country is not, or if the country
        is \c AnyCountry, the language is used with the most
        appropriate available country (for example, Germany for German),
-    \i If neither the language nor the country are found, QLocale
+    \li If neither the language nor the country are found, QLocale
        defaults to the default locale (see setDefault()).
     \endlist
 
@@ -707,14 +707,14 @@ QLocale::QLocale(Language language, Country country)
     \a country.
 
     \list
-    \i If the language/script/country is found in the database, it is used.
-    \i If both \a script is AnyScript and \a country is AnyCountry, the
+    \li If the language/script/country is found in the database, it is used.
+    \li If both \a script is AnyScript and \a country is AnyCountry, the
        language is used with the most appropriate available script and country
        (for example, Germany for German),
-    \i If either \a script is AnyScript or \a country is AnyCountry, the
+    \li If either \a script is AnyScript or \a country is AnyCountry, the
        language is used with the first locale that matches the given \a script
        and \a country.
-    \i If neither the language nor the country are found, QLocale
+    \li If neither the language nor the country are found, QLocale
        defaults to the default locale (see setDefault()).
     \endlist
 
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc
index 3a386c17d6..8e90d7d94e 100644
--- a/src/corelib/tools/qlocale.qdoc
+++ b/src/corelib/tools/qlocale.qdoc
@@ -51,12 +51,12 @@
     following effects:
 
     \list
-    \i If a QLocale object is constructed with the default constructor,
+    \li If a QLocale object is constructed with the default constructor,
        it will use the default locale's settings.
-    \i QString::toInt(), QString::toDouble(), etc., interpret the
+    \li QString::toInt(), QString::toDouble(), etc., interpret the
        string according to the default locale. If this fails, it
        falls back on the "C" locale.
-    \i QString::arg() uses the default locale to format a number when
+    \li QString::arg() uses the default locale to format a number when
        its position specifier in the format string contains an 'L',
        e.g. "%L1".
     \endlist
@@ -69,11 +69,11 @@
     of three things can happen:
 
     \list
-    \i If the language/country pair is found in the database, it is used.
-    \i If the language is found but the country is not, or if the country
+    \li If the language/country pair is found in the database, it is used.
+    \li If the language is found but the country is not, or if the country
        is \c AnyCountry, the language is used with the most
        appropriate available country (for example, Germany for German),
-    \i If neither the language nor the country are found, QLocale
+    \li If neither the language nor the country are found, QLocale
        defaults to the default locale (see setDefault()).
     \endlist
 
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index 37d705b3e0..103d074941 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -232,11 +232,11 @@ void QMapData::dump()
     differences are:
 
     \list
-    \i QHash provides faster lookups than QMap. (See \l{Algorithmic
+    \li QHash provides faster lookups than QMap. (See \l{Algorithmic
        Complexity} for details.)
-    \i When iterating over a QHash, the items are arbitrarily ordered.
+    \li When iterating over a QHash, the items are arbitrarily ordered.
        With QMap, the items are always sorted by key.
-    \i The key type of a QHash must provide operator==() and a global
+    \li The key type of a QHash must provide operator==() and a global
        qHash(Key) function. The key type of a QMap must provide
        operator<() specifying a total order.
     \endlist
diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp
index 7ff883a99a..aeab97803d 100644
--- a/src/corelib/tools/qrect.cpp
+++ b/src/corelib/tools/qrect.cpp
@@ -99,11 +99,11 @@ QT_BEGIN_NAMESPACE
 
     \table
     \row
-    \o \inlineimage qrect-intersect.png
-    \o \inlineimage qrect-unite.png
+    \li \inlineimage qrect-intersect.png
+    \li \inlineimage qrect-unite.png
     \row
-    \o intersected()
-    \o united()
+    \li intersected()
+    \li united()
     \endtable
 
     The isEmpty() function returns true if left() > right() or top() >
@@ -139,17 +139,17 @@ QT_BEGIN_NAMESPACE
 
     \table
     \row
-        \o \inlineimage qrect-diagram-zero.png
-        \o \inlineimage qrect-diagram-one.png
+        \li \inlineimage qrect-diagram-zero.png
+        \li \inlineimage qrect-diagram-one.png
     \row
-        \o Logical representation
-        \o One pixel wide pen
+        \li Logical representation
+        \li One pixel wide pen
     \row
-        \o \inlineimage qrect-diagram-two.png
-        \o \inlineimage qrect-diagram-three.png
+        \li \inlineimage qrect-diagram-two.png
+        \li \inlineimage qrect-diagram-three.png
     \row
-        \o Two pixel wide pen
-        \o Three pixel wide pen
+        \li Two pixel wide pen
+        \li Three pixel wide pen
     \endtable
 
     \section1 Coordinates
@@ -1278,11 +1278,11 @@ QDebug operator<<(QDebug dbg, const QRect &r) {
 
     \table
     \row
-    \o \inlineimage qrect-intersect.png
-    \o \inlineimage qrect-unite.png
+    \li \inlineimage qrect-intersect.png
+    \li \inlineimage qrect-unite.png
     \row
-    \o intersected()
-    \o united()
+    \li intersected()
+    \li united()
     \endtable
 
     The isEmpty() function returns true if the rectangle's width or
@@ -1318,17 +1318,17 @@ QDebug operator<<(QDebug dbg, const QRect &r) {
 
     \table
     \row
-        \o \inlineimage qrect-diagram-zero.png
-        \o \inlineimage qrectf-diagram-one.png
+        \li \inlineimage qrect-diagram-zero.png
+        \li \inlineimage qrectf-diagram-one.png
     \row
-        \o Logical representation
-        \o One pixel wide pen
+        \li Logical representation
+        \li One pixel wide pen
     \row
-        \o \inlineimage qrectf-diagram-two.png
-        \o \inlineimage qrectf-diagram-three.png
+        \li \inlineimage qrectf-diagram-two.png
+        \li \inlineimage qrectf-diagram-three.png
     \row
-        \o Two pixel wide pen
-        \o Three pixel wide pen
+        \li Two pixel wide pen
+        \li Three pixel wide pen
     \endtable
 
     \section1 Coordinates
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index e55144ec4c..29b3424315 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -90,21 +90,21 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
     substrings in a text. This is useful in many contexts, e.g.,
 
     \table
-    \row \i Validation
-         \i A regexp can test whether a substring meets some criteria,
+    \row \li Validation
+         \li A regexp can test whether a substring meets some criteria,
          e.g. is an integer or contains no whitespace.
-    \row \i Searching
-         \i A regexp provides more powerful pattern matching than
+    \row \li Searching
+         \li A regexp provides more powerful pattern matching than
          simple substring matching, e.g., match one of the words
          \e{mail}, \e{letter} or \e{correspondence}, but none of the
          words \e{email}, \e{mailman}, \e{mailer}, \e{letterbox}, etc.
-     \row \i Search and Replace
-         \i A regexp can replace all occurrences of a substring with a
+     \row \li Search and Replace
+         \li A regexp can replace all occurrences of a substring with a
          different substring, e.g., replace all occurrences of \e{&}
          with \e{\&amp;} except where the \e{&} is already followed by
          an \e{amp;}.
-    \row \i String Splitting
-         \i A regexp can be used to identify where a string should be
+    \row \li String Splitting
+         \li A regexp can be used to identify where a string should be
          split apart, e.g. splitting tab-delimited strings.
     \endtable
 
@@ -127,18 +127,18 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
     \section1 Introduction
 
     Regexps are built up from expressions, quantifiers, and
-    assertions. The simplest expression is a character, e.g. \bold{x}
-    or \bold{5}. An expression can also be a set of characters
-    enclosed in square brackets. \bold{[ABCD]} will match an \bold{A}
-    or a \bold{B} or a \bold{C} or a \bold{D}. We can write this same
-    expression as \bold{[A-D]}, and an experession to match any
+    assertions. The simplest expression is a character, e.g. \b{x}
+    or \b{5}. An expression can also be a set of characters
+    enclosed in square brackets. \b{[ABCD]} will match an \b{A}
+    or a \b{B} or a \b{C} or a \b{D}. We can write this same
+    expression as \b{[A-D]}, and an experession to match any
     captital letter in the English alphabet is written as
-    \bold{[A-Z]}.
+    \b{[A-Z]}.
 
     A quantifier specifies the number of occurrences of an expression
-    that must be matched. \bold{x{1,1}} means match one and only one
-    \bold{x}. \bold{x{1,5}} means match a sequence of \bold{x}
-    characters that contains at least one \bold{x} but no more than
+    that must be matched. \b{x{1,1}} means match one and only one
+    \b{x}. \b{x{1,5}} means match a sequence of \b{x}
+    characters that contains at least one \b{x} but no more than
     five.
 
     Note that in general regexps cannot be used to check for balanced
@@ -156,35 +156,35 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
 
     Suppose we want a regexp to match integers in the range 0 to 99.
     At least one digit is required, so we start with the expression
-    \bold{[0-9]{1,1}}, which matches a single digit exactly once. This
+    \b{[0-9]{1,1}}, which matches a single digit exactly once. This
     regexp matches integers in the range 0 to 9. To match integers up
     to 99, increase the maximum number of occurrences to 2, so the
-    regexp becomes \bold{[0-9]{1,2}}. This regexp satisfies the
+    regexp becomes \b{[0-9]{1,2}}. This regexp satisfies the
     original requirement to match integers from 0 to 99, but it will
     also match integers that occur in the middle of strings. If we
     want the matched integer to be the whole string, we must use the
-    anchor assertions, \bold{^} (caret) and \bold{$} (dollar). When
-    \bold{^} is the first character in a regexp, it means the regexp
-    must match from the beginning of the string. When \bold{$} is the
+    anchor assertions, \b{^} (caret) and \b{$} (dollar). When
+    \b{^} is the first character in a regexp, it means the regexp
+    must match from the beginning of the string. When \b{$} is the
     last character of the regexp, it means the regexp must match to
-    the end of the string. The regexp becomes \bold{^[0-9]{1,2}$}.
-    Note that assertions, e.g. \bold{^} and \bold{$}, do not match
+    the end of the string. The regexp becomes \b{^[0-9]{1,2}$}.
+    Note that assertions, e.g. \b{^} and \b{$}, do not match
     characters but locations in the string.
 
     If you have seen regexps described elsewhere, they may have looked
     different from the ones shown here. This is because some sets of
     characters and some quantifiers are so common that they have been
-    given special symbols to represent them. \bold{[0-9]} can be
-    replaced with the symbol \bold{\\d}. The quantifier to match
-    exactly one occurrence, \bold{{1,1}}, can be replaced with the
-    expression itself, i.e. \bold{x{1,1}} is the same as \bold{x}. So
-    our 0 to 99 matcher could be written as \bold{^\\d{1,2}$}. It can
-    also be written \bold{^\\d\\d{0,1}$}, i.e. \e{From the start of
+    given special symbols to represent them. \b{[0-9]} can be
+    replaced with the symbol \b{\\d}. The quantifier to match
+    exactly one occurrence, \b{{1,1}}, can be replaced with the
+    expression itself, i.e. \b{x{1,1}} is the same as \b{x}. So
+    our 0 to 99 matcher could be written as \b{^\\d{1,2}$}. It can
+    also be written \b{^\\d\\d{0,1}$}, i.e. \e{From the start of
     the string, match a digit, followed immediately by 0 or 1 digits}.
-    In practice, it would be written as \bold{^\\d\\d?$}. The \bold{?}
-    is shorthand for the quantifier \bold{{0,1}}, i.e. 0 or 1
-    occurrences. \bold{?} makes an expression optional. The regexp
-    \bold{^\\d\\d?$} means \e{From the beginning of the string, match
+    In practice, it would be written as \b{^\\d\\d?$}. The \b{?}
+    is shorthand for the quantifier \b{{0,1}}, i.e. 0 or 1
+    occurrences. \b{?} makes an expression optional. The regexp
+    \b{^\\d\\d?$} means \e{From the beginning of the string, match
     one digit, followed immediately by 0 or 1 more digit, followed
     immediately by end of string}.
 
@@ -192,45 +192,45 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
     'letter' \e or 'correspondence' but does not match words that
     contain these words, e.g., 'email', 'mailman', 'mailer', and
     'letterbox', start with a regexp that matches 'mail'. Expressed
-    fully, the regexp is \bold{m{1,1}a{1,1}i{1,1}l{1,1}}, but because
+    fully, the regexp is \b{m{1,1}a{1,1}i{1,1}l{1,1}}, but because
     a character expression is automatically quantified by
-    \bold{{1,1}}, we can simplify the regexp to \bold{mail}, i.e., an
+    \b{{1,1}}, we can simplify the regexp to \b{mail}, i.e., an
     'm' followed by an 'a' followed by an 'i' followed by an 'l'. Now
-    we can use the vertical bar \bold{|}, which means \bold{or}, to
+    we can use the vertical bar \b{|}, which means \b{or}, to
     include the other two words, so our regexp for matching any of the
-    three words becomes \bold{mail|letter|correspondence}. Match
-    'mail' \bold{or} 'letter' \bold{or} 'correspondence'. While this
+    three words becomes \b{mail|letter|correspondence}. Match
+    'mail' \b{or} 'letter' \b{or} 'correspondence'. While this
     regexp will match one of the three words we want to match, it will
     also match words we don't want to match, e.g., 'email'.  To
     prevent the regexp from matching unwanted words, we must tell it
     to begin and end the match at word boundaries. First we enclose
-    our regexp in parentheses, \bold{(mail|letter|correspondence)}.
+    our regexp in parentheses, \b{(mail|letter|correspondence)}.
     Parentheses group expressions together, and they identify a part
     of the regexp that we wish to \l{capturing text}{capture}.
     Enclosing the expression in parentheses allows us to use it as a
     component in more complex regexps. It also allows us to examine
     which of the three words was actually matched. To force the match
     to begin and end on word boundaries, we enclose the regexp in
-    \bold{\\b} \e{word boundary} assertions:
-    \bold{\\b(mail|letter|correspondence)\\b}.  Now the regexp means:
+    \b{\\b} \e{word boundary} assertions:
+    \b{\\b(mail|letter|correspondence)\\b}.  Now the regexp means:
     \e{Match a word boundary, followed by the regexp in parentheses,
-    followed by a word boundary}. The \bold{\\b} assertion matches a
+    followed by a word boundary}. The \b{\\b} assertion matches a
     \e position in the regexp, not a \e character. A word boundary is
     any non-word character, e.g., a space, newline, or the beginning
     or ending of a string.
 
     If we want to replace ampersand characters with the HTML entity
-    \bold{\&amp;}, the regexp to match is simply \bold{\&}. But this
+    \b{\&amp;}, the regexp to match is simply \b{\&}. But this
     regexp will also match ampersands that have already been converted
     to HTML entities. We want to replace only ampersands that are not
-    already followed by \bold{amp;}. For this, we need the negative
-    lookahead assertion, \bold{(?!}__\bold{)}. The regexp can then be
-    written as \bold{\&(?!amp;)}, i.e. \e{Match an ampersand that is}
-    \bold{not} \e{followed by} \bold{amp;}.
+    already followed by \b{amp;}. For this, we need the negative
+    lookahead assertion, \b{(?!}__\b{)}. The regexp can then be
+    written as \b{\&(?!amp;)}, i.e. \e{Match an ampersand that is}
+    \b{not} \e{followed by} \b{amp;}.
 
     If we want to count all the occurrences of 'Eric' and 'Eirik' in a
-    string, two valid solutions are \bold{\\b(Eric|Eirik)\\b} and
-    \bold{\\bEi?ri[ck]\\b}. The word boundary assertion '\\b' is
+    string, two valid solutions are \b{\\b(Eric|Eirik)\\b} and
+    \b{\\bEi?ri[ck]\\b}. The word boundary assertion '\\b' is
     required to avoid matching words that contain either name,
     e.g. 'Ericsson'. Note that the second regexp matches more
     spellings than we want: 'Eric', 'Erik', 'Eiric' and 'Eirik'.
@@ -242,52 +242,52 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
     \section1 Characters and Abbreviations for Sets of Characters
 
     \table
-    \header \i Element \i Meaning
-    \row \i \bold{c}
-         \i A character represents itself unless it has a special
-         regexp meaning. e.g. \bold{c} matches the character \e c.
-    \row \i \bold{\\c}
-         \i A character that follows a backslash matches the character
+    \header \li Element \li Meaning
+    \row \li \b{c}
+         \li A character represents itself unless it has a special
+         regexp meaning. e.g. \b{c} matches the character \e c.
+    \row \li \b{\\c}
+         \li A character that follows a backslash matches the character
          itself, except as specified below. e.g., To match a literal
-         caret at the beginning of a string, write \bold{\\^}.
-    \row \i \bold{\\a}
-         \i Matches the ASCII bell (BEL, 0x07).
-    \row \i \bold{\\f}
-         \i Matches the ASCII form feed (FF, 0x0C).
-    \row \i \bold{\\n}
-         \i Matches the ASCII line feed (LF, 0x0A, Unix newline).
-    \row \i \bold{\\r}
-         \i Matches the ASCII carriage return (CR, 0x0D).
-    \row \i \bold{\\t}
-         \i Matches the ASCII horizontal tab (HT, 0x09).
-    \row \i \bold{\\v}
-         \i Matches the ASCII vertical tab (VT, 0x0B).
-    \row \i \bold{\\x\e{hhhh}}
-         \i Matches the Unicode character corresponding to the
+         caret at the beginning of a string, write \b{\\^}.
+    \row \li \b{\\a}
+         \li Matches the ASCII bell (BEL, 0x07).
+    \row \li \b{\\f}
+         \li Matches the ASCII form feed (FF, 0x0C).
+    \row \li \b{\\n}
+         \li Matches the ASCII line feed (LF, 0x0A, Unix newline).
+    \row \li \b{\\r}
+         \li Matches the ASCII carriage return (CR, 0x0D).
+    \row \li \b{\\t}
+         \li Matches the ASCII horizontal tab (HT, 0x09).
+    \row \li \b{\\v}
+         \li Matches the ASCII vertical tab (VT, 0x0B).
+    \row \li \b{\\x\e{hhhh}}
+         \li Matches the Unicode character corresponding to the
          hexadecimal number \e{hhhh} (between 0x0000 and 0xFFFF).
-    \row \i \bold{\\0\e{ooo}} (i.e., \\zero \e{ooo})
-         \i matches the ASCII/Latin1 character for the octal number
+    \row \li \b{\\0\e{ooo}} (i.e., \\zero \e{ooo})
+         \li matches the ASCII/Latin1 character for the octal number
          \e{ooo} (between 0 and 0377).
-    \row \i \bold{. (dot)}
-         \i Matches any character (including newline).
-    \row \i \bold{\\d}
-         \i Matches a digit (QChar::isDigit()).
-    \row \i \bold{\\D}
-         \i Matches a non-digit.
-    \row \i \bold{\\s}
-         \i Matches a whitespace character (QChar::isSpace()).
-    \row \i \bold{\\S}
-         \i Matches a non-whitespace character.
-    \row \i \bold{\\w}
-         \i Matches a word character (QChar::isLetterOrNumber(), QChar::isMark(), or '_').
-    \row \i \bold{\\W}
-         \i Matches a non-word character.
-    \row \i \bold{\\\e{n}}
-         \i The \e{n}-th \l backreference, e.g. \\1, \\2, etc.
+    \row \li \b{. (dot)}
+         \li Matches any character (including newline).
+    \row \li \b{\\d}
+         \li Matches a digit (QChar::isDigit()).
+    \row \li \b{\\D}
+         \li Matches a non-digit.
+    \row \li \b{\\s}
+         \li Matches a whitespace character (QChar::isSpace()).
+    \row \li \b{\\S}
+         \li Matches a non-whitespace character.
+    \row \li \b{\\w}
+         \li Matches a word character (QChar::isLetterOrNumber(), QChar::isMark(), or '_').
+    \row \li \b{\\W}
+         \li Matches a non-word character.
+    \row \li \b{\\\e{n}}
+         \li The \e{n}-th \l backreference, e.g. \\1, \\2, etc.
     \endtable
 
-    \bold{Note:} The C++ compiler transforms backslashes in strings.
-    To include a \bold{\\} in a regexp, enter it twice, i.e. \c{\\}.
+    \b{Note:} The C++ compiler transforms backslashes in strings.
+    To include a \b{\\} in a regexp, enter it twice, i.e. \c{\\}.
     To match the backslash character itself, enter it four times, i.e.
     \c{\\\\}.
 
@@ -301,24 +301,24 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
     characters do not have special meanings in square brackets.
 
     \table
-    \row \i \bold{^}
+    \row \li \b{^}
 
-         \i The caret negates the character set if it occurs as the
+         \li The caret negates the character set if it occurs as the
          first character (i.e. immediately after the opening square
-         bracket). \bold{[abc]} matches 'a' or 'b' or 'c', but
-         \bold{[^abc]} matches anything \e but 'a' or 'b' or 'c'.
+         bracket). \b{[abc]} matches 'a' or 'b' or 'c', but
+         \b{[^abc]} matches anything \e but 'a' or 'b' or 'c'.
 
-    \row \i \bold{-}
+    \row \li \b{-}
 
-         \i The dash indicates a range of characters. \bold{[W-Z]}
+         \li The dash indicates a range of characters. \b{[W-Z]}
          matches 'W' or 'X' or 'Y' or 'Z'.
 
     \endtable
 
     Using the predefined character set abbreviations is more portable
     than using character ranges across platforms and languages. For
-    example, \bold{[0-9]} matches a digit in Western alphabets but
-    \bold{\\d} matches a digit in \e any alphabet.
+    example, \b{[0-9]} matches a digit in Western alphabets but
+    \b{\\d} matches a digit in \e any alphabet.
 
     Note: In other regexp documentation, sets of characters are often
     called "character classes".
@@ -327,64 +327,64 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
     \section1 Quantifiers
 
     By default, an expression is automatically quantified by
-    \bold{{1,1}}, i.e. it should occur exactly once. In the following
-    list, \bold{\e {E}} stands for expression. An expression is a
+    \b{{1,1}}, i.e. it should occur exactly once. In the following
+    list, \b{\e {E}} stands for expression. An expression is a
     character, or an abbreviation for a set of characters, or a set of
     characters in square brackets, or an expression in parentheses.
 
     \table
-    \row \i \bold{\e {E}?}
+    \row \li \b{\e {E}?}
 
-         \i Matches zero or one occurrences of \e E. This quantifier
+         \li Matches zero or one occurrences of \e E. This quantifier
          means \e{The previous expression is optional}, because it
-         will match whether or not the expression is found. \bold{\e
-         {E}?} is the same as \bold{\e {E}{0,1}}. e.g., \bold{dents?}
+         will match whether or not the expression is found. \b{\e
+         {E}?} is the same as \b{\e {E}{0,1}}. e.g., \b{dents?}
          matches 'dent' or 'dents'.
 
-    \row \i \bold{\e {E}+}
+    \row \li \b{\e {E}+}
 
-         \i Matches one or more occurrences of \e E. \bold{\e {E}+} is
-         the same as \bold{\e {E}{1,}}. e.g., \bold{0+} matches '0',
+         \li Matches one or more occurrences of \e E. \b{\e {E}+} is
+         the same as \b{\e {E}{1,}}. e.g., \b{0+} matches '0',
          '00', '000', etc.
 
-    \row \i \bold{\e {E}*}
+    \row \li \b{\e {E}*}
 
-         \i Matches zero or more occurrences of \e E. It is the same
-         as \bold{\e {E}{0,}}. The \bold{*} quantifier is often used
-         in error where \bold{+} should be used. For example, if
-         \bold{\\s*$} is used in an expression to match strings that
+         \li Matches zero or more occurrences of \e E. It is the same
+         as \b{\e {E}{0,}}. The \b{*} quantifier is often used
+         in error where \b{+} should be used. For example, if
+         \b{\\s*$} is used in an expression to match strings that
          end in whitespace, it will match every string because
-         \bold{\\s*$} means \e{Match zero or more whitespaces followed
+         \b{\\s*$} means \e{Match zero or more whitespaces followed
          by end of string}. The correct regexp to match strings that
          have at least one trailing whitespace character is
-         \bold{\\s+$}.
+         \b{\\s+$}.
 
-    \row \i \bold{\e {E}{n}}
+    \row \li \b{\e {E}{n}}
 
-         \i Matches exactly \e n occurrences of \e E. \bold{\e {E}{n}}
+         \li Matches exactly \e n occurrences of \e E. \b{\e {E}{n}}
          is the same as repeating \e E \e n times. For example,
-         \bold{x{5}} is the same as \bold{xxxxx}. It is also the same
-         as \bold{\e {E}{n,n}}, e.g. \bold{x{5,5}}.
+         \b{x{5}} is the same as \b{xxxxx}. It is also the same
+         as \b{\e {E}{n,n}}, e.g. \b{x{5,5}}.
 
-    \row \i \bold{\e {E}{n,}}
-         \i Matches at least \e n occurrences of \e E.
+    \row \li \b{\e {E}{n,}}
+         \li Matches at least \e n occurrences of \e E.
 
-    \row \i \bold{\e {E}{,m}}
-         \i Matches at most \e m occurrences of \e E. \bold{\e {E}{,m}}
-         is the same as \bold{\e {E}{0,m}}.
+    \row \li \b{\e {E}{,m}}
+         \li Matches at most \e m occurrences of \e E. \b{\e {E}{,m}}
+         is the same as \b{\e {E}{0,m}}.
 
-    \row \i \bold{\e {E}{n,m}}
-         \i Matches at least \e n and at most \e m occurrences of \e E.
+    \row \li \b{\e {E}{n,m}}
+         \li Matches at least \e n and at most \e m occurrences of \e E.
     \endtable
 
     To apply a quantifier to more than just the preceding character,
     use parentheses to group characters together in an expression. For
-    example, \bold{tag+} matches a 't' followed by an 'a' followed by
-    at least one 'g', whereas \bold{(tag)+} matches at least one
+    example, \b{tag+} matches a 't' followed by an 'a' followed by
+    at least one 'g', whereas \b{(tag)+} matches at least one
     occurrence of 'tag'.
 
     Note: Quantifiers are normally "greedy". They always match as much
-    text as they can. For example, \bold{0+} matches the first zero it
+    text as they can. For example, \b{0+} matches the first zero it
     finds and all the consecutive zeros after the first zero. Applied
     to '20005', it matches'2\underline{000}5'. Quantifiers can be made
     non-greedy, see setMinimal().
@@ -395,10 +395,10 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
 
     Parentheses allow us to group elements together so that we can
     quantify and capture them. For example if we have the expression
-    \bold{mail|letter|correspondence} that matches a string we know
+    \b{mail|letter|correspondence} that matches a string we know
     that \e one of the words matched but not which one. Using
     parentheses allows us to "capture" whatever is matched within
-    their bounds, so if we used \bold{(mail|letter|correspondence)}
+    their bounds, so if we used \b{(mail|letter|correspondence)}
     and matched this regexp against the string "I sent you some email"
     we can use the cap() or capturedTexts() functions to extract the
     matched characters, in this case 'mail'.
@@ -406,14 +406,14 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
     We can use captured text within the regexp itself. To refer to the
     captured text we use \e backreferences which are indexed from 1,
     the same as for cap(). For example we could search for duplicate
-    words in a string using \bold{\\b(\\w+)\\W+\\1\\b} which means match a
+    words in a string using \b{\\b(\\w+)\\W+\\1\\b} which means match a
     word boundary followed by one or more word characters followed by
     one or more non-word characters followed by the same text as the
     first parenthesized expression followed by a word boundary.
 
     If we want to use parentheses purely for grouping and not for
     capturing we can use the non-capturing syntax, e.g.
-    \bold{(?:green|blue)}. Non-capturing parentheses begin '(?:' and
+    \b{(?:green|blue)}. Non-capturing parentheses begin '(?:' and
     end ')'. In this example we match either 'green' or 'blue' but we
     do not capture the match so we only know whether or not we matched
     but not which color we actually found. Using non-capturing
@@ -424,9 +424,9 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
 
     \target greedy quantifiers
 
-    For historical reasons, quantifiers (e.g. \bold{*}) that apply to
+    For historical reasons, quantifiers (e.g. \b{*}) that apply to
     capturing parentheses are more "greedy" than other quantifiers.
-    For example, \bold{a*(a*)} will match "aaa" with cap(1) == "aaa".
+    For example, \b{a*(a*)} will match "aaa" with cap(1) == "aaa".
     This behavior is different from what other regexp engines do
     (notably, Perl). To obtain a more intuitive capturing behavior,
     specify QRegExp::RegExp2 to the QRegExp constructor or call
@@ -444,54 +444,54 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
 
     Assertions make some statement about the text at the point where
     they occur in the regexp but they do not match any characters. In
-    the following list \bold{\e {E}} stands for any expression.
+    the following list \b{\e {E}} stands for any expression.
 
     \table
-    \row \i \bold{^}
-         \i The caret signifies the beginning of the string. If you
+    \row \li \b{^}
+         \li The caret signifies the beginning of the string. If you
          wish to match a literal \c{^} you must escape it by
-         writing \c{\\^}. For example, \bold{^#include} will only
+         writing \c{\\^}. For example, \b{^#include} will only
          match strings which \e begin with the characters '#include'.
          (When the caret is the first character of a character set it
          has a special meaning, see \link #sets-of-characters Sets of
          Characters \endlink.)
 
-    \row \i \bold{$}
-         \i The dollar signifies the end of the string. For example
-         \bold{\\d\\s*$} will match strings which end with a digit
+    \row \li \b{$}
+         \li The dollar signifies the end of the string. For example
+         \b{\\d\\s*$} will match strings which end with a digit
          optionally followed by whitespace. If you wish to match a
          literal \c{$} you must escape it by writing
          \c{\\$}.
 
-    \row \i \bold{\\b}
-         \i A word boundary. For example the regexp
-         \bold{\\bOK\\b} means match immediately after a word
+    \row \li \b{\\b}
+         \li A word boundary. For example the regexp
+         \b{\\bOK\\b} means match immediately after a word
          boundary (e.g. start of string or whitespace) the letter 'O'
          then the letter 'K' immediately before another word boundary
          (e.g. end of string or whitespace). But note that the
          assertion does not actually match any whitespace so if we
-         write \bold{(\\bOK\\b)} and we have a match it will only
+         write \b{(\\bOK\\b)} and we have a match it will only
          contain 'OK' even if the string is "It's \underline{OK} now".
 
-    \row \i \bold{\\B}
-         \i A non-word boundary. This assertion is true wherever
-         \bold{\\b} is false. For example if we searched for
-         \bold{\\Bon\\B} in "Left on" the match would fail (space
+    \row \li \b{\\B}
+         \li A non-word boundary. This assertion is true wherever
+         \b{\\b} is false. For example if we searched for
+         \b{\\Bon\\B} in "Left on" the match would fail (space
          and end of string aren't non-word boundaries), but it would
          match in "t\underline{on}ne".
 
-    \row \i \bold{(?=\e E)}
-         \i Positive lookahead. This assertion is true if the
+    \row \li \b{(?=\e E)}
+         \li Positive lookahead. This assertion is true if the
          expression matches at this point in the regexp. For example,
-         \bold{const(?=\\s+char)} matches 'const' whenever it is
+         \b{const(?=\\s+char)} matches 'const' whenever it is
          followed by 'char', as in 'static \underline{const} char *'.
-         (Compare with \bold{const\\s+char}, which matches 'static
+         (Compare with \b{const\\s+char}, which matches 'static
          \underline{const char} *'.)
 
-    \row \i \bold{(?!\e E)}
-         \i Negative lookahead. This assertion is true if the
+    \row \li \b{(?!\e E)}
+         \li Negative lookahead. This assertion is true if the
          expression does not match at this point in the regexp. For
-         example, \bold{const(?!\\s+char)} matches 'const' \e except
+         example, \b{const(?!\\s+char)} matches 'const' \e except
          when it is followed by 'char'.
     \endtable
 
@@ -505,17 +505,17 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
     simpler than full regexps and has only four features:
 
     \table
-    \row \i \bold{c}
-         \i Any character represents itself apart from those mentioned
-         below. Thus \bold{c} matches the character \e c.
-    \row \i \bold{?}
-         \i Matches any single character. It is the same as
-         \bold{.} in full regexps.
-    \row \i \bold{*}
-         \i Matches zero or more of any characters. It is the
-         same as \bold{.*} in full regexps.
-    \row \i \bold{[...]}
-         \i Sets of characters can be represented in square brackets,
+    \row \li \b{c}
+         \li Any character represents itself apart from those mentioned
+         below. Thus \b{c} matches the character \e c.
+    \row \li \b{?}
+         \li Matches any single character. It is the same as
+         \b{.} in full regexps.
+    \row \li \b{*}
+         \li Matches zero or more of any characters. It is the
+         same as \b{.*} in full regexps.
+    \row \li \b{[...]}
+         \li Sets of characters can be represented in square brackets,
          similar to full regexps. Within the character class, like
          outside, backslash has no special meaning.
     \endtable
@@ -525,7 +525,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
     wildcard.
 
     For example if we are in wildcard mode and have strings which
-    contain filenames we could identify HTML files with \bold{*.html}.
+    contain filenames we could identify HTML files with \b{*.html}.
     This will match zero or more characters followed by a dot followed
     by 'h', 't', 'm' and 'l'.
 
@@ -553,7 +553,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
     (but see the \l{greedy quantifiers}{note above}). Non-greedy
     matching cannot be applied to individual quantifiers, but can be
     applied to all the quantifiers in the pattern. For example, to
-    match the Perl regexp \bold{ro+?m} requires:
+    match the Perl regexp \b{ro+?m} requires:
 
     \snippet doc/src/snippets/code/src_corelib_tools_qregexp.cpp 2
 
@@ -562,7 +562,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
 
     Perl's \c{/g} option can be emulated using a \l{#cap_in_a_loop}{loop}.
 
-    In QRegExp \bold{.} matches any character, therefore all QRegExp
+    In QRegExp \b{.} matches any character, therefore all QRegExp
     regexps have the equivalent of Perl's \c{/s} option. QRegExp
     does not have an equivalent to Perl's \c{/m} option, but this
     can be emulated in various ways for example by splitting the input
@@ -598,7 +598,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
     to Perl's split and join functions.
 
     Note: because C++ transforms \\'s they must be written \e twice in
-    code, e.g. \bold{\\b} must be written \bold{\\\\b}.
+    code, e.g. \b{\\b} must be written \b{\\\\b}.
 
     \target code-examples
     \section1 Code Examples
@@ -670,10 +670,10 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
 
     Wildcard matching can be convenient because of its simplicity, but
     any wildcard regexp can be defined using full regexps, e.g.
-    \bold{.*\\.html$}. Notice that we can't match both \c .html and \c
-    .htm files with a wildcard unless we use \bold{*.htm*} which will
+    \b{.*\\.html$}. Notice that we can't match both \c .html and \c
+    .htm files with a wildcard unless we use \b{*.htm*} which will
     also match 'test.html.bak'. A full regexp gives us the precision
-    we need, \bold{.*\\.html?$}.
+    we need, \b{.*\\.html?$}.
 
     QRegExp can match case insensitively using setCaseSensitivity(),
     and can use non-greedy matching, see setMinimal(). By
@@ -3898,7 +3898,7 @@ static void invalidateEngine(QRegExpPrivate *priv)
     \enum QRegExp::CaretMode
 
     The CaretMode enum defines the different meanings of the caret
-    (\bold{^}) in a regular expression. The possible values are:
+    (\b{^}) in a regular expression. The possible values are:
 
     \value CaretAtZero
            The caret corresponds to index 0 in the searched string.
@@ -4065,11 +4065,11 @@ bool QRegExp::isEmpty() const
     Returns true if the regular expression is valid; otherwise returns
     false. An invalid regular expression never matches.
 
-    The pattern \bold{[a-z} is an example of an invalid pattern, since
+    The pattern \b{[a-z} is an example of an invalid pattern, since
     it lacks a closing square bracket.
 
     Note that the validity of a regexp may also depend on the setting
-    of the wildcard flag, for example \bold{*.html} is a valid
+    of the wildcard flag, for example \b{*.html} is a valid
     wildcard regexp but an invalid full regexp.
 
     \sa errorString()
@@ -4124,7 +4124,7 @@ Qt::CaseSensitivity QRegExp::caseSensitivity() const
 /*!
     Sets case sensitive matching to \a cs.
 
-    If \a cs is Qt::CaseSensitive, \bold{\\.txt$} matches
+    If \a cs is Qt::CaseSensitive, \b{\\.txt$} matches
     \c{readme.txt} but not \c{README.TXT}.
 
     \sa setPatternSyntax(), setPattern(), setMinimal()
@@ -4153,7 +4153,7 @@ QRegExp::PatternSyntax QRegExp::patternSyntax() const
     QRegExp::RegExp.
 
     Setting \a syntax to QRegExp::Wildcard enables simple shell-like
-    \l{wildcard matching}. For example, \bold{r*.txt} matches the
+    \l{wildcard matching}. For example, \b{r*.txt} matches the
     string \c{readme.txt} in wildcard mode, but does not match
     \c{readme}.
 
@@ -4188,13 +4188,13 @@ bool QRegExp::isMinimal() const
 
     For example, suppose we have the input string "We must be
     <b>bold</b>, very <b>bold</b>!" and the pattern
-    \bold{<b>.*</b>}. With the default greedy (maximal) matching,
+    \b{<b>.*</b>}. With the default greedy (maximal) matching,
     the match is "We must be \underline{<b>bold</b>, very
     <b>bold</b>}!". But with minimal (non-greedy) matching, the
     first match is: "We must be \underline{<b>bold</b>}, very
     <b>bold</b>!" and the second match is "We must be <b>bold</b>,
     very \underline{<b>bold</b>}!". In practice we might use the pattern
-    \bold{<b>[^<]*\</b>} instead, although this will still fail for
+    \b{<b>[^<]*\</b>} instead, although this will still fail for
     nested tags.
 
     \sa setCaseSensitivity()
@@ -4215,7 +4215,7 @@ void QRegExp::setMinimal(bool minimal)
     in the start of string and end of string anchors, except that it
     sets matchedLength() differently.
 
-    For example, if the regular expression is \bold{blue}, then
+    For example, if the regular expression is \b{blue}, then
     exactMatch() returns true only for input \c blue. For inputs \c
     bluebell, \c blutak and \c lightblue, exactMatch() returns false
     and matchedLength() will return 4, 3 and 0 respectively.
@@ -4247,7 +4247,7 @@ bool QRegExp::exactMatch(const QString &str) const
     Returns the position of the first match, or -1 if there was no
     match.
 
-    The \a caretMode parameter can be used to instruct whether \bold{^}
+    The \a caretMode parameter can be used to instruct whether \b{^}
     should match at index 0 or at \a offset.
 
     You might prefer to use QString::indexOf(), QString::contains(),
@@ -4286,7 +4286,7 @@ int QRegExp::indexIn(const QString &str, int offset, CaretMode caretMode) const
     Returns the position of the first match, or -1 if there was no
     match.
 
-    The \a caretMode parameter can be used to instruct whether \bold{^}
+    The \a caretMode parameter can be used to instruct whether \b{^}
     should match at index 0 or at \a offset.
 
     Although const, this function sets matchedLength(),
@@ -4371,7 +4371,7 @@ int QRegExp::captureCount() const
 
     Some regexps can match an indeterminate number of times. For
     example if the input string is "Offsets: 12 14 99 231 7" and the
-    regexp, \c{rx}, is \bold{(\\d+)+}, we would hope to get a list of
+    regexp, \c{rx}, is \b{(\\d+)+}, we would hope to get a list of
     all the numbers matched. However, after calling
     \c{rx.indexIn(str)}, capturedTexts() will return the list ("12",
     "12"), i.e. the entire match was "12" and the first subexpression
diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp
index b6bf525fb9..5ecca89229 100644
--- a/src/corelib/tools/qscopedpointer.cpp
+++ b/src/corelib/tools/qscopedpointer.cpp
@@ -89,10 +89,10 @@ QT_BEGIN_NAMESPACE
     The following custom cleanup handlers exist:
 
     \list
-    \i QScopedPointerDeleter - the default, deletes the pointer using \c delete
-    \i QScopedPointerArrayDeleter - deletes the pointer using \c{delete []}. Use
+    \li QScopedPointerDeleter - the default, deletes the pointer using \c delete
+    \li QScopedPointerArrayDeleter - deletes the pointer using \c{delete []}. Use
        this handler for pointers that were allocated with \c{new []}.
-    \i QScopedPointerPodDeleter - deletes the pointer using \c{free()}. Use this
+    \li QScopedPointerPodDeleter - deletes the pointer using \c{free()}. Use this
        handler for pointers that were allocated with \c{malloc()}.
     \endlist
 
diff --git a/src/corelib/tools/qshareddata.cpp b/src/corelib/tools/qshareddata.cpp
index 6250745400..ffc8ac601d 100644
--- a/src/corelib/tools/qshareddata.cpp
+++ b/src/corelib/tools/qshareddata.cpp
@@ -86,10 +86,10 @@ QT_BEGIN_NAMESPACE
 
     \list
 
-    \o Define the class \c Employee to have a single data member of
+    \li Define the class \c Employee to have a single data member of
      type \c {QSharedDataPointer<EmployeeData>}.
 
-    \o Define the \c EmployeeData class derived from \l QSharedData to
+    \li Define the \c EmployeeData class derived from \l QSharedData to
      contain all the data members you would normally have put in the
      \c Employee class.
 
diff --git a/src/corelib/tools/qsize.cpp b/src/corelib/tools/qsize.cpp
index 4c94f899e7..b276d2d2e0 100644
--- a/src/corelib/tools/qsize.cpp
+++ b/src/corelib/tools/qsize.cpp
@@ -186,10 +186,10 @@ void QSize::transpose()
     height, according to the specified \a mode:
 
     \list
-    \i If \a mode is Qt::IgnoreAspectRatio, the size is set to (\a width, \a height).
-    \i If \a mode is Qt::KeepAspectRatio, the current size is scaled to a rectangle
+    \li If \a mode is Qt::IgnoreAspectRatio, the size is set to (\a width, \a height).
+    \li If \a mode is Qt::KeepAspectRatio, the current size is scaled to a rectangle
        as large as possible inside (\a width, \a height), preserving the aspect ratio.
-    \i If \a mode is Qt::KeepAspectRatioByExpanding, the current size is scaled to a rectangle
+    \li If \a mode is Qt::KeepAspectRatioByExpanding, the current size is scaled to a rectangle
        as small as possible outside (\a width, \a height), preserving the aspect ratio.
     \endlist
 
@@ -614,10 +614,10 @@ void QSizeF::transpose()
     height, according to the specified \a mode.
 
     \list
-    \i If \a mode is Qt::IgnoreAspectRatio, the size is set to (\a width, \a height).
-    \i If \a mode is Qt::KeepAspectRatio, the current size is scaled to a rectangle
+    \li If \a mode is Qt::IgnoreAspectRatio, the size is set to (\a width, \a height).
+    \li If \a mode is Qt::KeepAspectRatio, the current size is scaled to a rectangle
        as large as possible inside (\a width, \a height), preserving the aspect ratio.
-    \i If \a mode is Qt::KeepAspectRatioByExpanding, the current size is scaled to a rectangle
+    \li If \a mode is Qt::KeepAspectRatioByExpanding, the current size is scaled to a rectangle
        as small as possible outside (\a width, \a height), preserving the aspect ratio.
     \endlist
 
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index bf50159de2..45ccfb8aea 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -606,12 +606,12 @@ const QString::Null QString::null = { };
     toLatin1(), toUtf8(), and toLocal8Bit().
 
     \list
-    \o toAscii() returns a Latin-1 (ISO 8859-1) encoded 8-bit string.
-    \o toLatin1() returns a Latin-1 (ISO 8859-1) encoded 8-bit string.
-    \o toUtf8() returns a UTF-8 encoded 8-bit string. UTF-8 is a
+    \li toAscii() returns a Latin-1 (ISO 8859-1) encoded 8-bit string.
+    \li toLatin1() returns a Latin-1 (ISO 8859-1) encoded 8-bit string.
+    \li toUtf8() returns a UTF-8 encoded 8-bit string. UTF-8 is a
        superset of US-ASCII (ANSI X3.4-1986) that supports the entire
        Unicode character set through multibyte sequences.
-    \o toLocal8Bit() returns an 8-bit string using the system's local
+    \li toLocal8Bit() returns an 8-bit string using the system's local
        encoding.
     \endlist
 
@@ -629,9 +629,9 @@ const QString::Null QString::null = { };
     conversions by defining the following two preprocessor symbols:
 
     \list
-    \o \c QT_NO_CAST_FROM_ASCII disables automatic conversions from
+    \li \c QT_NO_CAST_FROM_ASCII disables automatic conversions from
        C string literals and pointers to Unicode.
-    \o \c QT_NO_CAST_TO_ASCII disables automatic conversion from QString
+    \li \c QT_NO_CAST_TO_ASCII disables automatic conversion from QString
        to C strings.
     \endlist
 
@@ -655,10 +655,10 @@ const QString::Null QString::null = { };
 
     \table 100 %
     \header
-    \o Note for C Programmers
+    \li Note for C Programmers
 
     \row
-    \o
+    \li
     Due to C++'s type system and the fact that QString is
     \l{implicitly shared}, QStrings may be treated like \c{int}s or
     other basic types. For example:
@@ -697,12 +697,12 @@ const QString::Null QString::null = { };
     following:
 
     \table
-    \header \o Format \o Meaning
-    \row \o \c e \o format as [-]9.9e[+|-]999
-    \row \o \c E \o format as [-]9.9E[+|-]999
-    \row \o \c f \o format as [-]9.9
-    \row \o \c g \o use \c e or \c f format, whichever is the most concise
-    \row \o \c G \o use \c E or \c f format, whichever is the most concise
+    \header \li Format \li Meaning
+    \row \li \c e \li format as [-]9.9e[+|-]999
+    \row \li \c E \li format as [-]9.9E[+|-]999
+    \row \li \c f \li format as [-]9.9
+    \row \li \c g \li use \c e or \c f format, whichever is the most concise
+    \row \li \c G \li use \c E or \c f format, whichever is the most concise
     \endtable
 
     A \e precision is also specified with the argument \e format. For
@@ -2789,7 +2789,7 @@ struct QStringCapture
   \snippet doc/src/snippets/qstring/main.cpp 42
 
   For regular expressions containing \l{capturing parentheses},
-  occurrences of \bold{\\1}, \bold{\\2}, ..., in \a after are replaced
+  occurrences of \b{\\1}, \b{\\2}, ..., in \a after are replaced
   with \a{rx}.cap(1), cap(2), ...
 
   \snippet doc/src/snippets/qstring/main.cpp 43
@@ -6059,7 +6059,7 @@ QStringList QString::split(QChar sep, SplitBehavior behavior, Qt::CaseSensitivit
     \snippet doc/src/snippets/qstring/main.cpp 60
 
     Here's a third example where we use a zero-length assertion,
-    \bold{\\b} (word boundary), to split the string into an
+    \b{\\b} (word boundary), to split the string into an
     alternating sequence of non-word and word tokens:
 
     \snippet doc/src/snippets/qstring/main.cpp 61
diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp
index a352045a7d..b4ec0c6498 100644
--- a/src/corelib/tools/qstringlist.cpp
+++ b/src/corelib/tools/qstringlist.cpp
@@ -342,7 +342,7 @@ void QtPrivate::QStringList_replaceInStrings(QStringList *that, const QString &b
     \snippet doc/src/snippets/qstringlist/main.cpp 14
 
     For regular expressions that contain \l{capturing parentheses},
-    occurrences of \bold{\\1}, \bold{\\2}, ..., in \a after are
+    occurrences of \b{\\1}, \b{\\2}, ..., in \a after are
     replaced with \a{rx}.cap(1), \a{rx}.cap(2), ...
 
     For example:
diff --git a/src/corelib/tools/qvarlengtharray.qdoc b/src/corelib/tools/qvarlengtharray.qdoc
index 1a0579a077..e1dc2bee9a 100644
--- a/src/corelib/tools/qvarlengtharray.qdoc
+++ b/src/corelib/tools/qvarlengtharray.qdoc
@@ -69,13 +69,13 @@
     structure. The main differences between the two classes are:
 
     \list
-    \o QVarLengthArray's API is much more low-level. It provides no
+    \li QVarLengthArray's API is much more low-level. It provides no
        iterators and lacks much of QVector's functionality.
 
-    \o QVarLengthArray doesn't initialize the memory if the value is
+    \li QVarLengthArray doesn't initialize the memory if the value is
        a basic type. (QVector always does.)
 
-    \o QVector uses \l{implicit sharing} as a memory optimization.
+    \li QVector uses \l{implicit sharing} as a memory optimization.
        QVarLengthArray doesn't provide that feature; however, it
        usually produces slightly better performance due to reduced
        overhead, especially in tight loops.
diff --git a/src/corelib/tools/qvector.cpp b/src/corelib/tools/qvector.cpp
index 3efe695559..75c219bbc9 100644
--- a/src/corelib/tools/qvector.cpp
+++ b/src/corelib/tools/qvector.cpp
@@ -108,21 +108,21 @@ int QVectorData::grow(int sizeofTypedData, int size, int sizeofT, bool excessive
     similar functionality. Here's an overview:
 
     \list
-    \i For most purposes, QList is the right class to use. Operations
+    \li For most purposes, QList is the right class to use. Operations
        like prepend() and insert() are usually faster than with
        QVector because of the way QList stores its items in memory
        (see \l{Algorithmic Complexity} for details),
        and its index-based API is more convenient than QLinkedList's
        iterator-based API. It also expands to less code in your
        executable.
-    \i If you need a real linked list, with guarantees of \l{constant
+    \li If you need a real linked list, with guarantees of \l{constant
        time} insertions in the middle of the list and iterators to
        items rather than indexes, use QLinkedList.
-    \i If you want the items to occupy adjacent memory positions, or
+    \li If you want the items to occupy adjacent memory positions, or
        if your items are larger than a pointer and you want to avoid
        the overhead of allocating them on the heap individually at
        insertion time, then use QVector.
-    \i If you want a low-level variable-size array, QVarLengthArray
+    \li If you want a low-level variable-size array, QVarLengthArray
        may be sufficient.
     \endlist
 
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp
index d6bdc19d51..8863766f40 100644
--- a/src/dbus/qdbusmessage.cpp
+++ b/src/dbus/qdbusmessage.cpp
@@ -331,10 +331,10 @@ QDBusMessage QDBusMessagePrivate::makeLocalReply(const QDBusConnectionPrivate &c
     messages (MessageType) that can occur on the bus:
 
     \list
-      \o Method calls
-      \o Method return values
-      \o Signal emissions
-      \o Error codes
+      \li Method calls
+      \li Method return values
+      \li Signal emissions
+      \li Error codes
     \endlist
 
     Objects of this type are created with the static createError(),
diff --git a/src/dbus/qdbuspendingreply.cpp b/src/dbus/qdbuspendingreply.cpp
index 78b64c4772..b9694ca205 100644
--- a/src/dbus/qdbuspendingreply.cpp
+++ b/src/dbus/qdbuspendingreply.cpp
@@ -60,9 +60,9 @@
     important differences:
 
     \list
-      \o QDBusReply accepts exactly one return type, whereas
+      \li QDBusReply accepts exactly one return type, whereas
          QDBusPendingReply can have from 1 to 8 types
-      \o QDBusReply only works on already completed replies, whereas
+      \li QDBusReply only works on already completed replies, whereas
          QDBusPendingReply allows one to wait for replies from pending
          calls
     \endlist
diff --git a/src/dbus/qdbusservicewatcher.cpp b/src/dbus/qdbusservicewatcher.cpp
index 749d68fad5..d45fa8b8ca 100644
--- a/src/dbus/qdbusservicewatcher.cpp
+++ b/src/dbus/qdbusservicewatcher.cpp
@@ -153,9 +153,9 @@ void QDBusServiceWatcherPrivate::removeService(const QString &service)
     modes:
 
     \list
-      \o Watching for service registration only.
-      \o Watching for service unregistration only.
-      \o Watching for any kind of service ownership change (the default mode).
+      \li Watching for service registration only.
+      \li Watching for service unregistration only.
+      \li Watching for any kind of service ownership change (the default mode).
     \endlist
 
     Besides being created or deleted, services may change owners without a
diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp
index 71edee1b2b..bed07692b8 100644
--- a/src/dbus/qdbusutil.cpp
+++ b/src/dbus/qdbusutil.cpp
@@ -348,11 +348,11 @@ namespace QDBusUtil
 
         Valid interface names must:
         \list
-          \o not be empty
-          \o not exceed 255 characters in length
-          \o be composed of dot-separated string components that contain only ASCII letters, digits
+          \li not be empty
+          \li not exceed 255 characters in length
+          \li be composed of dot-separated string components that contain only ASCII letters, digits
              and the underscore ("_") character
-          \o contain at least two such components
+          \li contain at least two such components
         \endlist
     */
     bool isValidInterfaceName(const QString& ifaceName)
@@ -408,11 +408,11 @@ namespace QDBusUtil
 
         A valid bus name is either a valid unique connection name or follows the rules:
         \list
-          \o is not empty
-          \o does not exceed 255 characters in length
-          \o be composed of dot-separated string components that contain only ASCII letters, digits,
+          \li is not empty
+          \li does not exceed 255 characters in length
+          \li be composed of dot-separated string components that contain only ASCII letters, digits,
              hyphens or underscores ("_"), but don't start with a digit
-          \o contains at least two such elements
+          \li contains at least two such elements
         \endlist
 
         \sa isValidUniqueConnectionName()
@@ -481,10 +481,10 @@ namespace QDBusUtil
 
         Valid object paths follow the rules:
         \list
-          \o start with the slash character ("/")
-          \o do not end in a slash, unless the path is just the initial slash
-          \o do not contain any two slashes in sequence
-          \o contain slash-separated parts, each of which is composed of ASCII letters, digits and
+          \li start with the slash character ("/")
+          \li do not end in a slash, unless the path is just the initial slash
+          \li do not contain any two slashes in sequence
+          \li contain slash-separated parts, each of which is composed of ASCII letters, digits and
              underscores ("_")
         \endlist
     */
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index b7e9275669..aa47616161 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -77,10 +77,10 @@ QT_BEGIN_NAMESPACE
     braille displays. Clients and servers communicate in the following way:
 
     \list
-    \o  \e{AT Servers} notify the clients about events through calls to the
+    \li  \e{AT Servers} notify the clients about events through calls to the
         updateAccessibility() function.
 
-    \o  \e{AT Clients} request information about the objects in the server.
+    \li  \e{AT Clients} request information about the objects in the server.
         The QAccessibleInterface class is the core interface, and encapsulates
         this information in a pure virtual API. Implementations of the interface
         are provided by Qt through the queryAccessibleInterface() API.
@@ -748,12 +748,12 @@ QAccessibleInterface *QAccessibleEvent::accessibleInterface() const
     The AT client uses three basic concepts to acquire information
     about any accessible object in an application:
     \list
-    \i \e Properties The client can read information about
+    \li \e Properties The client can read information about
     accessible objects. In some cases the client can also modify these
     properties; such as text in a line edit.
-    \i \e Actions The client can invoke actions like pressing a button
+    \li \e Actions The client can invoke actions like pressing a button
     or .
-    \i \e{Relationships and Navigation} The client can traverse from one
+    \li \e{Relationships and Navigation} The client can traverse from one
     accessible object to another, using the relationships between objects.
     \endlist
 
diff --git a/src/gui/accessible/qaccessible2.cpp b/src/gui/accessible/qaccessible2.cpp
index db3028b371..d3dafb8820 100644
--- a/src/gui/accessible/qaccessible2.cpp
+++ b/src/gui/accessible/qaccessible2.cpp
@@ -371,14 +371,14 @@ QT_BEGIN_NAMESPACE
 
     In general you should use one of the predefined action names, unless describing an action that does not fit these:
     \table
-    \header \o Action name         \o Description
-    \row    \o \l checkAction()    \o checks the item (checkbox, radio button, ...)
-    \row    \o \l decreaseAction() \o decrease the value of the accessible (e.g. spinbox)
-    \row    \o \l increaseAction() \o increase the value of the accessible (e.g. spinbox)
-    \row    \o \l pressAction()    \o press or click or activate the accessible (should correspont to clicking the object with the mouse)
-    \row    \o \l setFocusAction() \o set the focus to this accessible
-    \row    \o \l showMenuAction() \o show a context menu, corresponds to right-clicks
-    \row    \o \l uncheckAction()  \o uncheck the item (checkbox, radio button, ...)
+    \header \li Action name         \li Description
+    \row    \li \l checkAction()    \li checks the item (checkbox, radio button, ...)
+    \row    \li \l decreaseAction() \li decrease the value of the accessible (e.g. spinbox)
+    \row    \li \l increaseAction() \li increase the value of the accessible (e.g. spinbox)
+    \row    \li \l pressAction()    \li press or click or activate the accessible (should correspont to clicking the object with the mouse)
+    \row    \li \l setFocusAction() \li set the focus to this accessible
+    \row    \li \l showMenuAction() \li show a context menu, corresponds to right-clicks
+    \row    \li \l uncheckAction()  \li uncheck the item (checkbox, radio button, ...)
     \endtable
 
     In order to invoke the action, \l doAction() is called with an action name.
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 5b23dbf4dc..6ce08d93cc 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -327,17 +327,17 @@ bool QImageData::checkForAlphaPixels() const
     formats:
 
     \table
-    \header \o Format \o Description                      \o Qt's support
-    \row    \o BMP    \o Windows Bitmap                   \o Read/write
-    \row    \o GIF    \o Graphic Interchange Format (optional) \o Read
-    \row    \o JPG    \o Joint Photographic Experts Group \o Read/write
-    \row    \o JPEG   \o Joint Photographic Experts Group \o Read/write
-    \row    \o PNG    \o Portable Network Graphics        \o Read/write
-    \row    \o PBM    \o Portable Bitmap                  \o Read
-    \row    \o PGM    \o Portable Graymap                 \o Read
-    \row    \o PPM    \o Portable Pixmap                  \o Read/write
-    \row    \o XBM    \o X11 Bitmap                       \o Read/write
-    \row    \o XPM    \o X11 Pixmap                       \o Read/write
+    \header \li Format \li Description                      \li Qt's support
+    \row    \li BMP    \li Windows Bitmap                   \li Read/write
+    \row    \li GIF    \li Graphic Interchange Format (optional) \li Read
+    \row    \li JPG    \li Joint Photographic Experts Group \li Read/write
+    \row    \li JPEG   \li Joint Photographic Experts Group \li Read/write
+    \row    \li PNG    \li Portable Network Graphics        \li Read/write
+    \row    \li PBM    \li Portable Bitmap                  \li Read
+    \row    \li PGM    \li Portable Graymap                 \li Read
+    \row    \li PPM    \li Portable Pixmap                  \li Read/write
+    \row    \li XBM    \li X11 Bitmap                       \li Read/write
+    \row    \li XPM    \li X11 Pixmap                       \li Read/write
     \endtable
 
     \section1 Image Information
@@ -347,11 +347,11 @@ bool QImageData::checkForAlphaPixels() const
 
     \table
     \header
-    \o \o Available Functions
+    \li \li Available Functions
 
     \row
-    \o Geometry
-    \o
+    \li Geometry
+    \li
 
     The size(), width(), height(), dotsPerMeterX(), and
     dotsPerMeterY() functions provide information about the image size
@@ -365,8 +365,8 @@ bool QImageData::checkForAlphaPixels() const
     setOffset() function.
 
     \row
-    \o Colors
-    \o
+    \li Colors
+    \li
 
     The color of a pixel can be retrieved by passing its coordinates
     to the pixel() function.  The pixel() function returns the color
@@ -392,8 +392,8 @@ bool QImageData::checkForAlphaPixels() const
     sections.
 
     \row
-    \o Text
-    \o
+    \li Text
+    \li
 
     The text() function returns the image text associated with the
     given text key. An image's text keys can be retrieved using the
@@ -401,8 +401,8 @@ bool QImageData::checkForAlphaPixels() const
     image's text.
 
     \row
-    \o Low-level information
-    \o
+    \li Low-level information
+    \li
 
     The depth() function returns the depth of the image. The supported
     depths are 1 (monochrome), 8, 16, 24 and 32 bits. The
@@ -434,10 +434,10 @@ bool QImageData::checkForAlphaPixels() const
 
     \table
     \header
-    \o {2,1}32-bit
+    \li {2,1}32-bit
     \row
-    \o \inlineimage qimage-32bit_scaled.png
-    \o
+    \li \inlineimage qimage-32bit_scaled.png
+    \li
     \snippet doc/src/snippets/code/src_gui_image_qimage.cpp 0
     \endtable
 
@@ -455,10 +455,10 @@ bool QImageData::checkForAlphaPixels() const
 
     \table
     \header
-    \o {2,1} 8-bit
+    \li {2,1} 8-bit
     \row
-    \o \inlineimage qimage-8bit_scaled.png
-    \o
+    \li \inlineimage qimage-8bit_scaled.png
+    \li
     \snippet doc/src/snippets/code/src_gui_image_qimage.cpp 1
     \endtable
 
@@ -529,28 +529,28 @@ bool QImageData::checkForAlphaPixels() const
     in-place:
 
     \table
-    \header \o Function \o Description
+    \header \li Function \li Description
     \row
-    \o setDotsPerMeterX()
-    \o Defines the aspect ratio by setting the number of pixels that fit
+    \li setDotsPerMeterX()
+    \li Defines the aspect ratio by setting the number of pixels that fit
     horizontally in a physical meter.
     \row
-    \o setDotsPerMeterY()
-    \o Defines the aspect ratio by setting the number of pixels that fit
+    \li setDotsPerMeterY()
+    \li Defines the aspect ratio by setting the number of pixels that fit
     vertically in a physical meter.
     \row
-    \o fill()
-    \o Fills the entire image with the given pixel value.
+    \li fill()
+    \li Fills the entire image with the given pixel value.
     \row
-    \o invertPixels()
-    \o Inverts all pixel values in the image using the given InvertMode value.
+    \li invertPixels()
+    \li Inverts all pixel values in the image using the given InvertMode value.
     \row
-    \o setColorTable()
-    \o Sets the color table used to translate color indexes. Only
+    \li setColorTable()
+    \li Sets the color table used to translate color indexes. Only
     monochrome and 8-bit formats.
     \row
-    \o setColorCount()
-    \o Resizes the color table. Only monochrome and 8-bit formats.
+    \li setColorCount()
+    \li Resizes the color table. Only monochrome and 8-bit formats.
 
     \endtable
 
@@ -3794,11 +3794,11 @@ bool QImage::isGrayscale() const
     \image qimage-scaling.png
 
     \list
-    \i If \a aspectRatioMode is Qt::IgnoreAspectRatio, the image
+    \li If \a aspectRatioMode is Qt::IgnoreAspectRatio, the image
        is scaled to \a size.
-    \i If \a aspectRatioMode is Qt::KeepAspectRatio, the image is
+    \li If \a aspectRatioMode is Qt::KeepAspectRatio, the image is
        scaled to a rectangle as large as possible inside \a size, preserving the aspect ratio.
-    \i If \a aspectRatioMode is Qt::KeepAspectRatioByExpanding,
+    \li If \a aspectRatioMode is Qt::KeepAspectRatioByExpanding,
        the image is scaled to a rectangle as small as possible
        outside \a size, preserving the aspect ratio.
     \endlist
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index 4a9a9b00f4..870784f638 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -703,22 +703,22 @@ QByteArray QImageReader::format() const
 
     \list
 
-    \o Image plugins are queried first, based on either the optional format
+    \li Image plugins are queried first, based on either the optional format
     string, or the file name suffix (if the source device is a file). No
     content detection is done at this stage. QImageReader will choose the
     first plugin that supports reading for this format.
 
-    \o If no plugin supports the image format, Qt's built-in handlers are
+    \li If no plugin supports the image format, Qt's built-in handlers are
     checked based on either the optional format string, or the file name
     suffix.
 
-    \o If no capable plugins or built-in handlers are found, each plugin is
+    \li If no capable plugins or built-in handlers are found, each plugin is
     tested by inspecting the content of the data stream.
 
-    \o If no plugins could detect the image format based on data contents,
+    \li If no plugins could detect the image format based on data contents,
     each built-in image handler is tested by inspecting the contents.
 
-    \o Finally, if all above approaches fail, QImageReader will report failure
+    \li Finally, if all above approaches fail, QImageReader will report failure
     when trying to read the image.
 
     \endlist
@@ -1423,18 +1423,18 @@ QByteArray QImageReader::imageFormat(QIODevice *device)
     By default, Qt can read the following formats:
 
     \table
-    \header \o Format \o Description
-    \row    \o BMP    \o Windows Bitmap
-    \row    \o GIF    \o Graphic Interchange Format (optional)
-    \row    \o JPG    \o Joint Photographic Experts Group
-    \row    \o JPEG   \o Joint Photographic Experts Group
-    \row    \o PNG    \o Portable Network Graphics
-    \row    \o PBM    \o Portable Bitmap
-    \row    \o PGM    \o Portable Graymap
-    \row    \o PPM    \o Portable Pixmap
-    \row    \o XBM    \o X11 Bitmap
-    \row    \o XPM    \o X11 Pixmap
-    \row    \o SVG    \o Scalable Vector Graphics
+    \header \li Format \li Description
+    \row    \li BMP    \li Windows Bitmap
+    \row    \li GIF    \li Graphic Interchange Format (optional)
+    \row    \li JPG    \li Joint Photographic Experts Group
+    \row    \li JPEG   \li Joint Photographic Experts Group
+    \row    \li PNG    \li Portable Network Graphics
+    \row    \li PBM    \li Portable Bitmap
+    \row    \li PGM    \li Portable Graymap
+    \row    \li PPM    \li Portable Pixmap
+    \row    \li XBM    \li X11 Bitmap
+    \row    \li XPM    \li X11 Pixmap
+    \row    \li SVG    \li Scalable Vector Graphics
     \endtable
 
     Reading and writing SVG files is supported through Qt's
diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp
index 966017452c..8395f9d216 100644
--- a/src/gui/image/qimagewriter.cpp
+++ b/src/gui/image/qimagewriter.cpp
@@ -653,14 +653,14 @@ bool QImageWriter::supportsOption(QImageIOHandler::ImageOption option) const
     By default, Qt can write the following formats:
 
     \table
-    \header \o Format \o Description
-    \row    \o BMP    \o Windows Bitmap
-    \row    \o JPG    \o Joint Photographic Experts Group
-    \row    \o JPEG   \o Joint Photographic Experts Group
-    \row    \o PNG    \o Portable Network Graphics
-    \row    \o PPM    \o Portable Pixmap
-    \row    \o XBM    \o X11 Bitmap
-    \row    \o XPM    \o X11 Pixmap
+    \header \li Format \li Description
+    \row    \li BMP    \li Windows Bitmap
+    \row    \li JPG    \li Joint Photographic Experts Group
+    \row    \li JPEG   \li Joint Photographic Experts Group
+    \row    \li PNG    \li Portable Network Graphics
+    \row    \li PPM    \li Portable Pixmap
+    \row    \li XBM    \li X11 Bitmap
+    \row    \li XPM    \li X11 Pixmap
     \endtable
 
     Reading and writing SVG files is supported through Qt's
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index e8c1304b74..504f583baf 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1052,11 +1052,11 @@ bool QPixmap::convertFromImage(const QImage &image, Qt::ImageConversionFlags fla
     \image qimage-scaling.png
 
     \list
-    \i If \a aspectRatioMode is Qt::IgnoreAspectRatio, the pixmap
+    \li If \a aspectRatioMode is Qt::IgnoreAspectRatio, the pixmap
        is scaled to \a size.
-    \i If \a aspectRatioMode is Qt::KeepAspectRatio, the pixmap is
+    \li If \a aspectRatioMode is Qt::KeepAspectRatio, the pixmap is
        scaled to a rectangle as large as possible inside \a size, preserving the aspect ratio.
-    \i If \a aspectRatioMode is Qt::KeepAspectRatioByExpanding,
+    \li If \a aspectRatioMode is Qt::KeepAspectRatioByExpanding,
        the pixmap is scaled to a rectangle as small as possible
        outside \a size, preserving the aspect ratio.
     \endlist
@@ -1273,17 +1273,17 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode)
     formats:
 
     \table
-    \header \o Format \o Description                      \o Qt's support
-    \row    \o BMP    \o Windows Bitmap                   \o Read/write
-    \row    \o GIF    \o Graphic Interchange Format (optional) \o Read
-    \row    \o JPG    \o Joint Photographic Experts Group \o Read/write
-    \row    \o JPEG   \o Joint Photographic Experts Group \o Read/write
-    \row    \o PNG    \o Portable Network Graphics        \o Read/write
-    \row    \o PBM    \o Portable Bitmap                  \o Read
-    \row    \o PGM    \o Portable Graymap                 \o Read
-    \row    \o PPM    \o Portable Pixmap                  \o Read/write
-    \row    \o XBM    \o X11 Bitmap                       \o Read/write
-    \row    \o XPM    \o X11 Pixmap                       \o Read/write
+    \header \li Format \li Description                      \li Qt's support
+    \row    \li BMP    \li Windows Bitmap                   \li Read/write
+    \row    \li GIF    \li Graphic Interchange Format (optional) \li Read
+    \row    \li JPG    \li Joint Photographic Experts Group \li Read/write
+    \row    \li JPEG   \li Joint Photographic Experts Group \li Read/write
+    \row    \li PNG    \li Portable Network Graphics        \li Read/write
+    \row    \li PBM    \li Portable Bitmap                  \li Read
+    \row    \li PGM    \li Portable Graymap                 \li Read
+    \row    \li PPM    \li Portable Pixmap                  \li Read/write
+    \row    \li XBM    \li X11 Bitmap                       \li Read/write
+    \row    \li XPM    \li X11 Pixmap                       \li Read/write
     \endtable
 
     \section1 Pixmap Information
@@ -1293,17 +1293,17 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode)
 
     \table
     \header
-    \o \o Available Functions
+    \li \li Available Functions
     \row
-    \o Geometry
-    \o
+    \li Geometry
+    \li
     The size(), width() and height() functions provide information
     about the pixmap's size. The rect() function returns the image's
     enclosing rectangle.
 
     \row
-    \o Alpha component
-    \o
+    \li Alpha component
+    \li
 
     The hasAlphaChannel() returns true if the pixmap has a format that
     respects the alpha channel, otherwise returns false. The hasAlpha(),
@@ -1318,8 +1318,8 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode)
     QBitmap) for the pixmap based on a given color.
 
     \row
-    \o Low-level information
-    \o
+    \li Low-level information
+    \li
 
     The depth() function returns the depth of the pixmap. The
     defaultDepth() function returns the default depth, i.e. the depth
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp
index 8e881aabc7..27179cf141 100644
--- a/src/gui/kernel/qclipboard.cpp
+++ b/src/gui/kernel/qclipboard.cpp
@@ -86,18 +86,18 @@ QT_BEGIN_NAMESPACE
 
     \list
 
-    \i The X11 Window System has the concept of a separate selection
+    \li The X11 Window System has the concept of a separate selection
     and clipboard.  When text is selected, it is immediately available
     as the global mouse selection.  The global mouse selection may
     later be copied to the clipboard.  By convention, the middle mouse
     button is used to paste the global mouse selection.
 
-    \i X11 also has the concept of ownership; if you change the
+    \li X11 also has the concept of ownership; if you change the
     selection within a window, X11 will only notify the owner and the
     previous owner of the change, i.e. it will not notify all
     applications that the selection or clipboard data changed.
 
-    \i Lastly, the X11 clipboard is event driven, i.e. the clipboard
+    \li Lastly, the X11 clipboard is event driven, i.e. the clipboard
     will not function properly if the event loop is not running.
     Similarly, it is recommended that the contents of the clipboard
     are stored or retrieved in direct response to user-input events,
@@ -105,7 +105,7 @@ QT_BEGIN_NAMESPACE
     store or retrieve the clipboard contents in response to timer or
     non-user-input events.
 
-    \i Since there is no standard way to copy and paste files between
+    \li Since there is no standard way to copy and paste files between
     applications on X11, various MIME types and conventions are currently
     in use. For instance, Nautilus expects files to be supplied with a
     \c{x-special/gnome-copied-files} MIME type with data beginning with
@@ -123,12 +123,12 @@ QT_BEGIN_NAMESPACE
 
     \list
 
-    \i Windows and Mac OS X do not support the global mouse
+    \li Windows and Mac OS X do not support the global mouse
     selection; they only supports the global clipboard, i.e. they
     only add text to the clipboard when an explicit copy or cut is
     made.
 
-    \i Windows and Mac OS X does not have the concept of ownership;
+    \li Windows and Mac OS X does not have the concept of ownership;
     the clipboard is a fully global resource so all applications are
     notified of changes.
 
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp
index 77eb1e1e9c..f16e5c85de 100644
--- a/src/gui/kernel/qcursor.cpp
+++ b/src/gui/kernel/qcursor.cpp
@@ -85,7 +85,7 @@ QT_BEGIN_NAMESPACE
     To set or get the position of the mouse cursor use the static
     methods QCursor::pos() and QCursor::setPos().
 
-    \bold{Note:} It is possible to create a QCursor before
+    \b{Note:} It is possible to create a QCursor before
     QGuiApplication, but it is not useful except as a place-holder for a
     real QCursor created after QGuiApplication. Attempting to use a
     QCursor that was created before QGuiApplication will result in a
@@ -104,50 +104,50 @@ QT_BEGIN_NAMESPACE
     theme, while others will use an internal bitmap cursor.
 
     \table
-    \header \o Shape \o Qt::CursorShape Value \o Cursor Name
-            \o Shape \o Qt::CursorShape Value \o Cursor Name
-    \row \o \inlineimage cursor-arrow.png
-         \o Qt::ArrowCursor   \o \c left_ptr
-         \o \inlineimage      cursor-sizev.png
-         \o Qt::SizeVerCursor \o \c size_ver
-    \row \o \inlineimage      cursor-uparrow.png
-         \o Qt::UpArrowCursor \o \c up_arrow
-         \o \inlineimage      cursor-sizeh.png
-         \o Qt::SizeHorCursor \o \c size_hor
-    \row \o \inlineimage      cursor-cross.png
-         \o Qt::CrossCursor   \o \c cross
-         \o \inlineimage      cursor-sizeb.png
-         \o Qt::SizeBDiagCursor \o \c size_bdiag
-    \row \o \inlineimage      cursor-ibeam.png
-         \o Qt::IBeamCursor   \o \c ibeam
-         \o \inlineimage      cursor-sizef.png
-         \o Qt::SizeFDiagCursor \o \c size_fdiag
-    \row \o \inlineimage      cursor-wait.png
-         \o Qt::WaitCursor    \o \c wait
-         \o \inlineimage      cursor-sizeall.png
-         \o Qt::SizeAllCursor \o \c size_all
-    \row \o \inlineimage      cursor-busy.png
-         \o Qt::BusyCursor    \o \c left_ptr_watch
-         \o \inlineimage      cursor-vsplit.png
-         \o Qt::SplitVCursor  \o \c split_v
-    \row \o \inlineimage      cursor-forbidden.png
-         \o Qt::ForbiddenCursor \o \c forbidden
-         \o \inlineimage      cursor-hsplit.png
-         \o Qt::SplitHCursor  \o \c split_h
-    \row \o \inlineimage      cursor-hand.png
-         \o Qt::PointingHandCursor \o \c pointing_hand
-         \o \inlineimage      cursor-openhand.png
-         \o Qt::OpenHandCursor  \o \c openhand
-    \row \o \inlineimage      cursor-whatsthis.png
-         \o Qt::WhatsThisCursor \o \c whats_this
-         \o \inlineimage      cursor-closedhand.png
-         \o Qt::ClosedHandCursor \o \c closedhand
-    \row \o
-         \o Qt::DragMoveCursor      \o \c dnd-move or \c move
-         \o
-         \o Qt::DragCopyCursor      \o \c dnd-copy or \c copy
-    \row \o
-         \o Qt::DragLinkCursor      \o \c dnd-link or \c link
+    \header \li Shape \li Qt::CursorShape Value \li Cursor Name
+            \li Shape \li Qt::CursorShape Value \li Cursor Name
+    \row \li \inlineimage cursor-arrow.png
+         \li Qt::ArrowCursor   \li \c left_ptr
+         \li \inlineimage      cursor-sizev.png
+         \li Qt::SizeVerCursor \li \c size_ver
+    \row \li \inlineimage      cursor-uparrow.png
+         \li Qt::UpArrowCursor \li \c up_arrow
+         \li \inlineimage      cursor-sizeh.png
+         \li Qt::SizeHorCursor \li \c size_hor
+    \row \li \inlineimage      cursor-cross.png
+         \li Qt::CrossCursor   \li \c cross
+         \li \inlineimage      cursor-sizeb.png
+         \li Qt::SizeBDiagCursor \li \c size_bdiag
+    \row \li \inlineimage      cursor-ibeam.png
+         \li Qt::IBeamCursor   \li \c ibeam
+         \li \inlineimage      cursor-sizef.png
+         \li Qt::SizeFDiagCursor \li \c size_fdiag
+    \row \li \inlineimage      cursor-wait.png
+         \li Qt::WaitCursor    \li \c wait
+         \li \inlineimage      cursor-sizeall.png
+         \li Qt::SizeAllCursor \li \c size_all
+    \row \li \inlineimage      cursor-busy.png
+         \li Qt::BusyCursor    \li \c left_ptr_watch
+         \li \inlineimage      cursor-vsplit.png
+         \li Qt::SplitVCursor  \li \c split_v
+    \row \li \inlineimage      cursor-forbidden.png
+         \li Qt::ForbiddenCursor \li \c forbidden
+         \li \inlineimage      cursor-hsplit.png
+         \li Qt::SplitHCursor  \li \c split_h
+    \row \li \inlineimage      cursor-hand.png
+         \li Qt::PointingHandCursor \li \c pointing_hand
+         \li \inlineimage      cursor-openhand.png
+         \li Qt::OpenHandCursor  \li \c openhand
+    \row \li \inlineimage      cursor-whatsthis.png
+         \li Qt::WhatsThisCursor \li \c whats_this
+         \li \inlineimage      cursor-closedhand.png
+         \li Qt::ClosedHandCursor \li \c closedhand
+    \row \li
+         \li Qt::DragMoveCursor      \li \c dnd-move or \c move
+         \li
+         \li Qt::DragCopyCursor      \li \c dnd-copy or \c copy
+    \row \li
+         \li Qt::DragLinkCursor      \li \c dnd-link or \c link
     \endtable
 
     \sa QWidget, {fowler}{GUI Design Handbook: Cursors}
@@ -346,10 +346,10 @@ QCursor::QCursor(const QPixmap &pixmap, int hotX, int hotY)
 
     The cursor \a bitmap (B) and \a mask (M) bits are combined like this:
     \list
-    \o B=1 and M=1 gives black.
-    \o B=0 and M=1 gives white.
-    \o B=0 and M=0 gives transparent.
-    \o B=1 and M=0 gives an XOR'd result under Windows, undefined
+    \li B=1 and M=1 gives black.
+    \li B=0 and M=1 gives white.
+    \li B=0 and M=0 gives transparent.
+    \li B=1 and M=0 gives an XOR'd result under Windows, undefined
     results on all other platforms.
     \endlist
 
diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp
index ead0805bd1..40015c8706 100644
--- a/src/gui/kernel/qdrag.cpp
+++ b/src/gui/kernel/qdrag.cpp
@@ -176,7 +176,7 @@ QPixmap QDrag::pixmap() const
     Sets the position of the hot spot relative to the top-left corner of the
     pixmap used to the point specified by \a hotspot.
 
-    \bold{Note:} on X11, the pixmap may not be able to keep up with the mouse
+    \b{Note:} on X11, the pixmap may not be able to keep up with the mouse
     movements if the hot spot causes the pixmap to be displayed
     directly under the cursor.
 */
@@ -224,7 +224,7 @@ QObject *QDrag::target() const
     from are specified in \a supportedActions. The default proposed action will be selected
     among the allowed actions in the following order: Move, Copy and Link.
 
-    \bold{Note:} On Linux and Mac OS X, the drag and drop operation
+    \b{Note:} On Linux and Mac OS X, the drag and drop operation
     can take some time, but this function does not block the event
     loop. Other events are still delivered to the application while
     the operation is performed. On Windows, the Qt event loop is
@@ -246,7 +246,7 @@ Qt::DropAction QDrag::exec(Qt::DropActions supportedActions)
     The \a defaultDropAction determines which action will be proposed when the user performs a
     drag without using modifier keys.
 
-    \bold{Note:} On Linux and Mac OS X, the drag and drop operation
+    \b{Note:} On Linux and Mac OS X, the drag and drop operation
     can take some time, but this function does not block the event
     loop. Other events are still delivered to the application while
     the operation is performed. On Windows, the Qt event loop is
@@ -285,13 +285,13 @@ Qt::DropAction QDrag::exec(Qt::DropActions supportedActions, Qt::DropAction defa
 /*!
     \obsolete
 
-    \bold{Note:} It is recommended to use exec() instead of this function.
+    \b{Note:} It is recommended to use exec() instead of this function.
 
     Starts the drag and drop operation and returns a value indicating the requested
     drop action when it is completed. The drop actions that the user can choose
     from are specified in \a request. Qt::CopyAction is always allowed.
 
-    \bold{Note:} Although the drag and drop operation can take some time, this function
+    \b{Note:} Although the drag and drop operation can take some time, this function
     does not block the event loop. Other events are still delivered to the application
     while the operation is performed.
 
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index e902cbf7e2..60e754b289 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -377,9 +377,9 @@ QMouseEvent::~QMouseEvent()
     you will get the following QEvent::MouseMove events:
 
     \list 1
-        \o A::MouseMove
-        \o B::MouseMove
-        \o C::MouseMove
+        \li A::MouseMove
+        \li B::MouseMove
+        \li C::MouseMove
     \endlist
 
     You will get the same events for QEvent::HoverMove, except that the event
@@ -390,9 +390,9 @@ QMouseEvent::~QMouseEvent()
     In this case the events will occur in the following way:
 
     \list 1
-        \o A::HoverMove
-        \o A::HoverMove, B::HoverMove
-        \o A::HoverMove, B::HoverMove, C::HoverMove
+        \li A::HoverMove
+        \li A::HoverMove, B::HoverMove
+        \li A::HoverMove, B::HoverMove, C::HoverMove
     \endlist
 
 */
@@ -1483,20 +1483,20 @@ QContextMenuEvent::QContextMenuEvent(Reason reason, const QPoint &pos)
     step process:
 
     \list 1
-    \o \bold{Starting to Compose}
+    \li \b{Starting to Compose}
 
        When the user presses the first key on a keyboard, an input
        context is created. This input context will contain a string
        of the typed characters.
 
-    \o \bold{Composing}
+    \li \b{Composing}
 
        With every new key pressed, the input method will try to create a
        matching string for the text typed so far called preedit
        string. While the input context is active, the user can only move
        the cursor inside the string belonging to this input context.
 
-    \o \bold{Completing}
+    \li \b{Completing}
 
        At some point, the user will activate a user interface component
        (perhaps using a particular key) where they can choose from a
@@ -1539,10 +1539,10 @@ QContextMenuEvent::QContextMenuEvent(Reason reason, const QPoint &pos)
     following steps:
 
     \list 1
-    \o If the widget has selected text, the selected text should get
+    \li If the widget has selected text, the selected text should get
        removed.
 
-    \o Remove the text starting at replacementStart() with length
+    \li Remove the text starting at replacementStart() with length
        replacementLength() and replace it by the commitString(). If
        replacementLength() is 0, replacementStart() gives the insertion
        position for the commitString().
@@ -1556,7 +1556,7 @@ QContextMenuEvent::QContextMenuEvent(Reason reason, const QPoint &pos)
        If the widget implements undo/redo, this operation gets added to
        the undo stack.
 
-    \o If there is no current preedit string, insert the
+    \li If there is no current preedit string, insert the
        preeditString() at the current cursor position; otherwise replace
        the previous preeditString with the one received from this event.
 
@@ -2060,7 +2060,7 @@ QTabletEvent::~QTabletEvent()
 
     Returns the z position of the device. Typically this is represented by a
     wheel on a 4D Mouse. If the device does not support a Z-axis, this value is
-    always zero. This is \bold not the same as pressure.
+    always zero. This is \b not the same as pressure.
 
     \sa pressure()
 */
@@ -2576,11 +2576,11 @@ QHelpEvent::~QHelpEvent()
 
     \table 100%
     \row
-    \o
+    \li
     \snippet doc/src/snippets/qstatustipevent/main.cpp 1
     \dots
     \snippet doc/src/snippets/qstatustipevent/main.cpp 3
-    \o
+    \li
     \image qstatustipevent-widget.png Widget with status tip.
     \endtable
 
@@ -2589,12 +2589,12 @@ QHelpEvent::~QHelpEvent()
 
     \table 100%
     \row
-    \o
+    \li
     \snippet doc/src/snippets/qstatustipevent/main.cpp 0
     \snippet doc/src/snippets/qstatustipevent/main.cpp 2
     \dots
     \snippet doc/src/snippets/qstatustipevent/main.cpp 3
-    \o
+    \li
     \image qstatustipevent-action.png Action with status tip.
     \endtable
 
@@ -3405,10 +3405,10 @@ QWindowStateChangeEvent::~QWindowStateChangeEvent()
 
     \list
 
-    \i When the first touch point is detected, the destination widget is determined firstly by the
+    \li When the first touch point is detected, the destination widget is determined firstly by the
     location on screen and secondly by the propagation rules.
 
-    \i When additional touch points are detected, Qt first looks to see if there are any active
+    \li When additional touch points are detected, Qt first looks to see if there are any active
     touch points on any ancestor or descendent of the widget under the new touch point. If there
     are, the new touch point is grouped with the first, and the new touch point will be sent in a
     single QTouchEvent to the widget that handled the first touch point. (The widget under the new
@@ -3430,19 +3430,19 @@ QWindowStateChangeEvent::~QWindowStateChangeEvent()
 
     \list
 
-    \i As mentioned above, enabling touch events means multiple widgets can be receiving touch
+    \li As mentioned above, enabling touch events means multiple widgets can be receiving touch
     events simultaneously. Combined with the default QWidget::event() handling for QTouchEvents,
     this gives you great flexibility in designing touch user interfaces. Be aware of the
     implications. For example, it is possible that the user is moving a QSlider with one finger and
     pressing a QPushButton with another. The signals emitted by these widgets will be
     interleaved.
 
-    \i Recursion into the event loop using one of the exec() methods (e.g., QDialog::exec() or
+    \li Recursion into the event loop using one of the exec() methods (e.g., QDialog::exec() or
     QMenu::exec()) in a QTouchEvent event handler is not supported. Since there are multiple event
     recipients, recursion may cause problems, including but not limited to lost events
     and unexpected infinite recursion.
 
-    \i QTouchEvents are not affected by a \l{QWidget::grabMouse()}{mouse grab} or an
+    \li QTouchEvents are not affected by a \l{QWidget::grabMouse()}{mouse grab} or an
     \l{QApplication::activePopupWidget()}{active pop-up widget}. The behavior of QTouchEvents is
     undefined when opening a pop-up or grabbing the mouse while there are more than one active touch
     points.
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 09d4e98c3c..be82005a54 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -195,7 +195,7 @@ static inline void clearFontUnlocked()
     application's initialization and finalization. In addition, QGuiApplication handles
     most of the system-wide and application-wide settings.
 
-    For any GUI application using Qt, there is precisely \bold one QGuiApplication
+    For any GUI application using Qt, there is precisely \b one QGuiApplication
     object no matter whether the application has 0, 1, 2 or more windows at
     any given time. For non-GUI Qt applications, use QCoreApplication instead,
     as it does not depend on the \l QtGui library.
@@ -205,30 +205,30 @@ static inline void clearFontUnlocked()
 
     QGuiApplication's main areas of responsibility are:
         \list
-            \o  It initializes the application with the user's desktop settings,
+            \li  It initializes the application with the user's desktop settings,
                 such as palette(), font() and styleHints(). It keeps
                 track of these properties in case the user changes the desktop
                 globally, for example, through some kind of control panel.
 
-            \o  It performs event handling, meaning that it receives events
+            \li  It performs event handling, meaning that it receives events
                 from the underlying window system and dispatches them to the
                 relevant widgets. You can send your own events to windows by
                 using sendEvent() and postEvent().
 
-            \o  It parses common command line arguments and sets its internal
+            \li  It parses common command line arguments and sets its internal
                 state accordingly. See the \l{QGuiApplication::QGuiApplication()}
                 {constructor documentation} below for more details.
 
-            \o  It provides localization of strings that are visible to the
+            \li  It provides localization of strings that are visible to the
                 user via translate().
 
-            \o  It provides some magical objects like the clipboard().
+            \li  It provides some magical objects like the clipboard().
 
-            \o  It knows about the application's windows. You can ask which
+            \li  It knows about the application's windows. You can ask which
                 window is at a certain position using topLevelAt(), get a list of
                 topLevelWindows(), etc.
 
-            \o  It manages the application's mouse cursor handling, see
+            \li  It manages the application's mouse cursor handling, see
                 setOverrideCursor()
         \endlist
 
@@ -240,11 +240,11 @@ static inline void clearFontUnlocked()
 
     \table
     \header
-        \o{2,1} Groups of functions
+        \li{2,1} Groups of functions
 
         \row
-        \o  System settings
-        \o  desktopSettingsAware(),
+        \li  System settings
+        \li  desktopSettingsAware(),
             setDesktopSettingsAware(),
             styleHints(),
             palette(),
@@ -253,8 +253,8 @@ static inline void clearFontUnlocked()
             setFont().
 
         \row
-        \o  Event handling
-        \o  exec(),
+        \li  Event handling
+        \li  exec(),
             processEvents(),
             exit(),
             quit().
@@ -266,22 +266,22 @@ static inline void clearFontUnlocked()
             notify().
 
         \row
-        \o  Windows
-        \o  allWindows(),
+        \li  Windows
+        \li  allWindows(),
             topLevelWindows(),
             focusWindow(),
             clipboard(),
             topLevelAt().
 
         \row
-        \o  Advanced cursor handling
-        \o  overrideCursor(),
+        \li  Advanced cursor handling
+        \li  overrideCursor(),
             setOverrideCursor(),
             restoreOverrideCursor().
 
         \row
-        \o  Miscellaneous
-        \o  startingUp(),
+        \li  Miscellaneous
+        \li  startingUp(),
             closingDown(),
             type().
     \endtable
@@ -309,9 +309,9 @@ static inline void clearFontUnlocked()
 
     All Qt programs automatically support the following command line options:
     \list
-        \o  -reverse, sets the application's layout direction to
+        \li  -reverse, sets the application's layout direction to
             Qt::RightToLeft
-        \o  -qmljsdebugger=, activates the QML/JS debugger with a specified port.
+        \li  -qmljsdebugger=, activates the QML/JS debugger with a specified port.
             The value must be of format port:1234[,block], where block is optional
             and will make the application wait until a debugger connects to it.
     \endlist
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 7053f01196..153b2b5c2d 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -164,14 +164,14 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
     three different ways:
 
     \list
-    \o For standard shortcuts, a \l{QKeySequence::StandardKey}{standard key}
+    \li For standard shortcuts, a \l{QKeySequence::StandardKey}{standard key}
        can be used to request the platform-specific key sequence associated
        with each shortcut.
-    \o For custom shortcuts, human-readable strings such as "Ctrl+X" can
+    \li For custom shortcuts, human-readable strings such as "Ctrl+X" can
        be used, and these can be translated into the appropriate shortcuts
        for users of different languages. Translations are made in the
        "QShortcut" context.
-    \o For hard-coded shortcuts, integer key codes can be specified with
+    \li For hard-coded shortcuts, integer key codes can be specified with
        a combination of values defined by the Qt::Key and Qt::Modifier enum
        values. Each key code consists of a single Qt::Key value and zero or
        more modifiers, such as Qt::SHIFT, Qt::CTRL, Qt::ALT and Qt::META.
@@ -206,7 +206,7 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
     code point of the character; for example, 'A' gives the same key sequence
     as Qt::Key_A.
 
-    \bold{Note:} On Mac OS X, references to "Ctrl", Qt::CTRL, Qt::Control
+    \b{Note:} On Mac OS X, references to "Ctrl", Qt::CTRL, Qt::Control
     and Qt::ControlModifier correspond to the \key Command keys on the
     Macintosh keyboard, and references to "Meta", Qt::META, Qt::Meta and
     Qt::MetaModifier correspond to the \key Control keys. Developers on
@@ -225,72 +225,72 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
     corresponds to the \key Control keys.
 
     \table
-    \header \i StandardKey      \i Windows                              \i Mac OS X                 \i KDE          \i GNOME
-    \row    \i HelpContents     \i F1                                   \i Ctrl+?                   \i F1           \i F1
-    \row    \i WhatsThis        \i Shift+F1                             \i Shift+F1                 \i Shift+F1     \i Shift+F1
-    \row    \i Open             \i Ctrl+O                               \i Ctrl+O                   \i Ctrl+O       \i Ctrl+O
-    \row    \i Close            \i Ctrl+F4, Ctrl+W                      \i Ctrl+W, Ctrl+F4          \i Ctrl+W       \i Ctrl+W
-    \row    \i Save             \i Ctrl+S                               \i Ctrl+S                   \i Ctrl+S       \i Ctrl+S
-    \row    \i Quit             \i                                      \i Ctrl+Q                   \i Qtrl+Q       \i Qtrl+Q
-    \row    \i SaveAs           \i                                      \i Ctrl+Shift+S             \i              \i Ctrl+Shift+S
-    \row    \i New              \i Ctrl+N                               \i Ctrl+N                   \i Ctrl+N       \i Ctrl+N
-    \row    \i Delete           \i Del                                  \i Del, Meta+D              \i Del, Ctrl+D  \i Del, Ctrl+D
-    \row    \i Cut              \i Ctrl+X, Shift+Del                    \i Ctrl+X                   \i Ctrl+X, F20, Shift+Del \i Ctrl+X, F20, Shift+Del
-    \row    \i Copy             \i Ctrl+C, Ctrl+Ins                     \i Ctrl+C                   \i Ctrl+C, F16, Ctrl+Ins  \i Ctrl+C, F16, Ctrl+Ins
-    \row    \i Paste            \i Ctrl+V, Shift+Ins                    \i Ctrl+V                   \i Ctrl+V, F18, Shift+Ins \i Ctrl+V, F18, Shift+Ins
-    \row    \i Preferences      \i                                      \i Ctrl+,                   \i              \i
-    \row    \i Undo             \i Ctrl+Z, Alt+Backspace                \i Ctrl+Z                   \i Ctrl+Z, F14  \i Ctrl+Z, F14
-    \row    \i Redo             \i Ctrl+Y, Shift+Ctrl+Z, Alt+Shift+Backspace \i Ctrl+Shift+Z        \i Ctrl+Shift+Z \i Ctrl+Shift+Z
-    \row    \i Back             \i Alt+Left, Backspace                  \i Ctrl+[                   \i Alt+Left     \i Alt+Left
-    \row    \i Forward          \i Alt+Right, Shift+Backspace           \i Ctrl+]                   \i Alt+Right    \i Alt+Right
-    \row    \i Refresh          \i F5                                   \i F5                       \i F5           \i Ctrl+R, F5
-    \row    \i ZoomIn           \i Ctrl+Plus                            \i Ctrl+Plus                \i Ctrl+Plus    \i Ctrl+Plus
-    \row    \i ZoomOut          \i Ctrl+Minus                           \i Ctrl+Minus               \i Ctrl+Minus   \i Ctrl+Minus
-    \row    \i Print            \i Ctrl+P                               \i Ctrl+P                   \i Ctrl+P       \i Ctrl+P
-    \row    \i AddTab           \i Ctrl+T                               \i Ctrl+T                   \i Ctrl+Shift+N, Ctrl+T \i Ctrl+T
-    \row    \i NextChild        \i Ctrl+Tab, Forward, Ctrl+F6           \i Ctrl+}, Forward, Ctrl+Tab \i Ctrl+Tab, Forward, Ctrl+Comma \i Ctrl+Tab, Forward
-    \row    \i PreviousChild    \i Ctrl+Shift+Tab, Back, Ctrl+Shift+F6  \i Ctrl+{, Back, Ctrl+Shift+Tab \i Ctrl+Shift+Tab, Back, Ctrl+Period \i Ctrl+Shift+Tab, Back
-    \row    \i Find             \i Ctrl+F                               \i Ctrl+F                   \i Ctrl+F         \i Ctrl+F
-    \row    \i FindNext         \i F3, Ctrl+G                           \i Ctrl+G                   \i F3             \i Ctrl+G, F3
-    \row    \i FindPrevious     \i Shift+F3, Ctrl+Shift+G               \i Ctrl+Shift+G             \i Shift+F3       \i Ctrl+Shift+G, Shift+F3
-    \row    \i Replace          \i Ctrl+H                               \i (none)                   \i Ctrl+R         \i Ctrl+H
-    \row    \i SelectAll        \i Ctrl+A                               \i Ctrl+A                   \i Ctrl+A         \i Ctrl+A
-    \row    \i Bold             \i Ctrl+B                               \i Ctrl+B                   \i Ctrl+B         \i Ctrl+B
-    \row    \i Italic           \i Ctrl+I                               \i Ctrl+I                   \i Ctrl+I         \i Ctrl+I
-    \row    \i Underline        \i Ctrl+U                               \i Ctrl+U                   \i Ctrl+U         \i Ctrl+U
-    \row    \i MoveToNextChar       \i Right                            \i Right                    \i Right          \i Right
-    \row    \i MoveToPreviousChar   \i Left                             \i Left                     \i Left           \i Left
-    \row    \i MoveToNextWord       \i Ctrl+Right                       \i Alt+Right                \i Ctrl+Right     \i Ctrl+Right
-    \row    \i MoveToPreviousWord   \i Ctrl+Left                        \i Alt+Left                 \i Ctrl+Left      \i Ctrl+Left
-    \row    \i MoveToNextLine       \i Down                             \i Down                     \i Down           \i Down
-    \row    \i MoveToPreviousLine   \i Up                               \i Up                       \i Up             \i Up
-    \row    \i MoveToNextPage       \i PgDown                           \i PgDown, Alt+PgDown, Meta+Down, Meta+PgDown\i PgDown \i PgDown
-    \row    \i MoveToPreviousPage   \i PgUp                             \i PgUp, Alt+PgUp, Meta+Up, Meta+PgUp        \i PgUp   \i PgUp
-    \row    \i MoveToStartOfLine    \i Home                             \i Ctrl+Left, Meta+Left   \i Home            \i Home
-    \row    \i MoveToEndOfLine      \i End                              \i Ctrl+Right, Meta+Right \i End             \i End
-    \row    \i MoveToStartOfBlock   \i (none)                           \i Alt+Up, Meta+A         \i (none)          \i (none)
-    \row    \i MoveToEndOfBlock     \i (none)                           \i Alt+Down, Meta+E       \i (none)          \i (none)
-    \row    \i MoveToStartOfDocument\i Ctrl+Home                        \i Ctrl+Up, Home          \i Ctrl+Home       \i Ctrl+Home
-    \row    \i MoveToEndOfDocument  \i Ctrl+End                         \i Ctrl+Down, End         \i Ctrl+End        \i Ctrl+End
-    \row    \i SelectNextChar       \i Shift+Right                      \i Shift+Right            \i Shift+Right     \i Shift+Right
-    \row    \i SelectPreviousChar   \i Shift+Left                       \i Shift+Left             \i Shift+Left      \i Shift+Left
-    \row    \i SelectNextWord       \i Ctrl+Shift+Right                 \i Alt+Shift+Right        \i Ctrl+Shift+Right \i Ctrl+Shift+Right
-    \row    \i SelectPreviousWord   \i Ctrl+Shift+Left                  \i Alt+Shift+Left         \i Ctrl+Shift+Left \i Ctrl+Shift+Left
-    \row    \i SelectNextLine       \i Shift+Down                       \i Shift+Down             \i Shift+Down     \i Shift+Down
-    \row    \i SelectPreviousLine   \i Shift+Up                         \i Shift+Up               \i Shift+Up       \i Shift+Up
-    \row    \i SelectNextPage       \i Shift+PgDown                     \i Shift+PgDown           \i Shift+PgDown   \i Shift+PgDown
-    \row    \i SelectPreviousPage   \i Shift+PgUp                       \i Shift+PgUp             \i Shift+PgUp     \i Shift+PgUp
-    \row    \i SelectStartOfLine    \i Shift+Home                       \i Ctrl+Shift+Left        \i Shift+Home     \i Shift+Home
-    \row    \i SelectEndOfLine      \i Shift+End                        \i Ctrl+Shift+Right       \i Shift+End      \i Shift+End
-    \row    \i SelectStartOfBlock   \i (none)                           \i Alt+Shift+Up, Meta+Shift+A \i (none)     \i (none)
-    \row    \i SelectEndOfBlock     \i (none)                           \i Alt+Shift+Down, Meta+Shift+E \i (none)   \i (none)
-    \row    \i SelectStartOfDocument\i Ctrl+Shift+Home                  \i Ctrl+Shift+Up, Shift+Home          \i Ctrl+Shift+Home\i Ctrl+Shift+Home
-    \row    \i SelectEndOfDocument  \i Ctrl+Shift+End                   \i Ctrl+Shift+Down, Shift+End        \i Ctrl+Shift+End \i Ctrl+Shift+End
-    \row    \i DeleteStartOfWord    \i Ctrl+Backspace                   \i Alt+Backspace          \i Ctrl+Backspace \i Ctrl+Backspace
-    \row    \i DeleteEndOfWord      \i Ctrl+Del                         \i (none)                 \i Ctrl+Del       \i Ctrl+Del
-    \row    \i DeleteEndOfLine      \i (none)                           \i (none)                 \i Ctrl+K         \i Ctrl+K
-    \row    \i InsertParagraphSeparator     \i Enter                    \i Enter                  \i Enter          \i Enter
-    \row    \i InsertLineSeparator          \i Shift+Enter              \i Meta+Enter             \i Shift+Enter    \i Shift+Enter
+    \header \li StandardKey      \li Windows                              \li Mac OS X                 \li KDE          \li GNOME
+    \row    \li HelpContents     \li F1                                   \li Ctrl+?                   \li F1           \li F1
+    \row    \li WhatsThis        \li Shift+F1                             \li Shift+F1                 \li Shift+F1     \li Shift+F1
+    \row    \li Open             \li Ctrl+O                               \li Ctrl+O                   \li Ctrl+O       \li Ctrl+O
+    \row    \li Close            \li Ctrl+F4, Ctrl+W                      \li Ctrl+W, Ctrl+F4          \li Ctrl+W       \li Ctrl+W
+    \row    \li Save             \li Ctrl+S                               \li Ctrl+S                   \li Ctrl+S       \li Ctrl+S
+    \row    \li Quit             \li                                      \li Ctrl+Q                   \li Qtrl+Q       \li Qtrl+Q
+    \row    \li SaveAs           \li                                      \li Ctrl+Shift+S             \li              \li Ctrl+Shift+S
+    \row    \li New              \li Ctrl+N                               \li Ctrl+N                   \li Ctrl+N       \li Ctrl+N
+    \row    \li Delete           \li Del                                  \li Del, Meta+D              \li Del, Ctrl+D  \li Del, Ctrl+D
+    \row    \li Cut              \li Ctrl+X, Shift+Del                    \li Ctrl+X                   \li Ctrl+X, F20, Shift+Del \li Ctrl+X, F20, Shift+Del
+    \row    \li Copy             \li Ctrl+C, Ctrl+Ins                     \li Ctrl+C                   \li Ctrl+C, F16, Ctrl+Ins  \li Ctrl+C, F16, Ctrl+Ins
+    \row    \li Paste            \li Ctrl+V, Shift+Ins                    \li Ctrl+V                   \li Ctrl+V, F18, Shift+Ins \li Ctrl+V, F18, Shift+Ins
+    \row    \li Preferences      \li                                      \li Ctrl+,                   \li              \li
+    \row    \li Undo             \li Ctrl+Z, Alt+Backspace                \li Ctrl+Z                   \li Ctrl+Z, F14  \li Ctrl+Z, F14
+    \row    \li Redo             \li Ctrl+Y, Shift+Ctrl+Z, Alt+Shift+Backspace \li Ctrl+Shift+Z        \li Ctrl+Shift+Z \li Ctrl+Shift+Z
+    \row    \li Back             \li Alt+Left, Backspace                  \li Ctrl+[                   \li Alt+Left     \li Alt+Left
+    \row    \li Forward          \li Alt+Right, Shift+Backspace           \li Ctrl+]                   \li Alt+Right    \li Alt+Right
+    \row    \li Refresh          \li F5                                   \li F5                       \li F5           \li Ctrl+R, F5
+    \row    \li ZoomIn           \li Ctrl+Plus                            \li Ctrl+Plus                \li Ctrl+Plus    \li Ctrl+Plus
+    \row    \li ZoomOut          \li Ctrl+Minus                           \li Ctrl+Minus               \li Ctrl+Minus   \li Ctrl+Minus
+    \row    \li Print            \li Ctrl+P                               \li Ctrl+P                   \li Ctrl+P       \li Ctrl+P
+    \row    \li AddTab           \li Ctrl+T                               \li Ctrl+T                   \li Ctrl+Shift+N, Ctrl+T \li Ctrl+T
+    \row    \li NextChild        \li Ctrl+Tab, Forward, Ctrl+F6           \li Ctrl+}, Forward, Ctrl+Tab \li Ctrl+Tab, Forward, Ctrl+Comma \li Ctrl+Tab, Forward
+    \row    \li PreviousChild    \li Ctrl+Shift+Tab, Back, Ctrl+Shift+F6  \li Ctrl+{, Back, Ctrl+Shift+Tab \li Ctrl+Shift+Tab, Back, Ctrl+Period \li Ctrl+Shift+Tab, Back
+    \row    \li Find             \li Ctrl+F                               \li Ctrl+F                   \li Ctrl+F         \li Ctrl+F
+    \row    \li FindNext         \li F3, Ctrl+G                           \li Ctrl+G                   \li F3             \li Ctrl+G, F3
+    \row    \li FindPrevious     \li Shift+F3, Ctrl+Shift+G               \li Ctrl+Shift+G             \li Shift+F3       \li Ctrl+Shift+G, Shift+F3
+    \row    \li Replace          \li Ctrl+H                               \li (none)                   \li Ctrl+R         \li Ctrl+H
+    \row    \li SelectAll        \li Ctrl+A                               \li Ctrl+A                   \li Ctrl+A         \li Ctrl+A
+    \row    \li Bold             \li Ctrl+B                               \li Ctrl+B                   \li Ctrl+B         \li Ctrl+B
+    \row    \li Italic           \li Ctrl+I                               \li Ctrl+I                   \li Ctrl+I         \li Ctrl+I
+    \row    \li Underline        \li Ctrl+U                               \li Ctrl+U                   \li Ctrl+U         \li Ctrl+U
+    \row    \li MoveToNextChar       \li Right                            \li Right                    \li Right          \li Right
+    \row    \li MoveToPreviousChar   \li Left                             \li Left                     \li Left           \li Left
+    \row    \li MoveToNextWord       \li Ctrl+Right                       \li Alt+Right                \li Ctrl+Right     \li Ctrl+Right
+    \row    \li MoveToPreviousWord   \li Ctrl+Left                        \li Alt+Left                 \li Ctrl+Left      \li Ctrl+Left
+    \row    \li MoveToNextLine       \li Down                             \li Down                     \li Down           \li Down
+    \row    \li MoveToPreviousLine   \li Up                               \li Up                       \li Up             \li Up
+    \row    \li MoveToNextPage       \li PgDown                           \li PgDown, Alt+PgDown, Meta+Down, Meta+PgDown\li PgDown \li PgDown
+    \row    \li MoveToPreviousPage   \li PgUp                             \li PgUp, Alt+PgUp, Meta+Up, Meta+PgUp        \li PgUp   \li PgUp
+    \row    \li MoveToStartOfLine    \li Home                             \li Ctrl+Left, Meta+Left   \li Home            \li Home
+    \row    \li MoveToEndOfLine      \li End                              \li Ctrl+Right, Meta+Right \li End             \li End
+    \row    \li MoveToStartOfBlock   \li (none)                           \li Alt+Up, Meta+A         \li (none)          \li (none)
+    \row    \li MoveToEndOfBlock     \li (none)                           \li Alt+Down, Meta+E       \li (none)          \li (none)
+    \row    \li MoveToStartOfDocument\li Ctrl+Home                        \li Ctrl+Up, Home          \li Ctrl+Home       \li Ctrl+Home
+    \row    \li MoveToEndOfDocument  \li Ctrl+End                         \li Ctrl+Down, End         \li Ctrl+End        \li Ctrl+End
+    \row    \li SelectNextChar       \li Shift+Right                      \li Shift+Right            \li Shift+Right     \li Shift+Right
+    \row    \li SelectPreviousChar   \li Shift+Left                       \li Shift+Left             \li Shift+Left      \li Shift+Left
+    \row    \li SelectNextWord       \li Ctrl+Shift+Right                 \li Alt+Shift+Right        \li Ctrl+Shift+Right \li Ctrl+Shift+Right
+    \row    \li SelectPreviousWord   \li Ctrl+Shift+Left                  \li Alt+Shift+Left         \li Ctrl+Shift+Left \li Ctrl+Shift+Left
+    \row    \li SelectNextLine       \li Shift+Down                       \li Shift+Down             \li Shift+Down     \li Shift+Down
+    \row    \li SelectPreviousLine   \li Shift+Up                         \li Shift+Up               \li Shift+Up       \li Shift+Up
+    \row    \li SelectNextPage       \li Shift+PgDown                     \li Shift+PgDown           \li Shift+PgDown   \li Shift+PgDown
+    \row    \li SelectPreviousPage   \li Shift+PgUp                       \li Shift+PgUp             \li Shift+PgUp     \li Shift+PgUp
+    \row    \li SelectStartOfLine    \li Shift+Home                       \li Ctrl+Shift+Left        \li Shift+Home     \li Shift+Home
+    \row    \li SelectEndOfLine      \li Shift+End                        \li Ctrl+Shift+Right       \li Shift+End      \li Shift+End
+    \row    \li SelectStartOfBlock   \li (none)                           \li Alt+Shift+Up, Meta+Shift+A \li (none)     \li (none)
+    \row    \li SelectEndOfBlock     \li (none)                           \li Alt+Shift+Down, Meta+Shift+E \li (none)   \li (none)
+    \row    \li SelectStartOfDocument\li Ctrl+Shift+Home                  \li Ctrl+Shift+Up, Shift+Home          \li Ctrl+Shift+Home\li Ctrl+Shift+Home
+    \row    \li SelectEndOfDocument  \li Ctrl+Shift+End                   \li Ctrl+Shift+Down, Shift+End        \li Ctrl+Shift+End \li Ctrl+Shift+End
+    \row    \li DeleteStartOfWord    \li Ctrl+Backspace                   \li Alt+Backspace          \li Ctrl+Backspace \li Ctrl+Backspace
+    \row    \li DeleteEndOfWord      \li Ctrl+Del                         \li (none)                 \li Ctrl+Del       \li Ctrl+Del
+    \row    \li DeleteEndOfLine      \li (none)                           \li (none)                 \li Ctrl+K         \li Ctrl+K
+    \row    \li InsertParagraphSeparator     \li Enter                    \li Enter                  \li Enter          \li Enter
+    \row    \li InsertLineSeparator          \li Shift+Enter              \li Meta+Enter             \li Shift+Enter    \li Shift+Enter
     \endtable
 
     Note that, since the key sequences used for the standard shortcuts differ
diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index 6d3d1c9580..8ee62ce8d9 100644
--- a/src/gui/kernel/qpalette.cpp
+++ b/src/gui/kernel/qpalette.cpp
@@ -342,9 +342,9 @@ static void qt_palette_from_color(QPalette &pal, const QColor &button)
 
     The color groups:
     \list
-    \i The Active group is used for the window that has keyboard focus.
-    \i The Inactive group is used for other windows.
-    \i The Disabled group is used for widgets (not windows) that are
+    \li The Active group is used for the window that has keyboard focus.
+    \li The Inactive group is used for other windows.
+    \li The Disabled group is used for widgets (not windows) that are
     disabled for some reason.
     \endlist
 
diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.cpp b/src/gui/kernel/qplatformnativeinterface_qpa.cpp
index 7237849011..f87a2956a3 100644
--- a/src/gui/kernel/qplatformnativeinterface_qpa.cpp
+++ b/src/gui/kernel/qplatformnativeinterface_qpa.cpp
@@ -132,7 +132,7 @@ void QPlatformNativeInterface::setWindowProperty(QPlatformWindow *window, const
 
     The event filter function set here is called for all messages
     received from the platform if they are given type \eventType.
-    It is \i not called for messages that are not meant for Qt objects.
+    It is \e not called for messages that are not meant for Qt objects.
 
     The type of event is specific to the platform plugin chosen at run-time.
 
diff --git a/src/gui/math3d/qgenericmatrix.cpp b/src/gui/math3d/qgenericmatrix.cpp
index 113b767e9f..08ed0ae40f 100644
--- a/src/gui/math3d/qgenericmatrix.cpp
+++ b/src/gui/math3d/qgenericmatrix.cpp
@@ -53,9 +53,9 @@ QT_BEGIN_NAMESPACE
     The QGenericMatrix template has three parameters:
 
     \table
-    \row \i N \i Number of columns.
-    \row \i M \i Number of rows.
-    \row \i T \i Element type that is visible to users of the class.
+    \row \li N \li Number of columns.
+    \row \li M \li Number of rows.
+    \row \li T \li Element type that is visible to users of the class.
     \endtable
 
     \sa QMatrix4x4
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp
index 068b2e36f7..0eb3506779 100644
--- a/src/gui/math3d/qmatrix4x4.cpp
+++ b/src/gui/math3d/qmatrix4x4.cpp
@@ -62,11 +62,11 @@ QT_BEGIN_NAMESPACE
     Internally the data is stored as column-major format, so as to be optimal for
     passing to OpenGL functions, which expect column-major data.
 
-    When using these functions be aware that they return data in \bold{column-major}
+    When using these functions be aware that they return data in \b{column-major}
     format:
     \list
-    \o data()
-    \o constData()
+    \li data()
+    \li constData()
     \endlist
 
     \sa QVector3D, QGenericMatrix
diff --git a/src/gui/math3d/qvector2d.cpp b/src/gui/math3d/qvector2d.cpp
index 897fa356d3..3c3581f3f4 100644
--- a/src/gui/math3d/qvector2d.cpp
+++ b/src/gui/math3d/qvector2d.cpp
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
     The QVector2D class can also be used to represent vertices in 2D space.
     We therefore do not need to provide a separate vertex class.
 
-    \bold{Note:} By design values in the QVector2D instance are stored as \c float.
+    \b{Note:} By design values in the QVector2D instance are stored as \c float.
     This means that on platforms where the \c qreal arguments to QVector2D
     functions are represented by \c double values, it is possible to
     lose precision.
diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp
index 5251f9c015..adf3da4010 100644
--- a/src/gui/math3d/qvector3d.cpp
+++ b/src/gui/math3d/qvector3d.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
     The QVector3D class can also be used to represent vertices in 3D space.
     We therefore do not need to provide a separate vertex class.
 
-    \bold{Note:} By design values in the QVector3D instance are stored as \c float.
+    \b{Note:} By design values in the QVector3D instance are stored as \c float.
     This means that on platforms where the \c qreal arguments to QVector3D
     functions are represented by \c double values, it is possible to
     lose precision.
diff --git a/src/gui/math3d/qvector4d.cpp b/src/gui/math3d/qvector4d.cpp
index e7ee46b88b..6b29221d92 100644
--- a/src/gui/math3d/qvector4d.cpp
+++ b/src/gui/math3d/qvector4d.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
     The QVector4D class can also be used to represent vertices in 4D space.
     We therefore do not need to provide a separate vertex class.
 
-    \bold{Note:} By design values in the QVector4D instance are stored as \c float.
+    \b{Note:} By design values in the QVector4D instance are stored as \c float.
     This means that on platforms where the \c qreal arguments to QVector4D
     functions are represented by \c double values, it is possible to
     lose precision.
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp
index aa4941706a..cc5750490d 100644
--- a/src/gui/opengl/qopenglframebufferobject.cpp
+++ b/src/gui/opengl/qopenglframebufferobject.cpp
@@ -83,10 +83,10 @@ QT_BEGIN_NAMESPACE
 
     A framebuffer object has several characteristics:
     \list
-    \i \link setSamples() Number of samples per pixels.\endlink
-    \i \link setAttachment() Depth and/or stencil attachments.\endlink
-    \i \link setTextureTarget() Texture target.\endlink
-    \i \link setInternalTextureFormat() Internal texture format.\endlink
+    \li \link setSamples() Number of samples per pixels.\endlink
+    \li \link setAttachment() Depth and/or stencil attachments.\endlink
+    \li \link setTextureTarget() Texture target.\endlink
+    \li \link setInternalTextureFormat() Internal texture format.\endlink
     \endlist
 
     Note that the desired attachments or number of samples per pixels might not
@@ -657,7 +657,7 @@ void QOpenGLFramebufferObjectPrivate::initAttachments(QOpenGLContext *ctx, QOpen
     generates a 2D OpenGL texture (using the \c{GL_TEXTURE_2D} target),
     which is used as the internal rendering target.
 
-    \bold{It is important to have a current OpenGL context when creating a
+    \b{It is important to have a current OpenGL context when creating a
     QOpenGLFramebufferObject, otherwise initialization will fail.}
 
     When using a QPainter to paint to a QOpenGLFramebufferObject you should take
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 6850eac59e..fe9b370189 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -309,15 +309,15 @@ struct QBrushDataPointerDeleter
     otherwise false. A brush is considered opaque if:
 
     \list
-    \o The alpha component of the color() is 255.
-    \o Its texture() does not have an alpha channel and is not a QBitmap.
-    \o The colors in the gradient() all have an alpha component that is 255.
+    \li The alpha component of the color() is 255.
+    \li Its texture() does not have an alpha channel and is not a QBitmap.
+    \li The colors in the gradient() all have an alpha component that is 255.
     \endlist
 
     \table 100%
     \row
-    \o \inlineimage brush-outline.png Outlines
-    \o
+    \li \inlineimage brush-outline.png Outlines
+    \li
 
     To specify the style and color of lines and outlines, use the
     QPainter's \l {QPen}{pen} combined with Qt::PenStyle and
@@ -826,10 +826,10 @@ Q_GUI_EXPORT bool qt_isExtendedRadialGradient(const QBrush &brush)
     is considered opaque if:
 
     \list
-    \i The alpha component of the color() is 255.
-    \i Its texture() does not have an alpha channel and is not a QBitmap.
-    \i The colors in the gradient() all have an alpha component that is 255.
-    \i It is an extended radial gradient.
+    \li The alpha component of the color() is 255.
+    \li Its texture() does not have an alpha channel and is not a QBitmap.
+    \li The colors in the gradient() all have an alpha component that is 255.
+    \li It is an extended radial gradient.
     \endlist
 */
 
@@ -1178,12 +1178,12 @@ QDataStream &operator>>(QDataStream &s, QBrush &b)
     Qt currently supports three types of gradient fills:
 
     \list
-    \o \e Linear gradients interpolate colors between start and end points.
-    \o \e Simple radial gradients interpolate colors between a focal point
+    \li \e Linear gradients interpolate colors between start and end points.
+    \li \e Simple radial gradients interpolate colors between a focal point
         and end points on a circle surrounding it.
-    \o \e Extended radial gradients interpolate colors between a center and
+    \li \e Extended radial gradients interpolate colors between a center and
         a focal circle.
-    \o \e Conical gradients interpolate colors around a center point.
+    \li \e Conical gradients interpolate colors around a center point.
     \endlist
 
     A gradient's type can be retrieved using the type() function.
@@ -1191,13 +1191,13 @@ QDataStream &operator>>(QDataStream &s, QBrush &b)
 
     \table
     \header
-    \o QLinearGradient
-    \o QRadialGradient
-    \o QConicalGradient
+    \li QLinearGradient
+    \li QRadialGradient
+    \li QConicalGradient
     \row
-    \o \inlineimage qgradient-linear.png
-    \o \inlineimage qgradient-radial.png
-    \o \inlineimage qgradient-conical.png
+    \li \inlineimage qgradient-linear.png
+    \li \inlineimage qgradient-radial.png
+    \li \inlineimage qgradient-conical.png
     \endtable
 
     The colors in a gradient are defined using stop points of the
@@ -1232,13 +1232,13 @@ QDataStream &operator>>(QDataStream &s, QBrush &b)
 
     \table
     \row
-    \o \inlineimage qradialgradient-pad.png
-    \o \inlineimage qradialgradient-repeat.png
-    \o \inlineimage qradialgradient-reflect.png
+    \li \inlineimage qradialgradient-pad.png
+    \li \inlineimage qradialgradient-repeat.png
+    \li \inlineimage qradialgradient-reflect.png
     \row
-    \o \l {QGradient::PadSpread}{PadSpread}
-    \o \l {QGradient::RepeatSpread}{RepeatSpread}
-    \o \l {QGradient::ReflectSpread}{ReflectSpread}
+    \li \l {QGradient::PadSpread}{PadSpread}
+    \li \l {QGradient::RepeatSpread}{RepeatSpread}
+    \li \l {QGradient::ReflectSpread}{ReflectSpread}
     \endtable
 
     Note that the setSpread() function only has effect for linear and
@@ -1537,13 +1537,13 @@ bool QGradient::operator==(const QGradient &gradient) const
 
     \table
     \row
-    \o \inlineimage qlineargradient-pad.png
-    \o \inlineimage qlineargradient-reflect.png
-    \o \inlineimage qlineargradient-repeat.png
+    \li \inlineimage qlineargradient-pad.png
+    \li \inlineimage qlineargradient-reflect.png
+    \li \inlineimage qlineargradient-repeat.png
     \row
-    \o \l {QGradient::PadSpread}{PadSpread} (default)
-    \o \l {QGradient::ReflectSpread}{ReflectSpread}
-    \o \l {QGradient::RepeatSpread}{RepeatSpread}
+    \li \l {QGradient::PadSpread}{PadSpread} (default)
+    \li \l {QGradient::ReflectSpread}{ReflectSpread}
+    \li \l {QGradient::RepeatSpread}{RepeatSpread}
     \endtable
 
     The colors in a gradient is defined using stop points of the
@@ -1723,13 +1723,13 @@ void QLinearGradient::setFinalStop(const QPointF &stop)
 
     \table
     \row
-    \o \inlineimage qradialgradient-pad.png
-    \o \inlineimage qradialgradient-reflect.png
-    \o \inlineimage qradialgradient-repeat.png
+    \li \inlineimage qradialgradient-pad.png
+    \li \inlineimage qradialgradient-reflect.png
+    \li \inlineimage qradialgradient-repeat.png
     \row
-    \o \l {QGradient::PadSpread}{PadSpread} (default)
-    \o \l {QGradient::ReflectSpread}{ReflectSpread}
-    \o \l {QGradient::RepeatSpread}{RepeatSpread}
+    \li \l {QGradient::PadSpread}{PadSpread} (default)
+    \li \l {QGradient::ReflectSpread}{ReflectSpread}
+    \li \l {QGradient::RepeatSpread}{RepeatSpread}
     \endtable
 
     The colors in a gradient is defined using stop points of the
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index 96491918cd..f531565fb9 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -69,11 +69,11 @@ QT_BEGIN_NAMESPACE
 
     \table
     \header
-    \o RGB \o HSV \o CMYK
+    \li RGB \li HSV \li CMYK
     \row
-    \o \inlineimage qcolor-rgb.png
-    \o \inlineimage qcolor-hsv.png
-    \o \inlineimage qcolor-cmyk.png
+    \li \inlineimage qcolor-rgb.png
+    \li \inlineimage qcolor-hsv.png
+    \li \inlineimage qcolor-cmyk.png
     \endtable
 
     The QColor constructor creates the color based on RGB values.  To
@@ -194,20 +194,20 @@ QT_BEGIN_NAMESPACE
     HSV, like RGB, has three components:
 
     \list
-    \o H, for hue, is in the range 0 to 359 if the color is chromatic (not
+    \li H, for hue, is in the range 0 to 359 if the color is chromatic (not
     gray), or meaningless if it is gray. It represents degrees on the
     color wheel familiar to most people. Red is 0 (degrees), green is
     120, and blue is 240.
 
     \inlineimage qcolor-hue.png
 
-    \o S, for saturation, is in the range 0 to 255, and the bigger it is,
+    \li S, for saturation, is in the range 0 to 255, and the bigger it is,
     the stronger the color is. Grayish colors have saturation near 0; very
     strong colors have saturation near 255.
 
     \inlineimage qcolor-saturation.png
 
-    \o V, for value, is in the range 0 to 255 and represents lightness or
+    \li V, for value, is in the range 0 to 255 and represents lightness or
     brightness of the color. 0 is black; 255 is as far from black as
     possible.
 
@@ -498,16 +498,16 @@ QString QColor::name() const
     of these formats:
 
     \list
-    \i #RGB (each of R, G, and B is a single hex digit)
-    \i #RRGGBB
-    \i #RRRGGGBBB
-    \i #RRRRGGGGBBBB
-    \i A name from the list of colors defined in the list of \l{SVG color keyword names}
+    \li #RGB (each of R, G, and B is a single hex digit)
+    \li #RRGGBB
+    \li #RRRGGGBBB
+    \li #RRRRGGGGBBBB
+    \li A name from the list of colors defined in the list of \l{SVG color keyword names}
        provided by the World Wide Web Consortium; for example, "steelblue" or "gainsboro".
        These color names work on all platforms. Note that these color names are \e not the
        same as defined by the Qt::GlobalColor enums, e.g. "green" and Qt::green does not
        refer to the same color.
-    \i \c transparent - representing the absence of a color.
+    \li \c transparent - representing the absence of a color.
     \endlist
 
     The color is invalid if \a name cannot be parsed.
diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
index 6b5eb14f5f..ced2e4548c 100644
--- a/src/gui/painting/qmatrix.cpp
+++ b/src/gui/painting/qmatrix.cpp
@@ -111,8 +111,8 @@ QT_BEGIN_NAMESPACE
 
     \table 100%
     \row
-    \o \inlineimage qmatrix-simpletransformation.png
-    \o
+    \li \inlineimage qmatrix-simpletransformation.png
+    \li
     \snippet doc/src/snippets/matrix/matrix.cpp 0
     \endtable
 
@@ -123,8 +123,8 @@ QT_BEGIN_NAMESPACE
 
     \table 100%
     \row
-    \o \inlineimage qmatrix-combinedtransformation.png
-    \o
+    \li \inlineimage qmatrix-combinedtransformation.png
+    \li
     \snippet doc/src/snippets/matrix/matrix.cpp 1
     \endtable
 
@@ -171,8 +171,8 @@ QT_BEGIN_NAMESPACE
 
     \table 100%
     \row
-    \o \inlineimage qmatrix-combinedtransformation.png
-    \o
+    \li \inlineimage qmatrix-combinedtransformation.png
+    \li
     \snippet doc/src/snippets/matrix/matrix.cpp 2
     \endtable
 
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 43429abe8a..0f5468df4e 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -984,41 +984,41 @@ void QPainterPrivate::updateState(QPainterState *newState)
 
     \list
 
-    \o font() is the font used for drawing text. If the painter
+    \li font() is the font used for drawing text. If the painter
         isActive(), you can retrieve information about the currently set
         font, and its metrics, using the fontInfo() and fontMetrics()
         functions respectively.
 
-    \o brush() defines the color or pattern that is used for filling
+    \li brush() defines the color or pattern that is used for filling
        shapes.
 
-    \o pen() defines the color or stipple that is used for drawing
+    \li pen() defines the color or stipple that is used for drawing
        lines or boundaries.
 
-    \o backgroundMode() defines whether there is a background() or
+    \li backgroundMode() defines whether there is a background() or
        not, i.e it is either Qt::OpaqueMode or Qt::TransparentMode.
 
-    \o background() only applies when backgroundMode() is \l
+    \li background() only applies when backgroundMode() is \l
        Qt::OpaqueMode and pen() is a stipple. In that case, it
        describes the color of the background pixels in the stipple.
 
-    \o brushOrigin() defines the origin of the tiled brushes, normally
+    \li brushOrigin() defines the origin of the tiled brushes, normally
        the origin of widget's background.
 
-    \o viewport(), window(), worldTransform() make up the painter's coordinate
+    \li viewport(), window(), worldTransform() make up the painter's coordinate
         transformation system. For more information, see the \l
         {Coordinate Transformations} section and the \l {Coordinate
         System} documentation.
 
-    \o hasClipping() tells whether the painter clips at all. (The paint
+    \li hasClipping() tells whether the painter clips at all. (The paint
        device clips, too.) If the painter clips, it clips to clipRegion().
 
-    \o layoutDirection() defines the layout direction used by the
+    \li layoutDirection() defines the layout direction used by the
        painter when drawing text.
 
-    \o worldMatrixEnabled() tells whether world transformation is enabled.
+    \li worldMatrixEnabled() tells whether world transformation is enabled.
 
-    \o viewTransformEnabled() tells whether view transformation is
+    \li viewTransformEnabled() tells whether view transformation is
         enabled.
 
     \endlist
@@ -1052,9 +1052,9 @@ void QPainterPrivate::updateState(QPainterState *newState)
 
     \table 100%
     \row
-    \o \inlineimage qpainter-basicdrawing.png
-    \o
-    \bold {Basic Drawing Example}
+    \li \inlineimage qpainter-basicdrawing.png
+    \li
+    \b {Basic Drawing Example}
 
     The \l {painting/basicdrawing}{Basic Drawing} example shows how to
     display basic graphics primitives in a variety of styles using the
@@ -1068,8 +1068,8 @@ void QPainterPrivate::updateState(QPainterState *newState)
 
     \table 100%
     \row
-    \o
-    \bold {Painter Paths example}
+    \li
+    \b {Painter Paths example}
 
     The QPainterPath class provides a container for painting
     operations, enabling graphical shapes to be constructed and
@@ -1078,7 +1078,7 @@ void QPainterPrivate::updateState(QPainterState *newState)
     The \l {painting/painterpaths}{Painter Paths} example shows how
     painter paths can be used to build complex shapes for rendering.
 
-    \o \inlineimage qpainter-painterpaths.png
+    \li \inlineimage qpainter-painterpaths.png
     \endtable
 
     QPainter also provides the fillPath() function which fills the
@@ -1096,13 +1096,13 @@ void QPainterPrivate::updateState(QPainterState *newState)
 
     \table
     \header
-    \o \l {painting/deform}{Vector Deformation}
-    \o \l {painting/gradients}{Gradients}
-    \o \l {painting/pathstroke}{Path Stroking}
+    \li \l {painting/deform}{Vector Deformation}
+    \li \l {painting/gradients}{Gradients}
+    \li \l {painting/pathstroke}{Path Stroking}
     \row
-    \o \inlineimage qpainter-vectordeformation.png
-    \o \inlineimage qpainter-gradients.png
-    \o \inlineimage qpainter-pathstroking.png
+    \li \inlineimage qpainter-vectordeformation.png
+    \li \inlineimage qpainter-gradients.png
+    \li \inlineimage qpainter-pathstroking.png
     \endtable
 
 
@@ -1136,9 +1136,9 @@ void QPainterPrivate::updateState(QPainterState *newState)
 
     \table 100%
     \row
-    \o \inlineimage qpainter-concentriccircles.png
-    \o
-    \bold {Concentric Circles Example}
+    \li \inlineimage qpainter-concentriccircles.png
+    \li
+    \b {Concentric Circles Example}
 
     The \l {painting/concentriccircles}{Concentric Circles} example
     shows the improved rendering quality that can be obtained using
@@ -1176,12 +1176,12 @@ void QPainterPrivate::updateState(QPainterState *newState)
 
     \table
     \header
-    \o  nop \o rotate() \o scale() \o translate()
+    \li  nop \li rotate() \li scale() \li translate()
     \row
-    \o \inlineimage qpainter-clock.png
-    \o \inlineimage qpainter-rotation.png
-    \o \inlineimage qpainter-scale.png
-    \o \inlineimage qpainter-translation.png
+    \li \inlineimage qpainter-clock.png
+    \li \inlineimage qpainter-rotation.png
+    \li \inlineimage qpainter-scale.png
+    \li \inlineimage qpainter-translation.png
     \endtable
 
     The most commonly used transformations are scaling, rotation,
@@ -1200,15 +1200,15 @@ void QPainterPrivate::updateState(QPainterState *newState)
 
     \table 100%
     \row
-    \o
-    \bold {Affine Transformations Example}
+    \li
+    \b {Affine Transformations Example}
 
     The \l {painting/affine}{Affine Transformations} example shows Qt's
     ability to perform affine transformations on painting
     operations. The demo also allows the user to experiment with the
     transformation operations and see the results immediately.
 
-    \o \inlineimage qpainter-affinetransformations.png
+    \li \inlineimage qpainter-affinetransformations.png
     \endtable
 
     All the tranformation operations operate on the transformation
@@ -1282,10 +1282,10 @@ void QPainterPrivate::updateState(QPainterState *newState)
 
     \table 100%
     \row
-    \o \inlineimage qpainter-compositiondemo.png
+    \li \inlineimage qpainter-compositiondemo.png
 
-    \o
-    \bold {Composition Modes Example}
+    \li
+    \b {Composition Modes Example}
 
     The \l {painting/composition}{Composition Modes} example, available in
     Qt's examples directory, allows you to experiment with the various
@@ -1333,14 +1333,14 @@ void QPainterPrivate::updateState(QPainterState *newState)
 
     \list
 
-    \o Raster - This backend implements all rendering in pure software
+    \li Raster - This backend implements all rendering in pure software
     and is always used to render into QImages. For optimal performance
     only use the format types QImage::Format_ARGB32_Premultiplied,
     QImage::Format_RGB32 or QImage::Format_RGB16. Any other format,
     including QImage::Format_ARGB32, has significantly worse
     performance. This engine is used by default for QWidget and QPixmap.
 
-    \o OpenGL 2.0 (ES) - This backend is the primary backend for
+    \li OpenGL 2.0 (ES) - This backend is the primary backend for
     hardware accelerated graphics. It can be run on desktop machines
     and embedded devices supporting the OpenGL 2.0 or OpenGL/ES 2.0
     specification. This includes most graphics chips produced in the
@@ -1348,7 +1348,7 @@ void QPainterPrivate::updateState(QPainterState *newState)
     onto a QOpenGLWidget or by passing \c {-graphicssystem opengl} on the
     command line when the underlying system supports it.
 
-    \o OpenVG - This backend implements the Khronos standard for 2D
+    \li OpenVG - This backend implements the Khronos standard for 2D
     and Vector Graphics. It is primarily for embedded devices with
     hardware support for OpenVG.  The engine can be enabled by
     passing \c {-graphicssystem openvg} on the command line when
@@ -1360,26 +1360,26 @@ void QPainterPrivate::updateState(QPainterState *newState)
 
     \list
 
-    \o Simple transformations, meaning translation and scaling, pluss
+    \li Simple transformations, meaning translation and scaling, pluss
     0, 90, 180, 270 degree rotations.
 
-    \o \c drawPixmap() in combination with simple transformations and
+    \li \c drawPixmap() in combination with simple transformations and
     opacity with non-smooth transformation mode
     (\c QPainter::SmoothPixmapTransform not enabled as a render hint).
 
-    \o Rectangle fills with solid color, two-color linear gradients
+    \li Rectangle fills with solid color, two-color linear gradients
     and simple transforms.
 
-    \o Rectangular clipping with simple transformations and intersect
+    \li Rectangular clipping with simple transformations and intersect
     clip.
 
-    \o Composition Modes \c QPainter::CompositionMode_Source and
+    \li Composition Modes \c QPainter::CompositionMode_Source and
     QPainter::CompositionMode_SourceOver
 
-    \o Rounded rectangle filling using solid color and two-color
+    \li Rounded rectangle filling using solid color and two-color
     linear gradients fills.
 
-    \o 3x3 patched pixmaps, via qDrawBorderPixmap.
+    \li 3x3 patched pixmaps, via qDrawBorderPixmap.
 
     \endlist
 
@@ -1963,14 +1963,14 @@ QPaintEngine *QPainter::paintEngine() const
     2 engine:
 
     \list
-    \i blending is disabled
-    \i the depth, stencil and scissor tests are disabled
-    \i the active texture unit is reset to 0
-    \i the depth mask, depth function and the clear depth are reset to their
+    \li blending is disabled
+    \li the depth, stencil and scissor tests are disabled
+    \li the active texture unit is reset to 0
+    \li the depth mask, depth function and the clear depth are reset to their
     default values
-    \i the stencil mask, stencil operation and stencil function are reset to
+    \li the stencil mask, stencil operation and stencil function are reset to
     their default values
-     \i the current color is reset to solid white
+     \li the current color is reset to solid white
     \endlist
 
     If, for example, the OpenGL polygon mode is changed by the user inside a
@@ -2885,10 +2885,10 @@ void QPainter::setClipRegion(const QRegion &r, Qt::ClipOperation op)
     The following functions can transform the coordinate system without using
     a QMatrix:
     \list
-    \i translate()
-    \i scale()
-    \i shear()
-    \i rotate()
+    \li translate()
+    \li scale()
+    \li shear()
+    \li rotate()
     \endlist
 
     They operate on the painter's worldMatrix() and are implemented like this:
@@ -3360,8 +3360,8 @@ void QPainter::fillPath(const QPainterPath &path, const QBrush &brush)
 
     \table 100%
     \row
-    \o \inlineimage qpainter-path.png
-    \o
+    \li \inlineimage qpainter-path.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 5
     \endtable
 
@@ -3405,8 +3405,8 @@ void QPainter::drawPath(const QPainterPath &path)
 
     \table 100%
     \row
-    \o \inlineimage qpainter-line.png
-    \o
+    \li \inlineimage qpainter-line.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 6
     \endtable
 
@@ -3452,8 +3452,8 @@ void QPainter::drawPath(const QPainterPath &path)
 
     \table 100%
     \row
-    \o \inlineimage qpainter-rectangle.png
-    \o
+    \li \inlineimage qpainter-rectangle.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 7
     \endtable
 
@@ -4121,8 +4121,8 @@ const QFont &QPainter::font() const
 
     \table 100%
     \row
-    \o \inlineimage qpainter-roundrect.png
-    \o
+    \li \inlineimage qpainter-roundrect.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 8
     \endtable
 
@@ -4221,8 +4221,8 @@ void QPainter::drawRoundRect(const QRectF &r, int xRnd, int yRnd)
 
     \table 100%
     \row
-    \o \inlineimage qpainter-ellipse.png
-    \o
+    \li \inlineimage qpainter-ellipse.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 9
     \endtable
 
@@ -4347,8 +4347,8 @@ void QPainter::drawEllipse(const QRect &r)
 
     \table 100%
     \row
-    \o \inlineimage qpainter-arc.png
-    \o
+    \li \inlineimage qpainter-arc.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 10
     \endtable
 
@@ -4411,8 +4411,8 @@ void QPainter::drawArc(const QRectF &r, int a, int alen)
 
     \table 100%
     \row
-    \o \inlineimage qpainter-pie.png
-    \o
+    \li \inlineimage qpainter-pie.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 11
     \endtable
 
@@ -4480,8 +4480,8 @@ void QPainter::drawPie(const QRectF &r, int a, int alen)
 
     \table 100%
     \row
-    \o \inlineimage qpainter-chord.png
-    \o
+    \li \inlineimage qpainter-chord.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 12
     \endtable
 
@@ -4696,7 +4696,7 @@ void QPainter::drawLines(const QPoint *pointPairs, int lineCount)
 
     \table 100%
     \row
-    \o
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 13
     \endtable
 
@@ -4802,8 +4802,8 @@ void QPainter::drawPolyline(const QPoint *points, int pointCount)
 
     \table 100%
     \row
-    \o \inlineimage qpainter-polygon.png
-    \o
+    \li \inlineimage qpainter-polygon.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 14
     \endtable
 
@@ -4915,8 +4915,8 @@ void QPainter::drawPolygon(const QPoint *points, int pointCount, Qt::FillRule fi
 
     \table 100%
     \row
-    \o \inlineimage qpainter-polygon.png
-    \o
+    \li \inlineimage qpainter-polygon.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 15
     \endtable
 
@@ -5039,7 +5039,7 @@ static inline QPointF roundInDeviceCoordinates(const QPointF &p, const QTransfor
 
     \table 100%
     \row
-    \o
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 16
     \endtable
 
@@ -5952,8 +5952,8 @@ void QPainter::drawText(const QRect &r, int flags, const QString &str, QRect *br
 
     \table 100%
     \row
-    \o \inlineimage qpainter-text.png
-    \o
+    \li \inlineimage qpainter-text.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 17
     \endtable
 
@@ -5962,20 +5962,20 @@ void QPainter::drawText(const QRect &r, int flags, const QString &str, QRect *br
     OR of the following flags:
 
     \list
-    \o Qt::AlignLeft
-    \o Qt::AlignRight
-    \o Qt::AlignHCenter
-    \o Qt::AlignJustify
-    \o Qt::AlignTop
-    \o Qt::AlignBottom
-    \o Qt::AlignVCenter
-    \o Qt::AlignCenter
-    \o Qt::TextDontClip
-    \o Qt::TextSingleLine
-    \o Qt::TextExpandTabs
-    \o Qt::TextShowMnemonic
-    \o Qt::TextWordWrap
-    \o Qt::TextIncludeTrailingSpaces
+    \li Qt::AlignLeft
+    \li Qt::AlignRight
+    \li Qt::AlignHCenter
+    \li Qt::AlignJustify
+    \li Qt::AlignTop
+    \li Qt::AlignBottom
+    \li Qt::AlignVCenter
+    \li Qt::AlignCenter
+    \li Qt::TextDontClip
+    \li Qt::TextSingleLine
+    \li Qt::TextExpandTabs
+    \li Qt::TextShowMnemonic
+    \li Qt::TextWordWrap
+    \li Qt::TextIncludeTrailingSpaces
     \endlist
 
     \sa Qt::AlignmentFlag, Qt::TextFlag, boundingRect(), layoutDirection()
@@ -6044,18 +6044,18 @@ void QPainter::drawText(const QRectF &r, int flags, const QString &str, QRectF *
     the following flags:
 
     \list
-    \o Qt::AlignLeft
-    \o Qt::AlignRight
-    \o Qt::AlignHCenter
-    \o Qt::AlignJustify
-    \o Qt::AlignTop
-    \o Qt::AlignBottom
-    \o Qt::AlignVCenter
-    \o Qt::AlignCenter
-    \o Qt::TextSingleLine
-    \o Qt::TextExpandTabs
-    \o Qt::TextShowMnemonic
-    \o Qt::TextWordWrap
+    \li Qt::AlignLeft
+    \li Qt::AlignRight
+    \li Qt::AlignHCenter
+    \li Qt::AlignJustify
+    \li Qt::AlignTop
+    \li Qt::AlignBottom
+    \li Qt::AlignVCenter
+    \li Qt::AlignCenter
+    \li Qt::TextSingleLine
+    \li Qt::TextExpandTabs
+    \li Qt::TextShowMnemonic
+    \li Qt::TextWordWrap
     \endlist
 
     By default, QPainter draws text anti-aliased.
@@ -6472,18 +6472,18 @@ void QPainter::drawTextItem(const QPointF &p, const QTextItem &_ti)
 
     The \a flags argument is a bitwise OR of the following flags:
     \list
-         \o Qt::AlignLeft
-         \o Qt::AlignRight
-         \o Qt::AlignHCenter
-         \o Qt::AlignTop
-         \o Qt::AlignBottom
-         \o Qt::AlignVCenter
-         \o Qt::AlignCenter
-         \o Qt::TextSingleLine
-         \o Qt::TextExpandTabs
-         \o Qt::TextShowMnemonic
-         \o Qt::TextWordWrap
-         \o Qt::TextIncludeTrailingSpaces
+         \li Qt::AlignLeft
+         \li Qt::AlignRight
+         \li Qt::AlignHCenter
+         \li Qt::AlignTop
+         \li Qt::AlignBottom
+         \li Qt::AlignVCenter
+         \li Qt::AlignCenter
+         \li Qt::TextSingleLine
+         \li Qt::TextExpandTabs
+         \li Qt::TextShowMnemonic
+         \li Qt::TextWordWrap
+         \li Qt::TextIncludeTrailingSpaces
     \endlist
     If several of the horizontal or several of the vertical alignment
     flags are set, the resulting alignment is undefined.
@@ -6691,7 +6691,7 @@ void QPainter::drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPo
 
     \table 100%
     \row
-    \o
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 18
     \endtable
 
@@ -7675,7 +7675,7 @@ void QPainterState::init(QPainter *p) {
 
     \table 100%
     \row
-    \o
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 20
     \endtable
 
@@ -7791,21 +7791,21 @@ void QPainterState::init(QPainter *p) {
     \target GetFunction
 
     \table
-    \header \o Property Flag \o Current Property Value
-    \row \o QPaintEngine::DirtyBackground \o backgroundBrush()
-    \row \o QPaintEngine::DirtyBackgroundMode \o backgroundMode()
-    \row \o QPaintEngine::DirtyBrush \o brush()
-    \row \o QPaintEngine::DirtyBrushOrigin \o brushOrigin()
-    \row \o QPaintEngine::DirtyClipRegion \e or QPaintEngine::DirtyClipPath
-         \o clipOperation()
-    \row \o QPaintEngine::DirtyClipPath \o clipPath()
-    \row \o QPaintEngine::DirtyClipRegion \o clipRegion()
-    \row \o QPaintEngine::DirtyCompositionMode \o compositionMode()
-    \row \o QPaintEngine::DirtyFont \o font()
-    \row \o QPaintEngine::DirtyTransform \o transform()
-    \row \o QPaintEngine::DirtyClipEnabled \o isClipEnabled()
-    \row \o QPaintEngine::DirtyPen \o pen()
-    \row \o QPaintEngine::DirtyHints \o renderHints()
+    \header \li Property Flag \li Current Property Value
+    \row \li QPaintEngine::DirtyBackground \li backgroundBrush()
+    \row \li QPaintEngine::DirtyBackgroundMode \li backgroundMode()
+    \row \li QPaintEngine::DirtyBrush \li brush()
+    \row \li QPaintEngine::DirtyBrushOrigin \li brushOrigin()
+    \row \li QPaintEngine::DirtyClipRegion \e or QPaintEngine::DirtyClipPath
+         \li clipOperation()
+    \row \li QPaintEngine::DirtyClipPath \li clipPath()
+    \row \li QPaintEngine::DirtyClipRegion \li clipRegion()
+    \row \li QPaintEngine::DirtyCompositionMode \li compositionMode()
+    \row \li QPaintEngine::DirtyFont \li font()
+    \row \li QPaintEngine::DirtyTransform \li transform()
+    \row \li QPaintEngine::DirtyClipEnabled \li isClipEnabled()
+    \row \li QPaintEngine::DirtyPen \li pen()
+    \row \li QPaintEngine::DirtyHints \li renderHints()
     \endtable
 
     The QPaintEngineState class also provide the painter() function
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index 25dd134401..eb67709318 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -227,8 +227,8 @@ static void qt_debug_path(const QPainterPath &path)
 
     \table 100%
     \row
-    \o \inlineimage qpainterpath-construction.png
-    \o
+    \li \inlineimage qpainterpath-construction.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 0
     \endtable
 
@@ -241,11 +241,11 @@ static void qt_debug_path(const QPainterPath &path)
 
     \table
     \header
-    \o Qt::OddEvenFill
-    \o Qt::WindingFill
+    \li Qt::OddEvenFill
+    \li Qt::WindingFill
     \row
-    \o \inlineimage qt-fillrule-oddeven.png
-    \o \inlineimage qt-fillrule-winding.png
+    \li \inlineimage qt-fillrule-oddeven.png
+    \li \inlineimage qt-fillrule-winding.png
     \endtable
 
     See the Qt::FillRule documentation for the definition of the
@@ -316,11 +316,11 @@ static void qt_debug_path(const QPainterPath &path)
 
     \table
     \header
-    \o \l {painting/painterpaths}{Painter Paths Example}
-    \o \l {painting/deform}{Vector Deformation Example}
+    \li \l {painting/painterpaths}{Painter Paths Example}
+    \li \l {painting/deform}{Vector Deformation Example}
     \row
-    \o \inlineimage qpainterpath-example.png
-    \o \inlineimage qpainterpath-demo.png
+    \li \inlineimage qpainterpath-example.png
+    \li \inlineimage qpainterpath-demo.png
     \endtable
 
     \sa QPainterPathStroker, QPainter, QRegion, {Painter Paths Example}
@@ -731,8 +731,8 @@ void QPainterPath::lineTo(const QPointF &p)
 
     \table 100%
     \row
-    \o \inlineimage qpainterpath-cubicto.png
-    \o
+    \li \inlineimage qpainterpath-cubicto.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 1
     \endtable
 
@@ -858,8 +858,8 @@ void QPainterPath::quadTo(const QPointF &c, const QPointF &e)
 
     \table 100%
     \row
-    \o \inlineimage qpainterpath-arcto.png
-    \o
+    \li \inlineimage qpainterpath-arcto.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 2
     \endtable
 
@@ -970,8 +970,8 @@ QPointF QPainterPath::currentPosition() const
 
     \table 100%
     \row
-    \o \inlineimage qpainterpath-addrectangle.png
-    \o
+    \li \inlineimage qpainterpath-addrectangle.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 3
     \endtable
 
@@ -1017,8 +1017,8 @@ void QPainterPath::addRect(const QRectF &r)
 
     \table 100%
     \row
-    \o \inlineimage qpainterpath-addpolygon.png
-    \o
+    \li \inlineimage qpainterpath-addpolygon.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 4
     \endtable
 
@@ -1053,8 +1053,8 @@ void QPainterPath::addPolygon(const QPolygonF &polygon)
 
     \table 100%
     \row
-    \o \inlineimage qpainterpath-addellipse.png
-    \o
+    \li \inlineimage qpainterpath-addellipse.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 5
     \endtable
 
@@ -1105,8 +1105,8 @@ void QPainterPath::addEllipse(const QRectF &boundingRect)
 
     \table 100%
     \row
-    \o \inlineimage qpainterpath-addtext.png
-    \o
+    \li \inlineimage qpainterpath-addtext.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 6
     \endtable
 
@@ -1281,11 +1281,11 @@ Qt::FillRule QPainterPath::fillRule() const
 
     \table
     \header
-    \o Qt::OddEvenFill (default)
-    \o Qt::WindingFill
+    \li Qt::OddEvenFill (default)
+    \li Qt::WindingFill
     \row
-    \o \inlineimage qt-fillrule-oddeven.png
-    \o \inlineimage qt-fillrule-winding.png
+    \li \inlineimage qt-fillrule-oddeven.png
+    \li \inlineimage qt-fillrule-winding.png
     \endtable
 
     \sa fillRule()
@@ -2457,10 +2457,10 @@ void qt_path_stroke_cubic_to(qfixed c1x, qfixed c1y,
     functions:
 
     \list
-    \o setWidth()
-    \o setCapStyle()
-    \o setJoinStyle()
-    \o setDashPattern()
+    \li setWidth()
+    \li setCapStyle()
+    \li setJoinStyle()
+    \li setDashPattern()
     \endlist
 
     The setDashPattern() function accepts both a Qt::PenStyle object
diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp
index 8d05eb56ff..77f0edc52f 100644
--- a/src/gui/painting/qpen.cpp
+++ b/src/gui/painting/qpen.cpp
@@ -104,21 +104,21 @@ typedef QPenPrivate QPenData;
 
     \table
     \row
-    \o \inlineimage qpen-solid.png
-    \o \inlineimage qpen-dash.png
-    \o \inlineimage qpen-dot.png
+    \li \inlineimage qpen-solid.png
+    \li \inlineimage qpen-dash.png
+    \li \inlineimage qpen-dot.png
     \row
-    \o Qt::SolidLine
-    \o Qt::DashLine
-    \o Qt::DotLine
+    \li Qt::SolidLine
+    \li Qt::DashLine
+    \li Qt::DotLine
     \row
-    \o \inlineimage qpen-dashdot.png
-    \o \inlineimage qpen-dashdotdot.png
-    \o \inlineimage qpen-custom.png
+    \li \inlineimage qpen-dashdot.png
+    \li \inlineimage qpen-dashdotdot.png
+    \li \inlineimage qpen-custom.png
     \row
-    \o Qt::DashDotLine
-    \o Qt::DashDotDotLine
-    \o Qt::CustomDashLine
+    \li Qt::DashDotLine
+    \li Qt::DashDotDotLine
+    \li Qt::CustomDashLine
     \endtable
 
     Simply use the setStyle() function to convert the pen style to
@@ -153,13 +153,13 @@ typedef QPenPrivate QPenData;
 
     \table
     \row
-    \o \inlineimage qpen-square.png
-    \o \inlineimage qpen-flat.png
-    \o \inlineimage qpen-roundcap.png
+    \li \inlineimage qpen-square.png
+    \li \inlineimage qpen-flat.png
+    \li \inlineimage qpen-roundcap.png
     \row
-    \o Qt::SquareCap
-    \o Qt::FlatCap
-    \o Qt::RoundCap
+    \li Qt::SquareCap
+    \li Qt::FlatCap
+    \li Qt::RoundCap
     \endtable
 
     The Qt::SquareCap style is a square line end that covers the end
@@ -183,13 +183,13 @@ typedef QPenPrivate QPenData;
 
     \table
     \row
-    \o \inlineimage qpen-bevel.png
-    \o \inlineimage qpen-miter.png
-    \o \inlineimage qpen-roundjoin.png
+    \li \inlineimage qpen-bevel.png
+    \li \inlineimage qpen-miter.png
+    \li \inlineimage qpen-roundjoin.png
     \row
-    \o Qt::BevelJoin
-    \o Qt::MiterJoin
-    \o Qt::RoundJoin
+    \li Qt::BevelJoin
+    \li Qt::MiterJoin
+    \li Qt::RoundJoin
     \endtable
 
     The Qt::BevelJoin style fills the triangular notch between the two
@@ -213,8 +213,8 @@ typedef QPenPrivate QPenData;
 
     \table 100%
     \row
-    \o \inlineimage qpen-demo.png
-    \o \bold {\l {painting/pathstroke}{The Path Stroking Example}}
+    \li \inlineimage qpen-demo.png
+    \li \b {\l {painting/pathstroke}{The Path Stroking Example}}
 
     The Path Stroking example shows Qt's built-in dash patterns and shows
     how custom patterns can be used to extend the range of available
@@ -474,8 +474,8 @@ QVector<qreal> QPen::dashPattern() const
 
     \table 100%
     \row
-    \o \inlineimage qpen-custom.png
-    \o
+    \li \inlineimage qpen-custom.png
+    \li
     \snippet doc/src/snippets/code/src_gui_painting_qpen.cpp 3
     \endtable
 
@@ -527,8 +527,8 @@ qreal QPen::dashOffset() const
     to specify the dash pattern.
 
     \table
-    \row \o \inlineimage qpen-dashpattern.png
-    \o For example, a pattern where each stroke is four units long, followed by a gap
+    \row \li \inlineimage qpen-dashpattern.png
+    \li For example, a pattern where each stroke is four units long, followed by a gap
     of two units, will begin with the stroke when drawn as a line.
 
     However, if the dash offset is set to 4.0, any line drawn will begin with the gap.
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index 48b0c00014..ebca1edddc 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -894,11 +894,11 @@ QRegion QRegion::intersect(const QRect &r) const
     The rectangles \e must be optimally Y-X sorted and follow these restrictions:
 
     \list
-    \o The rectangles must not intersect.
-    \o All rectangles with a given top coordinate must have the same height.
-    \o No two rectangles may abut horizontally (they should be combined
+    \li The rectangles must not intersect.
+    \li All rectangles with a given top coordinate must have the same height.
+    \li No two rectangles may abut horizontally (they should be combined
        into a single wider rectangle in that case).
-    \o The rectangles must be sorted in ascending order, with Y as the major
+    \li The rectangles must be sorted in ascending order, with Y as the major
        sort key and X as the minor sort key.
     \endlist
     \omit
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index 363dd26bbf..e5c41efc15 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -156,8 +156,8 @@ QT_BEGIN_NAMESPACE
 
     \table 100%
     \row
-    \o \inlineimage qtransform-simpletransformation.png
-    \o
+    \li \inlineimage qtransform-simpletransformation.png
+    \li
     \snippet doc/src/snippets/transform/main.cpp 0
     \endtable
 
@@ -168,8 +168,8 @@ QT_BEGIN_NAMESPACE
 
     \table 100%
     \row
-    \o \inlineimage qtransform-combinedtransformation.png
-    \o
+    \li \inlineimage qtransform-combinedtransformation.png
+    \li
     \snippet doc/src/snippets/transform/main.cpp 1
     \endtable
 
@@ -218,8 +218,8 @@ QT_BEGIN_NAMESPACE
 
     \table 100%
     \row
-    \o \inlineimage qtransform-combinedtransformation2.png
-    \o
+    \li \inlineimage qtransform-combinedtransformation2.png
+    \li
     \snippet doc/src/snippets/transform/main.cpp 2
     \endtable
 
diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp
index 86de48b1dc..589c0f701f 100644
--- a/src/gui/text/qabstracttextdocumentlayout.cpp
+++ b/src/gui/text/qabstracttextdocumentlayout.cpp
@@ -100,14 +100,14 @@ QT_BEGIN_NAMESPACE
     custom text object into a document:
 
     \list
-        \o Choose an \a objectType. The \a objectType is an integer with a
+        \li Choose an \a objectType. The \a objectType is an integer with a
             value greater or equal to QTextFormat::UserObject.
-         \o Create a QTextCharFormat object and set the object type to the
+         \li Create a QTextCharFormat object and set the object type to the
             chosen type using the setObjectType() function.
-         \o Implement the QTextObjectInterface class.
-         \o Call QAbstractTextDocumentLayout::registerHandler() with an instance of your
+         \li Implement the QTextObjectInterface class.
+         \li Call QAbstractTextDocumentLayout::registerHandler() with an instance of your
             QTextObjectInterface subclass to register your object type.
-         \o Insert QChar::ObjectReplacementCharacter with the aforementioned
+         \li Insert QChar::ObjectReplacementCharacter with the aforementioned
             QTextCharFormat of the chosen object type into the document.
             As mentioned, the functions of QTextObjectInterface
             \l{QTextObjectInterface::}{intrinsicSize()} and
@@ -269,17 +269,17 @@ QT_BEGIN_NAMESPACE
     implementation of this function would have to do the following:
 
     \list
-        \o Determine the list of changed \l{QTextBlock}(s) using the parameters
+        \li Determine the list of changed \l{QTextBlock}(s) using the parameters
             provided.
-        \o Each QTextBlock object's corresponding QTextLayout object needs to
+        \li Each QTextBlock object's corresponding QTextLayout object needs to
             be processed. You can access the \l{QTextBlock}'s layout using the
             QTextBlock::layout() function. This processing should take the
             document's page size into consideration.
-        \o If the total number of pages changed, the pageCountChanged() signal
+        \li If the total number of pages changed, the pageCountChanged() signal
             should be emitted.
-        \o If the total size changed, the documentSizeChanged() signal should
+        \li If the total size changed, the documentSizeChanged() signal should
             be emitted.
-        \o The update() signal should be emitted to schedule a repaint of areas
+        \li The update() signal should be emitted to schedule a repaint of areas
             in the layout that require repainting.
     \endlist
 
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 3515c7dc3c..c68452d55a 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -419,14 +419,14 @@ QFontEngineData::~QFontEngineData()
     \target fontmatching
     The font matching algorithm works as follows:
     \list 1
-    \o The specified font family is searched for.
-    \o If not found, the styleHint() is used to select a replacement
+    \li The specified font family is searched for.
+    \li If not found, the styleHint() is used to select a replacement
        family.
-    \o Each replacement font family is searched for.
-    \o If none of these are found or there was no styleHint(), "helvetica"
+    \li Each replacement font family is searched for.
+    \li If none of these are found or there was no styleHint(), "helvetica"
        will be searched for.
-    \o If "helvetica" isn't found Qt will try the lastResortFamily().
-    \o If the lastResortFamily() isn't found Qt will try the
+    \li If "helvetica" isn't found Qt will try the lastResortFamily().
+    \li If the lastResortFamily() isn't found Qt will try the
        lastResortFont() which will always return a name of some kind.
     \endlist
 
@@ -440,10 +440,10 @@ QFontEngineData::~QFontEngineData()
     Once a font is found, the remaining attributes are matched in order of
     priority:
     \list 1
-    \o fixedPitch()
-    \o pointSize() (see below)
-    \o weight()
-    \o style()
+    \li fixedPitch()
+    \li pointSize() (see below)
+    \li weight()
+    \li style()
     \endlist
 
     If you have a font which matches on family, even if none of the
@@ -861,35 +861,35 @@ int QFont::pointSize() const
 
     \table
     \header
-    \o
-    \o PreferDefaultHinting
-    \o PreferNoHinting
-    \o PreferVerticalHinting
-    \o PreferFullHinting
+    \li
+    \li PreferDefaultHinting
+    \li PreferNoHinting
+    \li PreferVerticalHinting
+    \li PreferFullHinting
     \row
-    \o Windows Vista (w/o Platform Update) and earlier
-    \o Full hinting
-    \o Full hinting
-    \o Full hinting
-    \o Full hinting
+    \li Windows Vista (w/o Platform Update) and earlier
+    \li Full hinting
+    \li Full hinting
+    \li Full hinting
+    \li Full hinting
     \row
-    \o Windows 7 and Windows Vista (w/Platform Update) and DirectWrite enabled in Qt
-    \o Full hinting
-    \o Vertical hinting
-    \o Vertical hinting
-    \o Full hinting
+    \li Windows 7 and Windows Vista (w/Platform Update) and DirectWrite enabled in Qt
+    \li Full hinting
+    \li Vertical hinting
+    \li Vertical hinting
+    \li Full hinting
     \row
-    \o FreeType
-    \o Operating System setting
-    \o No hinting
-    \o Vertical hinting (light)
-    \o Full hinting
+    \li FreeType
+    \li Operating System setting
+    \li No hinting
+    \li Vertical hinting (light)
+    \li Full hinting
     \row
-    \o Cocoa on Mac OS X
-    \o No hinting
-    \o No hinting
-    \o No hinting
-    \o No hinting
+    \li Cocoa on Mac OS X
+    \li No hinting
+    \li No hinting
+    \li No hinting
+    \li No hinting
     \endtable
 
     \note Please be aware that altering the hinting preference on Windows is available through
@@ -2277,7 +2277,7 @@ QDataStream &operator>>(QDataStream &s, QFont &font)
 
     There are three ways to create a QFontInfo object.
     \list 1
-    \o Calling the QFontInfo constructor with a QFont creates a font
+    \li Calling the QFontInfo constructor with a QFont creates a font
     info object for a screen-compatible font, i.e. the font cannot be
     a printer font. If the font is changed later, the font
     info object is \e not updated.
@@ -2286,12 +2286,12 @@ QDataStream &operator>>(QDataStream &s, QFont &font)
     inaccurate. Printer fonts are not always accessible so the nearest
     screen font is used if a printer font is supplied.)
 
-    \o QWidget::fontInfo() returns the font info for a widget's font.
+    \li QWidget::fontInfo() returns the font info for a widget's font.
     This is equivalent to calling QFontInfo(widget->font()). If the
     widget's font is changed later, the font info object is \e not
     updated.
 
-    \o QPainter::fontInfo() returns the font info for a painter's
+    \li QPainter::fontInfo() returns the font info for a painter's
     current font. If the painter's font is changed later, the font
     info object is \e not updated.
     \endlist
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 7fa486e1ee..468d029cf2 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -2244,7 +2244,7 @@ int QFontDatabase::addApplicationFont(const QString &fileName)
 
     Currently only TrueType fonts and TrueType font collections are supported.
 
-    \bold{Note:} Adding application fonts on Unix/X11 platforms without fontconfig is
+    \b{Note:} Adding application fonts on Unix/X11 platforms without fontconfig is
     currently not supported.
 
     \sa addApplicationFont(), applicationFontFamilies(), removeApplicationFont()
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index 283494e316..7209fbdfc3 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -76,7 +76,7 @@ extern void qt_format_text(const QFont& font, const QRectF &_r,
     QFontMetrics object:
 
     \list 1
-    \o Calling the QFontMetrics constructor with a QFont creates a
+    \li Calling the QFontMetrics constructor with a QFont creates a
     font metrics object for a screen-compatible font, i.e. the font
     cannot be a printer font. If the font is changed
     later, the font metrics object is \e not updated.
@@ -85,12 +85,12 @@ extern void qt_format_text(const QFont& font, const QRectF &_r,
     inaccurate. Printer fonts are not always accessible so the nearest
     screen font is used if a printer font is supplied.)
 
-    \o QWidget::fontMetrics() returns the font metrics for a widget's
+    \li QWidget::fontMetrics() returns the font metrics for a widget's
     font. This is equivalent to QFontMetrics(widget->font()). If the
     widget's font is changed later, the font metrics object is \e not
     updated.
 
-    \o QPainter::fontMetrics() returns the font metrics for a
+    \li QPainter::fontMetrics() returns the font metrics for a
     painter's current font. If the painter's font is changed later, the
     font metrics object is \e not updated.
     \endlist
@@ -713,20 +713,20 @@ QRect QFontMetrics::boundingRect(QChar ch) const
 
     The \a flags argument is the bitwise OR of the following flags:
     \list
-    \o Qt::AlignLeft aligns to the left border, except for
+    \li Qt::AlignLeft aligns to the left border, except for
           Arabic and Hebrew where it aligns to the right.
-    \o Qt::AlignRight aligns to the right border, except for
+    \li Qt::AlignRight aligns to the right border, except for
           Arabic and Hebrew where it aligns to the left.
-    \o Qt::AlignJustify produces justified text.
-    \o Qt::AlignHCenter aligns horizontally centered.
-    \o Qt::AlignTop aligns to the top border.
-    \o Qt::AlignBottom aligns to the bottom border.
-    \o Qt::AlignVCenter aligns vertically centered
-    \o Qt::AlignCenter (== \c{Qt::AlignHCenter | Qt::AlignVCenter})
-    \o Qt::TextSingleLine ignores newline characters in the text.
-    \o Qt::TextExpandTabs expands tabs (see below)
-    \o Qt::TextShowMnemonic interprets "&x" as \underline{x}; i.e., underlined.
-    \o Qt::TextWordWrap breaks the text to fit the rectangle.
+    \li Qt::AlignJustify produces justified text.
+    \li Qt::AlignHCenter aligns horizontally centered.
+    \li Qt::AlignTop aligns to the top border.
+    \li Qt::AlignBottom aligns to the bottom border.
+    \li Qt::AlignVCenter aligns vertically centered
+    \li Qt::AlignCenter (== \c{Qt::AlignHCenter | Qt::AlignVCenter})
+    \li Qt::TextSingleLine ignores newline characters in the text.
+    \li Qt::TextExpandTabs expands tabs (see below)
+    \li Qt::TextShowMnemonic interprets "&x" as \underline{x}; i.e., underlined.
+    \li Qt::TextWordWrap breaks the text to fit the rectangle.
     \endlist
 
     Qt::Horizontal alignment defaults to Qt::AlignLeft and vertical
@@ -780,10 +780,10 @@ QRect QFontMetrics::boundingRect(const QRect &rect, int flags, const QString &te
 
     The \a flags argument is the bitwise OR of the following flags:
     \list
-    \o Qt::TextSingleLine ignores newline characters.
-    \o Qt::TextExpandTabs expands tabs (see below)
-    \o Qt::TextShowMnemonic interprets "&x" as \underline{x}; i.e., underlined.
-    \o Qt::TextWordBreak breaks the text to fit the rectangle.
+    \li Qt::TextSingleLine ignores newline characters.
+    \li Qt::TextExpandTabs expands tabs (see below)
+    \li Qt::TextShowMnemonic interprets "&x" as \underline{x}; i.e., underlined.
+    \li Qt::TextWordBreak breaks the text to fit the rectangle.
     \endlist
 
     If Qt::TextExpandTabs is set in \a flags, then: if \a tabArray is
@@ -1490,20 +1490,20 @@ QRectF QFontMetricsF::boundingRect(QChar ch) const
 
     The \a flags argument is the bitwise OR of the following flags:
     \list
-    \o Qt::AlignLeft aligns to the left border, except for
+    \li Qt::AlignLeft aligns to the left border, except for
           Arabic and Hebrew where it aligns to the right.
-    \o Qt::AlignRight aligns to the right border, except for
+    \li Qt::AlignRight aligns to the right border, except for
           Arabic and Hebrew where it aligns to the left.
-    \o Qt::AlignJustify produces justified text.
-    \o Qt::AlignHCenter aligns horizontally centered.
-    \o Qt::AlignTop aligns to the top border.
-    \o Qt::AlignBottom aligns to the bottom border.
-    \o Qt::AlignVCenter aligns vertically centered
-    \o Qt::AlignCenter (== \c{Qt::AlignHCenter | Qt::AlignVCenter})
-    \o Qt::TextSingleLine ignores newline characters in the text.
-    \o Qt::TextExpandTabs expands tabs (see below)
-    \o Qt::TextShowMnemonic interprets "&x" as \underline{x}; i.e., underlined.
-    \o Qt::TextWordWrap breaks the text to fit the rectangle.
+    \li Qt::AlignJustify produces justified text.
+    \li Qt::AlignHCenter aligns horizontally centered.
+    \li Qt::AlignTop aligns to the top border.
+    \li Qt::AlignBottom aligns to the bottom border.
+    \li Qt::AlignVCenter aligns vertically centered
+    \li Qt::AlignCenter (== \c{Qt::AlignHCenter | Qt::AlignVCenter})
+    \li Qt::TextSingleLine ignores newline characters in the text.
+    \li Qt::TextExpandTabs expands tabs (see below)
+    \li Qt::TextShowMnemonic interprets "&x" as \underline{x}; i.e., underlined.
+    \li Qt::TextWordWrap breaks the text to fit the rectangle.
     \endlist
 
     Qt::Horizontal alignment defaults to Qt::AlignLeft and vertical
@@ -1517,9 +1517,9 @@ QRectF QFontMetricsF::boundingRect(QChar ch) const
     If Qt::TextExpandTabs is set in \a flags, the following behavior is
     used to interpret tab characters in the text:
     \list
-    \o If \a tabArray is non-null, it specifies a 0-terminated sequence of
+    \li If \a tabArray is non-null, it specifies a 0-terminated sequence of
        pixel-positions for tabs in the text.
-    \o If \a tabStops is non-zero, it is used as the tab spacing (in pixels).
+    \li If \a tabStops is non-zero, it is used as the tab spacing (in pixels).
     \endlist
 
     Note that the bounding rectangle may extend to the left of (0, 0),
@@ -1559,10 +1559,10 @@ QRectF QFontMetricsF::boundingRect(const QRectF &rect, int flags, const QString&
 
     The \a flags argument is the bitwise OR of the following flags:
     \list
-    \o Qt::TextSingleLine ignores newline characters.
-    \o Qt::TextExpandTabs expands tabs (see below)
-    \o Qt::TextShowMnemonic interprets "&x" as \underline{x}; i.e., underlined.
-    \o Qt::TextWordBreak breaks the text to fit the rectangle.
+    \li Qt::TextSingleLine ignores newline characters.
+    \li Qt::TextExpandTabs expands tabs (see below)
+    \li Qt::TextShowMnemonic interprets "&x" as \underline{x}; i.e., underlined.
+    \li Qt::TextWordBreak breaks the text to fit the rectangle.
     \endlist
 
     These flags are defined in \l{Qt::TextFlags}.
@@ -1570,9 +1570,9 @@ QRectF QFontMetricsF::boundingRect(const QRectF &rect, int flags, const QString&
     If Qt::TextExpandTabs is set in \a flags, the following behavior is
     used to interpret tab characters in the text:
     \list
-    \o If \a tabArray is non-null, it specifies a 0-terminated sequence of
+    \li If \a tabArray is non-null, it specifies a 0-terminated sequence of
        pixel-positions for tabs in the text.
-    \o If \a tabStops is non-zero, it is used as the tab spacing (in pixels).
+    \li If \a tabStops is non-zero, it is used as the tab spacing (in pixels).
     \endlist
 
     Newline characters are processed as line breaks.
diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp
index 79793d5845..9fbeef4685 100644
--- a/src/gui/text/qrawfont.cpp
+++ b/src/gui/text/qrawfont.cpp
@@ -86,13 +86,13 @@ QT_BEGIN_NAMESPACE
 
    QRawFont can be constructed in a number of ways:
    \list
-   \o It can be constructed by calling QTextLayout::glyphs() or QTextFragment::glyphs(). The
+   \li It can be constructed by calling QTextLayout::glyphs() or QTextFragment::glyphs(). The
       returned QGlyphs objects will contain QRawFont objects which represent the actual fonts
       used to render each portion of the text.
-   \o It can be constructed by passing a QFont object to QRawFont::fromFont(). The function
+   \li It can be constructed by passing a QFont object to QRawFont::fromFont(). The function
       will return a QRawFont object representing the font that will be selected as response to
       the QFont query and the selected writing system.
-   \o It can be constructed by passing a file name or QByteArray directly to the QRawFont
+   \li It can be constructed by passing a file name or QByteArray directly to the QRawFont
       constructor, or by calling loadFromFile() or loadFromData(). In this case, the
       font will not be registered in QFontDatabase, and it will not be available as part of
       regular font selection.
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index ddf2fb080e..0dd0d99d2a 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -950,15 +950,15 @@ QTextLayout *QTextCursorPrivate::blockLayout(QTextBlock &block) const{
     document with the cursor:
 
     \list
-    \i Lists are ordered sequences of block elements that are decorated with
+    \li Lists are ordered sequences of block elements that are decorated with
        bullet points or symbols. These are inserted in a specified format
        with insertList().
-    \i Tables are inserted with the insertTable() function, and can be
+    \li Tables are inserted with the insertTable() function, and can be
        given an optional format. These contain an array of cells that can
        be traversed using the cursor.
-    \i Inline images are inserted with insertImage(). The image to be
+    \li Inline images are inserted with insertImage(). The image to be
        used can be specified in an image format, or by name.
-    \i Frames are inserted by calling insertFrame() with a specified format.
+    \li Frames are inserted by calling insertFrame() with a specified format.
     \endlist
 
     Actions can be grouped (i.e. treated as a single action for
@@ -1621,7 +1621,7 @@ void QTextCursor::selectedTableCells(int *firstRow, int *numRows, int *firstColu
 /*!
     Clears the current selection by setting the anchor to the cursor position.
 
-    Note that it does \bold{not} delete the text of the selection.
+    Note that it does \b{not} delete the text of the selection.
 
     \sa removeSelectedText() hasSelection()
 */
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 1fad064b5c..a8991d5428 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -261,14 +261,14 @@ QTextCodec *Qt::codecForHtml(const QByteArray &ba)
     system. The following are the undo/redo operations of a QTextDocument:
 
     \list
-        \o Insertion or removal of characters. A sequence of insertions or removals
+        \li Insertion or removal of characters. A sequence of insertions or removals
            within the same text block are regarded as a single undo/redo operation.
-        \o Insertion or removal of text blocks. Sequences of insertion or removals
+        \li Insertion or removal of text blocks. Sequences of insertion or removals
            in a single operation (e.g., by selecting and then deleting text) are
            regarded as a single undo/redo operation.
-        \o Text character format changes.
-        \o Text block format changes.
-        \o Text block group format changes.
+        \li Text character format changes.
+        \li Text block format changes.
+        \li Text block group format changes.
     \endlist
 
     \sa QTextCursor, QTextEdit, \link richtext.html Rich Text Processing\endlink , {Text Object Example}
@@ -887,7 +887,7 @@ QChar QTextDocument::characterAt(int pos) const
 
     The style sheet needs to be compliant to CSS 2.1 syntax.
 
-    \bold{Note:} Changing the default style sheet does not have any effect to the existing content
+    \b{Note:} Changing the default style sheet does not have any effect to the existing content
     of the document.
 
     \sa {Supported HTML Subset}
@@ -1169,7 +1169,7 @@ void QTextDocument::setPlainText(const QString &text)
 
     The HTML formatting is respected as much as possible; for example,
     "<b>bold</b> text" will produce text where the first word has a font
-    weight that gives it a bold appearance: "\bold{bold} text".
+    weight that gives it a bold appearance: "\b{bold} text".
 
     \note It is the responsibility of the caller to make sure that the
     text is correctly decoded when a QString containing HTML is created
diff --git a/src/gui/text/qtextdocumentwriter.cpp b/src/gui/text/qtextdocumentwriter.cpp
index d43a61866d..b0bbeb7a47 100644
--- a/src/gui/text/qtextdocumentwriter.cpp
+++ b/src/gui/text/qtextdocumentwriter.cpp
@@ -345,10 +345,10 @@ QTextCodec *QTextDocumentWriter::codec() const
     By default, Qt can write the following formats:
 
     \table
-    \header \o Format    \o Description
-    \row    \o plaintext \o Plain text
-    \row    \o HTML      \o HyperText Markup Language
-    \row    \o ODF       \o OpenDocument Format
+    \header \li Format    \li Description
+    \row    \li plaintext \li Plain text
+    \row    \li HTML      \li HyperText Markup Language
+    \row    \li ODF       \li OpenDocument Format
     \endtable
 
     \sa setFormat()
diff --git a/src/gui/text/qtextlist.cpp b/src/gui/text/qtextlist.cpp
index 5a642e90ef..c3c71bc021 100644
--- a/src/gui/text/qtextlist.cpp
+++ b/src/gui/text/qtextlist.cpp
@@ -107,7 +107,7 @@ public:
 
     Returns true if the list has no items; otherwise returns false.
 
-    \bold{Note:} Empty lists are automatically deleted by the QTextDocument that owns
+    \b{Note:} Empty lists are automatically deleted by the QTextDocument that owns
     them.
 
     \sa count()
diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp
index 12af933fd0..65bc8fde1e 100644
--- a/src/gui/text/qtexttable.cpp
+++ b/src/gui/text/qtexttable.cpp
@@ -541,22 +541,22 @@ void QTextTablePrivate::update() const
 
     \table 80%
     \row
-        \o \inlineimage texttable-split.png Original Table
-        \o Suppose we have a 2x3 table of names and addresses. To merge both
+        \li \inlineimage texttable-split.png Original Table
+        \li Suppose we have a 2x3 table of names and addresses. To merge both
         columns in the first row we invoke mergeCells() with \a row = 0,
         \a column = 0, \a numRows = 1 and \a numColumns = 2.
         \snippet doc/src/snippets/textdocument-texttable/main.cpp 0
 
     \row
-        \o \inlineimage texttable-merge.png
-        \o  This gives us the following table. To split the first row of the table
+        \li \inlineimage texttable-merge.png
+        \li  This gives us the following table. To split the first row of the table
         back into two cells, we invoke the splitCell() function with \a numRows
         and \a numCols = 1.
         \snippet doc/src/snippets/textdocument-texttable/main.cpp 1
 
     \row
-        \o \inlineimage texttable-split.png Split Table
-        \o This results in the original table.
+        \li \inlineimage texttable-split.png Split Table
+        \li This results in the original table.
     \endtable
 
     \sa QTextTableFormat
diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp
index 02552f5a53..ce16785d1d 100644
--- a/src/gui/util/qvalidator.cpp
+++ b/src/gui/util/qvalidator.cpp
@@ -82,18 +82,18 @@ QT_BEGIN_NAMESPACE
 
     \list
 
-    \i For a line edit that accepts integers from 10 to 1000 inclusive,
+    \li For a line edit that accepts integers from 10 to 1000 inclusive,
     42 and 123 are \l Acceptable, the empty string and 5 are \l
     Intermediate, and "asdf" and 1114 is \l Invalid.
 
-    \i For an editable combobox that accepts URLs, any well-formed URL
+    \li For an editable combobox that accepts URLs, any well-formed URL
     is \l Acceptable, "http://example.com/," is \l Intermediate
     (it might be a cut and paste action that accidentally took in a
     comma at the end), the empty string is \l Intermediate (the user
     might select and delete all of the text in preparation for entering
     a new URL) and "http:///./" is \l Invalid.
 
-    \i For a spin box that accepts lengths, "11cm" and "1in" are \l
+    \li For a spin box that accepts lengths, "11cm" and "1in" are \l
     Acceptable, "11" and the empty string are \l Intermediate, and
     "http://example.com" and "hour" are \l Invalid.
 
@@ -801,13 +801,13 @@ QDoubleValidator::Notation QDoubleValidator::notation() const
 
     When QRegExpValidator determines whether a string is \l Acceptable
     or not, the regexp is treated as if it begins with the start of string
-    assertion (\bold{^}) and ends with the end of string assertion
-    (\bold{$}); the match is against the entire input string, or from
+    assertion (\b{^}) and ends with the end of string assertion
+    (\b{$}); the match is against the entire input string, or from
     the given position if a start position greater than zero is given.
 
     If a string is a prefix of an \l Acceptable string, it is considered
     \l Intermediate. For example, "" and "A" are \l Intermediate for the
-    regexp \bold{[A-Z][0-9]} (whereas "_" would be \l Invalid).
+    regexp \b{[A-Z][0-9]} (whereas "_" would be \l Invalid).
 
     For a brief introduction to Qt's regexp engine, see \l QRegExp.
 
@@ -837,7 +837,7 @@ QRegExpValidator::QRegExpValidator(QObject *parent)
     accepts all strings that match the regular expression \a rx.
 
     The match is made against the entire string; e.g. if the regexp is
-    \bold{[A-Fa-f0-9]+} it will be treated as \bold{^[A-Fa-f0-9]+$}.
+    \b{[A-Fa-f0-9]+} it will be treated as \b{^[A-Fa-f0-9]+$}.
 */
 
 QRegExpValidator::QRegExpValidator(const QRegExp& rx, QObject *parent)
@@ -862,7 +862,7 @@ QRegExpValidator::~QRegExpValidator()
 
     The \a pos parameter is set to the length of the \a input parameter.
 
-    For example, if the regular expression is \bold{\\w\\d\\d}
+    For example, if the regular expression is \b{\\w\\d\\d}
     (word-character, digit, digit) then "A57" is \l Acceptable,
     "E5" is \l Intermediate, and "+9" is \l Invalid.
 
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 740e54b833..60c28274c6 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -451,12 +451,12 @@ QNetworkProxyFactory *QNetworkAccessManager::proxyFactory() const
 
     For example, a proxy factory could apply the following rules:
     \list
-      \o if the target address is in the local network (for example,
+      \li if the target address is in the local network (for example,
          if the hostname contains no dots or if it's an IP address in
          the organization's range), return QNetworkProxy::NoProxy
-      \o if the request is FTP, return an FTP proxy
-      \o if the request is HTTP or HTTPS, then return an HTTP proxy
-      \o otherwise, return a SOCKSv5 proxy server
+      \li if the request is FTP, return an FTP proxy
+      \li if the request is HTTP or HTTPS, then return an HTTP proxy
+      \li otherwise, return a SOCKSv5 proxy server
     \endlist
 
     The lifetime of the object \a factory will be managed by
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp
index 037a7fdbf3..0aa843f393 100644
--- a/src/network/bearer/qnetworkconfiguration.cpp
+++ b/src/network/bearer/qnetworkconfiguration.cpp
@@ -424,37 +424,37 @@ QNetworkConfiguration::BearerType QNetworkConfiguration::bearerType() const
 
     \table
         \header
-            \o BearerType
-            \o Value
+            \li BearerType
+            \li Value
         \row
-            \o BearerUnknown
-            \o
-            \o The session is based on an unknown or unspecified bearer type. The value of the
+            \li BearerUnknown
+            \li
+            \li The session is based on an unknown or unspecified bearer type. The value of the
                string returned describes the bearer type.
         \row
-            \o BearerEthernet
-            \o Ethernet
+            \li BearerEthernet
+            \li Ethernet
         \row
-            \o BearerWLAN
-            \o WLAN
+            \li BearerWLAN
+            \li WLAN
         \row
-            \o Bearer2G
-            \o 2G
+            \li Bearer2G
+            \li 2G
         \row
-            \o BearerCDMA2000
-            \o CDMA2000
+            \li BearerCDMA2000
+            \li CDMA2000
         \row
-            \o BearerWCDMA
-            \o WCDMA
+            \li BearerWCDMA
+            \li WCDMA
         \row
-            \o BearerHSPA
-            \o HSPA
+            \li BearerHSPA
+            \li HSPA
         \row
-            \o BearerBluetooth
-            \o Bluetooth
+            \li BearerBluetooth
+            \li Bluetooth
         \row
-            \o BearerWiMAX
-            \o WiMAX
+            \li BearerWiMAX
+            \li WiMAX
     \endtable
 
     This function returns an empty string if this is an invalid configuration, a network
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index 3f8cabe26e..ccf794633d 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -455,10 +455,10 @@ QString QNetworkSession::errorString() const
 
     \table
         \header
-            \o Key \o Description
+            \li Key \li Description
         \row
-            \o ActiveConfiguration
-            \o If the session \l isOpen() this property returns the identifier of the
+            \li ActiveConfiguration
+            \li If the session \l isOpen() this property returns the identifier of the
             QNetworkConfiguration that is used by this session; otherwise an empty string.
 
             The main purpose of this key is to determine which Internet access point is used
@@ -479,8 +479,8 @@ QString QNetworkSession::errorString() const
                     }
                 \endcode
         \row
-            \o UserChoiceConfiguration
-            \o If the session \l isOpen() and is bound to a QNetworkConfiguration of type
+            \li UserChoiceConfiguration
+            \li If the session \l isOpen() and is bound to a QNetworkConfiguration of type
             UserChoice, this property returns the identifier of the QNetworkConfiguration that the
             configuration resolved to when \l open() was called; otherwise an empty string.
 
@@ -492,14 +492,14 @@ QString QNetworkSession::errorString() const
             whereas \e ActiveConfiguration always returns identifiers to 
             \l {QNetworkConfiguration::InternetAccessPoint}{Internet access points} configurations.
         \row
-            \o ConnectInBackground
-            \o Setting this property to \e true before calling \l open() implies that the connection attempt
+            \li ConnectInBackground
+            \li Setting this property to \e true before calling \l open() implies that the connection attempt
             is made but if no connection can be established, the user is not connsulted and asked to select
             a suitable connection. This property is not set by default and support for it depends on the platform.
 
         \row
-            \o AutoCloseSessionTimeout
-            \o If the session requires polling to keep its state up to date, this property holds
+            \li AutoCloseSessionTimeout
+            \li If the session requires polling to keep its state up to date, this property holds
                the timeout in milliseconds before the session will automatically close. If the
                value of this property is -1 the session will not automatically close. This property
                is set to -1 by default.
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index b14fbf8c30..eef2a7fa76 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -80,9 +80,9 @@ static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phas
 
   QAuthenticator supports the following authentication methods:
   \list
-    \o Basic
-    \o NTLM version 2
-    \o Digest-MD5
+    \li Basic
+    \li NTLM version 2
+    \li Digest-MD5
   \endlist
 
   \section1 Options
@@ -104,8 +104,8 @@ static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phas
   \section2 Basic
 
   \table
-    \header \o Option \o Direction \o Description
-    \row \o \tt{realm} \o Incoming \o Contains the realm of the authentication, the same as realm()
+    \header \li Option \li Direction \li Description
+    \row \li \tt{realm} \li Incoming \li Contains the realm of the authentication, the same as realm()
   \endtable
 
   The Basic authentication mechanism supports no outgoing options.
@@ -117,8 +117,8 @@ static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phas
   \section2 Digest-MD5
 
   \table
-    \header \o Option \o Direction \o Description
-    \row \o \tt{realm} \o Incoming \o Contains the realm of the authentication, the same as realm()
+    \header \li Option \li Direction \li Description
+    \row \li \tt{realm} \li Incoming \li Contains the realm of the authentication, the same as realm()
   \endtable
 
   The Digest-MD5 authentication mechanism supports no outgoing options.
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index dd46b8126b..230abb86aa 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -822,20 +822,20 @@ QString QHostAddress::toString() const
 
     \list
 
-    \o Node-local: Addresses that are only used for communicating with
+    \li Node-local: Addresses that are only used for communicating with
     services on the same interface (e.g., the loopback interface "::1").
 
-    \o Link-local: Addresses that are local to the network interface
+    \li Link-local: Addresses that are local to the network interface
     (\e{link}). There is always one link-local address for each IPv6 interface
     on your host. Link-local addresses ("fe80...") are generated from the MAC
     address of the local network adaptor, and are not guaranteed to be unique.
 
-    \o Site-local: Addresses that are local to the site / private network
+    \li Site-local: Addresses that are local to the site / private network
     (e.g., the company intranet). Site-local addresses ("fec0...")  are
     usually distributed by the site router, and are not guaranteed to be
     unique outside of the local site.
 
-    \o Global: For globally routable addresses, such as public servers on the
+    \li Global: For globally routable addresses, such as public servers on the
     Internet.
 
     \endlist
@@ -1001,9 +1001,9 @@ bool QHostAddress::isInSubnet(const QPair<QHostAddress, int> &subnet) const
 
     This function supports arguments in the form:
     \list
-      \o 123.123.123.123/n  where n is any value between 0 and 32
-      \o 123.123.123.123/255.255.255.255
-      \o <ipv6-address>/n  where n is any value between 0 and 128
+      \li 123.123.123.123/n  where n is any value between 0 and 32
+      \li 123.123.123.123/255.255.255.255
+      \li <ipv6-address>/n  where n is any value between 0 and 128
     \endlist
 
     For IP version 4, this function accepts as well missing trailing
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 0238d22eb6..0281eaf48b 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -139,35 +139,35 @@
 
     \table
     \header
-        \o Proxy type
-        \o Description
-        \o Default capabilities
+        \li Proxy type
+        \li Description
+        \li Default capabilities
 
     \row
-        \o SOCKS 5
-        \o Generic proxy for any kind of connection. Supports TCP,
+        \li SOCKS 5
+        \li Generic proxy for any kind of connection. Supports TCP,
            UDP, binding to a port (incoming connections) and
            authentication.
-        \o TunnelingCapability, ListeningCapability,
+        \li TunnelingCapability, ListeningCapability,
            UdpTunnelingCapability, HostNameLookupCapability
 
     \row
-        \o HTTP
-        \o Implemented using the "CONNECT" command, supports only
+        \li HTTP
+        \li Implemented using the "CONNECT" command, supports only
            outgoing TCP connections; supports authentication.
-        \o TunnelingCapability, CachingCapability, HostNameLookupCapability
+        \li TunnelingCapability, CachingCapability, HostNameLookupCapability
 
     \row
-        \o Caching-only HTTP
-        \o Implemented using normal HTTP commands, it is useful only
+        \li Caching-only HTTP
+        \li Implemented using normal HTTP commands, it is useful only
            in the context of HTTP requests (see QNetworkAccessManager)
-        \o CachingCapability, HostNameLookupCapability
+        \li CachingCapability, HostNameLookupCapability
 
     \row
-        \o Caching FTP
-        \o Implemented using an FTP proxy, it is useful only in the
+        \li Caching FTP
+        \li Implemented using an FTP proxy, it is useful only in the
            context of FTP requests (see QNetworkAccessManager)
-        \o CachingCapability, HostNameLookupCapability
+        \li CachingCapability, HostNameLookupCapability
 
     \endtable
 
@@ -856,12 +856,12 @@ template<> void QSharedDataPointer<QNetworkProxyQueryPrivate>::detach()
     the proxy:
 
     \list
-      \o the type of query
-      \o the local port number to use
-      \o the destination host name
-      \o the destination port number
-      \o the protocol name, such as "http" or "ftp"
-      \o the URL being requested
+      \li the type of query
+      \li the local port number to use
+      \li the destination host name
+      \li the destination port number
+      \li the protocol name, such as "http" or "ftp"
+      \li the URL being requested
     \endlist
 
     The destination host name is the host in the connection in the
@@ -895,35 +895,35 @@ template<> void QSharedDataPointer<QNetworkProxyQueryPrivate>::detach()
 
     \table
     \header
-      \o Query type
-      \o Description
+      \li Query type
+      \li Description
 
     \row
-      \o TcpSocket
-      \o Normal sockets requesting a connection to a remote server,
+      \li TcpSocket
+      \li Normal sockets requesting a connection to a remote server,
          like QTcpSocket. The peer hostname and peer port match the
          values passed to QTcpSocket::connectToHost(). The local port
          is usually -1, indicating the socket has no preference in
          which port should be used. The URL component is not used.
 
     \row
-      \o UdpSocket
-      \o Datagram-based sockets, which can both send and
+      \li UdpSocket
+      \li Datagram-based sockets, which can both send and
          receive. The local port, remote host or remote port fields
          can all be used or be left unused, depending on the
          characteristics of the socket. The URL component is not used.
 
     \row
-      \o TcpServer
-      \o Passive server sockets that listen on a port and await
+      \li TcpServer
+      \li Passive server sockets that listen on a port and await
          incoming connections from the network. Normally, only the
          local port is used, but the remote address could be used in
          specific circumstances, for example to indicate which remote
          host a connection is expected from. The URL component is not used.
 
     \row
-      \o UrlRequest
-      \o A more high-level request, such as those coming from
+      \li UrlRequest
+      \li A more high-level request, such as those coming from
          QNetworkAccessManager. These requests will inevitably use an
          outgoing TCP socket, but the this query type is provided to
          indicate that more detailed information is present in the URL
@@ -1487,10 +1487,10 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact
     listed here.
 
     \list
-    \o On MacOS X, this function will ignore the Proxy Auto Configuration
+    \li On MacOS X, this function will ignore the Proxy Auto Configuration
     settings, since it cannot execute the associated ECMAScript code.
 
-    \o On Windows platforms, this function may take several seconds to
+    \li On Windows platforms, this function may take several seconds to
     execute depending on the configuration of the user's system.
     \endlist
 */
diff --git a/src/network/kernel/qnetworkproxy_mac.cpp b/src/network/kernel/qnetworkproxy_mac.cpp
index 75ed17048c..d25917ee47 100644
--- a/src/network/kernel/qnetworkproxy_mac.cpp
+++ b/src/network/kernel/qnetworkproxy_mac.cpp
@@ -58,14 +58,14 @@
  * proxy settings for:
  *
  * \list
- *   \o FTP proxy
- *   \o Web Proxy (HTTP)
- *   \o Secure Web Proxy (HTTPS)
- *   \o Streaming Proxy (RTSP)
- *   \o SOCKS Proxy
- *   \o Gopher Proxy
- *   \o URL for Automatic Proxy Configuration (PAC scripts)
- *   \o Bypass list (by default: *.local, 169.254/16)
+ *   \li FTP proxy
+ *   \li Web Proxy (HTTP)
+ *   \li Secure Web Proxy (HTTPS)
+ *   \li Streaming Proxy (RTSP)
+ *   \li SOCKS Proxy
+ *   \li Gopher Proxy
+ *   \li URL for Automatic Proxy Configuration (PAC scripts)
+ *   \li Bypass list (by default: *.local, 169.254/16)
  * \endlist
  *
  * The matching configuration can be obtained by calling SCDynamicStoreCopyProxies
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 75e99fe223..2f66671530 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -56,8 +56,8 @@
     you need a socket, you have two options:
 
     \list
-    \i  Instantiate QTcpSocket or QUdpSocket.
-    \i  Create a native socket descriptor, instantiate
+    \li  Instantiate QTcpSocket or QUdpSocket.
+    \li  Create a native socket descriptor, instantiate
         QAbstractSocket, and call setSocketDescriptor() to wrap the
         native socket.
     \endlist
@@ -129,15 +129,15 @@
     can be used to implement blocking sockets:
 
     \list
-    \o waitForConnected() blocks until a connection has been established.
+    \li waitForConnected() blocks until a connection has been established.
 
-    \o waitForReadyRead() blocks until new data is available for
+    \li waitForReadyRead() blocks until new data is available for
     reading.
 
-    \o waitForBytesWritten() blocks until one payload of data has been
+    \li waitForBytesWritten() blocks until one payload of data has been
     written to the socket.
 
-    \o waitForDisconnected() blocks until the connection has closed.
+    \li waitForDisconnected() blocks until the connection has closed.
     \endlist
 
     We show an example:
@@ -377,15 +377,15 @@
     Possible values for the \e{TypeOfServiceOption} are:
 
     \table
-    \header \o Value \o Description
-    \row \o 224 \o Network control
-    \row \o 192 \o Internetwork control
-    \row \o 160 \o CRITIC/ECP
-    \row \o 128 \o Flash override
-    \row \o 96 \o Flash
-    \row \o 64 \o Immediate
-    \row \o 32 \o Priority
-    \row \o 0 \o Routine
+    \header \li Value \li Description
+    \row \li 224 \li Network control
+    \row \li 192 \li Internetwork control
+    \row \li 160 \li CRITIC/ECP
+    \row \li 128 \li Flash override
+    \row \li 96 \li Flash
+    \row \li 64 \li Immediate
+    \row \li 32 \li Priority
+    \row \li 0 \li Routine
     \endtable
 
     \sa QAbstractSocket::setSocketOption(), QAbstractSocket::socketOption()
@@ -1510,7 +1510,7 @@ bool QAbstractSocket::bind(quint16 port, BindMode mode)
     Returns true if the socket is valid and ready for use; otherwise
     returns false.
 
-    \bold{Note:} The socket's state must be ConnectedState before reading and
+    \b{Note:} The socket's state must be ConnectedState before reading and
     writing can occur.
 
     \sa state()
@@ -1792,7 +1792,7 @@ qintptr QAbstractSocket::socketDescriptor() const
     The socket is opened in the mode specified by \a openMode, and
     enters the socket state specified by \a socketState.
 
-    \bold{Note:} It is not possible to initialize two abstract sockets
+    \b{Note:} It is not possible to initialize two abstract sockets
     with the same native socket descriptor.
 
     \sa socketDescriptor()
diff --git a/src/network/socket/qtcpsocket.cpp b/src/network/socket/qtcpsocket.cpp
index 706f5721b2..dff8b5efb5 100644
--- a/src/network/socket/qtcpsocket.cpp
+++ b/src/network/socket/qtcpsocket.cpp
@@ -58,7 +58,7 @@
     allows you to establish a TCP connection and transfer streams of
     data. See the QAbstractSocket documentation for details.
 
-    \bold{Note:} TCP sockets cannot be opened in QIODevice::Unbuffered mode.
+    \b{Note:} TCP sockets cannot be opened in QIODevice::Unbuffered mode.
 
     \sa QTcpServer, QUdpSocket, QNetworkAccessManager,
     {Fortune Server Example}, {Fortune Client Example},
diff --git a/src/network/ssl/qsslcertificateextension.cpp b/src/network/ssl/qsslcertificateextension.cpp
index eef27d7c2e..89b1a929c8 100644
--- a/src/network/ssl/qsslcertificateextension.cpp
+++ b/src/network/ssl/qsslcertificateextension.cpp
@@ -58,26 +58,26 @@
 
     \table
     \header
-       \o Property
-       \o Description
+       \li Property
+       \li Description
     \row
-       \o name
-       \o The human readable name of the extension, eg. 'basicConstraints'.
+       \li name
+       \li The human readable name of the extension, eg. 'basicConstraints'.
     \row
-       \o criticality
-       \o This is a boolean value indicating if the extension is critical
+       \li criticality
+       \li This is a boolean value indicating if the extension is critical
           to correctly interpreting the certificate.
     \row
-       \o oid
-       \o The ASN.1 object identifier that specifies which extension this
+       \li oid
+       \li The ASN.1 object identifier that specifies which extension this
           is.
     \row
-       \o supported
-       \o If this is true the structure of the extension's value will not
+       \li supported
+       \li If this is true the structure of the extension's value will not
           change between Qt versions.
     \row
-       \o value
-       \o A QVariant with a structure dependent on the type of extension.
+       \li value
+       \li A QVariant with a structure dependent on the type of extension.
     \endtable
 
     Whilst this class provides access to any type of extension, only
@@ -90,28 +90,28 @@
 
     \table
     \header
-       \o Name
-       \o OID
-       \o Details
+       \li Name
+       \li OID
+       \li Details
     \row
-       \o basicConstraints
-       \o 2.5.29.19
-       \o Returned as a QVariantMap. The key 'ca' contains a boolean value,
+       \li basicConstraints
+       \li 2.5.29.19
+       \li Returned as a QVariantMap. The key 'ca' contains a boolean value,
           the optional key 'pathLenConstraint' contains an integer.
     \row
-       \o authorityInfoAccess
-       \o 1.3.6.1.5.5.7.1.1
-       \o Returned as a QVariantMap. There is a key for each access method,
+       \li authorityInfoAccess
+       \li 1.3.6.1.5.5.7.1.1
+       \li Returned as a QVariantMap. There is a key for each access method,
           with the value being a URI.
     \row
-       \o subjectKeyIdentifier
-       \o 2.5.29.14
-       \o Returned as a QVariant containing a QString. The string is the key
+       \li subjectKeyIdentifier
+       \li 2.5.29.14
+       \li Returned as a QVariant containing a QString. The string is the key
           identifier.
     \row
-       \o authorityKeyIdentifier
-       \o 2.5.29.35
-       \o Returned as a QVariantMap. The optional key 'keyid' contains the key
+       \li authorityKeyIdentifier
+       \li 2.5.29.35
+       \li Returned as a QVariantMap. The optional key 'keyid' contains the key
           identifier as a hex string stored in a QByteArray. The optional key
           'serial' contains the authority key serial number as a qlonglong.
           Currently there is no support for the general names field of this
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
index dc530dae88..ec49c0f56e 100644
--- a/src/network/ssl/qsslconfiguration.cpp
+++ b/src/network/ssl/qsslconfiguration.cpp
@@ -67,11 +67,11 @@ const QSsl::SslOptions QSslConfigurationPrivate::defaultSslOptions = QSsl::SslOp
     The settings that QSslConfiguration currently supports are:
 
     \list
-      \o The SSL/TLS protocol to be used
-      \o The certificate to be presented to the peer during connection
+      \li The SSL/TLS protocol to be used
+      \li The certificate to be presented to the peer during connection
          and its associated private key
-      \o The ciphers allowed to be used for encrypting the connection
-      \o The list of Certificate Authorities certificates that are
+      \li The ciphers allowed to be used for encrypting the connection
+      \li The list of Certificate Authorities certificates that are
          used to validate the peer's certificate
     \endlist
 
@@ -81,9 +81,9 @@ const QSsl::SslOptions QSslConfigurationPrivate::defaultSslOptions = QSsl::SslOp
 
     The state that QSslConfiguration supports are:
     \list
-      \o The certificate the peer presented during handshake, along
+      \li The certificate the peer presented during handshake, along
          with the chain leading to a CA certificate
-      \o The cipher used to encrypt this session
+      \li The cipher used to encrypt this session
     \endlist
 
     The state can only be obtained once the SSL connection starts, but
@@ -541,10 +541,10 @@ bool QSslConfiguration::testSslOption(QSsl::SslOption option) const
     The default SSL configuration consists of:
 
     \list
-      \o no local certificate and no private key
-      \o protocol SecureProtocols (meaning either TLS 1.0 or SSL 3 will be used)
-      \o the system's default CA certificate list
-      \o the cipher list equal to the list of the SSL libraries'
+      \li no local certificate and no private key
+      \li protocol SecureProtocols (meaning either TLS 1.0 or SSL 3 will be used)
+      \li the system's default CA certificate list
+      \li the cipher list equal to the list of the SSL libraries'
          supported SSL ciphers
     \endlist
 
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 311ac5fe86..6338cbbe6f 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -132,12 +132,12 @@
     The following features can also be customized:
 
     \list
-    \o The socket's cryptographic cipher suite can be customized before
+    \li The socket's cryptographic cipher suite can be customized before
     the handshake phase with setCiphers() and setDefaultCiphers().
-    \o The socket's local certificate and private key can be customized
+    \li The socket's local certificate and private key can be customized
     before the handshake phase with setLocalCertificate() and
     setPrivateKey().
-    \o The CA certificate database can be extended and customized with
+    \li The CA certificate database can be extended and customized with
     addCaCertificate(), addCaCertificates(), setCaCertificates(),
     addDefaultCaCertificate(), addDefaultCaCertificates(), and
     setDefaultCaCertificates().
@@ -398,7 +398,7 @@ void QSslSocket::resume()
 
     \snippet doc/src/snippets/code/src_network_ssl_qsslsocket.cpp 3
 
-    \bold{Note:} The example above shows that text can be written to
+    \b{Note:} The example above shows that text can be written to
     the socket immediately after requesting the encrypted connection,
     before the encrypted() signal has been emitted. In such cases, the
     text is queued in the object and written to the socket \e after
@@ -468,7 +468,7 @@ void QSslSocket::connectToHostEncrypted(const QString &hostName, quint16 port,
     The socket is opened in the mode specified by \a openMode, and
     enters the socket state specified by \a state.
 
-    \bold{Note:} It is not possible to initialize two sockets with the same
+    \b{Note:} It is not possible to initialize two sockets with the same
     native socket descriptor.
 
     \sa socketDescriptor()
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 31d6064e90..eb27e865b5 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -169,17 +169,17 @@ QGLSignalProxy *QGLSignalProxy::instance()
 
     A display format has several characteristics:
     \list
-    \i \link setDoubleBuffer() Double or single buffering.\endlink
-    \i \link setDepth() Depth buffer.\endlink
-    \i \link setRgba() RGBA or color index mode.\endlink
-    \i \link setAlpha() Alpha channel.\endlink
-    \i \link setAccum() Accumulation buffer.\endlink
-    \i \link setStencil() Stencil buffer.\endlink
-    \i \link setStereo() Stereo buffers.\endlink
-    \i \link setDirectRendering() Direct rendering.\endlink
-    \i \link setOverlay() Presence of an overlay.\endlink
-    \i \link setPlane() Plane of an overlay.\endlink
-    \i \link setSampleBuffers() Multisample buffers.\endlink
+    \li \link setDoubleBuffer() Double or single buffering.\endlink
+    \li \link setDepth() Depth buffer.\endlink
+    \li \link setRgba() RGBA or color index mode.\endlink
+    \li \link setAlpha() Alpha channel.\endlink
+    \li \link setAccum() Accumulation buffer.\endlink
+    \li \link setStencil() Stencil buffer.\endlink
+    \li \link setStereo() Stereo buffers.\endlink
+    \li \link setDirectRendering() Direct rendering.\endlink
+    \li \link setOverlay() Presence of an overlay.\endlink
+    \li \link setPlane() Plane of an overlay.\endlink
+    \li \link setSampleBuffers() Multisample buffers.\endlink
     \endlist
 
     You can also specify preferred bit depths for the color buffer,
@@ -275,17 +275,17 @@ static inline GLint qgluProject(GLdouble objx, GLdouble objy, GLdouble objz,
 /*!
     Constructs a QGLFormat object with the following default settings:
     \list
-    \i \link setDoubleBuffer() Double buffer:\endlink Enabled.
-    \i \link setDepth() Depth buffer:\endlink Enabled.
-    \i \link setRgba() RGBA:\endlink Enabled (i.e., color index disabled).
-    \i \link setAlpha() Alpha channel:\endlink Disabled.
-    \i \link setAccum() Accumulator buffer:\endlink Disabled.
-    \i \link setStencil() Stencil buffer:\endlink Enabled.
-    \i \link setStereo() Stereo:\endlink Disabled.
-    \i \link setDirectRendering() Direct rendering:\endlink Enabled.
-    \i \link setOverlay() Overlay:\endlink Disabled.
-    \i \link setPlane() Plane:\endlink 0 (i.e., normal plane).
-    \i \link setSampleBuffers() Multisample buffers:\endlink Disabled.
+    \li \link setDoubleBuffer() Double buffer:\endlink Enabled.
+    \li \link setDepth() Depth buffer:\endlink Enabled.
+    \li \link setRgba() RGBA:\endlink Enabled (i.e., color index disabled).
+    \li \link setAlpha() Alpha channel:\endlink Disabled.
+    \li \link setAccum() Accumulator buffer:\endlink Disabled.
+    \li \link setStencil() Stencil buffer:\endlink Enabled.
+    \li \link setStereo() Stereo:\endlink Disabled.
+    \li \link setDirectRendering() Direct rendering:\endlink Enabled.
+    \li \link setOverlay() Overlay:\endlink Disabled.
+    \li \link setPlane() Plane:\endlink 0 (i.e., normal plane).
+    \li \link setSampleBuffers() Multisample buffers:\endlink Disabled.
     \endlist
 */
 
@@ -1339,17 +1339,17 @@ void QGLFormat::setDefaultFormat(const QGLFormat &f)
 
     The default overlay format is:
     \list
-    \i \link setDoubleBuffer() Double buffer:\endlink Disabled.
-    \i \link setDepth() Depth buffer:\endlink Disabled.
-    \i \link setRgba() RGBA:\endlink Disabled (i.e., color index enabled).
-    \i \link setAlpha() Alpha channel:\endlink Disabled.
-    \i \link setAccum() Accumulator buffer:\endlink Disabled.
-    \i \link setStencil() Stencil buffer:\endlink Disabled.
-    \i \link setStereo() Stereo:\endlink Disabled.
-    \i \link setDirectRendering() Direct rendering:\endlink Enabled.
-    \i \link setOverlay() Overlay:\endlink Disabled.
-    \i \link setSampleBuffers() Multisample buffers:\endlink Disabled.
-    \i \link setPlane() Plane:\endlink 1 (i.e., first overlay plane).
+    \li \link setDoubleBuffer() Double buffer:\endlink Disabled.
+    \li \link setDepth() Depth buffer:\endlink Disabled.
+    \li \link setRgba() RGBA:\endlink Disabled (i.e., color index enabled).
+    \li \link setAlpha() Alpha channel:\endlink Disabled.
+    \li \link setAccum() Accumulator buffer:\endlink Disabled.
+    \li \link setStencil() Stencil buffer:\endlink Disabled.
+    \li \link setStereo() Stereo:\endlink Disabled.
+    \li \link setDirectRendering() Direct rendering:\endlink Enabled.
+    \li \link setOverlay() Overlay:\endlink Disabled.
+    \li \link setSampleBuffers() Multisample buffers:\endlink Disabled.
+    \li \link setPlane() Plane:\endlink 1 (i.e., first overlay plane).
     \endlist
 
     \sa setDefaultFormat()
@@ -2642,10 +2642,10 @@ static void qDrawTextureRect(const QRectF &target, GLint textureWidth, GLint tex
     This function supports the following use cases:
 
     \list
-    \i On OpenGL and OpenGL ES 1.x it draws the given texture, \a textureId,
+    \li On OpenGL and OpenGL ES 1.x it draws the given texture, \a textureId,
     to the given target rectangle, \a target, in OpenGL model space. The
     \a textureTarget should be a 2D texture target.
-    \i On OpenGL and OpenGL ES 2.x, if a painter is active, not inside a
+    \li On OpenGL and OpenGL ES 2.x, if a painter is active, not inside a
     beginNativePainting / endNativePainting block, and uses the
     engine with type QPaintEngine::OpenGL2, the function will draw the given
     texture, \a textureId, to the given target rectangle, \a target,
@@ -2709,10 +2709,10 @@ void QGLContext::drawTexture(const QRectF &target, GLuint textureId, GLenum text
     This function supports the following use cases:
 
     \list
-    \i By default it draws the given texture, \a textureId,
+    \li By default it draws the given texture, \a textureId,
     at the given \a point in OpenGL model space. The
     \a textureTarget should be a 2D texture target.
-    \i If a painter is active, not inside a
+    \li If a painter is active, not inside a
     beginNativePainting / endNativePainting block, and uses the
     engine with type QPaintEngine::OpenGL2, the function will draw the given
     texture, \a textureId, at the given \a point,
@@ -3104,7 +3104,7 @@ void QGLContextPrivate::setCurrentContext(QGLContext *context)
 
 /*! \fn int QGLContext::choosePixelFormat(void* dummyPfd, HDC pdc)
 
-    \bold{Win32 only:} This virtual function chooses a pixel format
+    \b{Win32 only:} This virtual function chooses a pixel format
     that matches the OpenGL \link setFormat() format\endlink.
     Reimplement this function in a subclass if you need a custom
     context.
@@ -3118,7 +3118,7 @@ void QGLContextPrivate::setCurrentContext(QGLContext *context)
 
 /*! \fn void *QGLContext::chooseVisual()
 
-  \bold{X11 only:} This virtual function tries to find a visual that
+  \b{X11 only:} This virtual function tries to find a visual that
   matches the format, reducing the demands if the original request
   cannot be met.
 
@@ -3132,7 +3132,7 @@ void QGLContextPrivate::setCurrentContext(QGLContext *context)
 /*! \fn void *QGLContext::tryVisual(const QGLFormat& f, int bufDepth)
   \internal
 
-  \bold{X11 only:} This virtual function chooses a visual that matches
+  \b{X11 only:} This virtual function chooses a visual that matches
   the OpenGL \link format() format\endlink. Reimplement this function
   in a subclass if you need a custom visual.
 
@@ -3220,13 +3220,13 @@ void QGLContextPrivate::setCurrentContext(QGLContext *context)
     reimplement in your subclass to perform the typical OpenGL tasks:
 
     \list
-    \i paintGL() - Renders the OpenGL scene. Gets called whenever the widget
+    \li paintGL() - Renders the OpenGL scene. Gets called whenever the widget
     needs to be updated.
-    \i resizeGL() - Sets up the OpenGL viewport, projection, etc. Gets
+    \li resizeGL() - Sets up the OpenGL viewport, projection, etc. Gets
     called whenever the widget has been resized (and also when it
     is shown for the first time because all newly created widgets get a
     resize event automatically).
-    \i initializeGL() - Sets up the OpenGL rendering context, defines display
+    \li initializeGL() - Sets up the OpenGL rendering context, defines display
     lists, etc. Gets called once before the first time resizeGL() or
     paintGL() is called.
     \endlist
@@ -3277,9 +3277,9 @@ void QGLContextPrivate::setCurrentContext(QGLContext *context)
     implement some or all of these virtual methods:
 
     \list
-    \i paintOverlayGL()
-    \i resizeOverlayGL()
-    \i initializeOverlayGL()
+    \li paintOverlayGL()
+    \li resizeOverlayGL()
+    \li initializeOverlayGL()
     \endlist
 
     These methods work in the same way as the normal paintGL() etc.
@@ -3298,9 +3298,9 @@ void QGLContextPrivate::setCurrentContext(QGLContext *context)
     following way:
 
     \list
-    \o Reimplement the QGLWidget::initializeGL() and QGLWidget::resizeGL() to
+    \li Reimplement the QGLWidget::initializeGL() and QGLWidget::resizeGL() to
        set up the OpenGL state and provide a perspective transformation.
-    \o Reimplement QGLWidget::paintGL() to paint the 3D scene, calling only
+    \li Reimplement QGLWidget::paintGL() to paint the 3D scene, calling only
        OpenGL functions to draw on the widget.
     \endlist
 
@@ -3308,10 +3308,10 @@ void QGLContextPrivate::setCurrentContext(QGLContext *context)
     to reimplement QGLWidget::paintEvent() and do the following:
 
     \list
-    \o Construct a QPainter object.
-    \o Initialize it for use on the widget with the QPainter::begin() function.
-    \o Draw primitives using QPainter's member functions.
-    \o Call QPainter::end() to finish painting.
+    \li Construct a QPainter object.
+    \li Initialize it for use on the widget with the QPainter::begin() function.
+    \li Draw primitives using QPainter's member functions.
+    \li Call QPainter::end() to finish painting.
     \endlist
 
     Overpainting 2D content on top of 3D content takes a little more effort.
@@ -3323,7 +3323,7 @@ void QGLContextPrivate::setCurrentContext(QGLContext *context)
     As of Qt version 4.8, support for doing threaded GL rendering has
     been improved. There are three scenarios that we currently support:
     \list
-    \o 1. Buffer swapping in a thread.
+    \li 1. Buffer swapping in a thread.
 
     Swapping buffers in a double buffered context may be a
     synchronous, locking call that may be a costly operation in some
@@ -3350,7 +3350,7 @@ void QGLContextPrivate::setCurrentContext(QGLContext *context)
     having the main thread wait while the GPU finishes the swap
     operation. Note that this is highly implementation dependent.
 
-    \o 2. Texture uploading in a thread.
+    \li 2. Texture uploading in a thread.
 
     Doing texture uploads in a thread may be very useful for
     applications handling large amounts of images that needs to be
@@ -3363,7 +3363,7 @@ void QGLContextPrivate::setCurrentContext(QGLContext *context)
     thread. For each texture that is bound via bindTexture(), notify
     the main thread so that it can start using the texture.
 
-    \o 3. Using QPainter to draw into a QGLWidget in a thread.
+    \li 3. Using QPainter to draw into a QGLWidget in a thread.
 
     In Qt 4.8, it is possible to draw into a QGLWidget using a
     QPainter in a separate thread. Note that this is also possible for
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index 21b3abfdd8..ed362503ce 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -87,10 +87,10 @@ extern QImage qt_gl_read_framebuffer(const QSize&, bool, bool);
 
     A framebuffer object has several characteristics:
     \list
-    \i \link setSamples() Number of samples per pixels.\endlink
-    \i \link setAttachment() Depth and/or stencil attachments.\endlink
-    \i \link setTextureTarget() Texture target.\endlink
-    \i \link setInternalTextureFormat() Internal texture format.\endlink
+    \li \link setSamples() Number of samples per pixels.\endlink
+    \li \link setAttachment() Depth and/or stencil attachments.\endlink
+    \li \link setTextureTarget() Texture target.\endlink
+    \li \link setInternalTextureFormat() Internal texture format.\endlink
     \endlist
 
     Note that the desired attachments or number of samples per pixels might not
@@ -674,7 +674,7 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz,
     generates a 2D GL texture (using the \c{GL_TEXTURE_2D} target),
     which is used as the internal rendering target.
 
-    \bold{It is important to have a current GL context when creating a
+    \b{It is important to have a current GL context when creating a
     QGLFramebufferObject, otherwise initialization will fail.}
 
     OpenGL framebuffer objects and pbuffers (see
@@ -683,22 +683,22 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz,
     using framebuffer objects instead of pbuffers:
 
     \list 1
-    \o A framebuffer object does not require a separate rendering
+    \li A framebuffer object does not require a separate rendering
     context, so no context switching will occur when switching
     rendering targets. There is an overhead involved in switching
     targets, but in general it is cheaper than a context switch to a
     pbuffer.
 
-    \o Rendering to dynamic textures (i.e. render-to-texture
+    \li Rendering to dynamic textures (i.e. render-to-texture
     functionality) works on all platforms. No need to do explicit copy
     calls from a render buffer into a texture, as was necessary on
     systems that did not support the \c{render_texture} extension.
 
-    \o It is possible to attach several rendering buffers (or texture
+    \li It is possible to attach several rendering buffers (or texture
     objects) to the same framebuffer object, and render to all of them
     without doing a context switch.
 
-    \o The OpenGL framebuffer extension is a pure GL extension with no
+    \li The OpenGL framebuffer extension is a pure GL extension with no
     system dependant WGL, CGL, or GLX parts. This makes using
     framebuffer objects more portable.
     \endlist
diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp
index ab5a738ba7..bccac7e9a0 100644
--- a/src/opengl/qglpixelbuffer.cpp
+++ b/src/opengl/qglpixelbuffer.cpp
@@ -53,16 +53,16 @@
     There are three approaches to using this class:
 
     \list 1
-    \o \bold{We can draw into the pbuffer and convert it to a QImage
+    \li \b{We can draw into the pbuffer and convert it to a QImage
        using toImage().} This is normally much faster than calling
        QGLWidget::renderPixmap().
 
-    \o \bold{We can draw into the pbuffer and copy the contents into
+    \li \b{We can draw into the pbuffer and copy the contents into
        an OpenGL texture using updateDynamicTexture().} This allows
        us to create dynamic textures and works on all systems
        with pbuffer support.
 
-    \o \bold{On systems that support it, we can bind the pbuffer to
+    \li \b{On systems that support it, we can bind the pbuffer to
        an OpenGL texture.} The texture is then updated automatically
        when the pbuffer contents change, eliminating the need for
        additional copy operations. This is supported only on Windows
diff --git a/src/plugins/platforms/windows/main.cpp b/src/plugins/platforms/windows/main.cpp
index f16eff5449..6d7c89e086 100644
--- a/src/plugins/platforms/windows/main.cpp
+++ b/src/plugins/platforms/windows/main.cpp
@@ -59,15 +59,15 @@ QT_BEGIN_NAMESPACE
     of QGuiApplication:
 
     \list
-    \o \c fontengine=native Indicates that the freetype font
+    \li \c fontengine=native Indicates that the freetype font
        engine should not be used.
-    \o \c gl=gdi Indicates that ARB Open GL functionality should not be used
+    \li \c gl=gdi Indicates that ARB Open GL functionality should not be used
     \endlist
 
     \section1 Tips
 
     \list
-    \o The environment variable \c QT_LIGHTHOUSE_WINDOWS_VERBOSE controls
+    \li The environment variable \c QT_LIGHTHOUSE_WINDOWS_VERBOSE controls
        the debug level. It takes the form
        \c{<keyword1>:<level1>,<keyword2>:<level2>}, where
        keyword is one of \c integration, \c windows, \c backingstore and
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index 25b9336361..1239f3d8e2 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -366,10 +366,10 @@ void eatMouseMove()
     There 2 types of native dialogs:
 
     \list
-    \o Dialogs provided by the Comdlg32 library (ChooseColor,
+    \li Dialogs provided by the Comdlg32 library (ChooseColor,
        ChooseFont). They only provide a modal, blocking
        function call (with idle processing).
-    \o File dialogs are classes derived from IFileDialog. They
+    \li File dialogs are classes derived from IFileDialog. They
        inherit IModalWindow and their exec() method (calling
        IModalWindow::Show()) is similarly blocking, but methods
        like close() can be called on them from event handlers.
diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.cpp b/src/plugins/platforms/windows/qwindowsinputcontext.cpp
index 5085dfefb7..ae5053210e 100644
--- a/src/plugins/platforms/windows/qwindowsinputcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowsinputcontext.cpp
@@ -108,11 +108,11 @@ template <class T>
     \section1 Testing
 
     \list
-    \o Install the East Asian language support and choose Japanese (say).
-    \o Compile the \a mainwindows/mdi example and open a text window.
-    \o In the language bar, switch to Japanese and choose the
+    \li Install the East Asian language support and choose Japanese (say).
+    \li Compile the \a mainwindows/mdi example and open a text window.
+    \li In the language bar, switch to Japanese and choose the
        Input method 'Hiragana'.
-    \o In a text editor control, type the syllable \a 'la'.
+    \li In a text editor control, type the syllable \a 'la'.
        Underlined characters show up, indicating that there is completion
        available. Press the Space key two times. A completion popup occurs
        which shows the options.
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index 3e98be4741..b43362c045 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -74,9 +74,9 @@ QT_BEGIN_NAMESPACE
 
     Currently implemented keys
     \list
-    \o handle (HWND)
-    \o getDC (DC)
-    \o releaseDC Releases the previously acquired DC and returns 0.
+    \li handle (HWND)
+    \li getDC (DC)
+    \li releaseDC Releases the previously acquired DC and returns 0.
     \endlist
 
     \ingroup qt-lighthouse-win
diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
index 570e4b3b6b..e41db3f60f 100644
--- a/src/plugins/platforms/windows/qwindowsmime.cpp
+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
@@ -413,14 +413,14 @@ static bool canGetData(int cf, IDataObject * pDataObj)
     Qt has predefined support for the following Windows Clipboard formats:
 
     \table
-    \header \o Windows Format \o Equivalent MIME type
-    \row \o \c CF_UNICODETEXT \o \c text/plain
-    \row \o \c CF_TEXT        \o \c text/plain
-    \row \o \c CF_DIB         \o \c{image/xyz}, where \c xyz is
+    \header \li Windows Format \li Equivalent MIME type
+    \row \li \c CF_UNICODETEXT \li \c text/plain
+    \row \li \c CF_TEXT        \li \c text/plain
+    \row \li \c CF_DIB         \li \c{image/xyz}, where \c xyz is
                                  a \l{QImageWriter::supportedImageFormats()}{Qt image format}
-    \row \o \c CF_HDROP       \o \c text/uri-list
-    \row \o \c CF_INETURL     \o \c text/uri-list
-    \row \o \c CF_HTML        \o \c text/html
+    \row \li \c CF_HDROP       \li \c text/uri-list
+    \row \li \c CF_INETURL     \li \c text/uri-list
+    \row \li \c CF_HTML        \li \c text/html
     \endtable
 
     An example use of this class would be to map the Windows Metafile
diff --git a/src/plugins/platforms/windows/qwindowsole.cpp b/src/plugins/platforms/windows/qwindowsole.cpp
index 3ae9fe1048..6f34967ee8 100644
--- a/src/plugins/platforms/windows/qwindowsole.cpp
+++ b/src/plugins/platforms/windows/qwindowsole.cpp
@@ -63,11 +63,11 @@ QT_BEGIN_NAMESPACE
    The following methods are NOT supported for data transfer using the
    clipboard or drag-drop:
    \list
-   \o IDataObject::SetData    -- return E_NOTIMPL
-   \o IDataObject::DAdvise    -- return OLE_E_ADVISENOTSUPPORTED
-   \o ::DUnadvise
-   \o ::EnumDAdvise
-   \o IDataObject::GetCanonicalFormatEtc -- return E_NOTIMPL
+   \li IDataObject::SetData    -- return E_NOTIMPL
+   \li IDataObject::DAdvise    -- return OLE_E_ADVISENOTSUPPORTED
+   \li ::DUnadvise
+   \li ::EnumDAdvise
+   \li IDataObject::GetCanonicalFormatEtc -- return E_NOTIMPL
        (NOTE: must set pformatetcOut->ptd = NULL)
    \endlist
 
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index 3e0bec8d46..b2ebe06a58 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -205,18 +205,18 @@ static bool shouldShowMaximizeButton(Qt::WindowFlags flags)
     Window creation is split in 3 steps:
 
     \list
-    \o fromWindow() Gather all required information
-    \o create() Create the system handle.
-    \o initialize() Post creation initialization steps.
+    \li fromWindow() Gather all required information
+    \li create() Create the system handle.
+    \li initialize() Post creation initialization steps.
     \endlist
 
     The reason for this split is to also enable changing the QWindowFlags
     by calling:
 
     \list
-    \o fromWindow() Gather information and determine new system styles
-    \o applyWindowFlags() to apply the new window system styles.
-    \o initialize() Post creation initialization steps.
+    \li fromWindow() Gather information and determine new system styles
+    \li applyWindowFlags() to apply the new window system styles.
+    \li initialize() Post creation initialization steps.
     \endlist
 
     Contains the window creation code formerly in qwidget_win.cpp.
@@ -594,13 +594,13 @@ QWindowCreationContext::QWindowCreationContext(const QWindow *w,
     \brief Raster or OpenGL Window.
 
     \list
-    \o Raster type: handleWmPaint() is implemented to
+    \li Raster type: handleWmPaint() is implemented to
        to bitblt the image. The DC can be accessed
        via getDC/Relase DC, which has a special handling
        when within a paint event (in that case, the DC obtained
        from BeginPaint() is returned).
 
-    \o Open GL: The first time QWindowsGLContext accesses
+    \li Open GL: The first time QWindowsGLContext accesses
        the handle, it sets up the pixelformat on the DC
        which in turn sets it on the window (see flag
        PixelFormatInitialized).
diff --git a/src/printsupport/dialogs/qabstractprintdialog.cpp b/src/printsupport/dialogs/qabstractprintdialog.cpp
index 1c66c1888f..4e3586f646 100644
--- a/src/printsupport/dialogs/qabstractprintdialog.cpp
+++ b/src/printsupport/dialogs/qabstractprintdialog.cpp
@@ -386,8 +386,8 @@ void QAbstractPrintDialogPrivate::setPrinter(QPrinter *newPrinter)
 
     \table
     \row
-    \o \inlineimage plastique-printdialog.png
-    \o \inlineimage plastique-printdialog-properties.png
+    \li \inlineimage plastique-printdialog.png
+    \li \inlineimage plastique-printdialog-properties.png
     \endtable
 
     The printer dialog (shown above in Plastique style) enables access to common
diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp
index d50424609a..c7b450786d 100644
--- a/src/printsupport/dialogs/qprintpreviewdialog.cpp
+++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp
@@ -647,13 +647,13 @@ void QPrintPreviewDialogPrivate::_q_zoomFactorChanged()
     straightforward:
 
     \list 1
-    \o Create the QPrintPreviewDialog.
+    \li Create the QPrintPreviewDialog.
 
     You can construct a QPrintPreviewDialog with an existing QPrinter
     object, or you can have QPrintPreviewDialog create one for you,
     which will be the system default printer.
 
-    \o Connect the paintRequested() signal to a slot.
+    \li Connect the paintRequested() signal to a slot.
 
     When the dialog needs to generate a set of preview pages, the
     paintRequested() signal will be emitted. You can use the exact
@@ -663,7 +663,7 @@ void QPrintPreviewDialogPrivate::_q_zoomFactorChanged()
     signal, where you draw onto the QPrinter object that is passed
     into the slot.
 
-    \o Call exec().
+    \li Call exec().
 
     Call QPrintPreviewDialog::exec() to show the preview dialog.
     \endlist
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp
index e0373d99e8..447c535420 100644
--- a/src/printsupport/kernel/qprinter.cpp
+++ b/src/printsupport/kernel/qprinter.cpp
@@ -264,14 +264,14 @@ void QPrinterPrivate::addToManualSetList(QPrintEngine::PrintEnginePropertyKey ke
 
   The most important parameters are:
   \list
-  \i setOrientation() tells QPrinter which page orientation to use.
-  \i setPaperSize() tells QPrinter what paper size to expect from the
+  \li setOrientation() tells QPrinter which page orientation to use.
+  \li setPaperSize() tells QPrinter what paper size to expect from the
   printer.
-  \i setResolution() tells QPrinter what resolution you wish the
+  \li setResolution() tells QPrinter what resolution you wish the
   printer to provide, in dots per inch (DPI).
-  \i setFullPage() tells QPrinter whether you want to deal with the
+  \li setFullPage() tells QPrinter whether you want to deal with the
   full page or just with the part the printer can draw on.
-  \i setCopyCount() tells QPrinter how many copies of the document
+  \li setCopyCount() tells QPrinter how many copies of the document
   it should print.
   \endlist
 
diff --git a/src/printsupport/widgets/qprintpreviewwidget.cpp b/src/printsupport/widgets/qprintpreviewwidget.cpp
index ce2c6955a0..16aea238b1 100644
--- a/src/printsupport/widgets/qprintpreviewwidget.cpp
+++ b/src/printsupport/widgets/qprintpreviewwidget.cpp
@@ -467,13 +467,13 @@ void QPrintPreviewWidgetPrivate::setZoomFactor(qreal _zoomFactor)
     Using QPrintPreviewWidget is straightforward:
 
     \list 1
-    \o Create the QPrintPreviewWidget
+    \li Create the QPrintPreviewWidget
 
     Construct the QPrintPreviewWidget either by passing in an
     existing QPrinter object, or have QPrintPreviewWidget create a
     default constructed QPrinter object for you.
 
-    \o Connect the paintRequested() signal to a slot.
+    \li Connect the paintRequested() signal to a slot.
 
     When the widget needs to generate a set of preview pages, a
     paintRequested() signal will be emitted from the widget. Connect a
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp
index 7b6a2b8c12..d4633cea57 100644
--- a/src/sql/kernel/qsqldatabase.cpp
+++ b/src/sql/kernel/qsqldatabase.cpp
@@ -650,16 +650,16 @@ QStringList QSqlDatabase::connectionNames()
     The currently available driver types are:
 
     \table
-    \header \i Driver Type \i Description
-    \row \i QDB2     \i IBM DB2
-    \row \i QIBASE   \i Borland InterBase Driver
-    \row \i QMYSQL   \i MySQL Driver
-    \row \i QOCI     \i Oracle Call Interface Driver
-    \row \i QODBC    \i ODBC Driver (includes Microsoft SQL Server)
-    \row \i QPSQL    \i PostgreSQL Driver
-    \row \i QSQLITE  \i SQLite version 3 or above
-    \row \i QSQLITE2 \i SQLite version 2
-    \row \i QTDS     \i Sybase Adaptive Server
+    \header \li Driver Type \li Description
+    \row \li QDB2     \li IBM DB2
+    \row \li QIBASE   \li Borland InterBase Driver
+    \row \li QMYSQL   \li MySQL Driver
+    \row \li QOCI     \li Oracle Call Interface Driver
+    \row \li QODBC    \li ODBC Driver (includes Microsoft SQL Server)
+    \row \li QPSQL    \li PostgreSQL Driver
+    \row \li QSQLITE  \li SQLite version 3 or above
+    \row \li QSQLITE2 \li SQLite version 2
+    \row \li QTDS     \li Sybase Adaptive Server
     \endtable
 
     Additional third party drivers, including your own custom
@@ -1202,77 +1202,77 @@ QSqlRecord QSqlDatabase::record(const QString& tablename) const
     database client used:
 
     \table
-    \header \i ODBC \i MySQL \i PostgreSQL
+    \header \li ODBC \li MySQL \li PostgreSQL
     \row
 
-    \i
+    \li
     \list
-    \i SQL_ATTR_ACCESS_MODE
-    \i SQL_ATTR_LOGIN_TIMEOUT
-    \i SQL_ATTR_CONNECTION_TIMEOUT
-    \i SQL_ATTR_CURRENT_CATALOG
-    \i SQL_ATTR_METADATA_ID
-    \i SQL_ATTR_PACKET_SIZE
-    \i SQL_ATTR_TRACEFILE
-    \i SQL_ATTR_TRACE
-    \i SQL_ATTR_CONNECTION_POOLING
-    \i SQL_ATTR_ODBC_VERSION
+    \li SQL_ATTR_ACCESS_MODE
+    \li SQL_ATTR_LOGIN_TIMEOUT
+    \li SQL_ATTR_CONNECTION_TIMEOUT
+    \li SQL_ATTR_CURRENT_CATALOG
+    \li SQL_ATTR_METADATA_ID
+    \li SQL_ATTR_PACKET_SIZE
+    \li SQL_ATTR_TRACEFILE
+    \li SQL_ATTR_TRACE
+    \li SQL_ATTR_CONNECTION_POOLING
+    \li SQL_ATTR_ODBC_VERSION
     \endlist
 
-    \i
+    \li
     \list
-    \i CLIENT_COMPRESS
-    \i CLIENT_FOUND_ROWS
-    \i CLIENT_IGNORE_SPACE
-    \i CLIENT_SSL
-    \i CLIENT_ODBC
-    \i CLIENT_NO_SCHEMA
-    \i CLIENT_INTERACTIVE
-    \i UNIX_SOCKET
-    \i MYSQL_OPT_RECONNECT
+    \li CLIENT_COMPRESS
+    \li CLIENT_FOUND_ROWS
+    \li CLIENT_IGNORE_SPACE
+    \li CLIENT_SSL
+    \li CLIENT_ODBC
+    \li CLIENT_NO_SCHEMA
+    \li CLIENT_INTERACTIVE
+    \li UNIX_SOCKET
+    \li MYSQL_OPT_RECONNECT
     \endlist
 
-    \i
+    \li
     \list
-    \i connect_timeout
-    \i options
-    \i tty
-    \i requiressl
-    \i service
+    \li connect_timeout
+    \li options
+    \li tty
+    \li requiressl
+    \li service
     \endlist
 
-    \header \i DB2 \i OCI \i TDS
+    \header \li DB2 \li OCI \li TDS
     \row
 
-    \i
+    \li
     \list
-    \i SQL_ATTR_ACCESS_MODE
-    \i SQL_ATTR_LOGIN_TIMEOUT
+    \li SQL_ATTR_ACCESS_MODE
+    \li SQL_ATTR_LOGIN_TIMEOUT
     \endlist
 
-    \i
+    \li
     \list
-    \i OCI_ATTR_PREFETCH_ROWS
-    \i OCI_ATTR_PREFETCH_MEMORY
+    \li OCI_ATTR_PREFETCH_ROWS
+    \li OCI_ATTR_PREFETCH_MEMORY
     \endlist
 
-    \i
+    \li
     \e none
 
-    \header \i SQLite \i Interbase
+    \header \li SQLite \li Interbase
     \row
 
-    \i
+    \li
     \list
-    \i QSQLITE_BUSY_TIMEOUT
-    \i QSQLITE_OPEN_READONLY
-    \i QSQLITE_ENABLE_SHARED_CACHE
+    \li QSQLITE_BUSY_TIMEOUT
+    \li QSQLITE_OPEN_READONLY
+    \li QSQLITE_ENABLE_SHARED_CACHE
     \endlist
 
-    \i
+    \li
     \list
-    \i ISC_DPB_LC_CTYPE
-    \i ISC_DPB_SQL_ROLE_NAME
+    \li ISC_DPB_LC_CTYPE
+    \li ISC_DPB_SQL_ROLE_NAME
     \endlist
 
     \endtable
@@ -1354,47 +1354,47 @@ bool QSqlDatabase::isDriverAvailable(const QString& name)
     and their constructor arguments:
 
     \table
-    \header \i Driver \i Class name \i Constructor arguments \i File to include
+    \header \li Driver \li Class name \li Constructor arguments \li File to include
     \row
-    \i QPSQL
-    \i QPSQLDriver
-    \i PGconn *connection
-    \i \c qsql_psql.cpp
+    \li QPSQL
+    \li QPSQLDriver
+    \li PGconn *connection
+    \li \c qsql_psql.cpp
     \row
-    \i QMYSQL
-    \i QMYSQLDriver
-    \i MYSQL *connection
-    \i \c qsql_mysql.cpp
+    \li QMYSQL
+    \li QMYSQLDriver
+    \li MYSQL *connection
+    \li \c qsql_mysql.cpp
     \row
-    \i QOCI
-    \i QOCIDriver
-    \i OCIEnv *environment, OCISvcCtx *serviceContext
-    \i \c qsql_oci.cpp
+    \li QOCI
+    \li QOCIDriver
+    \li OCIEnv *environment, OCISvcCtx *serviceContext
+    \li \c qsql_oci.cpp
     \row
-    \i QODBC
-    \i QODBCDriver
-    \i SQLHANDLE environment, SQLHANDLE connection
-    \i \c qsql_odbc.cpp
+    \li QODBC
+    \li QODBCDriver
+    \li SQLHANDLE environment, SQLHANDLE connection
+    \li \c qsql_odbc.cpp
     \row
-    \i QDB2
-    \i QDB2
-    \i SQLHANDLE environment, SQLHANDLE connection
-    \i \c qsql_db2.cpp
+    \li QDB2
+    \li QDB2
+    \li SQLHANDLE environment, SQLHANDLE connection
+    \li \c qsql_db2.cpp
     \row
-    \i QTDS
-    \i QTDSDriver
-    \i LOGINREC *loginRecord, DBPROCESS *dbProcess, const QString &hostName
-    \i \c qsql_tds.cpp
+    \li QTDS
+    \li QTDSDriver
+    \li LOGINREC *loginRecord, DBPROCESS *dbProcess, const QString &hostName
+    \li \c qsql_tds.cpp
     \row
-    \i QSQLITE
-    \i QSQLiteDriver
-    \i sqlite *connection
-    \i \c qsql_sqlite.cpp
+    \li QSQLITE
+    \li QSQLiteDriver
+    \li sqlite *connection
+    \li \c qsql_sqlite.cpp
     \row
-    \i QIBASE
-    \i QIBaseDriver
-    \i isc_db_handle connection
-    \i \c qsql_ibase.cpp
+    \li QIBASE
+    \li QIBaseDriver
+    \li isc_db_handle connection
+    \li \c qsql_ibase.cpp
     \endtable
 
     The host name (or service name) is needed when constructing the
diff --git a/src/sql/kernel/qsqldriver.cpp b/src/sql/kernel/qsqldriver.cpp
index 861cd4ad0f..7e6a7f7386 100644
--- a/src/sql/kernel/qsqldriver.cpp
+++ b/src/sql/kernel/qsqldriver.cpp
@@ -569,22 +569,22 @@ QString QSqlDriver::sqlStatement(StatementType type, const QString &tableName,
 
     \list
 
-    \i If \a field is character data, the value is returned enclosed
+    \li If \a field is character data, the value is returned enclosed
     in single quotation marks, which is appropriate for many SQL
     databases. Any embedded single-quote characters are escaped
     (replaced with two single-quote characters). If \a trimStrings is
     true (the default is false), all trailing whitespace is trimmed
     from the field.
 
-    \i If \a field is date/time data, the value is formatted in ISO
+    \li If \a field is date/time data, the value is formatted in ISO
     format and enclosed in single quotation marks. If the date/time
     data is invalid, "NULL" is returned.
 
-    \i If \a field is \link QByteArray bytearray\endlink data, and the
+    \li If \a field is \link QByteArray bytearray\endlink data, and the
     driver can edit binary fields, the value is formatted as a
     hexadecimal string.
 
-    \i For any other field type, toString() is called on its value
+    \li For any other field type, toString() is called on its value
     and the result of this is returned.
 
     \endlist
diff --git a/src/sql/kernel/qsqlquery.cpp b/src/sql/kernel/qsqlquery.cpp
index 3e6712b27e..e21a8f4956 100644
--- a/src/sql/kernel/qsqlquery.cpp
+++ b/src/sql/kernel/qsqlquery.cpp
@@ -130,11 +130,11 @@ QSqlQueryPrivate::~QSqlQueryPrivate()
     Navigating records is performed with the following functions:
 
     \list
-    \o next()
-    \o previous()
-    \o first()
-    \o last()
-    \o seek()
+    \li next()
+    \li previous()
+    \li first()
+    \li last()
+    \li seek()
     \endlist
 
     These functions allow the programmer to move forward, backward
@@ -188,23 +188,23 @@ QSqlQueryPrivate::~QSqlQueryPrivate()
     different binding approaches, as well as one example of binding
     values to a stored procedure.
 
-    \bold{Named binding using named placeholders:}
+    \b{Named binding using named placeholders:}
 
     \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 9
 
-    \bold{Positional binding using named placeholders:}
+    \b{Positional binding using named placeholders:}
 
     \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 10
 
-    \bold{Binding values using positional placeholders (version 1):}
+    \b{Binding values using positional placeholders (version 1):}
 
     \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 11
 
-    \bold{Binding values using positional placeholders (version 2):}
+    \b{Binding values using positional placeholders (version 2):}
 
     \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 12
 
-    \bold{Binding values to a stored procedure:}
+    \b{Binding values to a stored procedure:}
 
     This code calls a stored procedure called \c AsciiToInt(), passing
     it a character through its in parameter, and taking its result in
@@ -460,10 +460,10 @@ const QSqlResult* QSqlQuery::result() const
 
   \list
 
-  \o If \a index is negative, the result is positioned before the
+  \li If \a index is negative, the result is positioned before the
   first record and false is returned.
 
-  \o Otherwise, an attempt is made to move to the record at position
+  \li Otherwise, an attempt is made to move to the record at position
   \a index. If the record at position \a index could not be retrieved,
   the result is positioned after the last record and false is
   returned. If the record is successfully retrieved, true is returned.
@@ -474,18 +474,18 @@ const QSqlResult* QSqlQuery::result() const
 
   \list
 
-  \o If the result is currently positioned before the first record or
+  \li If the result is currently positioned before the first record or
   on the first record, and \a index is negative, there is no change,
   and false is returned.
 
-  \o If the result is currently located after the last record, and \a
+  \li If the result is currently located after the last record, and \a
   index is positive, there is no change, and false is returned.
 
-  \o If the result is currently located somewhere in the middle, and
+  \li If the result is currently located somewhere in the middle, and
   the relative offset \a index moves the result below zero, the result
   is positioned before the first record and false is returned.
 
-  \o Otherwise, an attempt is made to move to the record \a index
+  \li Otherwise, an attempt is made to move to the record \a index
   records ahead of the current record (or \a index records behind the
   current record if \a index is negative). If the record at offset \a
   index could not be retrieved, the result is positioned after the
@@ -571,14 +571,14 @@ bool QSqlQuery::seek(int index, bool relative)
 
   \list
 
-  \o If the result is currently located before the first record,
+  \li If the result is currently located before the first record,
   e.g. immediately after a query is executed, an attempt is made to
   retrieve the first record.
 
-  \o If the result is currently located after the last record, there
+  \li If the result is currently located after the last record, there
   is no change and false is returned.
 
-  \o If the result is located somewhere in the middle, an attempt is
+  \li If the result is located somewhere in the middle, an attempt is
   made to retrieve the next record.
 
   \endlist
@@ -621,13 +621,13 @@ bool QSqlQuery::next()
 
   \list
 
-  \o If the result is currently located before the first record, there
+  \li If the result is currently located before the first record, there
   is no change and false is returned.
 
-  \o If the result is currently located after the last record, an
+  \li If the result is currently located after the last record, an
   attempt is made to retrieve the last record.
 
-  \o If the result is somewhere in the middle, an attempt is made to
+  \li If the result is somewhere in the middle, an attempt is made to
   retrieve the previous record.
 
   \endlist
diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp
index 8dd18ca1d0..3a521deea2 100644
--- a/src/sql/models/qsqlrelationaltablemodel.cpp
+++ b/src/sql/models/qsqlrelationaltablemodel.cpp
@@ -331,8 +331,8 @@ void QSqlRelationalTableModelPrivate::clearCache()
     columns to be set as foreign keys into other database tables.
 
     \table
-    \row \o \inlineimage noforeignkeys.png
-         \o \inlineimage foreignkeys.png
+    \row \li \inlineimage noforeignkeys.png
+         \li \inlineimage foreignkeys.png
     \endtable
 
     The screenshot on the left shows a plain QSqlTableModel in a
@@ -375,14 +375,14 @@ void QSqlRelationalTableModelPrivate::clearCache()
     Notes:
 
     \list
-    \o The table must have a primary key declared.
-    \o The table's primary key may not contain a relation to
+    \li The table must have a primary key declared.
+    \li The table's primary key may not contain a relation to
        another table.
-    \o If a relational table contains keys that refer to non-existent
+    \li If a relational table contains keys that refer to non-existent
        rows in the referenced table, the rows containing the invalid
        keys will not be exposed through the model. The user or the
        database is responsible for keeping referential integrity.
-    \o If a relation's display column name is also used as a column
+    \li If a relation's display column name is also used as a column
        name in the main table, or if it is used as display column
        name in more than one relation it will be aliased. The alias is
        is the relation's table name and display column name joined
@@ -393,7 +393,7 @@ void QSqlRelationalTableModelPrivate::clearCache()
        QSqlRelation, so QSqlRelation::displayColumn() will return the
        original display column name, but QSqlRecord::fieldName() will
        return aliases.
-    \o When using setData() the role should always be Qt::EditRole,
+    \li When using setData() the role should always be Qt::EditRole,
        and when using data() the role should always be Qt::DisplayRole.
     \endlist
 
diff --git a/src/testlib/qsignalspy.qdoc b/src/testlib/qsignalspy.qdoc
index 5fa3667d6b..dddaed74f6 100644
--- a/src/testlib/qsignalspy.qdoc
+++ b/src/testlib/qsignalspy.qdoc
@@ -48,7 +48,7 @@
 
     \snippet doc/src/snippets/code/doc_src_qsignalspy.cpp 1
 
-    \bold {Note:} Non-standard data types need to be registered, using
+    \b {Note:} Non-standard data types need to be registered, using
     the qRegisterMetaType() function, before you can create a
     QSignalSpy. For example:
 
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index e16787693d..5aac97cfab 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -109,7 +109,7 @@ QT_BEGIN_NAMESPACE
    true, execution continues. If not, a failure is recorded in the test log
    and the test won't be executed further.
 
-   \bold {Note:} This macro can only be used in a test function that is invoked
+   \b {Note:} This macro can only be used in a test function that is invoked
    by the test framework.
 
    Example:
@@ -246,7 +246,7 @@ QT_BEGIN_NAMESPACE
    \c aString and \c expected are variables on the stack that are initialized with
    the current test data.
 
-   \bold {Note:} This macro can only be used in a test function that is invoked
+   \b {Note:} This macro can only be used in a test function that is invoked
    by the test framework. The test function must have a _data function.
 */
 
@@ -266,7 +266,7 @@ QT_BEGIN_NAMESPACE
    This macro can be used to force a test failure. The test stops
    executing and the failure \a message is appended to the test log.
 
-   \bold {Note:} This macro can only be used in a test function that is invoked
+   \b {Note:} This macro can only be used in a test function that is invoked
    by the test framework.
 
    Example:
@@ -316,7 +316,7 @@ QT_BEGIN_NAMESPACE
    If called from initTestCase() or initTestCase_data(), the QSKIP() macro will
    skip all test and _data functions.
 
-   \bold {Note:} This macro can only be used in a test function or _data
+   \b {Note:} This macro can only be used in a test function or _data
    function that is invoked by the test framework.
 
    Example:
@@ -343,7 +343,7 @@ QT_BEGIN_NAMESPACE
    \a mode is a \l QTest::TestFailMode and sets whether the test should
    continue to execute or not.
 
-   \bold {Note:} This macro can only be used in a test function that is invoked
+   \b {Note:} This macro can only be used in a test function that is invoked
    by the test framework.
 
    Example 1:
@@ -379,11 +379,11 @@ QT_BEGIN_NAMESPACE
    resolves to an existing file or directory:
 
    \list
-   \o \a filename relative to QCoreApplication::applicationDirPath()
+   \li \a filename relative to QCoreApplication::applicationDirPath()
       (only if a QCoreApplication or QApplication object has been created).
-   \o \a filename relative to the test's standard install directory
+   \li \a filename relative to the test's standard install directory
       (QLibraryInfo::TestsPath with the lowercased testcase name appended).
-   \o \a filename relative to the directory containing the source file from which
+   \li \a filename relative to the directory containing the source file from which
       QFINDTESTDATA is invoked.
    \endlist
 
@@ -396,16 +396,16 @@ QT_BEGIN_NAMESPACE
    The testdata file will be resolved as the first existing file from:
 
    \list
-   \o \c{/home/user/build/myxmlparser/tests/tst_myxmlparser/testxml/simple1.xml}
-   \o \c{/usr/local/Qt-5.0.0/tests/tst_myxmlparser/testxml/simple1.xml}
-   \o \c{/home/user/sources/myxmlparser/tests/tst_myxmlparser/testxml/simple1.xml}
+   \li \c{/home/user/build/myxmlparser/tests/tst_myxmlparser/testxml/simple1.xml}
+   \li \c{/usr/local/Qt-5.0.0/tests/tst_myxmlparser/testxml/simple1.xml}
+   \li \c{/home/user/sources/myxmlparser/tests/tst_myxmlparser/testxml/simple1.xml}
    \endlist
 
    This allows the test to find its testdata regardless of whether the
    test has been installed, and regardless of whether the test's build tree
    is equal to the test's source tree.
 
-   \bold {Note:} reliable detection of testdata from the source directory requires
+   \b {Note:} reliable detection of testdata from the source directory requires
    either that qmake is used, or the \c{QT_TESTCASE_BUILDDIR} macro is defined to
    point to the working directory from which the compiler is invoked, or only
    absolute paths to the source files are passed to the compiler. Otherwise, the
@@ -427,7 +427,7 @@ QT_BEGIN_NAMESPACE
     Similarly, if qmake is used and the configuration includes \c{QT += gui}, then
     \c QT_GUI_LIB will be defined automatically.
 
-    \bold {Note:} On platforms that have keypad navigation enabled by default,
+    \b {Note:} On platforms that have keypad navigation enabled by default,
     this macro will forcefully disable it if \c QT_WIDGETS_LIB is defined.  This is done
     to simplify the usage of key events when writing autotests. If you wish to write a
     test case that uses keypad navigation, you should enable it either in the
@@ -597,7 +597,7 @@ QT_BEGIN_NAMESPACE
     Simulates pressing a \a key with an optional \a modifier on a \a widget. If \a delay
     is larger than 0, the test will wait for \a delay milliseconds before pressing the key.
 
-    \bold {Note:} At some point you should release the key using \l keyRelease().
+    \b {Note:} At some point you should release the key using \l keyRelease().
 
     \sa QTest::keyRelease(), QTest::keyClick()
 */
@@ -610,7 +610,7 @@ QT_BEGIN_NAMESPACE
     If \a delay is larger than 0, the test will wait for \a delay milliseconds
     before pressing the key.
 
-    \bold {Note:} At some point you should release the key using \l keyRelease().
+    \b {Note:} At some point you should release the key using \l keyRelease().
 
     \sa QTest::keyRelease(), QTest::keyClick()
 */
@@ -714,7 +714,7 @@ QT_BEGIN_NAMESPACE
     You can add specializations of this function to your test to enable
     verbose output.
 
-    \bold {Note:} The caller of toString() must delete the returned data
+    \b {Note:} The caller of toString() must delete the returned data
     using \c{delete[]}.  Your implementation should return a string
     created with \c{new[]} or qstrdup().
 
@@ -2128,7 +2128,7 @@ void QTest::qWarn(const char *message, const char *file, int line)
     test log. If the test finished and the \a message was not outputted,
     a test failure is appended to the test log.
 
-    \bold {Note:} Invoking this function will only ignore one message.
+    \b {Note:} Invoking this function will only ignore one message.
     If the message you want to ignore is outputted twice, you have to
     call ignoreMessage() twice, too.
 
@@ -2295,7 +2295,7 @@ void QTest::addColumnInternal(int id, const char *name)
     Example:
     \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 20
 
-    \bold {Note:} This macro can only be used in a test's data function
+    \b {Note:} This macro can only be used in a test's data function
     that is invoked by the test framework.
 
     See \l {Chapter 2: Data Driven Testing}{Data Driven Testing} for
@@ -2328,7 +2328,7 @@ QTestData &QTest::newRow(const char *dataTag)
     To add custom types to the testdata, the type must be registered with
     QMetaType via \l Q_DECLARE_METATYPE().
 
-    \bold {Note:} This macro can only be used in a test's data function
+    \b {Note:} This macro can only be used in a test's data function
     that is invoked by the test framework.
 
     See \l {Chapter 2: Data Driven Testing}{Data Driven Testing} for
@@ -2374,7 +2374,7 @@ bool QTest::currentTestFailed()
 
     \a ms must be greater than 0.
 
-    \bold {Note:} The qSleep() function calls either \c nanosleep() on
+    \b {Note:} The qSleep() function calls either \c nanosleep() on
     unix or \c Sleep() on windows, so the accuracy of time spent in
     qSleep() depends on the operating system.
 
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp
index 5ffb5466d6..4170df4799 100644
--- a/src/widgets/dialogs/qdialog.cpp
+++ b/src/widgets/dialogs/qdialog.cpp
@@ -166,7 +166,7 @@ QVariant QDialogPrivate::styleHint(QPlatformDialogHelper::StyleHint hint) const
 
     \section1 Modal Dialogs
 
-    A \bold{modal} dialog is a dialog that blocks input to other
+    A \b{modal} dialog is a dialog that blocks input to other
     visible windows in the same application. Dialogs that are used to
     request a file name from the user or that are used to set
     application preferences are usually modal. Dialogs can be
@@ -200,7 +200,7 @@ QVariant QDialogPrivate::styleHint(QPlatformDialogHelper::StyleHint hint) const
 
     \section1 Modeless Dialogs
 
-    A \bold{modeless} dialog is a dialog that operates
+    A \b{modeless} dialog is a dialog that operates
     independently of other windows in the same application. Find and
     replace dialogs in word-processors are often modeless to allow the
     user to interact with both the application's main window and with
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 84fdef6702..3908daec9c 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -1096,7 +1096,7 @@ QStringList qt_make_filter_list(const QString &filter)
     Sets the filter used in the file dialog to the given \a filter.
 
     If \a filter contains a pair of parentheses containing one or more
-    of \bold{anything*something}, separated by spaces, then only the
+    of \b{anything*something}, separated by spaces, then only the
     text contained in the parentheses is used as the filter. This means
     that these calls are all equivalent:
 
diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp
index 0211b2512c..5446eca383 100644
--- a/src/widgets/dialogs/qfilesystemmodel.cpp
+++ b/src/widgets/dialogs/qfilesystemmodel.cpp
@@ -130,12 +130,12 @@ QT_BEGIN_NAMESPACE
     \fn bool QFileSystemModel::rmdir(const QModelIndex &index) const
 
     Removes the directory corresponding to the model item \a index in the
-    file system model and \bold{deletes the corresponding directory from the
+    file system model and \b{deletes the corresponding directory from the
     file system}, returning true if successful. If the directory cannot be
     removed, false is returned.
 
     \warning This function deletes directories from the file system; it does
-    \bold{not} move them to a location where they can be recovered.
+    \b{not} move them to a location where they can be recovered.
 
     \sa remove()
 */
@@ -185,11 +185,11 @@ QT_BEGIN_NAMESPACE
 /*!
     \fn bool QFileSystemModel::remove(const QModelIndex &index) const
 
-    Removes the model item \a index from the file system model and \bold{deletes the
+    Removes the model item \a index from the file system model and \b{deletes the
     corresponding file from the file system}, returning true if successful. If the
     item cannot be removed, false is returned.
 
-    \warning This function deletes files from the file system; it does \bold{not}
+    \warning This function deletes files from the file system; it does \b{not}
     move them to a location where they can be recovered.
 
     \sa rmdir()
diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp
index 9cf41003f5..737d6bb467 100644
--- a/src/widgets/dialogs/qinputdialog.cpp
+++ b/src/widgets/dialogs/qinputdialog.cpp
@@ -1031,10 +1031,10 @@ QString QInputDialog::cancelButtonText() const
     in \a member. These are:
 
     \list
-      \o textValueSelected() if \a member has a QString for its first argument.
-      \o intValueSelected() if \a member has an int for its first argument.
-      \o doubleValueSelected() if \a member has a double for its first argument.
-      \o accepted() if \a member has NO arguments.
+      \li textValueSelected() if \a member has a QString for its first argument.
+      \li intValueSelected() if \a member has an int for its first argument.
+      \li doubleValueSelected() if \a member has a double for its first argument.
+      \li accepted() if \a member has NO arguments.
     \endlist
 
     The signal will be disconnected from the slot when the dialog is closed.
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
index a737584e3f..3909125fe7 100644
--- a/src/widgets/dialogs/qmessagebox.cpp
+++ b/src/widgets/dialogs/qmessagebox.cpp
@@ -577,21 +577,21 @@ void QMessageBoxPrivate::_q_buttonClicked(QAbstractButton *button)
 
     \table
     \row
-    \o \img qmessagebox-quest.png
-    \o \l Question
-    \o For asking a question during normal operations.
+    \li \img qmessagebox-quest.png
+    \li \l Question
+    \li For asking a question during normal operations.
     \row
-    \o \img qmessagebox-info.png
-    \o \l Information
-    \o For reporting information about normal operations.
+    \li \img qmessagebox-info.png
+    \li \l Information
+    \li For reporting information about normal operations.
     \row
-    \o \img qmessagebox-warn.png
-    \o \l Warning
-    \o For reporting non-critical errors.
+    \li \img qmessagebox-warn.png
+    \li \l Warning
+    \li For reporting non-critical errors.
     \row
-    \o \img qmessagebox-crit.png
-    \o \l Critical
-    \o For reporting critical errors.
+    \li \img qmessagebox-crit.png
+    \li \l Critical
+    \li For reporting critical errors.
     \endtable
 
     \l{QMessageBox::Icon}{Predefined icons} are not defined by QMessageBox, but
@@ -663,13 +663,13 @@ void QMessageBoxPrivate::_q_buttonClicked(QAbstractButton *button)
 
     \list 1
 
-    \o If there is only one button, it is the button activated when
+    \li If there is only one button, it is the button activated when
     \key Esc is pressed.
 
-    \o If there is a \l Cancel button, it is the button activated when
+    \li If there is a \l Cancel button, it is the button activated when
     \key Esc is pressed.
 
-    \o If there is exactly one button having either
+    \li If there is exactly one button having either
        \l{QMessageBox::RejectRole} {the Reject role} or the
        \l{QMessageBox::NoRole} {the No role}, it is the button
        activated when \key Esc is pressed.
@@ -927,9 +927,9 @@ QAbstractButton *QMessageBox::button(StandardButton which) const
     escape button as follows:
 
     \list 1
-    \o If there is only one button, it is made the escape button.
-    \o If there is a \l Cancel button, it is made the escape button.
-    \o On Mac OS X only, if there is exactly one button with the role
+    \li If there is only one button, it is made the escape button.
+    \li If there is a \l Cancel button, it is made the escape button.
+    \li On Mac OS X only, if there is exactly one button with the role
        QMessageBox::RejectRole, it is made the escape button.
     \endlist
 
@@ -1142,11 +1142,11 @@ void QMessageBox::setText(const QString &text)
     values:
 
     \list
-    \o QMessageBox::NoIcon
-    \o QMessageBox::Question
-    \o QMessageBox::Information
-    \o QMessageBox::Warning
-    \o QMessageBox::Critical
+    \li QMessageBox::NoIcon
+    \li QMessageBox::Question
+    \li QMessageBox::Information
+    \li QMessageBox::Warning
+    \li QMessageBox::Critical
     \endlist
 
     The default is QMessageBox::NoIcon.
@@ -1649,12 +1649,12 @@ QMessageBox::StandardButton QMessageBox::critical(QWidget *parent, const QString
     about() looks for a suitable icon in four locations:
 
     \list 1
-    \o It prefers \link QWidget::windowIcon() parent->icon() \endlink
+    \li It prefers \link QWidget::windowIcon() parent->icon() \endlink
     if that exists.
-    \o If not, it tries the top-level widget containing \a parent.
-    \o If that fails, it tries the \link
+    \li If not, it tries the top-level widget containing \a parent.
+    \li If that fails, it tries the \link
     QApplication::activeWindow() active window. \endlink
-    \o As a last resort it uses the Information icon.
+    \li As a last resort it uses the Information icon.
     \endlist
 
     The about box has a single button labelled "OK". On Mac OS X, the
@@ -1929,26 +1929,26 @@ void QMessageBoxPrivate::retranslateStrings()
 
     The \a icon must be one of the following:
     \list
-    \o QMessageBox::NoIcon
-    \o QMessageBox::Question
-    \o QMessageBox::Information
-    \o QMessageBox::Warning
-    \o QMessageBox::Critical
+    \li QMessageBox::NoIcon
+    \li QMessageBox::Question
+    \li QMessageBox::Information
+    \li QMessageBox::Warning
+    \li QMessageBox::Critical
     \endlist
 
     Each button, \a button0, \a button1 and \a button2, can have one
     of the following values:
     \list
-    \o QMessageBox::NoButton
-    \o QMessageBox::Ok
-    \o QMessageBox::Cancel
-    \o QMessageBox::Yes
-    \o QMessageBox::No
-    \o QMessageBox::Abort
-    \o QMessageBox::Retry
-    \o QMessageBox::Ignore
-    \o QMessageBox::YesAll
-    \o QMessageBox::NoAll
+    \li QMessageBox::NoButton
+    \li QMessageBox::Ok
+    \li QMessageBox::Cancel
+    \li QMessageBox::Yes
+    \li QMessageBox::No
+    \li QMessageBox::Abort
+    \li QMessageBox::Retry
+    \li QMessageBox::Ignore
+    \li QMessageBox::YesAll
+    \li QMessageBox::NoAll
     \endlist
 
     Use QMessageBox::NoButton for the later parameters to have fewer
@@ -1994,16 +1994,16 @@ QMessageBox::QMessageBox(const QString &title, const QString &text, Icon icon,
     of the following values:
 
     \list
-    \o QMessageBox::NoButton
-    \o QMessageBox::Ok
-    \o QMessageBox::Cancel
-    \o QMessageBox::Yes
-    \o QMessageBox::No
-    \o QMessageBox::Abort
-    \o QMessageBox::Retry
-    \o QMessageBox::Ignore
-    \o QMessageBox::YesAll
-    \o QMessageBox::NoAll
+    \li QMessageBox::NoButton
+    \li QMessageBox::Ok
+    \li QMessageBox::Cancel
+    \li QMessageBox::Yes
+    \li QMessageBox::No
+    \li QMessageBox::Abort
+    \li QMessageBox::Retry
+    \li QMessageBox::Ignore
+    \li QMessageBox::YesAll
+    \li QMessageBox::NoAll
     \endlist
 
     If you don't want all three buttons, set the last button, or last
@@ -2080,16 +2080,16 @@ int QMessageBox::information(QWidget *parent, const QString &title, const QStrin
     following values:
 
     \list
-    \o QMessageBox::NoButton
-    \o QMessageBox::Ok
-    \o QMessageBox::Cancel
-    \o QMessageBox::Yes
-    \o QMessageBox::No
-    \o QMessageBox::Abort
-    \o QMessageBox::Retry
-    \o QMessageBox::Ignore
-    \o QMessageBox::YesAll
-    \o QMessageBox::NoAll
+    \li QMessageBox::NoButton
+    \li QMessageBox::Ok
+    \li QMessageBox::Cancel
+    \li QMessageBox::Yes
+    \li QMessageBox::No
+    \li QMessageBox::Abort
+    \li QMessageBox::Retry
+    \li QMessageBox::Ignore
+    \li QMessageBox::YesAll
+    \li QMessageBox::NoAll
     \endlist
 
     If you don't want all three buttons, set the last button, or last
@@ -2166,16 +2166,16 @@ int QMessageBox::question(QWidget *parent, const QString &title, const QString&
     one of the following values:
 
     \list
-    \o QMessageBox::NoButton
-    \o QMessageBox::Ok
-    \o QMessageBox::Cancel
-    \o QMessageBox::Yes
-    \o QMessageBox::No
-    \o QMessageBox::Abort
-    \o QMessageBox::Retry
-    \o QMessageBox::Ignore
-    \o QMessageBox::YesAll
-    \o QMessageBox::NoAll
+    \li QMessageBox::NoButton
+    \li QMessageBox::Ok
+    \li QMessageBox::Cancel
+    \li QMessageBox::Yes
+    \li QMessageBox::No
+    \li QMessageBox::Abort
+    \li QMessageBox::Retry
+    \li QMessageBox::Ignore
+    \li QMessageBox::YesAll
+    \li QMessageBox::NoAll
     \endlist
 
     If you don't want all three buttons, set the last button, or last
@@ -2251,16 +2251,16 @@ int QMessageBox::warning(QWidget *parent, const QString &title, const QString& t
     one of the following values:
 
     \list
-    \o QMessageBox::NoButton
-    \o QMessageBox::Ok
-    \o QMessageBox::Cancel
-    \o QMessageBox::Yes
-    \o QMessageBox::No
-    \o QMessageBox::Abort
-    \o QMessageBox::Retry
-    \o QMessageBox::Ignore
-    \o QMessageBox::YesAll
-    \o QMessageBox::NoAll
+    \li QMessageBox::NoButton
+    \li QMessageBox::Ok
+    \li QMessageBox::Cancel
+    \li QMessageBox::Yes
+    \li QMessageBox::No
+    \li QMessageBox::Abort
+    \li QMessageBox::Retry
+    \li QMessageBox::Ignore
+    \li QMessageBox::YesAll
+    \li QMessageBox::NoAll
     \endlist
 
     If you don't want all three buttons, set the last button, or last
diff --git a/src/widgets/dialogs/qprogressdialog.cpp b/src/widgets/dialogs/qprogressdialog.cpp
index f39a7b63ec..350fb57e20 100644
--- a/src/widgets/dialogs/qprogressdialog.cpp
+++ b/src/widgets/dialogs/qprogressdialog.cpp
@@ -281,10 +281,10 @@ void QProgressDialogPrivate::_q_disconnectOnClose()
 
   Default settings:
   \list
-  \i The label text is empty.
-  \i The cancel button text is (translated) "Cancel".
-  \i minimum is 0;
-  \i maximum is 100
+  \li The label text is empty.
+  \li The cancel button text is (translated) "Cancel".
+  \li minimum is 0;
+  \li maximum is 100
   \endlist
 
   The \a parent argument is dialog's parent widget. The widget flags, \a f, are
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index 8cd3799cae..8a75353c86 100644
--- a/src/widgets/dialogs/qwizard.cpp
+++ b/src/widgets/dialogs/qwizard.cpp
@@ -1826,28 +1826,28 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
     QWizard supports four wizard looks:
 
     \list
-    \o ClassicStyle
-    \o ModernStyle
-    \o MacStyle
-    \o AeroStyle
+    \li ClassicStyle
+    \li ModernStyle
+    \li MacStyle
+    \li AeroStyle
     \endlist
 
     You can explicitly set the look to use using setWizardStyle()
     (e.g., if you want the same look on all platforms).
 
     \table
-    \header \o ClassicStyle
-            \o ModernStyle
-            \o MacStyle
-            \o AeroStyle
-    \row    \o \inlineimage qtwizard-classic1.png
-            \o \inlineimage qtwizard-modern1.png
-            \o \inlineimage qtwizard-mac1.png
-            \o \inlineimage qtwizard-aero1.png
-    \row    \o \inlineimage qtwizard-classic2.png
-            \o \inlineimage qtwizard-modern2.png
-            \o \inlineimage qtwizard-mac2.png
-            \o \inlineimage qtwizard-aero2.png
+    \header \li ClassicStyle
+            \li ModernStyle
+            \li MacStyle
+            \li AeroStyle
+    \row    \li \inlineimage qtwizard-classic1.png
+            \li \inlineimage qtwizard-modern1.png
+            \li \inlineimage qtwizard-mac1.png
+            \li \inlineimage qtwizard-aero1.png
+    \row    \li \inlineimage qtwizard-classic2.png
+            \li \inlineimage qtwizard-modern2.png
+            \li \inlineimage qtwizard-mac2.png
+            \li \inlineimage qtwizard-aero2.png
     \endtable
 
     Note: AeroStyle has effect only on a Windows Vista system with alpha compositing enabled.
@@ -1876,15 +1876,15 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
     only one page is shown. A page has the following attributes:
 
     \list
-    \o A \l{QWizardPage::}{title}.
-    \o A \l{QWizardPage::}{subTitle}.
-    \o A set of pixmaps, which may or may not be honored, depending
+    \li A \l{QWizardPage::}{title}.
+    \li A \l{QWizardPage::}{subTitle}.
+    \li A set of pixmaps, which may or may not be honored, depending
        on the wizard's style:
         \list
-        \o WatermarkPixmap (used by ClassicStyle and ModernStyle)
-        \o BannerPixmap (used by ModernStyle)
-        \o LogoPixmap (used by ClassicStyle and ModernStyle)
-        \o BackgroundPixmap (used by MacStyle)
+        \li WatermarkPixmap (used by ClassicStyle and ModernStyle)
+        \li BannerPixmap (used by ModernStyle)
+        \li LogoPixmap (used by ClassicStyle and ModernStyle)
+        \li BackgroundPixmap (used by MacStyle)
         \endlist
     \endlist
 
@@ -2590,9 +2590,9 @@ bool QWizard::testOption(WizardOption option) const
     By default, the following options are set (depending on the platform):
 
     \list
-    \o Windows: HelpButtonOnRight.
-    \o Mac OS X: NoDefaultButton and NoCancelButton.
-    \o X11 and QWS (Qt for Embedded Linux): none.
+    \li Windows: HelpButtonOnRight.
+    \li Mac OS X: NoDefaultButton and NoCancelButton.
+    \li X11 and QWS (Qt for Embedded Linux): none.
     \endlist
 
     \sa wizardStyle
@@ -2881,14 +2881,14 @@ QPixmap QWizard::pixmap(WizardPixmap which) const
     changedSignal. The table below lists these widgets:
 
     \table
-    \header \o Widget          \o Property                            \o Change Notification Signal
-    \row    \o QAbstractButton \o bool \l{QAbstractButton::}{checked} \o \l{QAbstractButton::}{toggled()}
-    \row    \o QAbstractSlider \o int \l{QAbstractSlider::}{value}    \o \l{QAbstractSlider::}{valueChanged()}
-    \row    \o QComboBox       \o int \l{QComboBox::}{currentIndex}   \o \l{QComboBox::}{currentIndexChanged()}
-    \row    \o QDateTimeEdit   \o QDateTime \l{QDateTimeEdit::}{dateTime} \o \l{QDateTimeEdit::}{dateTimeChanged()}
-    \row    \o QLineEdit       \o QString \l{QLineEdit::}{text}       \o \l{QLineEdit::}{textChanged()}
-    \row    \o QListWidget     \o int \l{QListWidget::}{currentRow}   \o \l{QListWidget::}{currentRowChanged()}
-    \row    \o QSpinBox        \o int \l{QSpinBox::}{value}           \o \l{QSpinBox::}{valueChanged()}
+    \header \li Widget          \li Property                            \li Change Notification Signal
+    \row    \li QAbstractButton \li bool \l{QAbstractButton::}{checked} \li \l{QAbstractButton::}{toggled()}
+    \row    \li QAbstractSlider \li int \l{QAbstractSlider::}{value}    \li \l{QAbstractSlider::}{valueChanged()}
+    \row    \li QComboBox       \li int \l{QComboBox::}{currentIndex}   \li \l{QComboBox::}{currentIndexChanged()}
+    \row    \li QDateTimeEdit   \li QDateTime \l{QDateTimeEdit::}{dateTime} \li \l{QDateTimeEdit::}{dateTimeChanged()}
+    \row    \li QLineEdit       \li QString \l{QLineEdit::}{text}       \li \l{QLineEdit::}{textChanged()}
+    \row    \li QListWidget     \li int \l{QListWidget::}{currentRow}   \li \l{QListWidget::}{currentRowChanged()}
+    \row    \li QSpinBox        \li int \l{QSpinBox::}{value}           \li \l{QSpinBox::}{valueChanged()}
     \endtable
 
     \sa QWizardPage::registerField()
@@ -3361,19 +3361,19 @@ int QWizard::nextId() const
     provide custom behavior:
 
     \list
-    \o initializePage() is called to initialize the page's contents
+    \li initializePage() is called to initialize the page's contents
        when the user clicks the wizard's \gui Next button. If you
        want to derive the page's default from what the user entered
        on previous pages, this is the function to reimplement.
-    \o cleanupPage() is called to reset the page's contents when the
+    \li cleanupPage() is called to reset the page's contents when the
        user clicks the wizard's \gui Back button.
-    \o validatePage() validates the page when the user clicks \gui
+    \li validatePage() validates the page when the user clicks \gui
        Next or \gui Finish. It is often used to show an error message
        if the user has entered incomplete or invalid information.
-    \o nextId() returns the ID of the next page. It is useful when
+    \li nextId() returns the ID of the next page. It is useful when
        \l{creating non-linear wizards}, which allow different
        traversal paths based on the information provided by the user.
-    \o isComplete() is called to determine whether the \gui Next
+    \li isComplete() is called to determine whether the \gui Next
        and/or \gui Finish button should be enabled or disabled. If
        you reimplement isComplete(), also make sure that
        completeChanged() is emitted whenever the complete state
@@ -3878,14 +3878,14 @@ QVariant QWizardPage::field(const QString &name) const
     changedSignal. The table below lists these widgets:
 
     \table
-    \header \o Widget          \o Property                            \o Change Notification Signal
-    \row    \o QAbstractButton \o bool \l{QAbstractButton::}{checked} \o \l{QAbstractButton::}{toggled()}
-    \row    \o QAbstractSlider \o int \l{QAbstractSlider::}{value}    \o \l{QAbstractSlider::}{valueChanged()}
-    \row    \o QComboBox       \o int \l{QComboBox::}{currentIndex}   \o \l{QComboBox::}{currentIndexChanged()}
-    \row    \o QDateTimeEdit   \o QDateTime \l{QDateTimeEdit::}{dateTime} \o \l{QDateTimeEdit::}{dateTimeChanged()}
-    \row    \o QLineEdit       \o QString \l{QLineEdit::}{text}       \o \l{QLineEdit::}{textChanged()}
-    \row    \o QListWidget     \o int \l{QListWidget::}{currentRow}   \o \l{QListWidget::}{currentRowChanged()}
-    \row    \o QSpinBox        \o int \l{QSpinBox::}{value}           \o \l{QSpinBox::}{valueChanged()}
+    \header \li Widget          \li Property                            \li Change Notification Signal
+    \row    \li QAbstractButton \li bool \l{QAbstractButton::}{checked} \li \l{QAbstractButton::}{toggled()}
+    \row    \li QAbstractSlider \li int \l{QAbstractSlider::}{value}    \li \l{QAbstractSlider::}{valueChanged()}
+    \row    \li QComboBox       \li int \l{QComboBox::}{currentIndex}   \li \l{QComboBox::}{currentIndexChanged()}
+    \row    \li QDateTimeEdit   \li QDateTime \l{QDateTimeEdit::}{dateTime} \li \l{QDateTimeEdit::}{dateTimeChanged()}
+    \row    \li QLineEdit       \li QString \l{QLineEdit::}{text}       \li \l{QLineEdit::}{textChanged()}
+    \row    \li QListWidget     \li int \l{QListWidget::}{currentRow}   \li \l{QListWidget::}{currentRowChanged()}
+    \row    \li QSpinBox        \li int \l{QSpinBox::}{value}           \li \l{QSpinBox::}{valueChanged()}
     \endtable
 
     You can use QWizard::setDefaultProperty() to add entries to this
diff --git a/src/widgets/effects/qgraphicseffect.cpp b/src/widgets/effects/qgraphicseffect.cpp
index f1b4cc80f9..80c0aff492 100644
--- a/src/widgets/effects/qgraphicseffect.cpp
+++ b/src/widgets/effects/qgraphicseffect.cpp
@@ -62,21 +62,21 @@
     Qt provides the following standard effects:
 
     \list
-    \o QGraphicsBlurEffect - blurs the item by a given radius
-    \o QGraphicsDropShadowEffect - renders a dropshadow behind the item
-    \o QGraphicsColorizeEffect - renders the item in shades of any given color
-    \o QGraphicsOpacityEffect - renders the item with an opacity
+    \li QGraphicsBlurEffect - blurs the item by a given radius
+    \li QGraphicsDropShadowEffect - renders a dropshadow behind the item
+    \li QGraphicsColorizeEffect - renders the item in shades of any given color
+    \li QGraphicsOpacityEffect - renders the item with an opacity
     \endlist
 
     \table
     \row
-    \o{2,1} \img graphicseffect-plain.png
+    \li{2,1} \img graphicseffect-plain.png
     \row
-    \o \img graphicseffect-blur.png
-    \o \img graphicseffect-colorize.png
+    \li \img graphicseffect-blur.png
+    \li \img graphicseffect-colorize.png
     \row
-    \o \img graphicseffect-opacity.png
-    \o \img graphicseffect-drop-shadow.png
+    \li \img graphicseffect-opacity.png
+    \li \img graphicseffect-drop-shadow.png
     \endtable
 
     \img graphicseffect-widget.png
diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout.cpp
index 1ccf6fcffe..348d8f2d09 100644
--- a/src/widgets/graphicsview/qgraphicsanchorlayout.cpp
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout.cpp
@@ -107,11 +107,11 @@
     avoid any future regressions in behaviour:
     \list
 
-    \o Stretch factors are not respected.
+    \li Stretch factors are not respected.
 
-    \o QSizePolicy::ExpandFlag is not respected.
+    \li QSizePolicy::ExpandFlag is not respected.
 
-    \o Height for width is not respected.
+    \li Height for width is not respected.
 
     \endlist
 
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index ab03ff7a9e..d88183fbb5 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -59,14 +59,14 @@
     common shapes. These are:
 
     \list
-    \o QGraphicsEllipseItem provides an ellipse item
-    \o QGraphicsLineItem provides a line item
-    \o QGraphicsPathItem provides an arbitrary path item
-    \o QGraphicsPixmapItem provides a pixmap item
-    \o QGraphicsPolygonItem provides a polygon item
-    \o QGraphicsRectItem provides a rectangular item
-    \o QGraphicsSimpleTextItem provides a simple text label item
-    \o QGraphicsTextItem provides an advanced text browser item
+    \li QGraphicsEllipseItem provides an ellipse item
+    \li QGraphicsLineItem provides a line item
+    \li QGraphicsPathItem provides an arbitrary path item
+    \li QGraphicsPixmapItem provides a pixmap item
+    \li QGraphicsPolygonItem provides a polygon item
+    \li QGraphicsRectItem provides a rectangular item
+    \li QGraphicsSimpleTextItem provides a simple text label item
+    \li QGraphicsTextItem provides an advanced text browser item
     \endlist
 
     All of an item's geometric information is based on its local coordinate
@@ -112,12 +112,12 @@
 
     \list 1
 
-    \o Reimplement shape() to return an accurate shape for your item,
+    \li Reimplement shape() to return an accurate shape for your item,
     and rely on the default implementation of collidesWithItem() to do
     shape-shape intersection. This can be rather expensive if the
     shapes are complex.
 
-    \o Reimplement collidesWithItem() to provide your own custom item
+    \li Reimplement collidesWithItem() to provide your own custom item
     and shape collision algorithm.
 
     \endlist
@@ -165,10 +165,10 @@
     QGraphicsItem always applies the properties in a fixed, defined order:
 
     \list
-    \o The item's base transform is applied (transform())
-    \o The item's transformations list is applied in order (transformations())
-    \o The item is rotated relative to its transform origin point (rotation(), transformOriginPoint())
-    \o The item is scaled relative to its transform origin point (scale(), transformOriginPoint())
+    \li The item's base transform is applied (transform())
+    \li The item's transformations list is applied in order (transformations())
+    \li The item is rotated relative to its transform origin point (rotation(), transformOriginPoint())
+    \li The item is scaled relative to its transform origin point (scale(), transformOriginPoint())
     \endlist
 
     \section1 Painting
@@ -215,14 +215,14 @@
     For advanced users, there are ways to alter how your items are sorted:
 
     \list
-    \o You can call setZValue() on an item to explicitly stack it on top of, or
+    \li You can call setZValue() on an item to explicitly stack it on top of, or
     under, other sibling items. The default Z value for an item is 0. Items
     with the same Z value are stacked by insertion order.
 
-    \o You can call stackBefore() to reorder the list of children. This will
+    \li You can call stackBefore() to reorder the list of children. This will
     directly modify the insertion order.
 
-    \o You can set the ItemStacksBehindParent flag to stack a child item behind
+    \li You can set the ItemStacksBehindParent flag to stack a child item behind
     its parent.
     \endlist
 
@@ -238,13 +238,13 @@
     to a set of convenience event handlers:
 
     \list
-    \o contextMenuEvent() handles context menu events
-    \o focusInEvent() and focusOutEvent() handle focus in and out events
-    \o hoverEnterEvent(), hoverMoveEvent(), and hoverLeaveEvent() handles
+    \li contextMenuEvent() handles context menu events
+    \li focusInEvent() and focusOutEvent() handle focus in and out events
+    \li hoverEnterEvent(), hoverMoveEvent(), and hoverLeaveEvent() handles
     hover enter, move and leave events
-    \o inputMethodEvent() handles input events, for accessibility support
-    \o keyPressEvent() and keyReleaseEvent() handle key press and release events
-    \o mousePressEvent(), mouseMoveEvent(), mouseReleaseEvent(), and
+    \li inputMethodEvent() handles input events, for accessibility support
+    \li keyPressEvent() and keyReleaseEvent() handle key press and release events
+    \li mousePressEvent(), mouseMoveEvent(), mouseReleaseEvent(), and
     mouseDoubleClickEvent() handles mouse press, move, release, click and
     doubleclick events
     \endlist
@@ -3469,11 +3469,11 @@ QGraphicsItem *QGraphicsItem::focusScopeItem() const
     following events occurs:
 
     \list
-    \o The item becomes invisible
-    \o The item is removed from the scene
-    \o The item is deleted
-    \o The item call ungrabMouse()
-    \o Another item calls grabMouse(); the item will regain the mouse grab
+    \li The item becomes invisible
+    \li The item is removed from the scene
+    \li The item is deleted
+    \li The item call ungrabMouse()
+    \li Another item calls grabMouse(); the item will regain the mouse grab
     when the other item calls ungrabMouse().
     \endlist
 
@@ -3531,11 +3531,11 @@ void QGraphicsItem::ungrabMouse()
     following events occur:
 
     \list
-    \o The item becomes invisible
-    \o The item is removed from the scene
-    \o The item is deleted
-    \o The item calls ungrabKeyboard()
-    \o Another item calls grabKeyboard(); the item will regain the keyboard grab
+    \li The item becomes invisible
+    \li The item is removed from the scene
+    \li The item is deleted
+    \li The item calls ungrabKeyboard()
+    \li Another item calls grabKeyboard(); the item will regain the keyboard grab
     when the other item calls ungrabKeyboard().
     \endlist
 
@@ -5730,7 +5730,7 @@ void QGraphicsItem::update(const QRectF &rect)
     viewport, which does not benefit from scroll optimizations), this function
     is equivalent to calling update(\a rect).
 
-    \bold{Note:} Scrolling is only supported when QGraphicsItem::ItemCoordinateCache
+    \b{Note:} Scrolling is only supported when QGraphicsItem::ItemCoordinateCache
     is enabled; in all other cases calling this function is equivalent to calling
     update(\a rect). If you for sure know that the item is opaque and not overlapped
     by other items, you can map the \a rect to viewport coordinates and scroll the
@@ -8652,8 +8652,8 @@ QVariant QGraphicsRectItem::extension(const QVariant &variant) const
 
     \table
         \row
-            \o \inlineimage graphicsview-ellipseitem.png
-            \o \inlineimage graphicsview-ellipseitem-pie.png
+            \li \inlineimage graphicsview-ellipseitem.png
+            \li \inlineimage graphicsview-ellipseitem-pie.png
     \endtable
 
     To set the item's ellipse, pass a QRectF to QGraphicsEllipseItem's
diff --git a/src/widgets/graphicsview/qgraphicslayout.cpp b/src/widgets/graphicsview/qgraphicslayout.cpp
index 63f04f67bc..6f93dd511d 100644
--- a/src/widgets/graphicsview/qgraphicslayout.cpp
+++ b/src/widgets/graphicsview/qgraphicslayout.cpp
@@ -77,19 +77,19 @@ QT_BEGIN_NAMESPACE
     minimum:
 
     \table
-    \header \o Function                     \o Description
-    \row     \o QGraphicsLayoutItem::setGeometry()
-               \o Notifies you when the geometry of the layout is set. You can
+    \header \li Function                     \li Description
+    \row     \li QGraphicsLayoutItem::setGeometry()
+               \li Notifies you when the geometry of the layout is set. You can
                    store the geometry in your own layout class in a reimplementation
                    of this function.
-    \row    \o QGraphicsLayoutItem::sizeHint()
-               \o Returns the layout's size hints.
-    \row    \o QGraphicsLayout::count()
-              \o Returns the number of items in your layout.
-    \row    \o QGraphicsLayout::itemAt()
-              \o Returns a pointer to an item in your layout.
-    \row    \o QGraphicsLayout::removeAt()
-              \o Removes an item from your layout without destroying it.
+    \row    \li QGraphicsLayoutItem::sizeHint()
+               \li Returns the layout's size hints.
+    \row    \li QGraphicsLayout::count()
+              \li Returns the number of items in your layout.
+    \row    \li QGraphicsLayout::itemAt()
+              \li Returns a pointer to an item in your layout.
+    \row    \li QGraphicsLayout::removeAt()
+              \li Removes an item from your layout without destroying it.
     \endtable
 
     For more details on how to implement each function, refer to the individual
diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
index d532c4e541..4cda3e51fb 100644
--- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
@@ -136,45 +136,45 @@ QT_BEGIN_NAMESPACE
     QGraphicsProxyWidget maintains symmetry for the following states:
 
     \table
-    \header \o QWidget state       \o QGraphicsProxyWidget state      \o Notes
-    \row     \o QWidget::enabled
-                    \o QGraphicsProxyWidget::enabled
-                        \o
-    \row    \o QWidget::visible
-                    \o QGraphicsProxyWidget::visible
-                        \o The explicit state is also symmetric.
-    \row    \o QWidget::geometry
-                    \o QGraphicsProxyWidget::geometry
-                        \o Geometry is only guaranteed to be symmetric while
+    \header \li QWidget state       \li QGraphicsProxyWidget state      \li Notes
+    \row     \li QWidget::enabled
+                    \li QGraphicsProxyWidget::enabled
+                        \li
+    \row    \li QWidget::visible
+                    \li QGraphicsProxyWidget::visible
+                        \li The explicit state is also symmetric.
+    \row    \li QWidget::geometry
+                    \li QGraphicsProxyWidget::geometry
+                        \li Geometry is only guaranteed to be symmetric while
                             the embedded widget is visible.
-    \row    \o QWidget::layoutDirection
-                    \o QGraphicsProxyWidget::layoutDirection
-                        \o
-    \row    \o QWidget::style
-                    \o QGraphicsProxyWidget::style
-                        \o
-    \row    \o QWidget::palette
-                    \o QGraphicsProxyWidget::palette
-                        \o
-    \row    \o QWidget::font
-                    \o QGraphicsProxyWidget::font
-                        \o
-    \row    \o QWidget::cursor
-                    \o QGraphicsProxyWidget::cursor
-                        \o The embedded widget overrides the proxy widget
+    \row    \li QWidget::layoutDirection
+                    \li QGraphicsProxyWidget::layoutDirection
+                        \li
+    \row    \li QWidget::style
+                    \li QGraphicsProxyWidget::style
+                        \li
+    \row    \li QWidget::palette
+                    \li QGraphicsProxyWidget::palette
+                        \li
+    \row    \li QWidget::font
+                    \li QGraphicsProxyWidget::font
+                        \li
+    \row    \li QWidget::cursor
+                    \li QGraphicsProxyWidget::cursor
+                        \li The embedded widget overrides the proxy widget
                             cursor. The proxy cursor changes depending on
                             which embedded subwidget is currently under the
                             mouse.
-    \row    \o QWidget::sizeHint()
-                    \o QGraphicsProxyWidget::sizeHint()
-                        \o All size hint functionality from the embedded
+    \row    \li QWidget::sizeHint()
+                    \li QGraphicsProxyWidget::sizeHint()
+                        \li All size hint functionality from the embedded
                             widget is forwarded by the proxy.
-    \row    \o QWidget::getContentsMargins()
-                    \o QGraphicsProxyWidget::getContentsMargins()
-                        \o Updated once by setWidget().
-    \row    \o QWidget::windowTitle
-                    \o QGraphicsProxyWidget::windowTitle
-                        \o Updated once by setWidget().
+    \row    \li QWidget::getContentsMargins()
+                    \li QGraphicsProxyWidget::getContentsMargins()
+                        \li Updated once by setWidget().
+    \row    \li QWidget::windowTitle
+                    \li QGraphicsProxyWidget::windowTitle
+                        \li Updated once by setWidget().
     \endtable
 
     \note QGraphicsScene keeps the embedded widget in a special state that
diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp
index 51d86dadb1..015cd254d4 100644
--- a/src/widgets/graphicsview/qgraphicsscene.cpp
+++ b/src/widgets/graphicsview/qgraphicsscene.cpp
@@ -3118,12 +3118,12 @@ bool QGraphicsScene::stickyFocus() const
     the following events occur:
 
     \list
-    \o If the item receives a mouse release event when there are no other
+    \li 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)}),
+    \li 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.
+    \li If the item is removed from the scene, it loses the mouse grab.
     \endlist
 
     If the item loses its mouse grab, the scene will ignore all mouse events
diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp
index c179aeff2b..da4ccb1a33 100644
--- a/src/widgets/graphicsview/qgraphicswidget.cpp
+++ b/src/widgets/graphicsview/qgraphicswidget.cpp
@@ -81,10 +81,10 @@ QT_BEGIN_NAMESPACE
     over QGraphicsItem. It is similar to QWidget in many ways:
 
     \list
-        \o Provides a \l palette, a \l font and a \l style().
-        \o Has a defined geometry().
-        \o Supports layouts with setLayout() and layout().
-        \o Supports shortcuts and actions with grabShortcut() and insertAction()
+        \li Provides a \l palette, a \l font and a \l style().
+        \li Has a defined geometry().
+        \li Supports layouts with setLayout() and layout().
+        \li Supports shortcuts and actions with grabShortcut() and insertAction()
     \endlist
 
     Unlike QGraphicsItem, QGraphicsWidget is not an abstract class; you can
@@ -106,23 +106,23 @@ QT_BEGIN_NAMESPACE
     Noticeable differences between QGraphicsWidget and QWidget are:
 
     \table
-    \header \o QGraphicsWidget
-                \o QWidget
-    \row      \o Coordinates and geometry are defined with qreals (doubles or
+    \header \li QGraphicsWidget
+                \li QWidget
+    \row      \li Coordinates and geometry are defined with qreals (doubles or
                     floats, depending on the platform).
-                \o QWidget uses integer geometry (QPoint, QRect).
-    \row      \o The widget is already visible by default; you do not have to
+                \li QWidget uses integer geometry (QPoint, QRect).
+    \row      \li The widget is already visible by default; you do not have to
                     call show() to display the widget.
-                \o QWidget is hidden by default until you call show().
-    \row      \o A subset of widget attributes are supported.
-                \o All widget attributes are supported.
-    \row      \o A top-level item's style defaults to QGraphicsScene::style
-                \o A top-level widget's style defaults to QApplication::style
-    \row      \o Graphics View provides a custom drag and drop framework, different
+                \li QWidget is hidden by default until you call show().
+    \row      \li A subset of widget attributes are supported.
+                \li All widget attributes are supported.
+    \row      \li A top-level item's style defaults to QGraphicsScene::style
+                \li A top-level widget's style defaults to QApplication::style
+    \row      \li Graphics View provides a custom drag and drop framework, different
                     from QWidget.
-                \o Standard drag and drop framework.
-    \row      \o Widget items do not support modality.
-                \o Full modality support.
+                \li Standard drag and drop framework.
+    \row      \li Widget items do not support modality.
+                \li Full modality support.
     \endtable
 
     QGraphicsWidget supports a subset of Qt's widget attributes,
@@ -130,32 +130,32 @@ QT_BEGIN_NAMESPACE
     listed in this table are unsupported, or otherwise unused.
 
     \table
-    \header \o Widget Attribute                         \o Usage
-    \row    \o Qt::WA_SetLayoutDirection
-                    \o Set by setLayoutDirection(), cleared by
+    \header \li Widget Attribute                         \li Usage
+    \row    \li Qt::WA_SetLayoutDirection
+                    \li Set by setLayoutDirection(), cleared by
                         unsetLayoutDirection(). You can test this attribute to
                         check if the widget has been explicitly assigned a
                         \l{QGraphicsWidget::layoutDirection()}
                         {layoutDirection}. If the attribute is not set, the
                         \l{QGraphicsWidget::layoutDirection()}
                         {layoutDirection()} is inherited.
-    \row    \o Qt::WA_RightToLeft
-                    \o Toggled by setLayoutDirection(). Inherited from the
+    \row    \li Qt::WA_RightToLeft
+                    \li Toggled by setLayoutDirection(). Inherited from the
                         parent/scene. If set, the widget's layout will order
                         horizontally arranged widgets from right to left.
-    \row    \o Qt::WA_SetStyle
-                    \o Set and cleared by setStyle(). If this attribute is
+    \row    \li Qt::WA_SetStyle
+                    \li Set and cleared by setStyle(). If this attribute is
                         set, the widget has been explicitly assigned a style.
                         If it is unset, the widget will use the scene's or the
                         application's style.
-    \row    \o Qt::WA_Resized
-                    \o Set by setGeometry() and resize().
-    \row    \o Qt::WA_SetPalette
-                    \o Set by setPalette().
-    \row    \o Qt::WA_SetFont
-                    \o Set by setFont().
-    \row    \o Qt::WA_WindowPropagation
-                    \o Enables propagation to window widgets.
+    \row    \li Qt::WA_Resized
+                    \li Set by setGeometry() and resize().
+    \row    \li Qt::WA_SetPalette
+                    \li Set by setPalette().
+    \row    \li Qt::WA_SetFont
+                    \li Set by setFont().
+    \row    \li Qt::WA_WindowPropagation
+                    \li Enables propagation to window widgets.
     \endtable
 
     Although QGraphicsWidget inherits from both QObject and QGraphicsItem,
@@ -646,29 +646,29 @@ QRectF QGraphicsWidget::windowFrameRect() const
 
     \table
       \header
-        \o Style Option Property
-        \o Value
+        \li Style Option Property
+        \li Value
       \row
-        \o state & QStyle::State_Enabled
-        \o Corresponds to QGraphicsItem::isEnabled().
+        \li state & QStyle::State_Enabled
+        \li Corresponds to QGraphicsItem::isEnabled().
       \row
-        \o state & QStyle::State_HasFocus
-        \o Corresponds to QGraphicsItem::hasFocus().
+        \li state & QStyle::State_HasFocus
+        \li Corresponds to QGraphicsItem::hasFocus().
       \row
-        \o state & QStyle::State_MouseOver
-        \o Corresponds to QGraphicsItem::isUnderMouse().
+        \li state & QStyle::State_MouseOver
+        \li Corresponds to QGraphicsItem::isUnderMouse().
       \row
-        \o direction
-        \o Corresponds to QGraphicsWidget::layoutDirection().
+        \li direction
+        \li Corresponds to QGraphicsWidget::layoutDirection().
       \row
-        \o rect
-        \o Corresponds to QGraphicsWidget::rect().toRect().
+        \li rect
+        \li Corresponds to QGraphicsWidget::rect().toRect().
       \row
-        \o palette
-        \o Corresponds to QGraphicsWidget::palette().
+        \li palette
+        \li Corresponds to QGraphicsWidget::palette().
       \row
-        \o fontMetrics
-        \o Corresponds to QFontMetrics(QGraphicsWidget::font()).
+        \li fontMetrics
+        \li Corresponds to QFontMetrics(QGraphicsWidget::font()).
     \endtable
 
     Subclasses of QGraphicsWidget should call the base implementation, and
@@ -1201,11 +1201,11 @@ QVariant QGraphicsWidget::itemChange(GraphicsItemChange change, const QVariant &
 
     QGraphicsWidget delivers notifications for the following properties:
 
-    \table     \o propertyName        \o Property
-    \row       \o layoutDirection     \o QGraphicsWidget::layoutDirection
-    \row       \o size                \o QGraphicsWidget::size
-    \row       \o font                \o QGraphicsWidget::font
-    \row       \o palette             \o QGraphicsWidget::palette
+    \table     \li propertyName        \li Property
+    \row       \li layoutDirection     \li QGraphicsWidget::layoutDirection
+    \row       \li size                \li QGraphicsWidget::size
+    \row       \li font                \li QGraphicsWidget::font
+    \row       \li palette             \li QGraphicsWidget::palette
     \endtable
 
     \sa itemChange()
@@ -1347,33 +1347,33 @@ Qt::WindowFrameSection QGraphicsWidget::windowFrameSectionAt(const QPointF &pos)
     Handles the \a event.  QGraphicsWidget handles the following
     events:
 
-    \table   \o Event                 \o Usage
-    \row     \o Polish
-                    \o Delivered to the widget some time after it has been
+    \table   \li Event                 \li Usage
+    \row     \li Polish
+                    \li Delivered to the widget some time after it has been
                         shown.
-    \row     \o GraphicsSceneMove
-                    \o Delivered to the widget after its local position has
+    \row     \li GraphicsSceneMove
+                    \li Delivered to the widget after its local position has
                         changed.
-    \row     \o GraphicsSceneResize
-                    \o Delivered to the widget after its size has changed.
-    \row     \o Show
-                    \o Delivered to the widget before it has been shown.
-    \row     \o Hide
-                    \o Delivered to the widget after it has been hidden.
-    \row     \o PaletteChange
-                    \o Delivered to the widget after its palette has changed.
-    \row     \o FontChange
-                    \o Delivered to the widget after its font has changed.
-    \row     \o EnabledChange
-                    \o Delivered to the widget after its enabled state has
+    \row     \li GraphicsSceneResize
+                    \li Delivered to the widget after its size has changed.
+    \row     \li Show
+                    \li Delivered to the widget before it has been shown.
+    \row     \li Hide
+                    \li Delivered to the widget after it has been hidden.
+    \row     \li PaletteChange
+                    \li Delivered to the widget after its palette has changed.
+    \row     \li FontChange
+                    \li Delivered to the widget after its font has changed.
+    \row     \li EnabledChange
+                    \li Delivered to the widget after its enabled state has
                         changed.
-    \row     \o StyleChange
-                    \o Delivered to the widget after its style has changed.
-    \row     \o LayoutDirectionChange
-                    \o Delivered to the widget after its layout direction has
+    \row     \li StyleChange
+                    \li Delivered to the widget after its style has changed.
+    \row     \li LayoutDirectionChange
+                    \li Delivered to the widget after its layout direction has
                         changed.
-    \row     \o ContentsRectChange
-                    \o Delivered to the widget after its contents margins/
+    \row     \li ContentsRectChange
+                    \li Delivered to the widget after its contents margins/
                         contents rect has changed.
     \endtable
 */
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index ff3de308e5..8530e2c23e 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -251,34 +251,34 @@ void QAbstractItemViewPrivate::_q_scrollerStateChanged()
 
     \table
         \header
-            \o Keys
-            \o Functionality
+            \li Keys
+            \li Functionality
         \row
-            \o Arrow keys
-            \o Changes the current item and selects it.
+            \li Arrow keys
+            \li Changes the current item and selects it.
         \row
-            \o Ctrl+Arrow keys
-            \o Changes the current item but does not select it.
+            \li Ctrl+Arrow keys
+            \li Changes the current item but does not select it.
         \row
-            \o Shift+Arrow keys
-            \o Changes the current item and selects it. The previously
+            \li Shift+Arrow keys
+            \li Changes the current item and selects it. The previously
                selected item(s) is not deselected.
         \row
-            \o Ctr+Space
-            \o Toggles selection of the current item.
+            \li Ctr+Space
+            \li Toggles selection of the current item.
         \row
-            \o Tab/Backtab
-            \o Changes the current item to the next/previous item.
+            \li Tab/Backtab
+            \li Changes the current item to the next/previous item.
         \row
-            \o Home/End
-            \o Selects the first/last item in the model.
+            \li Home/End
+            \li Selects the first/last item in the model.
         \row
-            \o Page up/Page down
-            \o Scrolls the rows shown up/down by the number of
+            \li Page up/Page down
+            \li Scrolls the rows shown up/down by the number of
                visible rows in the view.
         \row
-            \o Ctrl+A
-            \o Selects all items in the model.
+            \li Ctrl+A
+            \li Selects all items in the model.
     \endtable
 
     Note that the above table assumes that the
@@ -1428,7 +1428,7 @@ bool QAbstractItemView::dragEnabled() const
     \value DragOnly The view supports dragging of its own items
     \value DropOnly The view accepts drops
     \value DragDrop The view supports both dragging and dropping
-    \value InternalMove The view accepts move (\bold{not copy}) operations only
+    \value InternalMove The view accepts move (\b{not copy}) operations only
            from itself.
 
     Note that the model used needs to provide support for drag and drop operations.
diff --git a/src/widgets/itemviews/qdatawidgetmapper.cpp b/src/widgets/itemviews/qdatawidgetmapper.cpp
index e4eca4287b..2f7b1f7ecb 100644
--- a/src/widgets/itemviews/qdatawidgetmapper.cpp
+++ b/src/widgets/itemviews/qdatawidgetmapper.cpp
@@ -279,11 +279,11 @@ void QDataWidgetMapperPrivate::_q_modelDestroyed()
     Let us assume that we have an item model named \c{model} with the following contents:
 
     \table
-    \row \o 1 \o Qt Norway       \o Oslo
-    \row \o 2 \o Qt Australia    \o Brisbane
-    \row \o 3 \o Qt USA          \o Palo Alto
-    \row \o 4 \o Qt China        \o Beijing
-    \row \o 5 \o Qt Germany      \o Berlin
+    \row \li 1 \li Qt Norway       \li Oslo
+    \row \li 2 \li Qt Australia    \li Brisbane
+    \row \li 3 \li Qt USA          \li Palo Alto
+    \row \li 4 \li Qt China        \li Beijing
+    \row \li 5 \li Qt Germany      \li Berlin
     \endtable
 
     The following code will map the columns of the model to widgets called \c mySpinBox,
@@ -478,11 +478,11 @@ QModelIndex QDataWidgetMapper::rootIndex() const
 
     \snippet doc/src/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp 1
 
-    \bold{Notes:}
+    \b{Notes:}
     \list
-    \o If the \a widget is already mapped to a section, the
+    \li If the \a widget is already mapped to a section, the
     old mapping will be replaced by the new one.
-    \o Only one-to-one mappings between sections and widgets are allowed.
+    \li Only one-to-one mappings between sections and widgets are allowed.
     It is not possible to map a single section to multiple widgets, or to
     map a single widget to multiple sections.
     \endlist
@@ -781,11 +781,11 @@ void QDataWidgetMapper::clearMapping()
     Use Qt::Horizontal for tabular data that looks like this:
 
     \table
-    \row \o 1 \o Qt Norway       \o Oslo
-    \row \o 2 \o Qt Australia    \o Brisbane
-    \row \o 3 \o Qt USA          \o Silicon Valley
-    \row \o 4 \o Qt China        \o Beijing
-    \row \o 5 \o Qt Germany      \o Berlin
+    \row \li 1 \li Qt Norway       \li Oslo
+    \row \li 2 \li Qt Australia    \li Brisbane
+    \row \li 3 \li Qt USA          \li Silicon Valley
+    \row \li 4 \li Qt China        \li Beijing
+    \row \li 5 \li Qt Germany      \li Berlin
     \endtable
 
     If the orientation is set to Qt::Vertical, a widget is mapped to
@@ -796,9 +796,9 @@ void QDataWidgetMapper::clearMapping()
     Use Qt::Vertical for tabular data that looks like this:
 
     \table
-    \row \o 1 \o 2 \o 3 \o 4 \o 5
-    \row \o Qt Norway \o Qt Australia \o Qt USA \o Qt China \o Qt Germany
-    \row \o Oslo \o Brisbane \o Silicon Valley \o Beijing \i Berlin
+    \row \li 1 \li 2 \li 3 \li 4 \li 5
+    \row \li Qt Norway \li Qt Australia \li Qt USA \li Qt China \li Qt Germany
+    \row \li Oslo \li Brisbane \li Silicon Valley \li Beijing \li Berlin
     \endtable
 
     Changing the orientation clears all existing mappings.
diff --git a/src/widgets/itemviews/qdirmodel.cpp b/src/widgets/itemviews/qdirmodel.cpp
index ee097e5c41..490c272e39 100644
--- a/src/widgets/itemviews/qdirmodel.cpp
+++ b/src/widgets/itemviews/qdirmodel.cpp
@@ -1011,12 +1011,12 @@ QModelIndex QDirModel::mkdir(const QModelIndex &parent, const QString &name)
 
 /*!
   Removes the directory corresponding to the model item \a index in the
-  directory model and \bold{deletes the corresponding directory from the
+  directory model and \b{deletes the corresponding directory from the
   file system}, returning true if successful. If the directory cannot be
   removed, false is returned.
 
   \warning This function deletes directories from the file system; it does
-  \bold{not} move them to a location where they can be recovered.
+  \b{not} move them to a location where they can be recovered.
 
   \sa remove()
 */
@@ -1046,11 +1046,11 @@ bool QDirModel::rmdir(const QModelIndex &index)
 }
 
 /*!
-  Removes the model item \a index from the directory model and \bold{deletes the
+  Removes the model item \a index from the directory model and \b{deletes the
   corresponding file from the file system}, returning true if successful. If the
   item cannot be removed, false is returned.
 
-  \warning This function deletes files from the file system; it does \bold{not}
+  \warning This function deletes files from the file system; it does \b{not}
   move them to a location where they can be recovered.
 
   \sa rmdir()
@@ -1134,7 +1134,7 @@ QIcon QDirModel::fileIcon(const QModelIndex &index) const
 /*!
   Returns the file information for the specified model \a index.
 
-  \bold{Note:} If the model index represents a symbolic link in the
+  \b{Note:} If the model index represents a symbolic link in the
   underlying filing system, the file information returned will contain
   information about the symbolic link itself, regardless of whether
   resolveSymlinks is enabled or not.
diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp
index feec3fcbc5..419c62ff65 100644
--- a/src/widgets/itemviews/qitemdelegate.cpp
+++ b/src/widgets/itemviews/qitemdelegate.cpp
@@ -231,12 +231,12 @@ QSizeF QItemDelegatePrivate::doTextLayout(int lineWidth) const
     reimplemented here:
 
     \list
-        \o createEditor() returns the widget used to change data from the model
+        \li createEditor() returns the widget used to change data from the model
            and can be reimplemented to customize editing behavior.
-        \o setEditorData() provides the widget with data to manipulate.
-        \o updateEditorGeometry() ensures that the editor is displayed correctly
+        \li setEditorData() provides the widget with data to manipulate.
+        \li updateEditorGeometry() ensures that the editor is displayed correctly
            with respect to the item view.
-        \o setModelData() returns updated data to the model.
+        \li setModelData() returns updated data to the model.
     \endlist
 
     The closeEditor() signal indicates that the user has completed editing the data,
@@ -250,28 +250,28 @@ QSizeF QItemDelegatePrivate::doTextLayout(int lineWidth) const
     appearance of the delegate as described in the following table.
 
     \table
-    \header \o Role \o Accepted Types
+    \header \li Role \li Accepted Types
     \omit
-    \row    \o \l Qt::AccessibleDescriptionRole \o QString
-    \row    \o \l Qt::AccessibleTextRole \o QString
+    \row    \li \l Qt::AccessibleDescriptionRole \li QString
+    \row    \li \l Qt::AccessibleTextRole \li QString
     \endomit
-    \row    \o \l Qt::BackgroundRole \o QBrush
-    \row    \o \l Qt::BackgroundColorRole \o QColor (obsolete; use Qt::BackgroundRole instead)
-    \row    \o \l Qt::CheckStateRole \o Qt::CheckState
-    \row    \o \l Qt::DecorationRole \o QIcon, QPixmap and QColor
-    \row    \o \l Qt::DisplayRole \o QString and types with a string representation
-    \row    \o \l Qt::EditRole \o See QItemEditorFactory for details
-    \row    \o \l Qt::FontRole \o QFont
-    \row    \o \l Qt::SizeHintRole \o QSize
+    \row    \li \l Qt::BackgroundRole \li QBrush
+    \row    \li \l Qt::BackgroundColorRole \li QColor (obsolete; use Qt::BackgroundRole instead)
+    \row    \li \l Qt::CheckStateRole \li Qt::CheckState
+    \row    \li \l Qt::DecorationRole \li QIcon, QPixmap and QColor
+    \row    \li \l Qt::DisplayRole \li QString and types with a string representation
+    \row    \li \l Qt::EditRole \li See QItemEditorFactory for details
+    \row    \li \l Qt::FontRole \li QFont
+    \row    \li \l Qt::SizeHintRole \li QSize
     \omit
-    \row    \o \l Qt::StatusTipRole \o
+    \row    \li \l Qt::StatusTipRole \li
     \endomit
-    \row    \o \l Qt::TextAlignmentRole \o Qt::Alignment
-    \row    \o \l Qt::ForegroundRole \o QBrush
-    \row    \o \l Qt::TextColorRole \o QColor (obsolete; use Qt::ForegroundRole instead)
+    \row    \li \l Qt::TextAlignmentRole \li Qt::Alignment
+    \row    \li \l Qt::ForegroundRole \li QBrush
+    \row    \li \l Qt::TextColorRole \li QColor (obsolete; use Qt::ForegroundRole instead)
     \omit
-    \row    \o \l Qt::ToolTipRole
-    \row    \o \l Qt::WhatsThisRole
+    \row    \li \l Qt::ToolTipRole
+    \row    \li \l Qt::WhatsThisRole
     \endomit
     \endtable
 
@@ -1152,11 +1152,11 @@ QRect QItemDelegate::textRectangle(QPainter * /*painter*/, const QRect &rect,
     key press events are handled by default:
 
     \list
-        \o \gui Tab
-        \o \gui Backtab
-        \o \gui Enter
-        \o \gui Return
-        \o \gui Esc
+        \li \gui Tab
+        \li \gui Backtab
+        \li \gui Enter
+        \li \gui Return
+        \li \gui Esc
     \endlist
 
     In the case of \gui Tab, \gui Backtab, \gui Enter and \gui Return
diff --git a/src/widgets/itemviews/qitemeditorfactory.cpp b/src/widgets/itemviews/qitemeditorfactory.cpp
index 468929a554..b4180c18dd 100644
--- a/src/widgets/itemviews/qitemeditorfactory.cpp
+++ b/src/widgets/itemviews/qitemeditorfactory.cpp
@@ -102,16 +102,16 @@ public:
     types and the standard editors provided.
 
     \table
-    \header \o Type \o Editor Widget
-    \row    \o bool \o QComboBox
-    \row    \o double \o QDoubleSpinBox
-    \row    \o int \o{1,2} QSpinBox
-    \row    \o unsigned int
-    \row    \o QDate \o QDateEdit
-    \row    \o QDateTime \o QDateTimeEdit
-    \row    \o QPixmap \o QLabel
-    \row    \o QString \o QLineEdit
-    \row    \o QTime \o QTimeEdit
+    \header \li Type \li Editor Widget
+    \row    \li bool \li QComboBox
+    \row    \li double \li QDoubleSpinBox
+    \row    \li int \li{1,2} QSpinBox
+    \row    \li unsigned int
+    \row    \li QDate \li QDateEdit
+    \row    \li QDateTime \li QDateTimeEdit
+    \row    \li QPixmap \li QLabel
+    \row    \li QString \li QLineEdit
+    \row    \li QTime \li QTimeEdit
     \endtable
 
     Additional editors can be registered with the registerEditor() function.
@@ -168,7 +168,7 @@ QItemEditorFactory::~QItemEditorFactory()
 /*!
     Registers an item editor creator specified by \a creator for the given \a userType of data.
 
-    \bold{Note:} The factory takes ownership of the item editor creator and will destroy
+    \b{Note:} The factory takes ownership of the item editor creator and will destroy
     it if a new creator for the same type is registered later.
 
     \sa createEditor()
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index 8d069a8c7e..b00b1073a3 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -108,12 +108,12 @@ QT_BEGIN_NAMESPACE
     be rendered as large or small icons depending on their iconSize().
 
     \table 100%
-    \row \o \inlineimage windowsxp-listview.png Screenshot of a Windows XP style list view
-         \o \inlineimage macintosh-listview.png Screenshot of a Macintosh style table view
-         \o \inlineimage plastique-listview.png Screenshot of a Plastique style table view
-    \row \o A \l{Windows XP Style Widget Gallery}{Windows XP style} list view.
-         \o A \l{Macintosh Style Widget Gallery}{Macintosh style} list view.
-         \o A \l{Plastique Style Widget Gallery}{Plastique style} list view.
+    \row \li \inlineimage windowsxp-listview.png Screenshot of a Windows XP style list view
+         \li \inlineimage macintosh-listview.png Screenshot of a Macintosh style table view
+         \li \inlineimage plastique-listview.png Screenshot of a Plastique style table view
+    \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} list view.
+         \li A \l{Macintosh Style Widget Gallery}{Macintosh style} list view.
+         \li A \l{Plastique Style Widget Gallery}{Plastique style} list view.
     \endtable
 
     \section1 Improving Performance
diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp
index bb39546ec8..01cb7b4235 100644
--- a/src/widgets/itemviews/qlistwidget.cpp
+++ b/src/widgets/itemviews/qlistwidget.cpp
@@ -1187,12 +1187,12 @@ void QListWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
     new current item and the item that was previously current.
 
     \table 100%
-    \row \o \inlineimage windowsxp-listview.png Screenshot of a Windows XP style list widget
-         \o \inlineimage macintosh-listview.png Screenshot of a Macintosh style table widget
-         \o \inlineimage plastique-listview.png Screenshot of a Plastique style table widget
-    \row \o A \l{Windows XP Style Widget Gallery}{Windows XP style} list widget.
-         \o A \l{Macintosh Style Widget Gallery}{Macintosh style} list widget.
-         \o A \l{Plastique Style Widget Gallery}{Plastique style} list widget.
+    \row \li \inlineimage windowsxp-listview.png Screenshot of a Windows XP style list widget
+         \li \inlineimage macintosh-listview.png Screenshot of a Macintosh style table widget
+         \li \inlineimage plastique-listview.png Screenshot of a Plastique style table widget
+    \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} list widget.
+         \li A \l{Macintosh Style Widget Gallery}{Macintosh style} list widget.
+         \li A \l{Plastique Style Widget Gallery}{Plastique style} list widget.
     \endtable
 
     \sa QListWidgetItem, QListView, QTreeView, {Model/View Programming},
diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp
index d54d78512a..93893afaa8 100644
--- a/src/widgets/itemviews/qstyleditemdelegate.cpp
+++ b/src/widgets/itemviews/qstyleditemdelegate.cpp
@@ -143,28 +143,28 @@ public:
     each of the roles to determine the appearance of items in views.
 
     \table
-    \header \o Role \o Accepted Types
+    \header \li Role \li Accepted Types
     \omit
-    \row    \o \l Qt::AccessibleDescriptionRole \o QString
-    \row    \o \l Qt::AccessibleTextRole \o QString
+    \row    \li \l Qt::AccessibleDescriptionRole \li QString
+    \row    \li \l Qt::AccessibleTextRole \li QString
     \endomit
-    \row    \o \l Qt::BackgroundRole \o QBrush
-    \row    \o \l Qt::BackgroundColorRole \o QColor (obsolete; use Qt::BackgroundRole instead)
-    \row    \o \l Qt::CheckStateRole \o Qt::CheckState
-    \row    \o \l Qt::DecorationRole \o QIcon, QPixmap, QImage and QColor
-    \row    \o \l Qt::DisplayRole \o QString and types with a string representation
-    \row    \o \l Qt::EditRole \o See QItemEditorFactory for details
-    \row    \o \l Qt::FontRole \o QFont
-    \row    \o \l Qt::SizeHintRole \o QSize
+    \row    \li \l Qt::BackgroundRole \li QBrush
+    \row    \li \l Qt::BackgroundColorRole \li QColor (obsolete; use Qt::BackgroundRole instead)
+    \row    \li \l Qt::CheckStateRole \li Qt::CheckState
+    \row    \li \l Qt::DecorationRole \li QIcon, QPixmap, QImage and QColor
+    \row    \li \l Qt::DisplayRole \li QString and types with a string representation
+    \row    \li \l Qt::EditRole \li See QItemEditorFactory for details
+    \row    \li \l Qt::FontRole \li QFont
+    \row    \li \l Qt::SizeHintRole \li QSize
     \omit
-    \row    \o \l Qt::StatusTipRole \o
+    \row    \li \l Qt::StatusTipRole \li
     \endomit
-    \row    \o \l Qt::TextAlignmentRole \o Qt::Alignment
-    \row    \o \l Qt::ForegroundRole \o QBrush
-    \row    \o \l Qt::TextColorRole \o QColor (obsolete; use Qt::ForegroundRole instead)
+    \row    \li \l Qt::TextAlignmentRole \li Qt::Alignment
+    \row    \li \l Qt::ForegroundRole \li QBrush
+    \row    \li \l Qt::TextColorRole \li QColor (obsolete; use Qt::ForegroundRole instead)
     \omit
-    \row    \o \l Qt::ToolTipRole
-    \row    \o \l Qt::WhatsThisRole
+    \row    \li \l Qt::ToolTipRole
+    \row    \li \l Qt::WhatsThisRole
     \endomit
     \endtable
 
@@ -211,12 +211,12 @@ public:
     following virtual functions must be reimplemented:
 
     \list
-        \o createEditor() returns the widget used to change data from the model
+        \li createEditor() returns the widget used to change data from the model
            and can be reimplemented to customize editing behavior.
-        \o setEditorData() provides the widget with data to manipulate.
-        \o updateEditorGeometry() ensures that the editor is displayed correctly
+        \li setEditorData() provides the widget with data to manipulate.
+        \li updateEditorGeometry() ensures that the editor is displayed correctly
            with respect to the item view.
-        \o setModelData() returns updated data to the model.
+        \li setModelData() returns updated data to the model.
     \endlist
 
     The \l{Star Delegate Example}{Star Delegate} example creates
@@ -618,11 +618,11 @@ void QStyledItemDelegate::setItemEditorFactory(QItemEditorFactory *factory)
     key press events are handled by default:
 
     \list
-        \o \gui Tab
-        \o \gui Backtab
-        \o \gui Enter
-        \o \gui Return
-        \o \gui Esc
+        \li \gui Tab
+        \li \gui Backtab
+        \li \gui Enter
+        \li \gui Return
+        \li \gui Esc
     \endlist
 
     In the case of \gui Tab, \gui Backtab, \gui Enter and \gui Return
diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
index 7e6420bb53..d3bc826750 100644
--- a/src/widgets/itemviews/qtableview.cpp
+++ b/src/widgets/itemviews/qtableview.cpp
@@ -980,8 +980,8 @@ void QTableViewPrivate::drawCell(QPainter *painter, const QStyleOptionViewItemV4
     later retrieved with \l{QAbstractItemView::}{indexWidget()}.
 
     \table
-    \row \o \inlineimage qtableview-resized.png
-    \o By default, the cells in a table do not expand to fill the available space.
+    \row \li \inlineimage qtableview-resized.png
+    \li By default, the cells in a table do not expand to fill the available space.
 
     You can make the cells fill the available space by stretching the last
     header section. Access the relevant header using horizontalHeader()
@@ -1010,12 +1010,12 @@ void QTableViewPrivate::drawCell(QPainter *painter, const QStyleOptionViewItemV4
     its appearance in other styles.
 
     \table 100%
-    \row \o \inlineimage windowsxp-tableview.png Screenshot of a Windows XP style table view
-         \o \inlineimage macintosh-tableview.png Screenshot of a Macintosh style table view
-         \o \inlineimage plastique-tableview.png Screenshot of a Plastique style table view
-    \row \o A \l{Windows XP Style Widget Gallery}{Windows XP style} table view.
-         \o A \l{Macintosh Style Widget Gallery}{Macintosh style} table view.
-         \o A \l{Plastique Style Widget Gallery}{Plastique style} table view.
+    \row \li \inlineimage windowsxp-tableview.png Screenshot of a Windows XP style table view
+         \li \inlineimage macintosh-tableview.png Screenshot of a Macintosh style table view
+         \li \inlineimage plastique-tableview.png Screenshot of a Plastique style table view
+    \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} table view.
+         \li A \l{Macintosh Style Widget Gallery}{Macintosh style} table view.
+         \li A \l{Plastique Style Widget Gallery}{Plastique style} table view.
     \endtable
 
     \sa QTableWidget, {View Classes}, QAbstractItemModel, QAbstractItemView,
diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp
index 5932f20327..7ae74640d6 100644
--- a/src/widgets/itemviews/qtablewidget.cpp
+++ b/src/widgets/itemviews/qtablewidget.cpp
@@ -1537,12 +1537,12 @@ QTableWidgetItem &QTableWidgetItem::operator=(const QTableWidgetItem &other)
     clear() function.
 
     \table 100%
-    \row \o \inlineimage windowsxp-tableview.png Screenshot of a Windows XP style table widget
-         \o \inlineimage macintosh-tableview.png Screenshot of a Macintosh style table widget
-         \o \inlineimage plastique-tableview.png Screenshot of a Plastique style table widget
-    \row \o A \l{Windows XP Style Widget Gallery}{Windows XP style} table widget.
-         \o A \l{Macintosh Style Widget Gallery}{Macintosh style} table widget.
-         \o A \l{Plastique Style Widget Gallery}{Plastique style} table widget.
+    \row \li \inlineimage windowsxp-tableview.png Screenshot of a Windows XP style table widget
+         \li \inlineimage macintosh-tableview.png Screenshot of a Macintosh style table widget
+         \li \inlineimage plastique-tableview.png Screenshot of a Plastique style table widget
+    \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} table widget.
+         \li A \l{Macintosh Style Widget Gallery}{Macintosh style} table widget.
+         \li A \l{Plastique Style Widget Gallery}{Plastique style} table widget.
     \endtable
 
     \sa QTableWidgetItem, QTableView, {Model/View Programming}
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
index 7f5e5964ab..c54c11d0f5 100644
--- a/src/widgets/itemviews/qtreeview.cpp
+++ b/src/widgets/itemviews/qtreeview.cpp
@@ -113,29 +113,29 @@ QT_BEGIN_NAMESPACE
     navigate in the view and interact with the contents of items:
 
     \table
-    \header \o Key \o Action
-    \row \o Up   \o Moves the cursor to the item in the same column on
+    \header \li Key \li Action
+    \row \li Up   \li Moves the cursor to the item in the same column on
          the previous row. If the parent of the current item has no more rows to
          navigate to, the cursor moves to the relevant item in the last row
          of the sibling that precedes the parent.
-    \row \o Down \o Moves the cursor to the item in the same column on
+    \row \li Down \li Moves the cursor to the item in the same column on
          the next row. If the parent of the current item has no more rows to
          navigate to, the cursor moves to the relevant item in the first row
          of the sibling that follows the parent.
-    \row \o Left  \o Hides the children of the current item (if present)
+    \row \li Left  \li Hides the children of the current item (if present)
          by collapsing a branch.
-    \row \o Minus  \o Same as LeftArrow.
-    \row \o Right \o Reveals the children of the current item (if present)
+    \row \li Minus  \li Same as LeftArrow.
+    \row \li Right \li Reveals the children of the current item (if present)
          by expanding a branch.
-    \row \o Plus  \o Same as RightArrow.
-    \row \o Asterisk  \o Expands all children of the current item (if present).
-    \row \o PageUp   \o Moves the cursor up one page.
-    \row \o PageDown \o Moves the cursor down one page.
-    \row \o Home \o Moves the cursor to an item in the same column of the first
+    \row \li Plus  \li Same as RightArrow.
+    \row \li Asterisk  \li Expands all children of the current item (if present).
+    \row \li PageUp   \li Moves the cursor up one page.
+    \row \li PageDown \li Moves the cursor down one page.
+    \row \li Home \li Moves the cursor to an item in the same column of the first
          row of the first top-level item in the model.
-    \row \o End  \o Moves the cursor to an item in the same column of the last
+    \row \li End  \li Moves the cursor to an item in the same column of the last
          row of the last top-level item in the model.
-    \row \o F2   \o In editable models, this opens the current item for editing.
+    \row \li F2   \li In editable models, this opens the current item for editing.
          The Escape key can be used to cancel the editing process and revert
          any changes to the data displayed.
     \endtable
@@ -145,12 +145,12 @@ QT_BEGIN_NAMESPACE
     \endomit
 
     \table 100%
-    \row \o \inlineimage windowsxp-treeview.png Screenshot of a Windows XP style tree view
-         \o \inlineimage macintosh-treeview.png Screenshot of a Macintosh style tree view
-         \o \inlineimage plastique-treeview.png Screenshot of a Plastique style tree view
-    \row \o A \l{Windows XP Style Widget Gallery}{Windows XP style} tree view.
-         \o A \l{Macintosh Style Widget Gallery}{Macintosh style} tree view.
-         \o A \l{Plastique Style Widget Gallery}{Plastique style} tree view.
+    \row \li \inlineimage windowsxp-treeview.png Screenshot of a Windows XP style tree view
+         \li \inlineimage macintosh-treeview.png Screenshot of a Macintosh style tree view
+         \li \inlineimage plastique-treeview.png Screenshot of a Plastique style tree view
+    \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} tree view.
+         \li A \l{Macintosh Style Widget Gallery}{Macintosh style} tree view.
+         \li A \l{Plastique Style Widget Gallery}{Plastique style} tree view.
     \endtable
 
     \section1 Improving Performance
@@ -3146,7 +3146,7 @@ void QTreeViewPrivate::_q_columnsRemoved(const QModelIndex &parent, int start, i
 }
 
 /** \internal
-    creates and initialize the viewItem structure of the children of the element \i
+    creates and initialize the viewItem structure of the children of the element \li
 
     set \a recursiveExpanding if the function has to expand all the children (called from expandAll)
     \a afterIsUninitialized is when we recurse from layout(-1), it means all the items after 'i' are
diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp
index cec709a816..156121a533 100644
--- a/src/widgets/itemviews/qtreewidget.cpp
+++ b/src/widgets/itemviews/qtreewidget.cpp
@@ -2376,12 +2376,12 @@ void QTreeWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
   whether sorting is enabled.
 
   \table 100%
-  \row \o \inlineimage windowsxp-treeview.png Screenshot of a Windows XP style tree widget
-       \o \inlineimage macintosh-treeview.png Screenshot of a Macintosh style tree widget
-       \o \inlineimage plastique-treeview.png Screenshot of a Plastique style tree widget
-  \row \o A \l{Windows XP Style Widget Gallery}{Windows XP style} tree widget.
-       \o A \l{Macintosh Style Widget Gallery}{Macintosh style} tree widget.
-       \o A \l{Plastique Style Widget Gallery}{Plastique style} tree widget.
+  \row \li \inlineimage windowsxp-treeview.png Screenshot of a Windows XP style tree widget
+       \li \inlineimage macintosh-treeview.png Screenshot of a Macintosh style tree widget
+       \li \inlineimage plastique-treeview.png Screenshot of a Plastique style tree widget
+  \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} tree widget.
+       \li A \l{Macintosh Style Widget Gallery}{Macintosh style} tree widget.
+       \li A \l{Plastique Style Widget Gallery}{Plastique style} tree widget.
   \endtable
 
   \sa QTreeWidgetItem, QTreeWidgetItemIterator, QTreeView,
@@ -3263,7 +3263,7 @@ void QTreeWidget::collapseItem(const QTreeWidgetItem *item)
 /*!
     Clears the tree widget by removing all of its items and selections.
 
-    \bold{Note:} Since each item is removed from the tree widget before being
+    \b{Note:} Since each item is removed from the tree widget before being
     deleted, the return value of QTreeWidgetItem::treeWidget() will be invalid
     when called from an item's destructor.
 
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index c350223278..095b58eeaf 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -185,7 +185,7 @@ QApplicationPrivate::~QApplicationPrivate()
     for QWidget-based applications. It handles widget specific initialization,
     finalization, and provides session management.
 
-    For any GUI application using Qt, there is precisely \bold one QApplication
+    For any GUI application using Qt, there is precisely \b one QApplication
     object, no matter whether the application has 0, 1, 2 or more windows at
     any given time. For non-QWidget based Qt applications, use QGuiApplication instead,
     as it does not depend on the \l QtWidgets library.
@@ -195,41 +195,41 @@ QApplicationPrivate::~QApplicationPrivate()
 
     QApplication's main areas of responsibility are:
         \list
-            \o  It initializes the application with the user's desktop settings
+            \li  It initializes the application with the user's desktop settings
                 such as palette(), font() and doubleClickInterval(). It keeps
                 track of these properties in case the user changes the desktop
                 globally, for example through some kind of control panel.
 
-            \o  It performs event handling, meaning that it receives events
+            \li  It performs event handling, meaning that it receives events
                 from the underlying window system and dispatches them to the
                 relevant widgets. By using sendEvent() and postEvent() you can
                 send your own events to widgets.
 
-            \o  It parses common command line arguments and sets its internal
+            \li  It parses common command line arguments and sets its internal
                 state accordingly. See the \l{QApplication::QApplication()}
                 {constructor documentation} below for more details.
 
-            \o  It defines the application's look and feel, which is
+            \li  It defines the application's look and feel, which is
                 encapsulated in a QStyle object. This can be changed at runtime
                 with setStyle().
 
-            \o  It specifies how the application is to allocate colors. See
+            \li  It specifies how the application is to allocate colors. See
                 setColorSpec() for details.
 
-            \o  It provides localization of strings that are visible to the
+            \li  It provides localization of strings that are visible to the
                 user via translate().
 
-            \o  It provides some magical objects like the desktop() and the
+            \li  It provides some magical objects like the desktop() and the
                 clipboard().
 
-            \o  It knows about the application's windows. You can ask which
+            \li  It knows about the application's windows. You can ask which
                 widget is at a certain position using widgetAt(), get a list of
                 topLevelWidgets() and closeAllWindows(), etc.
 
-            \o  It manages the application's mouse cursor handling, see
+            \li  It manages the application's mouse cursor handling, see
                 setOverrideCursor()
 
-            \o  It provides support for sophisticated \l{Session Management}
+            \li  It provides support for sophisticated \l{Session Management}
                 {session management}. This makes it possible for applications
                 to terminate gracefully when the user logs out, to cancel a
                 shutdown process if termination isn't possible and even to
@@ -246,11 +246,11 @@ QApplicationPrivate::~QApplicationPrivate()
 
     \table
     \header
-        \o{2,1} Groups of functions
+        \li{2,1} Groups of functions
 
         \row
-        \o  System settings
-        \o  desktopSettingsAware(),
+        \li  System settings
+        \li  desktopSettingsAware(),
             setDesktopSettingsAware(),
             cursorFlashTime(),
             setCursorFlashTime(),
@@ -266,8 +266,8 @@ QApplicationPrivate::~QApplicationPrivate()
             fontMetrics().
 
         \row
-        \o  Event handling
-        \o  exec(),
+        \li  Event handling
+        \li  exec(),
             processEvents(),
             exit(),
             quit().
@@ -279,24 +279,24 @@ QApplicationPrivate::~QApplicationPrivate()
             notify().
 
         \row
-        \o  GUI Styles
-        \o  style(),
+        \li  GUI Styles
+        \li  style(),
             setStyle().
 
         \row
-        \o  Color usage
-        \o  colorSpec(),
+        \li  Color usage
+        \li  colorSpec(),
             setColorSpec().
 
         \row
-        \o  Text handling
-        \o  installTranslator(),
+        \li  Text handling
+        \li  installTranslator(),
             removeTranslator()
             translate().
 
         \row
-        \o  Widgets
-        \o  allWidgets(),
+        \li  Widgets
+        \li  allWidgets(),
             topLevelWidgets(),
             desktop(),
             activePopupWidget(),
@@ -307,21 +307,21 @@ QApplicationPrivate::~QApplicationPrivate()
             widgetAt().
 
         \row
-        \o  Advanced cursor handling
-        \o  overrideCursor(),
+        \li  Advanced cursor handling
+        \li  overrideCursor(),
             setOverrideCursor(),
             restoreOverrideCursor().
 
         \row
-        \o  Session management
-        \o  isSessionRestored(),
+        \li  Session management
+        \li  isSessionRestored(),
             sessionId(),
             commitData(),
             saveState().
 
         \row
-        \o  Miscellaneous
-        \o  closeAllWindows(),
+        \li  Miscellaneous
+        \li  closeAllWindows(),
             startingUp(),
             closingDown(),
             type().
@@ -534,25 +534,25 @@ void QApplicationPrivate::process_cmdline()
 
     All Qt programs automatically support the following command line options:
     \list
-        \o  -style= \e style, sets the application GUI style. Possible values
+        \li  -style= \e style, sets the application GUI style. Possible values
             are \c motif, \c windows, and \c platinum. If you compiled Qt with
             additional styles or have additional styles as plugins these will
             be available to the \c -style command line option.
-        \o  -style \e style, is the same as listed above.
-        \o  -stylesheet= \e stylesheet, sets the application \l styleSheet. The
+        \li  -style \e style, is the same as listed above.
+        \li  -stylesheet= \e stylesheet, sets the application \l styleSheet. The
             value must be a path to a file that contains the Style Sheet.
             \note Relative URLs in the Style Sheet file are relative to the
             Style Sheet file's path.
-        \o  -stylesheet \e stylesheet, is the same as listed above.
-        \o  -session= \e session, restores the application from an earlier
+        \li  -stylesheet \e stylesheet, is the same as listed above.
+        \li  -session= \e session, restores the application from an earlier
             \l{Session Management}{session}.
-        \o  -session \e session, is the same as listed above.
-        \o  -widgetcount, prints debug message at the end about number of
+        \li  -session \e session, is the same as listed above.
+        \li  -widgetcount, prints debug message at the end about number of
             widgets left undestroyed and maximum number of widgets existed at
             the same time
-        \o  -reverse, sets the application's layout direction to
+        \li  -reverse, sets the application's layout direction to
             Qt::RightToLeft
-        \o  -qmljsdebugger=, activates the QML/JS debugger with a specified port.
+        \li  -qmljsdebugger=, activates the QML/JS debugger with a specified port.
             The value must be of format port:1234[,block], where block is optional
             and will make the application wait until a debugger connects to it.
     \endlist
@@ -968,7 +968,7 @@ bool QApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventLis
     \since 4.4
     \brief defines a threshold for auto maximizing widgets
 
-    \bold{The auto maximize threshold is only available as part of Qt for
+    \b{The auto maximize threshold is only available as part of Qt for
     Windows CE.}
 
     This property defines a threshold for the size of a window as a percentage
@@ -997,7 +997,7 @@ bool QApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventLis
     the WA_InputMethodEnabled attribute set, and is typically used to launch
     a virtual keyboard on devices which have very few or no keys.
 
-    \bold{ The property only has an effect on platforms which use software input
+    \b{ The property only has an effect on platforms which use software input
     panels, such as Windows CE.}
 
     The default is platform dependent.
@@ -1275,21 +1275,21 @@ int QApplication::colorSpec()
 
     The options are:
     \list
-        \o  QApplication::NormalColor. This is the default color allocation
+        \li  QApplication::NormalColor. This is the default color allocation
             strategy. Use this option if your application uses buttons, menus,
             texts and pixmaps with few colors. With this option, the
             application uses system global colors. This works fine for most
             applications under X11, but on the Windows platform, it may cause
             dithering of non-standard colors.
-        \o  QApplication::CustomColor. Use this option if your application
+        \li  QApplication::CustomColor. Use this option if your application
             needs a small number of custom colors. On X11, this option is the
             same as NormalColor. On Windows, Qt creates a Windows palette, and
             allocates colors to it on demand.
-        \o  QApplication::ManyColor. Use this option if your application is
+        \li  QApplication::ManyColor. Use this option if your application is
             very color hungry, e.g., it requires thousands of colors. \br
             Under X11 the effect is:
             \list
-                \o  For 256-color displays which have at best a 256 color true
+                \li  For 256-color displays which have at best a 256 color true
                     color visual, the default visual is used, and colors are
                     allocated from a color cube. The color cube is the 6x6x6
                     (216 color) "Web palette" (the red, green, and blue
@@ -1298,7 +1298,7 @@ int QApplication::colorSpec()
                     can be changed by the \e -ncols option. The user can force
                     the application to use the true color visual with the
                     \l{QApplication::QApplication()}{-visual} option.
-                \o  For 256-color displays which have a true color visual with
+                \li  For 256-color displays which have a true color visual with
                     more than 256 colors, use that visual. Silicon Graphics X
                     servers this feature, for example. They provide an 8 bit
                     visual by default but can deliver true color when asked.
diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp
index 4b7153715d..7ea77d211c 100644
--- a/src/widgets/kernel/qboxlayout.cpp
+++ b/src/widgets/kernel/qboxlayout.cpp
@@ -487,17 +487,17 @@ void QBoxLayoutPrivate::calcHfw(int w)
     one of four functions:
 
     \list
-    \o addWidget() to add a widget to the QBoxLayout and set the
+    \li addWidget() to add a widget to the QBoxLayout and set the
     widget's stretch factor. (The stretch factor is along the row of
     boxes.)
 
-    \o addSpacing() to create an empty box; this is one of the
+    \li addSpacing() to create an empty box; this is one of the
     functions you use to create nice and spacious dialogs. See below
     for ways to set margins.
 
-    \o addStretch() to create an empty, stretchable box.
+    \li addStretch() to create an empty, stretchable box.
 
-    \o addLayout() to add a box containing another QLayout to the row
+    \li addLayout() to add a box containing another QLayout to the row
     and set that layout's stretch factor.
     \endlist
 
@@ -508,10 +508,10 @@ void QBoxLayoutPrivate::calcHfw(int w)
     QBoxLayout also includes two margin widths:
 
     \list
-    \o setContentsMargins() sets the width of the outer border on 
+    \li setContentsMargins() sets the width of the outer border on
        each side of the widget. This is the width of the reserved space 
        along each of the QBoxLayout's four sides.
-    \o setSpacing() sets the width between neighboring boxes. (You
+    \li setSpacing() sets the width between neighboring boxes. (You
        can use addSpacing() to get more space at a particular spot.)
     \endlist
 
diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp
index dd61528124..440f3f1dc2 100644
--- a/src/widgets/kernel/qformlayout.cpp
+++ b/src/widgets/kernel/qformlayout.cpp
@@ -1019,20 +1019,20 @@ QStyle* QFormLayoutPrivate::getStyle() const
     provides the following advantages:
 
     \list
-    \o \bold{Adherence to the different platform's look and feel guidelines.}
+    \li \b{Adherence to the different platform's look and feel guidelines.}
 
         For example, the
         \l{Mac OS X Aqua} and KDE guidelines specify that the
         labels should be right-aligned, whereas Windows and GNOME
         applications normally use left-alignment.
 
-    \o \bold{Support for wrapping long rows.}
+    \li \b{Support for wrapping long rows.}
 
        For devices with small displays, QFormLayout can be set to
        \l{WrapLongRows}{wrap long rows}, or even to
        \l{WrapAllRows}{wrap all rows}.
 
-    \o \bold{Convenient API for creating label--field pairs.}
+    \li \b{Convenient API for creating label--field pairs.}
 
        The addRow() overload that takes a QString and a QWidget *
        creates a QLabel behind the scenes and automatically set up
@@ -1049,30 +1049,30 @@ QStyle* QFormLayoutPrivate::getStyle() const
 
     \table
     \header
-        \o QCommonStyle derived styles (except QPlastiqueStyle)
-        \o QMacStyle
-        \o QPlastiqueStyle
-        \o Qt Extended styles
+        \li QCommonStyle derived styles (except QPlastiqueStyle)
+        \li QMacStyle
+        \li QPlastiqueStyle
+        \li Qt Extended styles
     \row
-        \o \inlineimage qformlayout-win.png
-        \o \inlineimage qformlayout-mac.png
-        \o \inlineimage qformlayout-kde.png
-        \o \inlineimage qformlayout-qpe.png
+        \li \inlineimage qformlayout-win.png
+        \li \inlineimage qformlayout-mac.png
+        \li \inlineimage qformlayout-kde.png
+        \li \inlineimage qformlayout-qpe.png
     \row
-        \o Traditional style used for Windows, GNOME, and earlier
+        \li Traditional style used for Windows, GNOME, and earlier
            versions of KDE. Labels are left aligned, and expanding
            fields grow to fill the available space. (This normally
            corresponds to what we would get using a two-column
            QGridLayout.)
-        \o Style based on the
+        \li Style based on the
            \l{Mac OS X Aqua} guidelines. Labels are right-aligned,
            the fields don't grow beyond their size hint, and the
            form is horizontally centered.
-        \o Recommended style for
+        \li Recommended style for
            \l{KDE applications}. Similar to MacStyle, except that the form
            is left-aligned and all fields grow to fill the available
            space.
-        \o Default style for Qt Extended styles. Labels are right-aligned,
+        \li Default style for Qt Extended styles. Labels are right-aligned,
            expanding fields grow to fill the available space, and row
            wrapping is enabled for long lines.
     \endtable
@@ -1966,7 +1966,7 @@ void QFormLayoutPrivate::arrangeWidgets(const QVector<QLayoutStruct>& layouts, Q
     If the cell is already occupied, the \a widget is not inserted and an error message is
     sent to the console.
 
-    \bold{Note:} For most applications, addRow() or insertRow() should be used instead of setWidget().
+    \b{Note:} For most applications, addRow() or insertRow() should be used instead of setWidget().
 
     \sa setLayout()
 */
@@ -1986,7 +1986,7 @@ void QFormLayout::setWidget(int row, ItemRole role, QWidget *widget)
     If the cell is already occupied, the \a layout is not inserted and an error message is
     sent to the console.
 
-    \bold{Note:} For most applications, addRow() or insertRow() should be used instead of setLayout().
+    \b{Note:} For most applications, addRow() or insertRow() should be used instead of setLayout().
 
     \sa setWidget()
 */
diff --git a/src/widgets/kernel/qicon.cpp b/src/widgets/kernel/qicon.cpp
index eebd57f97e..4f244b1027 100644
--- a/src/widgets/kernel/qicon.cpp
+++ b/src/widgets/kernel/qicon.cpp
@@ -945,8 +945,8 @@ QString QIcon::themeName()
     specification can be obtained here:
 
     \list
-    \o \l{http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html}
-    \o \l{http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html}
+    \li \l{http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html}
+    \li \l{http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html}
     \endlist
 
     To fetch an icon from the current icon theme:
diff --git a/src/widgets/kernel/qiconengineplugin.cpp b/src/widgets/kernel/qiconengineplugin.cpp
index ced4f5dd3e..26c9e7890a 100644
--- a/src/widgets/kernel/qiconengineplugin.cpp
+++ b/src/widgets/kernel/qiconengineplugin.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
     \ingroup plugins
     \inmodule QtWidgets
 
-    \bold {Use QIconEnginePluginV2 instead.}
+    \b {Use QIconEnginePluginV2 instead.}
 
     The icon engine plugin is a simple plugin interface that makes it easy to
     create custom icon engines that can be loaded dynamically into applications
diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp
index d5d739e431..541350c35c 100644
--- a/src/widgets/kernel/qlayout.cpp
+++ b/src/widgets/kernel/qlayout.cpp
@@ -215,7 +215,7 @@ QSpacerItem *QLayoutPrivate::createSpacerItem(const QLayout *layout, int w, int
     to a layout, use the addWidget() function; to add a child layout, use the
     addLayout() function provided by the relevant QLayout subclass.
 
-    \bold{Note:} The ownership of \a item is transferred to the layout, and it's
+    \b{Note:} The ownership of \a item is transferred to the layout, and it's
     the layout's responsibility to delete it.
 
     \sa addWidget(), QBoxLayout::addLayout(), QGridLayout::addLayout()
@@ -1270,7 +1270,7 @@ QRect QLayout::alignmentRect(const QRect &r) const
     is the caller's responsibility to give the widget a reasonable
     geometry or to put the widget back into a layout.
     
-    \bold{Note:} The ownership of \a widget remains the same as
+    \b{Note:} The ownership of \a widget remains the same as
     when it was added.
 
     \sa removeItem(), QWidget::setGeometry(), addWidget()
diff --git a/src/widgets/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp
index 664334d725..814b807b82 100644
--- a/src/widgets/kernel/qlayoutitem.cpp
+++ b/src/widgets/kernel/qlayoutitem.cpp
@@ -127,15 +127,15 @@ QSizePolicy::operator QVariant() const
     manipulating empty space in layouts:
 
     \table
-    \header \o Class
-            \o Functions
-    \row    \o QHBoxLayout
-            \o \l{QBoxLayout::addSpacing()}{addSpacing()},
+    \header \li Class
+            \li Functions
+    \row    \li QHBoxLayout
+            \li \l{QBoxLayout::addSpacing()}{addSpacing()},
                \l{QBoxLayout::addStretch()}{addStretch()},
                \l{QBoxLayout::insertSpacing()}{insertSpacing()},
                \l{QBoxLayout::insertStretch()}{insertStretch()}
-    \row    \o QGridLayout
-            \o \l{QGridLayout::setRowMinimumHeight()}{setRowMinimumHeight()},
+    \row    \li QGridLayout
+            \li \l{QGridLayout::setRowMinimumHeight()}{setRowMinimumHeight()},
                \l{QGridLayout::setRowStretch()}{setRowStretch()},
                \l{QGridLayout::setColumnMinimumWidth()}{setColumnMinimumWidth()},
                \l{QGridLayout::setColumnStretch()}{setColumnStretch()}
@@ -156,16 +156,16 @@ QSizePolicy::operator QVariant() const
     manipulating widgets in layouts:
 
     \table
-    \header \o Class
-            \o Functions
-    \row    \o QBoxLayout
-            \o \l{QBoxLayout::addWidget()}{addWidget()},
+    \header \li Class
+            \li Functions
+    \row    \li QBoxLayout
+            \li \l{QBoxLayout::addWidget()}{addWidget()},
                \l{QBoxLayout::insertWidget()}{insertWidget()},
                \l{QBoxLayout::setStretchFactor()}{setStretchFactor()}
-    \row    \o QGridLayout
-            \o \l{QGridLayout::addWidget()}{addWidget()}
-    \row    \o QStackedLayout
-            \o \l{QStackedLayout::addWidget()}{addWidget()},
+    \row    \li QGridLayout
+            \li \l{QGridLayout::addWidget()}{addWidget()}
+    \row    \li QStackedLayout
+            \li \l{QStackedLayout::addWidget()}{addWidget()},
                \l{QStackedLayout::insertWidget()}{insertWidget()},
                \l{QStackedLayout::currentWidget()}{currentWidget()},
                \l{QStackedLayout::setCurrentWidget()}{setCurrentWidget()},
@@ -191,7 +191,7 @@ QSizePolicy::operator QVariant() const
 /*!
     Sets the alignment of this item to \a alignment.
 
-    \bold{Note:} Item alignment is only supported by QLayoutItem subclasses
+    \b{Note:} Item alignment is only supported by QLayoutItem subclasses
     where it would have a visual effect. Except for QSpacerItem, which provides
     blank space for layouts, all public Qt classes that inherit QLayoutItem
     support item alignment.
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 44995f0959..5eee5752cc 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -484,11 +484,11 @@ void QWidget::setAutoFillBackground(bool enabled)
     Every widget's constructor accepts one or two standard arguments:
 
     \list 1
-        \i  \c{QWidget *parent = 0} is the parent of the new widget. If it is 0
+        \li  \c{QWidget *parent = 0} is the parent of the new widget. If it is 0
             (the default), the new widget will be a window. If not, it will be
             a child of \e parent, and be constrained by \e parent's geometry
             (unless you specify Qt::Window as window flag).
-        \i  \c{Qt::WindowFlags f = 0} (where available) sets the window flags;
+        \li  \c{Qt::WindowFlags f = 0} (where available) sets the window flags;
             the default is suitable for almost all widgets, but to get, for
             example, a window without a window system frame, you must use
             special flags.
@@ -593,16 +593,16 @@ void QWidget::setAutoFillBackground(bool enabled)
     starting with the most common ones:
 
     \list
-        \i  paintEvent() is called whenever the widget needs to be repainted.
+        \li  paintEvent() is called whenever the widget needs to be repainted.
             Every widget displaying custom content must implement it. Painting
             using a QPainter can only take place in a paintEvent() or a
             function called by a paintEvent().
-        \i  resizeEvent() is called when the widget has been resized.
-        \i  mousePressEvent() is called when a mouse button is pressed while
+        \li  resizeEvent() is called when the widget has been resized.
+        \li  mousePressEvent() is called when a mouse button is pressed while
             the mouse cursor is inside the widget, or when the widget has
             grabbed the mouse using grabMouse(). Pressing the mouse without
             releasing it is effectively the same as calling grabMouse().
-        \i  mouseReleaseEvent() is called when a mouse button is released. A
+        \li  mouseReleaseEvent() is called when a mouse button is released. A
             widget receives mouse release events when it has received the
             corresponding mouse press event. This means that if the user
             presses the mouse inside \e your widget, then drags the mouse
@@ -610,7 +610,7 @@ void QWidget::setAutoFillBackground(bool enabled)
             receives the release event. There is one exception: if a popup menu
             appears while the mouse button is held down, this popup immediately
             steals the mouse events.
-        \i  mouseDoubleClickEvent() is called when the user double-clicks in
+        \li  mouseDoubleClickEvent() is called when the user double-clicks in
             the widget. If the user double-clicks, the widget receives a mouse
             press event, a mouse release event and finally this event instead
             of a second mouse press event. (Some mouse move events may also be
@@ -625,46 +625,46 @@ void QWidget::setAutoFillBackground(bool enabled)
     handlers:
 
     \list
-        \i  keyPressEvent() is called whenever a key is pressed, and again when
+        \li  keyPressEvent() is called whenever a key is pressed, and again when
             a key has been held down long enough for it to auto-repeat. The
             \key Tab and \key Shift+Tab keys are only passed to the widget if
             they are not used by the focus-change mechanisms. To force those
             keys to be processed by your widget, you must reimplement
             QWidget::event().
-        \i  focusInEvent() is called when the widget gains keyboard focus
+        \li  focusInEvent() is called when the widget gains keyboard focus
             (assuming you have called setFocusPolicy()). Well-behaved widgets
             indicate that they own the keyboard focus in a clear but discreet
             way.
-        \i  focusOutEvent() is called when the widget loses keyboard focus.
+        \li  focusOutEvent() is called when the widget loses keyboard focus.
     \endlist
 
     You may be required to also reimplement some of the less common event
     handlers:
 
     \list
-        \i  mouseMoveEvent() is called whenever the mouse moves while a mouse
+        \li  mouseMoveEvent() is called whenever the mouse moves while a mouse
             button is held down. This can be useful during drag and drop
             operations. If you call \l{setMouseTracking()}{setMouseTracking}(true),
             you get mouse move events even when no buttons are held down.
             (See also the \l{Drag and Drop} guide.)
-        \i  keyReleaseEvent() is called whenever a key is released and while it
+        \li  keyReleaseEvent() is called whenever a key is released and while it
             is held down (if the key is auto-repeating). In that case, the
             widget will receive a pair of key release and key press event for
             every repeat. The \key Tab and \key Shift+Tab keys are only passed
             to the widget if they are not used by the focus-change mechanisms.
             To force those keys to be processed by your widget, you must
             reimplement QWidget::event().
-        \i  wheelEvent() is called whenever the user turns the mouse wheel
+        \li  wheelEvent() is called whenever the user turns the mouse wheel
             while the widget has the focus.
-        \i  enterEvent() is called when the mouse enters the widget's screen
+        \li  enterEvent() is called when the mouse enters the widget's screen
             space. (This excludes screen space owned by any of the widget's
             children.)
-        \i  leaveEvent() is called when the mouse leaves the widget's screen
+        \li  leaveEvent() is called when the mouse leaves the widget's screen
             space. If the mouse enters a child widget it will not cause a
             leaveEvent().
-        \i  moveEvent() is called when the widget has been moved relative to
+        \li  moveEvent() is called when the widget has been moved relative to
             its parent.
-        \i  closeEvent() is called when the user closes the widget (or when
+        \li  closeEvent() is called when the user closes the widget (or when
             close() is called).
     \endlist
 
@@ -682,27 +682,27 @@ void QWidget::setAutoFillBackground(bool enabled)
     \section1 Groups of Functions and Properties
 
     \table
-    \header \i Context \i Functions and Properties
+    \header \li Context \li Functions and Properties
 
-    \row \i Window functions \i
+    \row \li Window functions \li
         show(),
         hide(),
         raise(),
         lower(),
         close().
 
-    \row \i Top-level windows \i
+    \row \li Top-level windows \li
         \l windowModified, \l windowTitle, \l windowIcon, \l windowIconText,
         \l isActiveWindow, activateWindow(), \l minimized, showMinimized(),
         \l maximized, showMaximized(), \l fullScreen, showFullScreen(),
         showNormal().
 
-    \row \i Window contents \i
+    \row \li Window contents \li
         update(),
         repaint(),
         scroll().
 
-    \row \i Geometry \i
+    \row \li Geometry \li
         \l pos, x(), y(), \l rect, \l size, width(), height(), move(), resize(),
         \l sizePolicy, sizeHint(), minimumSizeHint(),
         updateGeometry(), layout(),
@@ -713,7 +713,7 @@ void QWidget::setAutoFillBackground(bool enabled)
         \l maximumSize, \l minimumSize, \l sizeIncrement,
         \l baseSize, setFixedSize()
 
-    \row \i Mode \i
+    \row \li Mode \li
         \l visible, isVisibleTo(),
         \l enabled, isEnabledTo(),
         \l modal,
@@ -722,7 +722,7 @@ void QWidget::setAutoFillBackground(bool enabled)
         \l updatesEnabled,
         visibleRegion().
 
-    \row \i Look and feel \i
+    \row \li Look and feel \li
         style(),
         setStyle(),
         \l styleSheet,
@@ -732,17 +732,17 @@ void QWidget::setAutoFillBackground(bool enabled)
         backgroundRole(), setBackgroundRole(),
         fontInfo(), fontMetrics().
 
-    \row \i Keyboard focus functions \i
+    \row \li Keyboard focus functions \li
         \l focus, \l focusPolicy,
         setFocus(), clearFocus(), setTabOrder(), setFocusProxy(),
         focusNextChild(), focusPreviousChild().
 
-    \row \i Mouse and keyboard grabbing \i
+    \row \li Mouse and keyboard grabbing \li
         grabMouse(), releaseMouse(),
         grabKeyboard(), releaseKeyboard(),
         mouseGrabber(), keyboardGrabber().
 
-    \row \i Event handlers \i
+    \row \li Event handlers \li
         event(),
         mousePressEvent(),
         mouseReleaseEvent(),
@@ -769,11 +769,11 @@ void QWidget::setAutoFillBackground(bool enabled)
         customEvent().
         changeEvent(),
 
-    \row \i System functions \i
+    \row \li System functions \li
         parentWidget(), window(), setParent(), winId(),
         find(), metric().
 
-    \row \i Interactive help \i
+    \row \li Interactive help \li
         setToolTip(), setWhatsThis()
 
     \endtable
@@ -815,15 +815,15 @@ void QWidget::setAutoFillBackground(bool enabled)
     achieve different effects:
 
     \list
-        \i  The left widget has no additional properties or widget attributes
+        \li  The left widget has no additional properties or widget attributes
             set. This default state suits most custom widgets using
             transparency, are irregularly-shaped, or do not paint over their
             entire area with an opaque brush.
-        \i  The center widget has the \l autoFillBackground property set. This
+        \li  The center widget has the \l autoFillBackground property set. This
             property is used with custom widgets that rely on the widget to
             supply a default background, and do not paint over their entire
             area with an opaque brush.
-        \i  The right widget has the Qt::WA_OpaquePaintEvent widget attribute
+        \li  The right widget has the Qt::WA_OpaquePaintEvent widget attribute
             set. This indicates that the widget will paint over its entire area
             with opaque colors. The widget's area will initially be
             \e{uninitialized}, represented in the diagram with a red diagonal
@@ -874,9 +874,9 @@ void QWidget::setAutoFillBackground(bool enabled)
     Platform notes:
 
     \list
-    \o X11: This feature relies on the use of an X server that supports ARGB visuals
+    \li X11: This feature relies on the use of an X server that supports ARGB visuals
     and a compositing window manager.
-    \o Windows: The widget needs to have the Qt::FramelessWindowHint window flag set
+    \li Windows: The widget needs to have the Qt::FramelessWindowHint window flag set
     for the translucency to work.
     \endlist
 
@@ -891,14 +891,14 @@ void QWidget::setAutoFillBackground(bool enabled)
     one of the following options:
 
     \list 1
-        \i  Use the \c{QT_USE_NATIVE_WINDOWS=1} in your environment.
-        \i  Set the Qt::AA_NativeWindows attribute on your application. All
+        \li  Use the \c{QT_USE_NATIVE_WINDOWS=1} in your environment.
+        \li  Set the Qt::AA_NativeWindows attribute on your application. All
             widgets will be native widgets.
-        \i  Set the Qt::WA_NativeWindow attribute on widgets: The widget itself
+        \li  Set the Qt::WA_NativeWindow attribute on widgets: The widget itself
             and all of its ancestors will become native (unless
             Qt::WA_DontCreateNativeAncestors is set).
-        \i  Call QWidget::winId to enforce a native window (this implies 3).
-        \i  Set the Qt::WA_PaintOnScreen attribute to enforce a native window
+        \li  Call QWidget::winId to enforce a native window (this implies 3).
+        \li  Set the Qt::WA_PaintOnScreen attribute to enforce a native window
             (this implies 3).
     \endlist
 
@@ -957,17 +957,17 @@ QRegion qt_dirtyRegion(QWidget *widget)
 /*
     Widget state flags:
   \list
-  \i Qt::WA_WState_Created The widget has a valid winId().
-  \i Qt::WA_WState_Visible The widget is currently visible.
-  \i Qt::WA_WState_Hidden The widget is hidden, i.e. it won't
+  \li Qt::WA_WState_Created The widget has a valid winId().
+  \li Qt::WA_WState_Visible The widget is currently visible.
+  \li Qt::WA_WState_Hidden The widget is hidden, i.e. it won't
   become visible unless you call show() on it. Qt::WA_WState_Hidden
   implies !Qt::WA_WState_Visible.
-  \i Qt::WA_WState_CompressKeys Compress keyboard events.
-  \i Qt::WA_WState_BlockUpdates Repaints and updates are disabled.
-  \i Qt::WA_WState_InPaintEvent Currently processing a paint event.
-  \i Qt::WA_WState_Reparented The widget has been reparented.
-  \i Qt::WA_WState_ConfigPending A configuration (resize/move) event is pending.
-  \i Qt::WA_WState_DND (Deprecated) The widget supports drag and drop, see setAcceptDrops().
+  \li Qt::WA_WState_CompressKeys Compress keyboard events.
+  \li Qt::WA_WState_BlockUpdates Repaints and updates are disabled.
+  \li Qt::WA_WState_InPaintEvent Currently processing a paint event.
+  \li Qt::WA_WState_Reparented The widget has been reparented.
+  \li Qt::WA_WState_ConfigPending A configuration (resize/move) event is pending.
+  \li Qt::WA_WState_DND (Deprecated) The widget supports drag and drop, see setAcceptDrops().
   \endlist
 */
 
@@ -5689,16 +5689,16 @@ QString QWidget::windowIconText() const
     On Mac OS X:
 
     \list
-    \o The file name of the specified path, obtained using QFileInfo::fileName().
+    \li The file name of the specified path, obtained using QFileInfo::fileName().
     \endlist
 
     On Windows and X11:
 
     \list
-    \o The file name of the specified path, obtained using QFileInfo::fileName().
-    \o An optional \c{*} character, if the \l windowModified property is set.
-    \o The \c{0x2014} unicode character, padded either side by spaces.
-    \o The application name, obtained from the application's
+    \li The file name of the specified path, obtained using QFileInfo::fileName().
+    \li An optional \c{*} character, if the \l windowModified property is set.
+    \li The \c{0x2014} unicode character, padded either side by spaces.
+    \li The application name, obtained from the application's
     \l{QCoreApplication::}{applicationName} property.
     \endlist
 
@@ -7164,9 +7164,9 @@ void QWidgetPrivate::hide_helper()
 
     Widgets are hidden if:
     \list
-        \o they were created as independent windows,
-        \o they were created as children of visible widgets,
-        \o hide() or setVisible(false) was called.
+        \li they were created as independent windows,
+        \li they were created as children of visible widgets,
+        \li hide() or setVisible(false) was called.
     \endlist
 */
 
@@ -8587,9 +8587,9 @@ void QWidget::leaveEvent(QEvent *)
     happen for one of the following reasons:
 
     \list
-        \o repaint() or update() was invoked,
-        \o the widget was obscured and has now been uncovered, or
-        \o many other reasons.
+        \li repaint() or update() was invoked,
+        \li the widget was obscured and has now been uncovered, or
+        \li many other reasons.
     \endlist
 
     Many widgets can simply repaint their entire surface when asked to, but
@@ -8612,13 +8612,13 @@ void QWidget::leaveEvent(QEvent *)
     Since Qt 4.0, QWidget automatically double-buffers its painting, so there
     is no need to write double-buffering code in paintEvent() to avoid flicker.
 
-    \bold{Note for the X11 platform}: It is possible to toggle global double
+    \b{Note for the X11 platform}: It is possible to toggle global double
     buffering by calling \c qt_x11_set_global_double_buffer(). For example,
 
     \snippet doc/src/snippets/code/src_gui_kernel_qwidget.cpp 14
 
     \note Generally, you should refrain from calling update() or repaint()
-    \bold{inside} a paintEvent(). For example, calling update() or repaint() on
+    \b{inside} a paintEvent(). For example, calling update() or repaint() on
     children inside a paintevent() results in undefined behavior; the child may
     or may not get a paint event.
 
@@ -8960,8 +8960,8 @@ void QWidget::hideEvent(QHideEvent *)
     x11Event(), winEvent() and macEvent() of Qt 4.
 
     \table
-    \header \i Platform \i Event Type Identifier \i Message Type \i Result Type
-    \row \i Windows \i "windows_generic_MSG" \i MSG * \i LRESULT
+    \header \li Platform \li Event Type Identifier \li Message Type \li Result Type
+    \row \li Windows \li "windows_generic_MSG" \li MSG * \li LRESULT
     \endtable
 */
 
@@ -8991,7 +8991,7 @@ bool QWidget::nativeEvent(const QByteArray &eventType, void *message, long *resu
     If you need to change some settings when a widget is polished,
     reimplement event() and handle the QEvent::Polish event type.
 
-    \bold{Note:} The function is declared const so that it can be called from
+    \b{Note:} The function is declared const so that it can be called from
     other const functions (e.g., sizeHint()).
 
     \sa event()
@@ -11081,7 +11081,7 @@ void QWidget::ungrabGesture(Qt::GestureType gesture)
     \note Only visible widgets can grab mouse input. If isVisible()
     returns false for a widget, that widget cannot call grabMouse().
 
-    \note \bold{(Mac OS X developers)} For \e Cocoa, calling
+    \note \b{(Mac OS X developers)} For \e Cocoa, calling
     grabMouse() on a widget only works when the mouse is inside the
     frame of that widget.  For \e Carbon, it works outside the widget's
     frame as well, like for Windows and X11.
@@ -11101,7 +11101,7 @@ void QWidget::ungrabGesture(Qt::GestureType gesture)
 
     \warning Grabbing the mouse might lock the terminal.
 
-    \note \bold{(Mac OS X developers)} See the note in QWidget::grabMouse().
+    \note \b{(Mac OS X developers)} See the note in QWidget::grabMouse().
 
     \sa releaseMouse(), grabKeyboard(), releaseKeyboard(), setCursor()
 */
diff --git a/src/widgets/kernel/qwidgetaction.cpp b/src/widgets/kernel/qwidgetaction.cpp
index 14369513da..c3fc6c7cfb 100644
--- a/src/widgets/kernel/qwidgetaction.cpp
+++ b/src/widgets/kernel/qwidgetaction.cpp
@@ -87,17 +87,17 @@ QT_BEGIN_NAMESPACE
     Note that it is up to the widget to activate the action, for example by
     reimplementing mouse event handlers and calling QAction::trigger().
 
-    \bold {Mac OS X}: If you add a widget to a menu in the application's menu
+    \b {Mac OS X}: If you add a widget to a menu in the application's menu
     bar on Mac OS X, the widget will be added and it will function but with some
     limitations:
     \list 1
-        \o The widget is reparented away from the QMenu to the native menu
+        \li The widget is reparented away from the QMenu to the native menu
             view. If you show the menu in some other place (e.g. as a popup menu),
             the widget will not be there.
-        \o Focus/Keyboard handling of the widget is not possible.
-        \o Due to Apple's design, mouse tracking on the widget currently does
+        \li Focus/Keyboard handling of the widget is not possible.
+        \li Due to Apple's design, mouse tracking on the widget currently does
             not work.
-        \o Connecting the triggered() signal to a slot that opens a modal
+        \li Connecting the triggered() signal to a slot that opens a modal
             dialog will cause a crash in Mac OS X 10.4 (known bug acknowledged
             by Apple), a workaround is to use a QueuedConnection instead of a
             DirectConnection.
diff --git a/src/widgets/styles/qmacstyle.qdoc b/src/widgets/styles/qmacstyle.qdoc
index d48a65c41f..dc8da491bf 100644
--- a/src/widgets/styles/qmacstyle.qdoc
+++ b/src/widgets/styles/qmacstyle.qdoc
@@ -49,21 +49,21 @@
 
     \list
 
-    \i Layout - The restrictions on window layout are such that some
+    \li Layout - The restrictions on window layout are such that some
     aspects of layout that are style-dependent cannot be achieved
     using QLayout. Changes are being considered (and feedback would be
     appreciated) to make layouts QStyle-able. Some of the restrictions
     involve horizontal and vertical widget alignment and widget size
     (covered below).
 
-    \i Widget size - Mac OS X allows widgets to have specific fixed sizes.  Qt
+    \li Widget size - Mac OS X allows widgets to have specific fixed sizes.  Qt
     does not fully implement this behavior so as to maintain cross-platform
     compatibility. As a result some widgets sizes may be inappropriate (and
     subsequently not rendered correctly by the HITheme APIs).The
     QWidget::sizeHint() will return the appropriate size for many
     managed widgets (widgets enumerated in \l QStyle::ContentsType).
 
-    \i Effects - QMacStyle uses HITheme for performing most of the drawing, but
+    \li Effects - QMacStyle uses HITheme for performing most of the drawing, but
     also uses emulation in a few cases where HITheme does not provide the
     required functionality (for example, tab bars on Panther, the toolbar
     separator, etc). We tried to make the emulation as close to the original as
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index 3ff5aea0ca..db387fecec 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -124,10 +124,10 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
 
     Most QStyle draw functions take four arguments:
     \list
-    \o an enum value specifying which graphical element to draw
-    \o a QStyleOption specifying how and where to render that element
-    \o a QPainter that should be used to draw the element
-    \o a QWidget on which the drawing is performed (optional)
+    \li an enum value specifying which graphical element to draw
+    \li a QStyleOption specifying how and where to render that element
+    \li a QPainter that should be used to draw the element
+    \li a QWidget on which the drawing is performed (optional)
     \endlist
 
     For example, if you want to draw a focus rectangle on your
@@ -275,12 +275,12 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
     right-to-left environment:
 
     \list
-    \o subControlRect() and subElementRect() return rectangles in screen coordinates
-    \o QStyleOption::direction indicates in which direction the item should be drawn in
-    \o If a style is not right-to-left aware it will display items as if it were left-to-right
-    \o visualRect(), visualPos(), and visualAlignment() are helpful functions that will
+    \li subControlRect() and subElementRect() return rectangles in screen coordinates
+    \li QStyleOption::direction indicates in which direction the item should be drawn in
+    \li If a style is not right-to-left aware it will display items as if it were left-to-right
+    \li visualRect(), visualPos(), and visualAlignment() are helpful functions that will
        translate from logical to screen representations.
-    \o alignedRect() will return a logical rect aligned for the current direction
+    \li alignedRect() will return a logical rect aligned for the current direction
     \endlist
 
     \section1 Styles in Item Views
@@ -731,50 +731,50 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     it uses a plain QStyleOption object.
 
     \table
-    \header \o Primitive Element \o QStyleOption Subclass \o Style Flag \o Remark
-    \row \o \l PE_FrameFocusRect \o \l QStyleOptionFocusRect
-         \o \l State_FocusAtBorder
-         \o Whether the focus is is at the border or inside the widget.
-    \row \o{1,2} \l PE_IndicatorCheckBox \o{1,2} \l QStyleOptionButton
-          \o \l State_NoChange \o Indicates a "tri-state" checkbox.
-    \row \o \l State_On \o Indicates the indicator is checked.
-    \row \o \l PE_IndicatorRadioButton \o \l QStyleOptionButton
-          \o \l State_On \o Indicates that a radio button is selected.
-    \row \o{1,3} \l PE_Q3CheckListExclusiveIndicator, \l PE_Q3CheckListIndicator
-         \o{1,3} \l QStyleOptionQ3ListView \o \l State_On
-         \o Indicates whether or not the controller is selected.
-    \row \o \l State_NoChange \o Indicates a "tri-state" controller.
-    \row \o \l State_Enabled \o Indicates the controller is enabled.
-    \row \o{1,4} \l PE_IndicatorBranch \o{1,4} \l QStyleOption
-         \o \l State_Children \o Indicates that the control for expanding the tree to show child items, should be drawn.
-    \row \o \l State_Item \o Indicates that a horizontal branch (to show a child item), should be drawn.
-    \row \o \l State_Open \o Indicates that the tree branch is expanded.
-    \row \o \l State_Sibling \o Indicates that a vertical line (to show a sibling item), should be drawn.
-    \row \o \l PE_IndicatorHeaderArrow \o \l QStyleOptionHeader
-         \o \l State_UpArrow \o Indicates that the arrow should be drawn up;
+    \header \li Primitive Element \li QStyleOption Subclass \li Style Flag \li Remark
+    \row \li \l PE_FrameFocusRect \li \l QStyleOptionFocusRect
+         \li \l State_FocusAtBorder
+         \li Whether the focus is is at the border or inside the widget.
+    \row \li{1,2} \l PE_IndicatorCheckBox \li{1,2} \l QStyleOptionButton
+          \li \l State_NoChange \li Indicates a "tri-state" checkbox.
+    \row \li \l State_On \li Indicates the indicator is checked.
+    \row \li \l PE_IndicatorRadioButton \li \l QStyleOptionButton
+          \li \l State_On \li Indicates that a radio button is selected.
+    \row \li{1,3} \l PE_Q3CheckListExclusiveIndicator, \l PE_Q3CheckListIndicator
+         \li{1,3} \l QStyleOptionQ3ListView \li \l State_On
+         \li Indicates whether or not the controller is selected.
+    \row \li \l State_NoChange \li Indicates a "tri-state" controller.
+    \row \li \l State_Enabled \li Indicates the controller is enabled.
+    \row \li{1,4} \l PE_IndicatorBranch \li{1,4} \l QStyleOption
+         \li \l State_Children \li Indicates that the control for expanding the tree to show child items, should be drawn.
+    \row \li \l State_Item \li Indicates that a horizontal branch (to show a child item), should be drawn.
+    \row \li \l State_Open \li Indicates that the tree branch is expanded.
+    \row \li \l State_Sibling \li Indicates that a vertical line (to show a sibling item), should be drawn.
+    \row \li \l PE_IndicatorHeaderArrow \li \l QStyleOptionHeader
+         \li \l State_UpArrow \li Indicates that the arrow should be drawn up;
          otherwise it should be down.
-    \row \o \l PE_FrameGroupBox, \l PE_Frame, \l PE_FrameLineEdit,
+    \row \li \l PE_FrameGroupBox, \l PE_Frame, \l PE_FrameLineEdit,
             \l PE_FrameMenu, \l PE_FrameDockWidget, \l PE_FrameWindow
-         \o \l QStyleOptionFrame \o \l State_Sunken
-         \o Indicates that the Frame should be sunken.
-    \row \o \l PE_IndicatorToolBarHandle \o \l QStyleOption
-         \o \l State_Horizontal \o Indicates that the window handle is horizontal
+         \li \l QStyleOptionFrame \li \l State_Sunken
+         \li Indicates that the Frame should be sunken.
+    \row \li \l PE_IndicatorToolBarHandle \li \l QStyleOption
+         \li \l State_Horizontal \li Indicates that the window handle is horizontal
          instead of vertical.
-    \row \o \l PE_Q3DockWindowSeparator \o \l QStyleOption
-         \o \l State_Horizontal \o Indicates that the separator is horizontal
+    \row \li \l PE_Q3DockWindowSeparator \li \l QStyleOption
+         \li \l State_Horizontal \li Indicates that the separator is horizontal
          instead of vertical.
-    \row \o \l PE_IndicatorSpinPlus, \l PE_IndicatorSpinMinus, \l PE_IndicatorSpinUp,
+    \row \li \l PE_IndicatorSpinPlus, \l PE_IndicatorSpinMinus, \l PE_IndicatorSpinUp,
             \l PE_IndicatorSpinDown,
-         \o \l QStyleOptionSpinBox
-         \o \l State_Sunken \o Indicates that the button is pressed.
-    \row \o{1,5} \l PE_PanelButtonCommand
-         \o{1,5} \l QStyleOptionButton
-         \o \l State_Enabled \o Set if the button is enabled.
-    \row \o \l State_HasFocus \o Set if the button has input focus.
-    \row \o \l State_Raised \o Set if the button is not down, not on and not flat.
-    \row \o \l State_On \o Set if the button is a toggle button and is toggled on.
-    \row \o \l State_Sunken
-         \o Set if the button is down (i.e., the mouse button or the
+         \li \l QStyleOptionSpinBox
+         \li \l State_Sunken \li Indicates that the button is pressed.
+    \row \li{1,5} \l PE_PanelButtonCommand
+         \li{1,5} \l QStyleOptionButton
+         \li \l State_Enabled \li Set if the button is enabled.
+    \row \li \l State_HasFocus \li Set if the button has input focus.
+    \row \li \l State_Raised \li Set if the button is not down, not on and not flat.
+    \row \li \l State_On \li Set if the button is a toggle button and is toggled on.
+    \row \li \l State_Sunken
+         \li Set if the button is down (i.e., the mouse button or the
          space bar is pressed on the button).
     \endtable
 
@@ -887,69 +887,69 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     it uses a plain QStyleOption object.
 
     \table
-    \header \o Control Element \o QStyleOption Subclass \o Style Flag \o Remark
-    \row \o{1,5} \l CE_MenuItem, \l CE_MenuBarItem
-         \o{1,5} \l QStyleOptionMenuItem
-         \o \l State_Selected \o The menu item is currently selected item.
-    \row \o \l State_Enabled \o The item is enabled.
-    \row \o \l State_DownArrow \o Indicates that a scroll down arrow should be drawn.
-    \row \o \l State_UpArrow \o Indicates that a scroll up arrow should be drawn
-    \row \o \l State_HasFocus \o Set if the menu bar has input focus.
-
-    \row \o{1,5} \l CE_PushButton, \l CE_PushButtonBevel, \l CE_PushButtonLabel
-         \o{1,5} \l QStyleOptionButton
-         \o \l State_Enabled \o Set if the button is enabled.
-    \row \o \l State_HasFocus \o Set if the button has input focus.
-    \row \o \l State_Raised \o Set if the button is not down, not on and not flat.
-    \row \o \l State_On \o Set if the button is a toggle button and is toggled on.
-    \row \o \l State_Sunken
-         \o Set if the button is down (i.e., the mouse button or the
+    \header \li Control Element \li QStyleOption Subclass \li Style Flag \li Remark
+    \row \li{1,5} \l CE_MenuItem, \l CE_MenuBarItem
+         \li{1,5} \l QStyleOptionMenuItem
+         \li \l State_Selected \li The menu item is currently selected item.
+    \row \li \l State_Enabled \li The item is enabled.
+    \row \li \l State_DownArrow \li Indicates that a scroll down arrow should be drawn.
+    \row \li \l State_UpArrow \li Indicates that a scroll up arrow should be drawn
+    \row \li \l State_HasFocus \li Set if the menu bar has input focus.
+
+    \row \li{1,5} \l CE_PushButton, \l CE_PushButtonBevel, \l CE_PushButtonLabel
+         \li{1,5} \l QStyleOptionButton
+         \li \l State_Enabled \li Set if the button is enabled.
+    \row \li \l State_HasFocus \li Set if the button has input focus.
+    \row \li \l State_Raised \li Set if the button is not down, not on and not flat.
+    \row \li \l State_On \li Set if the button is a toggle button and is toggled on.
+    \row \li \l State_Sunken
+         \li Set if the button is down (i.e., the mouse button or the
          space bar is pressed on the button).
 
-    \row \o{1,6} \l CE_RadioButton, \l CE_RadioButtonLabel,
+    \row \li{1,6} \l CE_RadioButton, \l CE_RadioButtonLabel,
                  \l CE_CheckBox, \l CE_CheckBoxLabel
-         \o{1,6} \l QStyleOptionButton
-         \o \l State_Enabled \o Set if the button is enabled.
-    \row \o \l State_HasFocus \o Set if the button has input focus.
-    \row \o \l State_On \o Set if the button is checked.
-    \row \o \l State_Off \o Set if the button is not checked.
-    \row \o \l State_NoChange \o Set if the button is in the NoChange state.
-    \row \o \l State_Sunken
-         \o Set if the button is down (i.e., the mouse button or
+         \li{1,6} \l QStyleOptionButton
+         \li \l State_Enabled \li Set if the button is enabled.
+    \row \li \l State_HasFocus \li Set if the button has input focus.
+    \row \li \l State_On \li Set if the button is checked.
+    \row \li \l State_Off \li Set if the button is not checked.
+    \row \li \l State_NoChange \li Set if the button is in the NoChange state.
+    \row \li \l State_Sunken
+         \li Set if the button is down (i.e., the mouse button or
          the space bar is pressed on the button).
 
-   \row \o{1,2} \l CE_ProgressBarContents, \l CE_ProgressBarLabel,
+   \row \li{1,2} \l CE_ProgressBarContents, \l CE_ProgressBarLabel,
                  \l CE_ProgressBarGroove
-         \o{1,2} \l QStyleOptionProgressBar
-         \o \l State_Enabled \o Set if the progress bar is enabled.
-    \row \o \l State_HasFocus \o Set if the progress bar has input focus.
-
-    \row \o \l CE_Header, \l CE_HeaderSection, \l CE_HeaderLabel \o \l QStyleOptionHeader \o \o
-
-    \row \o{1,3} \l CE_TabBarTab, CE_TabBarTabShape, CE_TabBarTabLabel
-        \o{1,3} \l QStyleOptionTab
-        \o \l State_Enabled \o Set if the tab bar is enabled.
-    \row \o \l State_Selected \o The tab bar is the currently selected tab bar.
-    \row \o \l State_HasFocus \o Set if the tab bar tab has input focus.
-
-    \row \o{1,7} \l CE_ToolButtonLabel
-         \o{1,7} \l QStyleOptionToolButton
-         \o \l State_Enabled \o Set if the tool button is enabled.
-    \row \o \l State_HasFocus \o Set if the tool button has input focus.
-    \row \o \l State_Sunken
-         \o Set if the tool button is down (i.e., a mouse button or
+         \li{1,2} \l QStyleOptionProgressBar
+         \li \l State_Enabled \li Set if the progress bar is enabled.
+    \row \li \l State_HasFocus \li Set if the progress bar has input focus.
+
+    \row \li \l CE_Header, \l CE_HeaderSection, \l CE_HeaderLabel \li \l QStyleOptionHeader \li \li
+
+    \row \li{1,3} \l CE_TabBarTab, CE_TabBarTabShape, CE_TabBarTabLabel
+        \li{1,3} \l QStyleOptionTab
+        \li \l State_Enabled \li Set if the tab bar is enabled.
+    \row \li \l State_Selected \li The tab bar is the currently selected tab bar.
+    \row \li \l State_HasFocus \li Set if the tab bar tab has input focus.
+
+    \row \li{1,7} \l CE_ToolButtonLabel
+         \li{1,7} \l QStyleOptionToolButton
+         \li \l State_Enabled \li Set if the tool button is enabled.
+    \row \li \l State_HasFocus \li Set if the tool button has input focus.
+    \row \li \l State_Sunken
+         \li Set if the tool button is down (i.e., a mouse button or
          the space bar is pressed).
-    \row \o \l State_On \o Set if the tool button is a toggle button and is toggled on.
-    \row \o \l State_AutoRaise \o Set if the tool button has auto-raise enabled.
-    \row \o \l State_MouseOver \o Set if the mouse pointer is over the tool button.
-    \row \o \l State_Raised \o Set if the button is not down and is not on.
-
-    \row \o \l CE_ToolBoxTab \o \l QStyleOptionToolBox
-         \o \l State_Selected \o The tab is the currently selected tab.
-    \row \o{1,3} \l CE_HeaderSection \o{1,3} \l QStyleOptionHeader
-         \o \l State_Sunken \o Indicates that the section is pressed.
-    \row \o \l State_UpArrow \o Indicates that the sort indicator should be pointing up.
-    \row \o \l State_DownArrow \o Indicates that the sort indicator should be pointing down.
+    \row \li \l State_On \li Set if the tool button is a toggle button and is toggled on.
+    \row \li \l State_AutoRaise \li Set if the tool button has auto-raise enabled.
+    \row \li \l State_MouseOver \li Set if the mouse pointer is over the tool button.
+    \row \li \l State_Raised \li Set if the button is not down and is not on.
+
+    \row \li \l CE_ToolBoxTab \li \l QStyleOptionToolBox
+         \li \l State_Selected \li The tab is the currently selected tab.
+    \row \li{1,3} \l CE_HeaderSection \li{1,3} \l QStyleOptionHeader
+         \li \l State_Sunken \li Indicates that the section is pressed.
+    \row \li \l State_UpArrow \li Indicates that the sort indicator should be pointing up.
+    \row \li \l State_DownArrow \li Indicates that the sort indicator should be pointing down.
     \endtable
 
     \sa drawPrimitive(), drawComplexControl()
@@ -1077,20 +1077,20 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     table below for the appropriate \a option casts:
 
     \table
-    \header \o Sub Element \o QStyleOption Subclass
-    \row \o \l SE_PushButtonContents   \o \l QStyleOptionButton
-    \row \o \l SE_PushButtonFocusRect  \o \l QStyleOptionButton
-    \row \o \l SE_CheckBoxIndicator    \o \l QStyleOptionButton
-    \row \o \l SE_CheckBoxContents     \o \l QStyleOptionButton
-    \row \o \l SE_CheckBoxFocusRect    \o \l QStyleOptionButton
-    \row \o \l SE_RadioButtonIndicator \o \l QStyleOptionButton
-    \row \o \l SE_RadioButtonContents  \o \l QStyleOptionButton
-    \row \o \l SE_RadioButtonFocusRect \o \l QStyleOptionButton
-    \row \o \l SE_ComboBoxFocusRect    \o \l QStyleOptionComboBox
-    \row \o \l SE_Q3DockWindowHandleRect \o \l QStyleOptionQ3DockWindow
-    \row \o \l SE_ProgressBarGroove    \o \l QStyleOptionProgressBar
-    \row \o \l SE_ProgressBarContents  \o \l QStyleOptionProgressBar
-    \row \o \l SE_ProgressBarLabel     \o \l QStyleOptionProgressBar
+    \header \li Sub Element \li QStyleOption Subclass
+    \row \li \l SE_PushButtonContents   \li \l QStyleOptionButton
+    \row \li \l SE_PushButtonFocusRect  \li \l QStyleOptionButton
+    \row \li \l SE_CheckBoxIndicator    \li \l QStyleOptionButton
+    \row \li \l SE_CheckBoxContents     \li \l QStyleOptionButton
+    \row \li \l SE_CheckBoxFocusRect    \li \l QStyleOptionButton
+    \row \li \l SE_RadioButtonIndicator \li \l QStyleOptionButton
+    \row \li \l SE_RadioButtonContents  \li \l QStyleOptionButton
+    \row \li \l SE_RadioButtonFocusRect \li \l QStyleOptionButton
+    \row \li \l SE_ComboBoxFocusRect    \li \l QStyleOptionComboBox
+    \row \li \l SE_Q3DockWindowHandleRect \li \l QStyleOptionQ3DockWindow
+    \row \li \l SE_ProgressBarGroove    \li \l QStyleOptionProgressBar
+    \row \li \l SE_ProgressBarContents  \li \l QStyleOptionProgressBar
+    \row \li \l SE_ProgressBarLabel     \li \l QStyleOptionProgressBar
     \endtable
 */
 
@@ -1222,43 +1222,43 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     appropriate subclass.
 
     \table
-    \header \o Complex Control \o QStyleOptionComplex Subclass \o Style Flag \o Remark
-    \row \o{1,2} \l{CC_SpinBox} \o{1,2} \l QStyleOptionSpinBox
-         \o \l State_Enabled \o Set if the spin box is enabled.
-    \row \o \l State_HasFocus \o Set if the spin box has input focus.
-
-    \row \o{1,2} \l {CC_ComboBox} \o{1,2} \l QStyleOptionComboBox
-         \o \l State_Enabled \o Set if the combobox is enabled.
-    \row \o \l State_HasFocus \o Set if the combobox has input focus.
-
-    \row \o{1,2} \l {CC_ScrollBar} \o{1,2} \l QStyleOptionSlider
-         \o \l State_Enabled \o Set if the scroll bar is enabled.
-    \row \o \l State_HasFocus \o Set if the scroll bar has input focus.
-
-    \row \o{1,2} \l {CC_Slider} \o{1,2} \l QStyleOptionSlider
-         \o \l State_Enabled \o Set if the slider is enabled.
-    \row \o \l State_HasFocus \o Set if the slider has input focus.
-
-    \row \o{1,2} \l {CC_Dial} \o{1,2} \l QStyleOptionSlider
-         \o \l State_Enabled \o Set if the dial is enabled.
-    \row \o \l State_HasFocus \o Set if the dial has input focus.
-
-    \row \o{1,6} \l {CC_ToolButton} \o{1,6} \l QStyleOptionToolButton
-         \o \l State_Enabled \o Set if the tool button is enabled.
-    \row \o \l State_HasFocus \o Set if the tool button has input focus.
-    \row \o \l State_DownArrow \o Set if the tool button is down (i.e., a mouse
+    \header \li Complex Control \li QStyleOptionComplex Subclass \li Style Flag \li Remark
+    \row \li{1,2} \l{CC_SpinBox} \li{1,2} \l QStyleOptionSpinBox
+         \li \l State_Enabled \li Set if the spin box is enabled.
+    \row \li \l State_HasFocus \li Set if the spin box has input focus.
+
+    \row \li{1,2} \l {CC_ComboBox} \li{1,2} \l QStyleOptionComboBox
+         \li \l State_Enabled \li Set if the combobox is enabled.
+    \row \li \l State_HasFocus \li Set if the combobox has input focus.
+
+    \row \li{1,2} \l {CC_ScrollBar} \li{1,2} \l QStyleOptionSlider
+         \li \l State_Enabled \li Set if the scroll bar is enabled.
+    \row \li \l State_HasFocus \li Set if the scroll bar has input focus.
+
+    \row \li{1,2} \l {CC_Slider} \li{1,2} \l QStyleOptionSlider
+         \li \l State_Enabled \li Set if the slider is enabled.
+    \row \li \l State_HasFocus \li Set if the slider has input focus.
+
+    \row \li{1,2} \l {CC_Dial} \li{1,2} \l QStyleOptionSlider
+         \li \l State_Enabled \li Set if the dial is enabled.
+    \row \li \l State_HasFocus \li Set if the dial has input focus.
+
+    \row \li{1,6} \l {CC_ToolButton} \li{1,6} \l QStyleOptionToolButton
+         \li \l State_Enabled \li Set if the tool button is enabled.
+    \row \li \l State_HasFocus \li Set if the tool button has input focus.
+    \row \li \l State_DownArrow \li Set if the tool button is down (i.e., a mouse
         button or the space bar is pressed).
-    \row \o \l State_On \o Set if the tool button is a toggle button
+    \row \li \l State_On \li Set if the tool button is a toggle button
         and is toggled on.
-    \row \o \l State_AutoRaise \o Set if the tool button has auto-raise enabled.
-    \row \o \l State_Raised \o Set if the button is not down, not on, and doesn't
+    \row \li \l State_AutoRaise \li Set if the tool button has auto-raise enabled.
+    \row \li \l State_Raised \li Set if the button is not down, not on, and doesn't
         contain the mouse when auto-raise is enabled.
 
-    \row \o \l{CC_TitleBar} \o \l QStyleOptionTitleBar
-         \o \l State_Enabled \o Set if the title bar is enabled.
+    \row \li \l{CC_TitleBar} \li \l QStyleOptionTitleBar
+         \li \l State_Enabled \li Set if the title bar is enabled.
 
-    \row \o \l{CC_Q3ListView} \o \l QStyleOptionQ3ListView
-         \o \l State_Enabled \o Set if the list view is enabled.
+    \row \li \l{CC_Q3ListView} \li \l QStyleOptionQ3ListView
+         \li \l State_Enabled \li Set if the list view is enabled.
 
     \endtable
 
@@ -1492,17 +1492,17 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     for the appropriate \a option casts:
 
     \table
-    \header \o Pixel Metric \o QStyleOption Subclass
-    \row \o \l PM_SliderControlThickness \o \l QStyleOptionSlider
-    \row \o \l PM_SliderLength           \o \l QStyleOptionSlider
-    \row \o \l PM_SliderTickmarkOffset   \o \l QStyleOptionSlider
-    \row \o \l PM_SliderSpaceAvailable   \o \l QStyleOptionSlider
-    \row \o \l PM_ScrollBarExtent        \o \l QStyleOptionSlider
-    \row \o \l PM_TabBarTabOverlap       \o \l QStyleOptionTab
-    \row \o \l PM_TabBarTabHSpace        \o \l QStyleOptionTab
-    \row \o \l PM_TabBarTabVSpace        \o \l QStyleOptionTab
-    \row \o \l PM_TabBarBaseHeight       \o \l QStyleOptionTab
-    \row \o \l PM_TabBarBaseOverlap      \o \l QStyleOptionTab
+    \header \li Pixel Metric \li QStyleOption Subclass
+    \row \li \l PM_SliderControlThickness \li \l QStyleOptionSlider
+    \row \li \l PM_SliderLength           \li \l QStyleOptionSlider
+    \row \li \l PM_SliderTickmarkOffset   \li \l QStyleOptionSlider
+    \row \li \l PM_SliderSpaceAvailable   \li \l QStyleOptionSlider
+    \row \li \l PM_ScrollBarExtent        \li \l QStyleOptionSlider
+    \row \li \l PM_TabBarTabOverlap       \li \l QStyleOptionTab
+    \row \li \l PM_TabBarTabHSpace        \li \l QStyleOptionTab
+    \row \li \l PM_TabBarTabVSpace        \li \l QStyleOptionTab
+    \row \li \l PM_TabBarBaseHeight       \li \l QStyleOptionTab
+    \row \li \l PM_TabBarBaseOverlap      \li \l QStyleOptionTab
     \endtable
 
     Some pixel metrics are called from widgets and some are only called
@@ -1568,16 +1568,16 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     See the table below for the appropriate \a option casts:
 
     \table
-    \header \o Contents Type    \o QStyleOption Subclass
-    \row \o \l CT_PushButton   \o \l QStyleOptionButton
-    \row \o \l CT_CheckBox     \o \l QStyleOptionButton
-    \row \o \l CT_RadioButton  \o \l QStyleOptionButton
-    \row \o \l CT_ToolButton   \o \l QStyleOptionToolButton
-    \row \o \l CT_ComboBox     \o \l QStyleOptionComboBox
-    \row \o \l CT_Splitter     \o \l QStyleOption
-    \row \o \l CT_Q3DockWindow \o \l QStyleOptionQ3DockWindow
-    \row \o \l CT_ProgressBar  \o \l QStyleOptionProgressBar
-    \row \o \l CT_MenuItem     \o \l QStyleOptionMenuItem
+    \header \li Contents Type    \li QStyleOption Subclass
+    \row \li \l CT_PushButton   \li \l QStyleOptionButton
+    \row \li \l CT_CheckBox     \li \l QStyleOptionButton
+    \row \li \l CT_RadioButton  \li \l QStyleOptionButton
+    \row \li \l CT_ToolButton   \li \l QStyleOptionToolButton
+    \row \li \l CT_ComboBox     \li \l QStyleOptionComboBox
+    \row \li \l CT_Splitter     \li \l QStyleOption
+    \row \li \l CT_Q3DockWindow \li \l QStyleOptionQ3DockWindow
+    \row \li \l CT_ProgressBar  \li \l QStyleOptionProgressBar
+    \row \li \l CT_MenuItem     \li \l QStyleOptionMenuItem
     \endtable
 
     \sa ContentsType QStyleOption
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index 63e7b8775e..d72ba1bac5 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -1795,7 +1795,7 @@ QStyleOptionMenuItem::QStyleOptionMenuItem(int version)
     \brief the text for the menu item
 
     Note that the text format is something like this "Menu
-    text\bold{\\t}Shortcut".
+    text\b{\\t}Shortcut".
 
     If the menu item doesn't have a shortcut, it will just contain the
     menu item's text. The default value is an empty string.
@@ -2240,7 +2240,7 @@ QStyleOptionSpinBox::QStyleOptionSpinBox(int version)
     \inmodule QtWidgets
  
     This class is used for drawing the compatibility Q3ListView's
-    items. \bold {It is not recommended for new classes}.
+    items. \b {It is not recommended for new classes}.
 
     QStyleOptionQ3ListViewItem contains all the information that
     QStyle functions need to draw the Q3ListView items.
@@ -2376,7 +2376,7 @@ QStyleOptionQ3ListViewItem::QStyleOptionQ3ListViewItem(int version)
 
     \inmodule QtWidgets
  
-    This class is used for drawing the compatibility Q3ListView. \bold
+    This class is used for drawing the compatibility Q3ListView. \b
     {It is not recommended for new classes}.
 
     QStyleOptionQ3ListView contains all the information that QStyle
@@ -2523,7 +2523,7 @@ QStyleOptionQ3ListView::QStyleOptionQ3ListView(int version)
     \inmodule QtWidgets
  
     This class is used for drawing the old Q3DockWindow and its
-    parts. \bold {It is not recommended for new classes}.
+    parts. \b {It is not recommended for new classes}.
 
     QStyleOptionQ3DockWindow contains all the information that QStyle
     functions need to draw Q3DockWindow and its parts.
diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp
index d416f26f51..91e4a9c3c1 100644
--- a/src/widgets/util/qcompleter.cpp
+++ b/src/widgets/util/qcompleter.cpp
@@ -1475,7 +1475,7 @@ int QCompleter::completionCount() const
     The sort order (i.e ascending or descending order) of the model is determined
     dynamically by inspecting the contents of the model.
 
-    \bold{Note:} The performance improvements described above cannot take place
+    \b{Note:} The performance improvements described above cannot take place
     when the completer's \l caseSensitivity is different to the case sensitivity
     used by the model's when sorting.
 
diff --git a/src/widgets/util/qscrollerproperties.cpp b/src/widgets/util/qscrollerproperties.cpp
index 8d6ad36014..b698252b07 100644
--- a/src/widgets/util/qscrollerproperties.cpp
+++ b/src/widgets/util/qscrollerproperties.cpp
@@ -329,7 +329,7 @@ void QScrollerProperties::setScrollMetric(ScrollMetric metric, const QVariant &v
     around the axis. The threshold must be in the range \c 0 to \c 1.
 
     \value ScrollingCurve The QEasingCurve used when decelerating the scrolling velocity after an
-    user initiated flick. Please note that this is the easing curve for the positions, \bold{not}
+    user initiated flick. Please note that this is the easing curve for the positions, \b{not}
     the velocity: the default is QEasingCurve::OutQuad, which results in a linear decrease in
     velocity (1st derivative) and a constant deceleration (2nd derivative).
 
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
index bed8dc2eae..fc2d046114 100644
--- a/src/widgets/util/qsystemtrayicon.cpp
+++ b/src/widgets/util/qsystemtrayicon.cpp
@@ -77,10 +77,10 @@ QT_BEGIN_NAMESPACE
     The QSystemTrayIcon class can be used on the following platforms:
 
     \list
-    \o All supported versions of Windows.
-    \o All window managers for X11 that implement the \l{freedesktop.org} system
+    \li All supported versions of Windows.
+    \li All window managers for X11 that implement the \l{freedesktop.org} system
        tray specification, including recent versions of KDE and GNOME.
-    \o All supported versions of Mac OS X. Note that the Growl
+    \li All supported versions of Mac OS X. Note that the Growl
        notification system must be installed for
        QSystemTrayIcon::showMessage() to display messages.
     \endlist
diff --git a/src/widgets/util/qundostack.cpp b/src/widgets/util/qundostack.cpp
index 7cd77678e6..5392dd2f8e 100644
--- a/src/widgets/util/qundostack.cpp
+++ b/src/widgets/util/qundostack.cpp
@@ -934,10 +934,10 @@ QAction *QUndoStack::createRedoAction(QObject *parent, const QString &prefix) co
 
     While a macro is composed, the stack is disabled. This means that:
     \list
-    \i indexChanged() and cleanChanged() are not emitted,
-    \i canUndo() and canRedo() return false,
-    \i calling undo() or redo() has no effect,
-    \i the undo/redo actions are disabled.
+    \li indexChanged() and cleanChanged() are not emitted,
+    \li canUndo() and canRedo() return false,
+    \li calling undo() or redo() has no effect,
+    \li the undo/redo actions are disabled.
     \endlist
 
     The stack becomes enabled and appropriate signals are emitted when endMacro()
diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp
index be250c54e1..2c51e89c43 100644
--- a/src/widgets/widgets/qabstractbutton.cpp
+++ b/src/widgets/widgets/qabstractbutton.cpp
@@ -109,21 +109,21 @@ Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets;
 
     \list
 
-    \o isDown() indicates whether the button is \e pressed down.
+    \li isDown() indicates whether the button is \e pressed down.
 
-    \o isChecked() indicates whether the button is \e checked.  Only
+    \li isChecked() indicates whether the button is \e checked.  Only
     checkable buttons can be checked and unchecked (see below).
 
-    \o isEnabled() indicates whether the button can be pressed by the
+    \li isEnabled() indicates whether the button can be pressed by the
     user. \note As opposed to other widgets, buttons derived from
     QAbstractButton accepts mouse and context menu events
     when disabled.
 
-    \o setAutoRepeat() sets whether the button will auto-repeat if the
+    \li setAutoRepeat() sets whether the button will auto-repeat if the
     user holds it down. \l autoRepeatDelay and \l autoRepeatInterval
     define how auto-repetition is done.
 
-    \o setCheckable() sets whether the button is a toggle button or not.
+    \li setCheckable() sets whether the button is a toggle button or not.
 
     \endlist
 
@@ -138,16 +138,16 @@ Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets;
 
     \list 1
 
-    \o pressed() is emitted when the left mouse button is pressed while
+    \li pressed() is emitted when the left mouse button is pressed while
     the mouse cursor is inside the button.
 
-    \o released() is emitted when the left mouse button is released.
+    \li released() is emitted when the left mouse button is released.
 
-    \o clicked() is emitted when the button is first pressed and then
+    \li clicked() is emitted when the button is first pressed and then
     released, when the shortcut key is typed, or when click() or
     animateClick() is called.
 
-    \o toggled() is emitted when the state of a toggle button changes.
+    \li toggled() is emitted when the state of a toggle button changes.
 
     \endlist
 
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp
index 03ec21680d..a960ce8d9c 100644
--- a/src/widgets/widgets/qabstractscrollarea.cpp
+++ b/src/widgets/widgets/qabstractscrollarea.cpp
@@ -101,14 +101,14 @@ QT_BEGIN_NAMESPACE
     following:
 
     \list
-        \o Control the scroll bars by setting their
+        \li Control the scroll bars by setting their
            range, value, page step, and tracking their
            movements.
-        \o Draw the contents of the area in the viewport according
+        \li Draw the contents of the area in the viewport according
            to the values of the scroll bars.
-        \o Handle events received by the viewport in
+        \li Handle events received by the viewport in
            viewportEvent() - notably resize events.
-        \o Use \c{viewport->update()} to update the contents of the
+        \li Use \c{viewport->update()} to update the contents of the
           viewport instead of \l{QWidget::update()}{update()}
           as all painting operations take place on the viewport.
     \endlist
diff --git a/src/widgets/widgets/qabstractslider.cpp b/src/widgets/widgets/qabstractslider.cpp
index be193f64f0..6aff2e9077 100644
--- a/src/widgets/widgets/qabstractslider.cpp
+++ b/src/widgets/widgets/qabstractslider.cpp
@@ -65,23 +65,23 @@ QT_BEGIN_NAMESPACE
 
     \list 1
 
-    \i \l value: The bounded integer that QAbstractSlider maintains.
+    \li \l value: The bounded integer that QAbstractSlider maintains.
 
-    \i \l minimum: The lowest possible value.
+    \li \l minimum: The lowest possible value.
 
-    \i \l maximum: The highest possible value.
+    \li \l maximum: The highest possible value.
 
-    \i \l singleStep: The smaller of two natural steps that an
+    \li \l singleStep: The smaller of two natural steps that an
     abstract sliders provides and typically corresponds to the user
     pressing an arrow key.
 
-    \i \l pageStep: The larger of two natural steps that an abstract
+    \li \l pageStep: The larger of two natural steps that an abstract
     slider provides and typically corresponds to the user pressing
     PageUp or PageDown.
 
-    \i \l tracking: Whether slider tracking is enabled.
+    \li \l tracking: Whether slider tracking is enabled.
 
-    \i \l sliderPosition: The current position of the slider. If \l
+    \li \l sliderPosition: The current position of the slider. If \l
     tracking is enabled (the default), this is identical to \l value.
 
     \endlist
@@ -95,21 +95,21 @@ QT_BEGIN_NAMESPACE
     QAbstractSlider emits a comprehensive set of signals:
 
     \table
-    \header \i Signal \i Emitted when
-    \row \i \l valueChanged()
-         \i the value has changed. The \l tracking
+    \header \li Signal \li Emitted when
+    \row \li \l valueChanged()
+         \li the value has changed. The \l tracking
             determines whether this signal is emitted during user
             interaction.
-    \row \i \l sliderPressed()
-         \i the user starts to drag the slider.
-    \row \i \l sliderMoved()
-         \i the user drags the slider.
-    \row \i \l sliderReleased()
-         \i the user releases the slider.
-    \row \i \l actionTriggered()
-         \i a slider action was triggerd.
-    \row \i \l rangeChanged()
-         \i a the range has changed.
+    \row \li \l sliderPressed()
+         \li the user starts to drag the slider.
+    \row \li \l sliderMoved()
+         \li the user drags the slider.
+    \row \li \l sliderReleased()
+         \li the user releases the slider.
+    \row \li \l actionTriggered()
+         \li a slider action was triggerd.
+    \row \li \l rangeChanged()
+         \li a the range has changed.
     \endtable
 
     QAbstractSlider provides a virtual sliderChange() function that is
diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp
index 331b4918bd..e9652a9869 100644
--- a/src/widgets/widgets/qabstractspinbox.cpp
+++ b/src/widgets/widgets/qabstractspinbox.cpp
@@ -90,11 +90,11 @@ QT_BEGIN_NAMESPACE
 
     \list 1
 
-    \i \l text: The text that is displayed in the QAbstractSpinBox.
+    \li \l text: The text that is displayed in the QAbstractSpinBox.
 
-    \i \l alignment: The alignment of the text in the QAbstractSpinBox.
+    \li \l alignment: The alignment of the text in the QAbstractSpinBox.
 
-    \i \l wrapping: Whether the QAbstractSpinBox wraps from the
+    \li \l wrapping: Whether the QAbstractSpinBox wraps from the
     minimum value to the maximum value and vica versa.
 
     \endlist
@@ -167,7 +167,7 @@ QAbstractSpinBox::~QAbstractSpinBox()
     \inlineimage qspinbox-plusminus.png
 
     \value UpDownArrows Little arrows in the classic style.
-    \value PlusMinus \bold{+} and \bold{-} symbols.
+    \value PlusMinus \b{+} and \b{-} symbols.
     \value NoButtons Don't display buttons.
 
     \sa QAbstractSpinBox::buttonSymbols
@@ -918,17 +918,17 @@ void QAbstractSpinBox::paintEvent(QPaintEvent *)
 
     The following keys are handled specifically:
     \table
-    \row \i Enter/Return
-         \i This will reinterpret the text and emit a signal even if the value has not changed
+    \row \li Enter/Return
+         \li This will reinterpret the text and emit a signal even if the value has not changed
          since last time a signal was emitted.
-    \row \i Up
-         \i This will invoke stepBy(1)
-    \row \i Down
-         \i This will invoke stepBy(-1)
-    \row \i Page up
-         \i This will invoke stepBy(10)
-    \row \i Page down
-         \i This will invoke stepBy(-10)
+    \row \li Up
+         \li This will invoke stepBy(1)
+    \row \li Down
+         \li This will invoke stepBy(-1)
+    \row \li Page up
+         \li This will invoke stepBy(10)
+    \row \li Page down
+         \li This will invoke stepBy(-10)
     \endtable
 */
 
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp
index 1541010646..129da9d94d 100644
--- a/src/widgets/widgets/qcalendarwidget.cpp
+++ b/src/widgets/widgets/qcalendarwidget.cpp
@@ -2001,9 +2001,9 @@ void QCalendarWidgetPrivate::_q_editingFinished()
     setGridVisible() function:
 
     \table
-    \row \o
+    \row \li
         \image qcalendarwidget-grid.png
-    \row \o
+    \row \li
         \snippet doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp 0
     \endtable
 
@@ -2418,9 +2418,9 @@ void QCalendarWidget::showToday()
 
     \table
     \row
-    \o \image qcalendarwidget-minimum.png
+    \li \image qcalendarwidget-minimum.png
     \row
-    \o
+    \li
     \snippet doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp 1
     \endtable
 
@@ -2469,9 +2469,9 @@ void QCalendarWidget::setMinimumDate(const QDate &date)
 
     \table
     \row
-    \o \image qcalendarwidget-maximum.png
+    \li \image qcalendarwidget-maximum.png
     \row
-    \o
+    \li
     \snippet doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp 2
     \endtable
 
@@ -2638,9 +2638,9 @@ void QCalendarWidget::setVerticalHeaderFormat(QCalendarWidget::VerticalHeaderFor
 
     \table
     \row
-        \o \inlineimage qcalendarwidget-grid.png
+        \li \inlineimage qcalendarwidget-grid.png
     \row
-        \o
+        \li
         \snippet doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp 5
     \endtable
 
diff --git a/src/widgets/widgets/qcheckbox.cpp b/src/widgets/widgets/qcheckbox.cpp
index 3bf2e39ef1..13440ac104 100644
--- a/src/widgets/widgets/qcheckbox.cpp
+++ b/src/widgets/widgets/qcheckbox.cpp
@@ -87,8 +87,8 @@ public:
     non-exclusive checkboxes.
 
     \table
-    \row \o \inlineimage checkboxes-exclusive.png
-         \o \inlineimage checkboxes-non-exclusive.png
+    \row \li \inlineimage checkboxes-exclusive.png
+         \li \inlineimage checkboxes-non-exclusive.png
     \endtable
 
     Whenever a checkbox is checked or cleared it emits the signal
@@ -121,14 +121,14 @@ public:
 
     \table 100%
     \row
-        \o \inlineimage macintosh-checkbox.png Screenshot of a Macintosh style checkbox
-        \o A checkbox shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
+        \li \inlineimage macintosh-checkbox.png Screenshot of a Macintosh style checkbox
+        \li A checkbox shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
     \row
-        \o \inlineimage windows-checkbox.png Screenshot of a Windows XP style checkbox
-        \o A checkbox shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
+        \li \inlineimage windows-checkbox.png Screenshot of a Windows XP style checkbox
+        \li A checkbox shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
     \row
-        \o \inlineimage plastique-checkbox.png Screenshot of a Plastique style checkbox
-        \o A checkbox shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
+        \li \inlineimage plastique-checkbox.png Screenshot of a Plastique style checkbox
+        \li A checkbox shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
     \endtable
 
     \sa QAbstractButton, QRadioButton, {fowler}{GUI Design Handbook: Check Box}
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp
index 5761c1299c..3d0996a9f5 100644
--- a/src/widgets/widgets/qdatetimeedit.cpp
+++ b/src/widgets/widgets/qdatetimeedit.cpp
@@ -103,12 +103,12 @@ QT_BEGIN_NAMESPACE
   calendar widget can be retrieved with calendarWidget().
 
   \table 100%
-  \row \o \inlineimage windowsxp-datetimeedit.png Screenshot of a Windows XP style date time editing widget
-       \o A date time editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
-  \row \o \inlineimage macintosh-datetimeedit.png Screenshot of a Macintosh style date time editing widget
-       \o A date time editing widget shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
-  \row \o \inlineimage plastique-datetimeedit.png Screenshot of a Plastique style date time editing widget
-       \o A date time editing widget shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
+  \row \li \inlineimage windowsxp-datetimeedit.png Screenshot of a Windows XP style date time editing widget
+       \li A date time editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
+  \row \li \inlineimage macintosh-datetimeedit.png Screenshot of a Macintosh style date time editing widget
+       \li A date time editing widget shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
+  \row \li \inlineimage plastique-datetimeedit.png Screenshot of a Plastique style date time editing widget
+       \li A date time editing widget shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
   \endtable
 
   \sa QDateEdit, QTimeEdit, QDate, QTime
@@ -835,10 +835,10 @@ QString QDateTimeEdit::sectionText(Section section) const
   Example format strings (assuming that the date is 2nd of July 1969):
 
   \table
-  \header \i Format \i Result
-  \row \i dd.MM.yyyy \i 02.07.1969
-  \row \i MMM d yy \i Jul 2 69
-  \row \i MMMM d yy \i July 2 69
+  \header \li Format \li Result
+  \row \li dd.MM.yyyy \li 02.07.1969
+  \row \li MMM d yy \li Jul 2 69
+  \row \li MMMM d yy \li July 2 69
   \endtable
 
   Note that if you specify a two digit year, it will be interpreted
@@ -1520,22 +1520,22 @@ void QDateTimeEdit::mousePressEvent(QMouseEvent *event)
   class:
 
   \list
-  \o \l{QDateTimeEdit::time}{time} holds the date displayed by the widget.
-  \o \l{QDateTimeEdit::minimumTime}{minimumTime} defines the minimum (earliest) time
+  \li \l{QDateTimeEdit::time}{time} holds the date displayed by the widget.
+  \li \l{QDateTimeEdit::minimumTime}{minimumTime} defines the minimum (earliest) time
      that can be set by the user.
-  \o \l{QDateTimeEdit::maximumTime}{maximumTime} defines the maximum (latest) time
+  \li \l{QDateTimeEdit::maximumTime}{maximumTime} defines the maximum (latest) time
      that can be set by the user.
-  \o \l{QDateTimeEdit::displayFormat}{displayFormat} contains a string that is used
+  \li \l{QDateTimeEdit::displayFormat}{displayFormat} contains a string that is used
      to format the time displayed in the widget.
   \endlist
 
   \table 100%
-  \row \o \inlineimage windowsxp-timeedit.png Screenshot of a Windows XP style time editing widget
-       \o A time editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
-  \row \o \inlineimage macintosh-timeedit.png Screenshot of a Macintosh style time editing widget
-       \o A time editing widget shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
-  \row \o \inlineimage plastique-timeedit.png Screenshot of a Plastique style time editing widget
-       \o A time editing widget shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
+  \row \li \inlineimage windowsxp-timeedit.png Screenshot of a Windows XP style time editing widget
+       \li A time editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
+  \row \li \inlineimage macintosh-timeedit.png Screenshot of a Macintosh style time editing widget
+       \li A time editing widget shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
+  \row \li \inlineimage plastique-timeedit.png Screenshot of a Plastique style time editing widget
+       \li A time editing widget shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
   \endtable
 
   \sa QDateEdit, QDateTimeEdit
@@ -1575,22 +1575,22 @@ QTimeEdit::QTimeEdit(const QTime &time, QWidget *parent)
   class:
 
   \list
-  \o \l{QDateTimeEdit::date}{date} holds the date displayed by the widget.
-  \o \l{QDateTimeEdit::minimumDate}{minimumDate} defines the minimum (earliest)
+  \li \l{QDateTimeEdit::date}{date} holds the date displayed by the widget.
+  \li \l{QDateTimeEdit::minimumDate}{minimumDate} defines the minimum (earliest)
      date that can be set by the user.
-  \o \l{QDateTimeEdit::maximumDate}{maximumDate} defines the maximum (latest) date
+  \li \l{QDateTimeEdit::maximumDate}{maximumDate} defines the maximum (latest) date
      that can be set by the user.
-  \o \l{QDateTimeEdit::displayFormat}{displayFormat} contains a string that is used
+  \li \l{QDateTimeEdit::displayFormat}{displayFormat} contains a string that is used
      to format the date displayed in the widget.
   \endlist
 
   \table 100%
-  \row \o \inlineimage windowsxp-dateedit.png Screenshot of a Windows XP style date editing widget
-       \o A date editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
-  \row \o \inlineimage macintosh-dateedit.png Screenshot of a Macintosh style date editing widget
-       \o A date editing widget shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
-  \row \o \inlineimage plastique-dateedit.png Screenshot of a Plastique style date editing widget
-       \o A date editing widget shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
+  \row \li \inlineimage windowsxp-dateedit.png Screenshot of a Windows XP style date editing widget
+       \li A date editing widget shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
+  \row \li \inlineimage macintosh-dateedit.png Screenshot of a Macintosh style date editing widget
+       \li A date editing widget shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
+  \row \li \inlineimage plastique-dateedit.png Screenshot of a Plastique style date editing widget
+       \li A date editing widget shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
   \endtable
 
   \sa QTimeEdit, QDateTimeEdit
diff --git a/src/widgets/widgets/qdial.cpp b/src/widgets/widgets/qdial.cpp
index 566652b8f5..e3fe390f2a 100644
--- a/src/widgets/widgets/qdial.cpp
+++ b/src/widgets/widgets/qdial.cpp
@@ -230,10 +230,10 @@ int QDialPrivate::valueFromPoint(const QPoint &p) const
     \l {QAbstractSlider::pageStep} {pageStep}.
 
     \table
-    \row \o \inlineimage plastique-dial.png Screenshot of a dial in the Plastique widget style
-    \o \inlineimage windowsxp-dial.png Screenshot of a dial in the Windows XP widget style
-    \o \inlineimage macintosh-dial.png Screenshot of a dial in the Macintosh widget style
-    \row \o {3,1} Dials shown in various widget styles (from left to right):
+    \row \li \inlineimage plastique-dial.png Screenshot of a dial in the Plastique widget style
+    \li \inlineimage windowsxp-dial.png Screenshot of a dial in the Windows XP widget style
+    \li \inlineimage macintosh-dial.png Screenshot of a dial in the Macintosh widget style
+    \row \li {3,1} Dials shown in various widget styles (from left to right):
          \l{Plastique Style Widget Gallery}{Plastique},
          \l{Windows XP Style Widget Gallery}{Windows XP},
          \l{Macintosh Style Widget Gallery}{Macintosh}.
diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp
index d1084168a9..14643e77f6 100644
--- a/src/widgets/widgets/qdialogbuttonbox.cpp
+++ b/src/widgets/widgets/qdialogbuttonbox.cpp
@@ -76,9 +76,9 @@ QT_BEGIN_NAMESPACE
     Most buttons for a dialog follow certain roles. Such roles include:
 
     \list
-    \o Accepting or rejecting the dialog.
-    \o Asking for help.
-    \o Performing actions on the dialog itself (such as resetting fields or
+    \li Accepting or rejecting the dialog.
+    \li Asking for help.
+    \li Performing actions on the dialog itself (such as resetting fields or
        applying changes).
     \endlist
 
@@ -104,35 +104,35 @@ QT_BEGIN_NAMESPACE
 
     Currently the buttons are laid out in the following way if the button box is horizontal:
     \table
-    \row \o \inlineimage buttonbox-gnomelayout-horizontal.png GnomeLayout Horizontal
-         \o Button box laid out in horizontal GnomeLayout
-    \row \o \inlineimage buttonbox-kdelayout-horizontal.png KdeLayout Horizontal
-         \o Button box laid out in horizontal KdeLayout
-    \row \o \inlineimage buttonbox-maclayout-horizontal.png MacLayout Horizontal
-         \o Button box laid out in horizontal MacLayout
-    \row \o \inlineimage buttonbox-winlayout-horizontal.png  WinLayout Horizontal
-         \o Button box laid out in horizontal WinLayout
+    \row \li \inlineimage buttonbox-gnomelayout-horizontal.png GnomeLayout Horizontal
+         \li Button box laid out in horizontal GnomeLayout
+    \row \li \inlineimage buttonbox-kdelayout-horizontal.png KdeLayout Horizontal
+         \li Button box laid out in horizontal KdeLayout
+    \row \li \inlineimage buttonbox-maclayout-horizontal.png MacLayout Horizontal
+         \li Button box laid out in horizontal MacLayout
+    \row \li \inlineimage buttonbox-winlayout-horizontal.png  WinLayout Horizontal
+         \li Button box laid out in horizontal WinLayout
     \endtable
 
     The buttons are laid out the following way if the button box is vertical:
 
     \table
-    \row \o GnomeLayout
-         \o KdeLayout
-         \o MacLayout
-         \o WinLayout
-    \row \o \inlineimage buttonbox-gnomelayout-vertical.png GnomeLayout Vertical
-         \o \inlineimage buttonbox-kdelayout-vertical.png KdeLayout Vertical
-         \o \inlineimage buttonbox-maclayout-vertical.png MacLayout Vertical
-         \o \inlineimage buttonbox-winlayout-vertical.png WinLayout Vertical
+    \row \li GnomeLayout
+         \li KdeLayout
+         \li MacLayout
+         \li WinLayout
+    \row \li \inlineimage buttonbox-gnomelayout-vertical.png GnomeLayout Vertical
+         \li \inlineimage buttonbox-kdelayout-vertical.png KdeLayout Vertical
+         \li \inlineimage buttonbox-maclayout-vertical.png MacLayout Vertical
+         \li \inlineimage buttonbox-winlayout-vertical.png WinLayout Vertical
     \endtable
 
     Additionally, button boxes that contain only buttons with ActionRole or
     HelpRole can be considered modeless and have an alternate look on Mac OS X:
 
     \table
-    \row \o modeless horizontal MacLayout
-         \o \inlineimage buttonbox-mac-modeless-horizontal.png Screenshot of modeless horizontal MacLayout
+    \row \li modeless horizontal MacLayout
+         \li \inlineimage buttonbox-mac-modeless-horizontal.png Screenshot of modeless horizontal MacLayout
     \endtable
 
     When a button is clicked in the button box, the clicked() signal is emitted
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index a90c754cee..e40b109455 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -1538,22 +1538,22 @@ QAction * QDockWidget::toggleViewAction() const
     Here are some tips for implementing custom title bars:
 
     \list
-    \o Mouse events that are not explicitly handled by the title bar widget
+    \li Mouse events that are not explicitly handled by the title bar widget
        must be ignored by calling QMouseEvent::ignore(). These events then
        propagate to the QDockWidget parent, which handles them in the usual
        manner, moving when the title bar is dragged, docking and undocking
        when it is double-clicked, etc.
 
-    \o When DockWidgetVerticalTitleBar is set on QDockWidget, the title
+    \li When DockWidgetVerticalTitleBar is set on QDockWidget, the title
        bar widget is repositioned accordingly. In resizeEvent(), the title
        bar should check what orientation it should assume:
        \snippet doc/src/snippets/code/src_gui_widgets_qdockwidget.cpp 0
 
-    \o The title bar widget must have a valid QWidget::sizeHint() and
+    \li The title bar widget must have a valid QWidget::sizeHint() and
        QWidget::minimumSizeHint(). These functions should take into account
        the current orientation of the title bar.
 
-    \o It is not possible to remove a title bar from a dock widget. However,
+    \li It is not possible to remove a title bar from a dock widget. However,
        a similar effect can be achieved by setting a default constructed
        QWidget as the title bar widget.
     \endlist
diff --git a/src/widgets/widgets/qframe.cpp b/src/widgets/widgets/qframe.cpp
index cae4137803..29c213f7af 100644
--- a/src/widgets/widgets/qframe.cpp
+++ b/src/widgets/widgets/qframe.cpp
@@ -97,15 +97,15 @@ inline void QFramePrivate::init()
     border: \l lineWidth, \l midLineWidth, and \l frameWidth.
 
     \list
-    \o The line width is the width of the frame border. It can be modified
+    \li The line width is the width of the frame border. It can be modified
        to customize the frame's appearance.
 
-    \o The mid-line width specifies the width of an extra line in the
+    \li The mid-line width specifies the width of an extra line in the
        middle of the frame, which uses a third color to obtain a special
        3D effect. Notice that a mid-line is only drawn for \l Box, \l
        HLine and \l VLine frames that are raised or sunken.
 
-    \o The frame width is determined by the frame style, and the frameWidth()
+    \li The frame width is determined by the frame style, and the frameWidth()
        function is used to obtain the value defined for the style used.
     \endlist
 
diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp
index 17f3a9323a..cf3e14871f 100644
--- a/src/widgets/widgets/qgroupbox.cpp
+++ b/src/widgets/widgets/qgroupbox.cpp
@@ -172,12 +172,12 @@ void QGroupBoxPrivate::click()
     \snippet examples/widgets/groupbox/window.cpp 2
 
     \table 100%
-    \row \o \inlineimage windowsxp-groupbox.png Screenshot of a Windows XP style group box
-         \o \inlineimage macintosh-groupbox.png Screenshot of a Macintosh style group box
-         \o \inlineimage plastique-groupbox.png Screenshot of a Plastique style group box
-    \row \o A \l{Windows XP Style Widget Gallery}{Windows XP style} group box.
-         \o A \l{Macintosh Style Widget Gallery}{Macintosh style} group box.
-         \o A \l{Plastique Style Widget Gallery}{Plastique style} group box.
+    \row \li \inlineimage windowsxp-groupbox.png Screenshot of a Windows XP style group box
+         \li \inlineimage macintosh-groupbox.png Screenshot of a Macintosh style group box
+         \li \inlineimage plastique-groupbox.png Screenshot of a Plastique style group box
+    \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} group box.
+         \li A \l{Macintosh Style Widget Gallery}{Macintosh style} group box.
+         \li A \l{Plastique Style Widget Gallery}{Plastique style} group box.
     \endtable
 
     \sa QButtonGroup, {Group Box Example}
@@ -287,9 +287,9 @@ QString QGroupBox::title() const
     the following list:
 
     \list
-    \i Qt::AlignLeft aligns the title text with the left-hand side of the group box.
-    \i Qt::AlignRight aligns the title text with the right-hand side of the group box.
-    \i Qt::AlignHCenter aligns the title text with the horizontal center of the group box.
+    \li Qt::AlignLeft aligns the title text with the left-hand side of the group box.
+    \li Qt::AlignRight aligns the title text with the right-hand side of the group box.
+    \li Qt::AlignHCenter aligns the title text with the horizontal center of the group box.
     \endlist
 
     The default alignment is Qt::AlignLeft.
@@ -516,7 +516,7 @@ QSize QGroupBox::minimumSizeHint() const
     By default, this property is disabled; i.e. group boxes are not flat unless
     explicitly specified.
 
-    \bold{Note:} In some styles, flat and non-flat group boxes have similar
+    \b{Note:} In some styles, flat and non-flat group boxes have similar
     representations and may not be as distinguishable as they are in other
     styles.
 
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp
index d23fab4083..82e56f3354 100644
--- a/src/widgets/widgets/qlabel.cpp
+++ b/src/widgets/widgets/qlabel.cpp
@@ -76,20 +76,20 @@ QT_BEGIN_NAMESPACE
     A QLabel can contain any of the following content types:
 
     \table
-    \header \o Content \o Setting
-    \row \o Plain text
-         \o Pass a QString to setText().
-    \row \o Rich text
-         \o Pass a QString that contains rich text to setText().
-    \row \o A pixmap
-         \o Pass a QPixmap to setPixmap().
-    \row \o A movie
-         \o Pass a QMovie to setMovie().
-    \row \o A number
-         \o Pass an \e int or a \e double to setNum(), which converts
+    \header \li Content \li Setting
+    \row \li Plain text
+         \li Pass a QString to setText().
+    \row \li Rich text
+         \li Pass a QString that contains rich text to setText().
+    \row \li A pixmap
+         \li Pass a QPixmap to setPixmap().
+    \row \li A movie
+         \li Pass a QMovie to setMovie().
+    \row \li A number
+         \li Pass an \e int or a \e double to setNum(), which converts
             the number to plain text.
-    \row \o Nothing
-         \o The same as an empty plain text. This is the default. Set
+    \row \li Nothing
+         \li The same as an empty plain text. This is the default. Set
             by clear().
     \endtable
 
@@ -134,14 +134,14 @@ QT_BEGIN_NAMESPACE
 
     \table 100%
     \row
-    \o \inlineimage macintosh-label.png Screenshot of a Macintosh style label
-    \o A label shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
+    \li \inlineimage macintosh-label.png Screenshot of a Macintosh style label
+    \li A label shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
     \row
-    \o \inlineimage plastique-label.png Screenshot of a Plastique style label
-    \o A label shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
+    \li \inlineimage plastique-label.png Screenshot of a Plastique style label
+    \li A label shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
     \row
-    \o \inlineimage windowsxp-label.png Screenshot of a Windows XP style label
-    \o A label shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
+    \li \inlineimage windowsxp-label.png Screenshot of a Windows XP style label
+    \li A label shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
     \endtable
 
     \sa QLineEdit, QTextEdit, QPixmap, QMovie,
@@ -655,7 +655,7 @@ int QLabel::heightForWidth(int w) const
     QDesktopServices::openUrl() instead of emitting the
     linkActivated() signal.
 
-    \bold{Note:} The textInteractionFlags set on the label need to include
+    \b{Note:} The textInteractionFlags set on the label need to include
     either LinksAccessibleByMouse or LinksAccessibleByKeyboard.
 
     The default value is false.
@@ -723,7 +723,7 @@ Qt::TextInteractionFlags QLabel::textInteractionFlags() const
 
     \sa selectedText()
 
-    \bold{Note:} The textInteractionFlags set on the label need to include
+    \b{Note:} The textInteractionFlags set on the label need to include
     either TextSelectableByMouse or TextSelectableByKeyboard.
 
     \since 4.7
@@ -751,7 +751,7 @@ void QLabel::setSelection(int start, int length)
 
     \sa selectedText()
 
-    \bold{Note:} The textInteractionFlags set on the label need to include
+    \b{Note:} The textInteractionFlags set on the label need to include
     either TextSelectableByMouse or TextSelectableByKeyboard.
 
     \since 4.7
@@ -775,7 +775,7 @@ bool QLabel::hasSelectedText() const
 
     \sa hasSelectedText()
 
-    \bold{Note:} The textInteractionFlags set on the label need to include
+    \b{Note:} The textInteractionFlags set on the label need to include
     either TextSelectableByMouse or TextSelectableByKeyboard.
 
     \since 4.7
@@ -794,7 +794,7 @@ QString QLabel::selectedText() const
 
     \sa selectedText()
 
-    \bold{Note:} The textInteractionFlags set on the label need to include
+    \b{Note:} The textInteractionFlags set on the label need to include
     either TextSelectableByMouse or TextSelectableByKeyboard.
 
     \since 4.7
diff --git a/src/widgets/widgets/qlcdnumber.cpp b/src/widgets/widgets/qlcdnumber.cpp
index 71e08fdaeb..4639b15834 100644
--- a/src/widgets/widgets/qlcdnumber.cpp
+++ b/src/widgets/widgets/qlcdnumber.cpp
@@ -108,13 +108,13 @@ public:
     Sinclair Spectrum\endlink.
 
     \table
-    \row \o \inlineimage motif-lcdnumber.png Screenshot of a Motif style LCD number widget
+    \row \li \inlineimage motif-lcdnumber.png Screenshot of a Motif style LCD number widget
     \inlineimage cde-lcdnumber.png Screenshot of a CDE style LCD number widget
     \inlineimage windows-lcdnumber.png Screenshot of a Windows style LCD number widget
     \inlineimage windowsxp-lcdnumber.png Screenshot of a Windows XP style LCD number widget
     \inlineimage macintosh-lcdnumber.png Screenshot of a Macintosh style LCD number widget
     \inlineimage plastique-lcdnumber.png Screenshot of a Plastique style LCD number widget
-    \row \o LCD number widgets shown in various widget styles (from left to right):
+    \row \li LCD number widgets shown in various widget styles (from left to right):
     \l{Motif Style Widget Gallery}{Motif}, \l{CDE Style Widget Gallery}{CDE},
     \l{Windows Style Widget Gallery}{Windows}, \l{Windows XP Style Widget Gallery}{Windows XP},
     \l{Macintosh Style Widget Gallery}{Macintosh}, \l{Plastique Style Widget Gallery}{Plastique}.
@@ -1184,14 +1184,14 @@ void QLCDNumberPrivate::drawSegment(const QPoint &pos, char segmentNo, QPainter
     \brief the style of the LCDNumber
 
     \table
-    \header \i Style \i Result
-    \row \i \c Outline
-         \i Produces raised segments filled with the background color
-    \row \i \c Filled
+    \header \li Style \li Result
+    \row \li \c Outline
+         \li Produces raised segments filled with the background color
+    \row \li \c Filled
             (this is the default).
-         \i Produces raised segments filled with the foreground color.
-    \row \i \c Flat
-         \i Produces flat segments filled with the foreground color.
+         \li Produces raised segments filled with the foreground color.
+    \row \li \c Flat
+         \li Produces flat segments filled with the foreground color.
     \endtable
 
     \c Outline and \c Filled will additionally use
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
index 7118881ef2..07843136ff 100644
--- a/src/widgets/widgets/qlineedit.cpp
+++ b/src/widgets/widgets/qlineedit.cpp
@@ -177,39 +177,39 @@ void QLineEdit::initStyleOption(QStyleOptionFrame *option) const
     that presents some of these editing options.
     \target desc
     \table
-    \header \i Keypress \i Action
-    \row \i Left Arrow \i Moves the cursor one character to the left.
-    \row \i Shift+Left Arrow \i Moves and selects text one character to the left.
-    \row \i Right Arrow \i Moves the cursor one character to the right.
-    \row \i Shift+Right Arrow \i Moves and selects text one character to the right.
-    \row \i Home \i Moves the cursor to the beginning of the line.
-    \row \i End \i Moves the cursor to the end of the line.
-    \row \i Backspace \i Deletes the character to the left of the cursor.
-    \row \i Ctrl+Backspace \i Deletes the word to the left of the cursor.
-    \row \i Delete \i Deletes the character to the right of the cursor.
-    \row \i Ctrl+Delete \i Deletes the word to the right of the cursor.
-    \row \i Ctrl+A \i Select all.
-    \row \i Ctrl+C \i Copies the selected text to the clipboard.
-    \row \i Ctrl+Insert \i Copies the selected text to the clipboard.
-    \row \i Ctrl+K \i Deletes to the end of the line.
-    \row \i Ctrl+V \i Pastes the clipboard text into line edit.
-    \row \i Shift+Insert \i Pastes the clipboard text into line edit.
-    \row \i Ctrl+X \i Deletes the selected text and copies it to the clipboard.
-    \row \i Shift+Delete \i Deletes the selected text and copies it to the clipboard.
-    \row \i Ctrl+Z \i Undoes the last operation.
-    \row \i Ctrl+Y \i Redoes the last undone operation.
+    \header \li Keypress \li Action
+    \row \li Left Arrow \li Moves the cursor one character to the left.
+    \row \li Shift+Left Arrow \li Moves and selects text one character to the left.
+    \row \li Right Arrow \li Moves the cursor one character to the right.
+    \row \li Shift+Right Arrow \li Moves and selects text one character to the right.
+    \row \li Home \li Moves the cursor to the beginning of the line.
+    \row \li End \li Moves the cursor to the end of the line.
+    \row \li Backspace \li Deletes the character to the left of the cursor.
+    \row \li Ctrl+Backspace \li Deletes the word to the left of the cursor.
+    \row \li Delete \li Deletes the character to the right of the cursor.
+    \row \li Ctrl+Delete \li Deletes the word to the right of the cursor.
+    \row \li Ctrl+A \li Select all.
+    \row \li Ctrl+C \li Copies the selected text to the clipboard.
+    \row \li Ctrl+Insert \li Copies the selected text to the clipboard.
+    \row \li Ctrl+K \li Deletes to the end of the line.
+    \row \li Ctrl+V \li Pastes the clipboard text into line edit.
+    \row \li Shift+Insert \li Pastes the clipboard text into line edit.
+    \row \li Ctrl+X \li Deletes the selected text and copies it to the clipboard.
+    \row \li Shift+Delete \li Deletes the selected text and copies it to the clipboard.
+    \row \li Ctrl+Z \li Undoes the last operation.
+    \row \li Ctrl+Y \li Redoes the last undone operation.
     \endtable
 
     Any other key sequence that represents a valid character, will
     cause the character to be inserted into the line edit.
 
     \table 100%
-    \row \o \inlineimage macintosh-lineedit.png Screenshot of a Macintosh style line edit
-         \o A line edit shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
-    \row \o \inlineimage windows-lineedit.png Screenshot of a Windows XP style line edit
-         \o A line edit shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
-    \row \o \inlineimage plastique-lineedit.png Screenshot of a Plastique style line edit
-         \o A line edit shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
+    \row \li \inlineimage macintosh-lineedit.png Screenshot of a Macintosh style line edit
+         \li A line edit shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
+    \row \li \inlineimage windows-lineedit.png Screenshot of a Windows XP style line edit
+         \li A line edit shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
+    \row \li \inlineimage plastique-lineedit.png Screenshot of a Plastique style line edit
+         \li A line edit shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
     \endtable
 
     \sa QTextEdit, QLabel, QComboBox, {fowler}{GUI Design Handbook: Field, Entry}, {Line Edits Example}
@@ -1096,26 +1096,26 @@ QMargins QLineEdit::textMargins() const
     where a character is \e{permitted but not required}.
 
     \table
-    \header \i Character \i Meaning
-    \row \i \c A \i ASCII alphabetic character required. A-Z, a-z.
-    \row \i \c a \i ASCII alphabetic character permitted but not required.
-    \row \i \c N \i ASCII alphanumeric character required. A-Z, a-z, 0-9.
-    \row \i \c n \i ASCII alphanumeric character permitted but not required.
-    \row \i \c X \i Any character required.
-    \row \i \c x \i Any character permitted but not required.
-    \row \i \c 9 \i ASCII digit required. 0-9.
-    \row \i \c 0 \i ASCII digit permitted but not required.
-    \row \i \c D \i ASCII digit required. 1-9.
-    \row \i \c d \i ASCII digit permitted but not required (1-9).
-    \row \i \c # \i ASCII digit or plus/minus sign permitted but not required.
-    \row \i \c H \i Hexadecimal character required. A-F, a-f, 0-9.
-    \row \i \c h \i Hexadecimal character permitted but not required.
-    \row \i \c B \i Binary character required. 0-1.
-    \row \i \c b \i Binary character permitted but not required.
-    \row \i \c > \i All following alphabetic characters are uppercased.
-    \row \i \c < \i All following alphabetic characters are lowercased.
-    \row \i \c ! \i Switch off case conversion.
-    \row \i \tt{\\} \i Use \tt{\\} to escape the special
+    \header \li Character \li Meaning
+    \row \li \c A \li ASCII alphabetic character required. A-Z, a-z.
+    \row \li \c a \li ASCII alphabetic character permitted but not required.
+    \row \li \c N \li ASCII alphanumeric character required. A-Z, a-z, 0-9.
+    \row \li \c n \li ASCII alphanumeric character permitted but not required.
+    \row \li \c X \li Any character required.
+    \row \li \c x \li Any character permitted but not required.
+    \row \li \c 9 \li ASCII digit required. 0-9.
+    \row \li \c 0 \li ASCII digit permitted but not required.
+    \row \li \c D \li ASCII digit required. 1-9.
+    \row \li \c d \li ASCII digit permitted but not required (1-9).
+    \row \li \c # \li ASCII digit or plus/minus sign permitted but not required.
+    \row \li \c H \li Hexadecimal character required. A-F, a-f, 0-9.
+    \row \li \c h \li Hexadecimal character permitted but not required.
+    \row \li \c B \li Binary character required. 0-1.
+    \row \li \c b \li Binary character permitted but not required.
+    \row \li \c > \li All following alphabetic characters are uppercased.
+    \row \li \c < \li All following alphabetic characters are lowercased.
+    \row \li \c ! \li Switch off case conversion.
+    \row \li \tt{\\} \li Use \tt{\\} to escape the special
                            characters listed above to use them as
                            separators.
     \endtable
@@ -1127,11 +1127,11 @@ QMargins QLineEdit::textMargins() const
 
     Examples:
     \table
-    \header \i Mask \i Notes
-    \row \i \c 000.000.000.000;_ \i IP address; blanks are \c{_}.
-    \row \i \c HH:HH:HH:HH:HH:HH;_ \i MAC address
-    \row \i \c 0000-00-00 \i ISO Date; blanks are \c space
-    \row \i \c >AAAAA-AAAAA-AAAAA-AAAAA-AAAAA;# \i License number;
+    \header \li Mask \li Notes
+    \row \li \c 000.000.000.000;_ \li IP address; blanks are \c{_}.
+    \row \li \c HH:HH:HH:HH:HH:HH;_ \li MAC address
+    \row \li \c 0000-00-00 \li ISO Date; blanks are \c space
+    \row \li \c >AAAAA-AAAAA-AAAAA-AAAAA-AAAAA;# \li License number;
     blanks are \c - and all (alphabetic) characters are converted to
     uppercase.
     \endtable
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp
index 73ba0cc15e..7607f2f238 100644
--- a/src/widgets/widgets/qmainwindow.cpp
+++ b/src/widgets/widgets/qmainwindow.cpp
@@ -1480,12 +1480,12 @@ bool QMainWindow::event(QEvent *event)
     moved to that. This means a couple of things.
 
     \list
-    \i QToolBars in this toolbar area are not movable and you cannot drag other
+    \li QToolBars in this toolbar area are not movable and you cannot drag other
         toolbars to it
-    \i Toolbar breaks are not respected or preserved
-    \i Any custom widgets in the toolbar will not be shown if the toolbar
+    \li Toolbar breaks are not respected or preserved
+    \li Any custom widgets in the toolbar will not be shown if the toolbar
         becomes too small (only actions will be shown)
-    \i Before Qt 4.5, if you called showFullScreen() on the main window, the QToolbar would
+    \li Before Qt 4.5, if you called showFullScreen() on the main window, the QToolbar would
         disappear since it is considered to be part of the title bar. Qt 4.5 and up will now work around this by pulling
         the toolbars out and back into the regular toolbar and vice versa when you swap out.
     \endlist
diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp
index 7d73a66c5c..36fba72963 100644
--- a/src/widgets/widgets/qmdiarea.cpp
+++ b/src/widgets/widgets/qmdiarea.cpp
@@ -92,8 +92,8 @@
     slots and are easily connected to menu entries.
 
     \table
-    \row \o \inlineimage mdi-cascade.png
-         \o \inlineimage mdi-tile.png
+    \row \li \inlineimage mdi-cascade.png
+         \li \inlineimage mdi-tile.png
     \endtable
 
     \note The default scroll bar property for QMdiArea is Qt::ScrollBarAlwaysOff.
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index 7ebfdbecae..3fb2a6122c 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -1218,9 +1218,9 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action)
 
     \table 100%
     \row
-    \o \inlineimage plastique-menu.png
-    \o \inlineimage windowsxp-menu.png
-    \o \inlineimage macintosh-menu.png
+    \li \inlineimage plastique-menu.png
+    \li \inlineimage windowsxp-menu.png
+    \li \inlineimage macintosh-menu.png
     \endtable
     \caption Fig. A menu shown in \l{Plastique Style Widget Gallery}{Plastique widget style},
            \l{Windows XP Style Widget Gallery}{Windows XP widget style},
@@ -1284,7 +1284,7 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action)
     See the \l{mainwindows/menus}{Menus} example for an example of how
     to use QMenuBar and QMenu in your application.
 
-    \bold{Important inherited functions:} addAction(), removeAction(), clear(),
+    \b{Important inherited functions:} addAction(), removeAction(), clear(),
     addSeparator(), and addMenu().
 
     \sa QMenuBar, {fowler}{GUI Design Handbook: Menu, Drop-Down and Pop-Up},
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index 16e486e77f..11f6592cc9 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -621,17 +621,17 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
 
     \table
 
-    \row \o \inlineimage plastique-menubar.png A menu bar shown in the
+    \row \li \inlineimage plastique-menubar.png A menu bar shown in the
     Plastique widget style.
 
-    \o The \l{QPlastiqueStyle}{Plastique widget style}, like most
+    \li The \l{QPlastiqueStyle}{Plastique widget style}, like most
     other styles, handles the \gui{Help} menu in the same way as it
     handles any other menu.
 
-    \row \o \inlineimage motif-menubar.png A menu bar shown in the
+    \row \li \inlineimage motif-menubar.png A menu bar shown in the
     Motif widget style.
 
-    \o The \l{QMotifStyle}{Motif widget style} treats \gui{Help} menus
+    \li The \l{QMotifStyle}{Motif widget style} treats \gui{Help} menus
     in a special way, placing them at right-hand end of the menu bar.
 
     \endtable
@@ -652,18 +652,18 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
     the strings looked for and where the entry is placed if matched:
 
     \table
-    \header \i String matches \i Placement \i Notes
-    \row \i about.*
-         \i Application Menu | About <application name>
-         \i The application name is fetched from the \c {Info.plist} file
+    \header \li String matches \li Placement \li Notes
+    \row \li about.*
+         \li Application Menu | About <application name>
+         \li The application name is fetched from the \c {Info.plist} file
             (see note below). If this entry is not found no About item
             will appear in the Application Menu.
-    \row \i config, options, setup, settings or preferences
-         \i Application Menu | Preferences
-         \i If this entry is not found the Settings item will be disabled
-    \row \i quit or exit
-         \i Application Menu | Quit <application name>
-         \i If this entry is not found a default Quit item will be
+    \row \li config, options, setup, settings or preferences
+         \li Application Menu | Preferences
+         \li If this entry is not found the Settings item will be disabled
+    \row \li quit or exit
+         \li Application Menu | Quit <application name>
+         \li If this entry is not found a default Quit item will be
             created to call QApplication::quit()
     \endtable
 
@@ -676,12 +676,12 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
 
     \snippet doc/src/snippets/code/src_gui_widgets_qmenubar.cpp 1
 
-    \bold{Note:} Do \e{not} call QMainWindow::menuBar() to create the
+    \b{Note:} Do \e{not} call QMainWindow::menuBar() to create the
     shared menu bar, because that menu bar will have the QMainWindow
     as its parent. That menu bar would only be displayed for the
     parent QMainWindow.
 
-    \bold{Note:} The text used for the application name in the menu
+    \b{Note:} The text used for the application name in the menu
     bar is obtained from the value set in the \c{Info.plist} file in
     the application's bundle. See \l{Deploying an Application on
     Mac OS X} for more information.
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp
index de6cb6a283..fad2d4e747 100644
--- a/src/widgets/widgets/qplaintextedit.cpp
+++ b/src/widgets/widgets/qplaintextedit.cpp
@@ -1081,19 +1081,19 @@ void QPlainTextEditPrivate::ensureViewportLayouted()
     When QPlainTextEdit is used read-only the key bindings are limited to
     navigation, and text may only be selected with the mouse:
     \table
-    \header \i Keypresses \i Action
-    \row \i Qt::UpArrow        \i Moves one line up.
-    \row \i Qt::DownArrow        \i Moves one line down.
-    \row \i Qt::LeftArrow        \i Moves one character to the left.
-    \row \i Qt::RightArrow        \i Moves one character to the right.
-    \row \i PageUp        \i Moves one (viewport) page up.
-    \row \i PageDown        \i Moves one (viewport) page down.
-    \row \i Home        \i Moves to the beginning of the text.
-    \row \i End                \i Moves to the end of the text.
-    \row \i Alt+Wheel
-         \i Scrolls the page horizontally (the Wheel is the mouse wheel).
-    \row \i Ctrl+Wheel        \i Zooms the text.
-    \row \i Ctrl+A            \i Selects all text.
+    \header \li Keypresses \li Action
+    \row \li Qt::UpArrow        \li Moves one line up.
+    \row \li Qt::DownArrow        \li Moves one line down.
+    \row \li Qt::LeftArrow        \li Moves one character to the left.
+    \row \li Qt::RightArrow        \li Moves one character to the right.
+    \row \li PageUp        \li Moves one (viewport) page up.
+    \row \li PageDown        \li Moves one (viewport) page down.
+    \row \li Home        \li Moves to the beginning of the text.
+    \row \li End                \li Moves to the end of the text.
+    \row \li Alt+Wheel
+         \li Scrolls the page horizontally (the Wheel is the mouse wheel).
+    \row \li Ctrl+Wheel        \li Zooms the text.
+    \row \li Ctrl+A            \li Selects all text.
     \endtable
 
 
@@ -1127,34 +1127,34 @@ void QPlainTextEditPrivate::ensureViewportLayouted()
 
     The list of key bindings which are implemented for editing:
     \table
-    \header \i Keypresses \i Action
-    \row \i Backspace \i Deletes the character to the left of the cursor.
-    \row \i Delete \i Deletes the character to the right of the cursor.
-    \row \i Ctrl+C \i Copy the selected text to the clipboard.
-    \row \i Ctrl+Insert \i Copy the selected text to the clipboard.
-    \row \i Ctrl+K \i Deletes to the end of the line.
-    \row \i Ctrl+V \i Pastes the clipboard text into text edit.
-    \row \i Shift+Insert \i Pastes the clipboard text into text edit.
-    \row \i Ctrl+X \i Deletes the selected text and copies it to the clipboard.
-    \row \i Shift+Delete \i Deletes the selected text and copies it to the clipboard.
-    \row \i Ctrl+Z \i Undoes the last operation.
-    \row \i Ctrl+Y \i Redoes the last operation.
-    \row \i LeftArrow \i Moves the cursor one character to the left.
-    \row \i Ctrl+LeftArrow \i Moves the cursor one word to the left.
-    \row \i RightArrow \i Moves the cursor one character to the right.
-    \row \i Ctrl+RightArrow \i Moves the cursor one word to the right.
-    \row \i UpArrow \i Moves the cursor one line up.
-    \row \i Ctrl+UpArrow \i Moves the cursor one word up.
-    \row \i DownArrow \i Moves the cursor one line down.
-    \row \i Ctrl+Down Arrow \i Moves the cursor one word down.
-    \row \i PageUp \i Moves the cursor one page up.
-    \row \i PageDown \i Moves the cursor one page down.
-    \row \i Home \i Moves the cursor to the beginning of the line.
-    \row \i Ctrl+Home \i Moves the cursor to the beginning of the text.
-    \row \i End \i Moves the cursor to the end of the line.
-    \row \i Ctrl+End \i Moves the cursor to the end of the text.
-    \row \i Alt+Wheel \i Scrolls the page horizontally (the Wheel is the mouse wheel).
-    \row \i Ctrl+Wheel \i Zooms the text.
+    \header \li Keypresses \li Action
+    \row \li Backspace \li Deletes the character to the left of the cursor.
+    \row \li Delete \li Deletes the character to the right of the cursor.
+    \row \li Ctrl+C \li Copy the selected text to the clipboard.
+    \row \li Ctrl+Insert \li Copy the selected text to the clipboard.
+    \row \li Ctrl+K \li Deletes to the end of the line.
+    \row \li Ctrl+V \li Pastes the clipboard text into text edit.
+    \row \li Shift+Insert \li Pastes the clipboard text into text edit.
+    \row \li Ctrl+X \li Deletes the selected text and copies it to the clipboard.
+    \row \li Shift+Delete \li Deletes the selected text and copies it to the clipboard.
+    \row \li Ctrl+Z \li Undoes the last operation.
+    \row \li Ctrl+Y \li Redoes the last operation.
+    \row \li LeftArrow \li Moves the cursor one character to the left.
+    \row \li Ctrl+LeftArrow \li Moves the cursor one word to the left.
+    \row \li RightArrow \li Moves the cursor one character to the right.
+    \row \li Ctrl+RightArrow \li Moves the cursor one word to the right.
+    \row \li UpArrow \li Moves the cursor one line up.
+    \row \li Ctrl+UpArrow \li Moves the cursor one word up.
+    \row \li DownArrow \li Moves the cursor one line down.
+    \row \li Ctrl+Down Arrow \li Moves the cursor one word down.
+    \row \li PageUp \li Moves the cursor one page up.
+    \row \li PageDown \li Moves the cursor one page down.
+    \row \li Home \li Moves the cursor to the beginning of the line.
+    \row \li Ctrl+Home \li Moves the cursor to the beginning of the text.
+    \row \li End \li Moves the cursor to the end of the line.
+    \row \li Ctrl+End \li Moves the cursor to the end of the text.
+    \row \li Alt+Wheel \li Scrolls the page horizontally (the Wheel is the mouse wheel).
+    \row \li Ctrl+Wheel \li Zooms the text.
     \endtable
 
     To select (mark) text hold down the Shift key whilst pressing one
diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp
index eabed2ee62..816b847cf5 100644
--- a/src/widgets/widgets/qprogressbar.cpp
+++ b/src/widgets/widgets/qprogressbar.cpp
@@ -196,12 +196,12 @@ bool QProgressBarPrivate::repaintRequired() const
     they are unable to determine the size of the item being downloaded.
 
     \table
-    \row \o \inlineimage macintosh-progressbar.png Screenshot of a Macintosh style progress bar
-         \o A progress bar shown in the Macintosh widget style.
-    \row \o \inlineimage windowsxp-progressbar.png Screenshot of a Windows XP style progress bar
-         \o A progress bar shown in the Windows XP widget style.
-    \row \o \inlineimage plastique-progressbar.png Screenshot of a Plastique style progress bar
-         \o A progress bar shown in the Plastique widget style.
+    \row \li \inlineimage macintosh-progressbar.png Screenshot of a Macintosh style progress bar
+         \li A progress bar shown in the Macintosh widget style.
+    \row \li \inlineimage windowsxp-progressbar.png Screenshot of a Windows XP style progress bar
+         \li A progress bar shown in the Windows XP widget style.
+    \row \li \inlineimage plastique-progressbar.png Screenshot of a Plastique style progress bar
+         \li A progress bar shown in the Plastique widget style.
     \endtable
 
     \sa QProgressDialog, {fowler}{GUI Design Handbook: Progress Indicator}
diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp
index 99252c43dc..7ca5dcb486 100644
--- a/src/widgets/widgets/qpushbutton.cpp
+++ b/src/widgets/widgets/qpushbutton.cpp
@@ -126,13 +126,13 @@ QT_BEGIN_NAMESPACE
 
     The most important modes or states are:
     \list
-    \i Available or not (grayed out, disabled).
-    \i Standard push button, toggling push button or menu button.
-    \i On or off (only for toggling push buttons).
-    \i Default or normal. The default button in a dialog can generally
+    \li Available or not (grayed out, disabled).
+    \li Standard push button, toggling push button or menu button.
+    \li On or off (only for toggling push buttons).
+    \li Default or normal. The default button in a dialog can generally
        be "clicked" using the Enter or Return key.
-    \i Auto-repeat or not.
-    \i Pressed down or not.
+    \li Auto-repeat or not.
+    \li Pressed down or not.
     \endlist
 
     As a general rule, use a push button when the application or
@@ -160,18 +160,18 @@ QT_BEGIN_NAMESPACE
     check boxes (see QCheckBox).
 
     \table 100%
-    \row \o \inlineimage macintosh-pushbutton.png Screenshot of a Macintosh style push button
-         \o A push button shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
+    \row \li \inlineimage macintosh-pushbutton.png Screenshot of a Macintosh style push button
+         \li A push button shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
 
          Note that when a button's width becomes smaller than 50 or
          its height becomes smaller than 30, the button's corners are
          changed from round to square. Use the setMinimumSize()
          function to prevent this behavior.
 
-    \row \o \inlineimage windowsxp-pushbutton.png Screenshot of a Windows XP style push button
-         \o A push button shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
-    \row \o \inlineimage plastique-pushbutton.png Screenshot of a Plastique style push button
-         \o A push button shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
+    \row \li \inlineimage windowsxp-pushbutton.png Screenshot of a Windows XP style push button
+         \li A push button shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
+    \row \li \inlineimage plastique-pushbutton.png Screenshot of a Plastique style push button
+         \li A push button shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
     \endtable
 
     In Qt, the QAbstractButton base class provides most of the modes
@@ -518,9 +518,9 @@ void QPushButton::focusOutEvent(QFocusEvent *e)
 
     \table 100%
     \row
-    \o \inlineimage plastique-pushbutton-menu.png Screenshot of a Plastique style push button with popup menu.
-    \o \inlineimage cleanlooks-pushbutton-menu.png Screenshot of a Cleanlooks style push button with popup menu.
-    \o Push buttons with popup menus shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}
+    \li \inlineimage plastique-pushbutton-menu.png Screenshot of a Plastique style push button with popup menu.
+    \li \inlineimage cleanlooks-pushbutton-menu.png Screenshot of a Cleanlooks style push button with popup menu.
+    \li Push buttons with popup menus shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}
     (left) and \l{Cleanlooks Style Widget Gallery}{Cleanlooks widget style} (right).
     \endtable
 
diff --git a/src/widgets/widgets/qradiobutton.cpp b/src/widgets/widgets/qradiobutton.cpp
index 792550949b..11cd89bca2 100644
--- a/src/widgets/widgets/qradiobutton.cpp
+++ b/src/widgets/widgets/qradiobutton.cpp
@@ -116,12 +116,12 @@ void QRadioButtonPrivate::init()
     toggle(), pressed(), released(), clicked(), and toggled().
 
     \table 100%
-    \row \o \inlineimage plastique-radiobutton.png Screenshot of a Plastique radio button
-         \o A radio button shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
-    \row \o \inlineimage windows-radiobutton.png Screenshot of a Windows XP radio button
-         \o A radio button shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
-    \row \o \inlineimage macintosh-radiobutton.png Screenshot of a Macintosh radio button
-         \o A radio button shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
+    \row \li \inlineimage plastique-radiobutton.png Screenshot of a Plastique radio button
+         \li A radio button shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
+    \row \li \inlineimage windows-radiobutton.png Screenshot of a Windows XP radio button
+         \li A radio button shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
+    \row \li \inlineimage macintosh-radiobutton.png Screenshot of a Macintosh radio button
+         \li A radio button shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
     \endtable
 
     \sa QPushButton, QToolButton, QCheckBox, {fowler}{GUI Design Handbook: Radio Button},
diff --git a/src/widgets/widgets/qscrollarea.cpp b/src/widgets/widgets/qscrollarea.cpp
index 490dea0d2d..84be2d569b 100644
--- a/src/widgets/widgets/qscrollarea.cpp
+++ b/src/widgets/widgets/qscrollarea.cpp
@@ -77,9 +77,9 @@ QT_BEGIN_NAMESPACE
 
     \table
     \row
-    \o \inlineimage qscrollarea-noscrollbars.png
-    \o \inlineimage qscrollarea-onescrollbar.png
-    \o \inlineimage qscrollarea-twoscrollbars.png
+    \li \inlineimage qscrollarea-noscrollbars.png
+    \li \inlineimage qscrollarea-onescrollbar.png
+    \li \inlineimage qscrollarea-twoscrollbars.png
     \endtable
 
     The scroll bars appearance depends on the currently set \l
diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp
index cb3126e566..6ac5473f2e 100644
--- a/src/widgets/widgets/qscrollbar.cpp
+++ b/src/widgets/widgets/qscrollbar.cpp
@@ -83,21 +83,21 @@ QT_BEGIN_NAMESPACE
     needs.
 
     \table
-    \row \o \image qscrollbar-picture.png
-    \o Scroll bars typically include four separate controls: a slider,
+    \row \li \image qscrollbar-picture.png
+    \li Scroll bars typically include four separate controls: a slider,
     scroll arrows, and a page control.
 
     \list
-    \o a. The slider provides a way to quickly go to any part of the
+    \li a. The slider provides a way to quickly go to any part of the
     document, but does not support accurate navigation within large
     documents.
-    \o b. The scroll arrows are push buttons which can be used to accurately
+    \li b. The scroll arrows are push buttons which can be used to accurately
     navigate to a particular place in a document. For a vertical scroll bar
     connected to a text editor, these typically move the current position one
     "line" up or down, and adjust the position of the slider by a small
     amount. In editors and list boxes a "line" might mean one line of text;
     in an image viewer it might mean 20 pixels.
-    \o c. The page control is the area over which the slider is dragged (the
+    \li c. The page control is the area over which the slider is dragged (the
     scroll bar's background). Clicking here moves the scroll bar towards
     the click by one "page". This value is usually the same as the length of
     the slider.
@@ -135,8 +135,8 @@ QT_BEGIN_NAMESPACE
     value of 80. This would give us a scroll bar with five "pages".
 
     \table
-    \row \o \inlineimage qscrollbar-values.png
-    \o The relationship between a document length, the range of values used
+    \row \li \inlineimage qscrollbar-values.png
+    \li The relationship between a document length, the range of values used
     in a scroll bar, and the page step is simple in many common situations.
     The scroll bar's range of values is determined by subtracting a
     chosen page step from some value representing the length of the document.
@@ -153,18 +153,18 @@ QT_BEGIN_NAMESPACE
 
     ScrollBar inherits a comprehensive set of signals from QAbstractSlider:
     \list
-    \o \l{QAbstractSlider::valueChanged()}{valueChanged()} is emitted when the
+    \li \l{QAbstractSlider::valueChanged()}{valueChanged()} is emitted when the
        scroll bar's value has changed. The tracking() determines whether this
        signal is emitted during user interaction.
-    \o \l{QAbstractSlider::rangeChanged()}{rangeChanged()} is emitted when the
+    \li \l{QAbstractSlider::rangeChanged()}{rangeChanged()} is emitted when the
        scroll bar's range of values has changed.
-    \o \l{QAbstractSlider::sliderPressed()}{sliderPressed()} is emitted when
+    \li \l{QAbstractSlider::sliderPressed()}{sliderPressed()} is emitted when
        the user starts to drag the slider.
-    \o \l{QAbstractSlider::sliderMoved()}{sliderMoved()} is emitted when the user
+    \li \l{QAbstractSlider::sliderMoved()}{sliderMoved()} is emitted when the user
        drags the slider.
-    \o \l{QAbstractSlider::sliderReleased()}{sliderReleased()} is emitted when
+    \li \l{QAbstractSlider::sliderReleased()}{sliderReleased()} is emitted when
        the user releases the slider.
-    \o \l{QAbstractSlider::actionTriggered()}{actionTriggered()} is emitted
+    \li \l{QAbstractSlider::actionTriggered()}{actionTriggered()} is emitted
        when the scroll bar is changed by user interaction or via the
        \l{QAbstractSlider::triggerAction()}{triggerAction()} function.
     \endlist
@@ -173,12 +173,12 @@ QT_BEGIN_NAMESPACE
     default focusPolicy() of Qt::NoFocus. Use setFocusPolicy() to
     enable keyboard interaction with the scroll bar:
     \list
-         \o Left/Right move a horizontal scroll bar by one single step.
-         \o Up/Down move a vertical scroll bar by one single step.
-         \o PageUp moves up one page.
-         \o PageDown moves down one page.
-         \o Home moves to the start (mininum).
-         \o End moves to the end (maximum).
+         \li Left/Right move a horizontal scroll bar by one single step.
+         \li Up/Down move a vertical scroll bar by one single step.
+         \li PageUp moves up one page.
+         \li PageDown moves down one page.
+         \li Home moves to the start (mininum).
+         \li End moves to the end (maximum).
      \endlist
 
     The slider itself can be controlled by using the
@@ -190,12 +190,12 @@ QT_BEGIN_NAMESPACE
     slider.
 
     \table 100%
-    \row \o \inlineimage macintosh-horizontalscrollbar.png Screenshot of a Macintosh style scroll bar
-         \o A scroll bar shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
-    \row \o \inlineimage windowsxp-horizontalscrollbar.png Screenshot of a Windows XP style scroll bar
-         \o A scroll bar shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
-    \row \o \inlineimage plastique-horizontalscrollbar.png Screenshot of a Plastique style scroll bar
-         \o A scroll bar shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
+    \row \li \inlineimage macintosh-horizontalscrollbar.png Screenshot of a Macintosh style scroll bar
+         \li A scroll bar shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
+    \row \li \inlineimage windowsxp-horizontalscrollbar.png Screenshot of a Windows XP style scroll bar
+         \li A scroll bar shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
+    \row \li \inlineimage plastique-horizontalscrollbar.png Screenshot of a Plastique style scroll bar
+         \li A scroll bar shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
     \endtable
 
     \sa QScrollArea, QSlider, QDial, QSpinBox, {fowler}{GUI Design Handbook: Scroll Bar}, {Sliders Example}
diff --git a/src/widgets/widgets/qsizegrip.cpp b/src/widgets/widgets/qsizegrip.cpp
index 09557a3c90..4a5269c110 100644
--- a/src/widgets/widgets/qsizegrip.cpp
+++ b/src/widgets/widgets/qsizegrip.cpp
@@ -195,8 +195,8 @@ Qt::Corner QSizeGripPrivate::corner() const
     window is shown full screen or maximised.
 
     \table 50%
-    \row \o \inlineimage plastique-sizegrip.png Screenshot of a Plastique style size grip
-    \o A size grip widget at the bottom-right corner of a main window, shown in the
+    \row \li \inlineimage plastique-sizegrip.png Screenshot of a Plastique style size grip
+    \li A size grip widget at the bottom-right corner of a main window, shown in the
     \l{Plastique Style Widget Gallery}{Plastique widget style}.
     \endtable
 
diff --git a/src/widgets/widgets/qslider.cpp b/src/widgets/widgets/qslider.cpp
index b05726c965..7f77bc9d03 100644
--- a/src/widgets/widgets/qslider.cpp
+++ b/src/widgets/widgets/qslider.cpp
@@ -225,17 +225,17 @@ QStyle::SubControl QSliderPrivate::newHoverControl(const QPoint &pos)
 
     QSlider inherits a comprehensive set of signals:
     \table
-    \header \o Signal \o Description
-    \row \o \l valueChanged()
-    \o Emitted when the slider's value has changed. The tracking()
+    \header \li Signal \li Description
+    \row \li \l valueChanged()
+    \li Emitted when the slider's value has changed. The tracking()
        determines whether this signal is emitted during user
        interaction.
-    \row \o \l sliderPressed()
-    \o Emitted when the user starts to drag the slider.
-    \row \o \l sliderMoved()
-    \o Emitted when the user drags the slider.
-    \row \o \l sliderReleased()
-    \o Emitted when the user releases the slider.
+    \row \li \l sliderPressed()
+    \li Emitted when the user starts to drag the slider.
+    \row \li \l sliderMoved()
+    \li Emitted when the user drags the slider.
+    \row \li \l sliderReleased()
+    \li Emitted when the user releases the slider.
     \endtable
 
     QSlider only provides integer ranges. Note that although
@@ -246,21 +246,21 @@ QStyle::SubControl QSliderPrivate::newHoverControl(const QPoint &pos)
     keyboard interface. The keyboard interface is the following:
 
     \list
-        \o Left/Right move a horizontal slider by one single step.
-        \o Up/Down move a vertical slider by one single step.
-        \o PageUp moves up one page.
-        \o PageDown moves down one page.
-        \o Home moves to the start (mininum).
-        \o End moves to the end (maximum).
+        \li Left/Right move a horizontal slider by one single step.
+        \li Up/Down move a vertical slider by one single step.
+        \li PageUp moves up one page.
+        \li PageDown moves down one page.
+        \li Home moves to the start (mininum).
+        \li End moves to the end (maximum).
     \endlist
 
     \table 100%
-    \row \o \inlineimage macintosh-slider.png Screenshot of a Macintosh slider
-         \o A slider shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
-    \row \o \inlineimage windows-slider.png Screenshot of a Windows XP slider
-         \o A slider shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
-    \row \o \inlineimage plastique-slider.png Screenshot of a Plastique slider
-         \o A slider shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
+    \row \li \inlineimage macintosh-slider.png Screenshot of a Macintosh slider
+         \li A slider shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
+    \row \li \inlineimage windows-slider.png Screenshot of a Windows XP slider
+         \li A slider shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
+    \row \li \inlineimage plastique-slider.png Screenshot of a Plastique slider
+         \li A slider shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
     \endtable
 
     \sa QScrollBar, QSpinBox, QDial, {fowler}{GUI Design Handbook: Slider}, {Sliders Example}
diff --git a/src/widgets/widgets/qspinbox.cpp b/src/widgets/widgets/qspinbox.cpp
index 3038d8e30c..7dcaead2f4 100644
--- a/src/widgets/widgets/qspinbox.cpp
+++ b/src/widgets/widgets/qspinbox.cpp
@@ -152,12 +152,12 @@ public:
     setSpecialValueText() for how to do this with QSpinBox.
 
     \table 100%
-    \row \o \inlineimage windowsxp-spinbox.png Screenshot of a Windows XP spin box
-         \o A spin box shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
-    \row \o \inlineimage plastique-spinbox.png Screenshot of a Plastique spin box
-         \o A spin box shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
-    \row \o \inlineimage macintosh-spinbox.png Screenshot of a Macintosh spin box
-         \o A spin box shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
+    \row \li \inlineimage windowsxp-spinbox.png Screenshot of a Windows XP spin box
+         \li A spin box shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
+    \row \li \inlineimage plastique-spinbox.png Screenshot of a Plastique spin box
+         \li A spin box shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
+    \row \li \inlineimage macintosh-spinbox.png Screenshot of a Macintosh spin box
+         \li A spin box shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
     \endtable
 
     \section1 Subclassing QSpinBox
diff --git a/src/widgets/widgets/qstackedwidget.cpp b/src/widgets/widgets/qstackedwidget.cpp
index 5a8a382a58..9617d6de58 100644
--- a/src/widgets/widgets/qstackedwidget.cpp
+++ b/src/widgets/widgets/qstackedwidget.cpp
@@ -232,7 +232,7 @@ int QStackedWidget::insertWidget(int index, QWidget *widget)
     not deleted but simply removed from the stacked layout, causing it
     to be hidden.
 
-    \bold{Note:} Ownership of \a widget reverts to the application.
+    \b{Note:} Ownership of \a widget reverts to the application.
 
     \sa addWidget(), insertWidget(), currentWidget()
 */
diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp
index 9f170626da..4b9242499c 100644
--- a/src/widgets/widgets/qstatusbar.cpp
+++ b/src/widgets/widgets/qstatusbar.cpp
@@ -165,12 +165,12 @@ QRect QStatusBarPrivate::messageRect() const
     Each status indicator falls into one of three categories:
 
     \list
-    \o \e Temporary - briefly occupies most of the status bar. Used
+    \li \e Temporary - briefly occupies most of the status bar. Used
         to explain tool tip texts or menu entries, for example.
-    \o \e Normal - occupies part of the status bar and may be hidden
+    \li \e Normal - occupies part of the status bar and may be hidden
         by temporary messages. Used to display the page and line
         number in a word processor, for example.
-    \o \e Permanent - is never hidden. Used for important mode
+    \li \e Permanent - is never hidden. Used for important mode
         indications, for example, some applications put a Caps Lock
         indicator in the status bar.
     \endlist
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
index 580aea10b9..ca94854d11 100644
--- a/src/widgets/widgets/qtabbar.cpp
+++ b/src/widgets/widgets/qtabbar.cpp
@@ -252,21 +252,21 @@ void QTabBar::initStyleOption(QStyleOptionTab *option, int tabIndex) const
     tab:
 
     \list
-    \i tabSizeHint() calcuates the size of a tab.
-    \i tabInserted() notifies that a new tab was added.
-    \i tabRemoved() notifies that a tab was removed.
-    \i tabLayoutChange() notifies that the tabs have been re-laid out.
-    \i paintEvent() paints all tabs.
+    \li tabSizeHint() calcuates the size of a tab.
+    \li tabInserted() notifies that a new tab was added.
+    \li tabRemoved() notifies that a tab was removed.
+    \li tabLayoutChange() notifies that the tabs have been re-laid out.
+    \li paintEvent() paints all tabs.
     \endlist
 
     For subclasses, you might also need the tabRect() functions which
     returns the visual geometry of a single tab.
 
     \table 100%
-    \row \o \inlineimage plastique-tabbar.png Screenshot of a Plastique style tab bar
-         \o A tab bar shown in the Plastique widget style.
-    \row \o \inlineimage plastique-tabbar-truncated.png Screenshot of a truncated Plastique tab bar
-         \o A truncated tab bar shown in the Plastique widget style.
+    \row \li \inlineimage plastique-tabbar.png Screenshot of a Plastique style tab bar
+         \li A tab bar shown in the Plastique widget style.
+    \row \li \inlineimage plastique-tabbar-truncated.png Screenshot of a truncated Plastique tab bar
+         \li A truncated tab bar shown in the Plastique widget style.
     \endtable
 
     \sa QTabWidget
diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp
index 612d51826c..505287512e 100644
--- a/src/widgets/widgets/qtabwidget.cpp
+++ b/src/widgets/widgets/qtabwidget.cpp
@@ -77,12 +77,12 @@ QT_BEGIN_NAMESPACE
 
     The normal way to use QTabWidget is to do the following:
     \list 1
-    \i Create a QTabWidget.
-    \i Create a QWidget for each of the pages in the tab dialog, but
+    \li Create a QTabWidget.
+    \li Create a QWidget for each of the pages in the tab dialog, but
        do not specify parent widgets for them.
-    \i Insert child widgets into the page widget, using layouts to
+    \li Insert child widgets into the page widget, using layouts to
        position them as normal.
-    \i Call addTab() or insertTab() to put the page widgets into the
+    \li Call addTab() or insertTab() to put the page widgets into the
        tab widget, giving each tab a suitable label with an optional
        keyboard shortcut.
     \endlist
@@ -120,12 +120,12 @@ QT_BEGIN_NAMESPACE
     area, organizing the individual pages).
 
     \table 100%
-    \row \o \inlineimage windowsxp-tabwidget.png Screenshot of a Windows XP style tab widget
-         \o \inlineimage macintosh-tabwidget.png Screenshot of a Macintosh style tab widget
-         \o \inlineimage plastique-tabwidget.png Screenshot of a Plastique style tab widget
-    \row \o A Windows XP style tab widget.
-         \o A Macintosh style tab widget.
-         \o A Plastique style tab widget.
+    \row \li \inlineimage windowsxp-tabwidget.png Screenshot of a Windows XP style tab widget
+         \li \inlineimage macintosh-tabwidget.png Screenshot of a Macintosh style tab widget
+         \li \inlineimage plastique-tabwidget.png Screenshot of a Plastique style tab widget
+    \row \li A Windows XP style tab widget.
+         \li A Macintosh style tab widget.
+         \li A Plastique style tab widget.
     \endtable
 
     \sa QTabBar, QStackedWidget, QToolBox, {Tab Dialog Example}
diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp
index d9229c12e8..050730ec2a 100644
--- a/src/widgets/widgets/qtextbrowser.cpp
+++ b/src/widgets/widgets/qtextbrowser.cpp
@@ -902,10 +902,10 @@ void QTextBrowser::home()
 /*!
     The event \a ev is used to provide the following keyboard shortcuts:
     \table
-    \header \i Keypress            \i Action
-    \row \i Alt+Left Arrow  \i \l backward()
-    \row \i Alt+Right Arrow \i \l forward()
-    \row \i Alt+Up Arrow    \i \l home()
+    \header \li Keypress            \li Action
+    \row \li Alt+Left Arrow  \li \l backward()
+    \row \li Alt+Right Arrow \li \l forward()
+    \row \li Alt+Up Arrow    \li \l home()
     \endtable
 */
 void QTextBrowser::keyPressEvent(QKeyEvent *ev)
@@ -1068,10 +1068,10 @@ void QTextBrowser::paintEvent(QPaintEvent *e)
     depending on the resource type:
 
     \table
-    \header \i ResourceType  \i QVariant::Type
-    \row    \i QTextDocument::HtmlResource  \i QString or QByteArray
-    \row    \i QTextDocument::ImageResource \i QImage, QPixmap or QByteArray
-    \row    \i QTextDocument::StyleSheetResource \i QString or QByteArray
+    \header \li ResourceType  \li QVariant::Type
+    \row    \li QTextDocument::HtmlResource  \li QString or QByteArray
+    \row    \li QTextDocument::ImageResource \li QImage, QPixmap or QByteArray
+    \row    \li QTextDocument::StyleSheetResource \li QString or QByteArray
     \endtable
 */
 QVariant QTextBrowser::loadResource(int /*type*/, const QUrl &name)
@@ -1146,10 +1146,10 @@ void QTextBrowser::clearHistory()
    Returns the url of the HistoryItem.
 
     \table
-    \header \i Input            \i Return
-    \row \i \a{i} < 0  \i \l backward() history
-    \row \i\a{i} == 0 \i current, see QTextBrowser::source()
-    \row \i \a{i} > 0  \i \l forward() history
+    \header \li Input            \li Return
+    \row \li \a{i} < 0  \li \l backward() history
+    \row \li\a{i} == 0 \li current, see QTextBrowser::source()
+    \row \li \a{i} > 0  \li \l forward() history
     \endtable
 
     \since 4.4
@@ -1164,10 +1164,10 @@ QUrl QTextBrowser::historyUrl(int i) const
     Returns the documentTitle() of the HistoryItem.
 
     \table
-    \header \i Input            \i Return
-    \row \i \a{i} < 0  \i \l backward() history
-    \row \i \a{i} == 0 \i current, see QTextBrowser::source()
-    \row \i \a{i} > 0  \i \l forward() history
+    \header \li Input            \li Return
+    \row \li \a{i} < 0  \li \l backward() history
+    \row \li \a{i} == 0 \li current, see QTextBrowser::source()
+    \row \li \a{i} > 0  \li \l forward() history
     \endtable
 
     \snippet doc/src/snippets/code/src_gui_widgets_qtextbrowser.cpp 0
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index d0065aacb9..198d101dbf 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -412,19 +412,19 @@ void QTextEditPrivate::_q_ensureVisible(const QRectF &_rect)
     When QTextEdit is used read-only the key bindings are limited to
     navigation, and text may only be selected with the mouse:
     \table
-    \header \i Keypresses \i Action
-    \row \i Up        \i Moves one line up.
-    \row \i Down        \i Moves one line down.
-    \row \i Left        \i Moves one character to the left.
-    \row \i Right        \i Moves one character to the right.
-    \row \i PageUp        \i Moves one (viewport) page up.
-    \row \i PageDown        \i Moves one (viewport) page down.
-    \row \i Home        \i Moves to the beginning of the text.
-    \row \i End                \i Moves to the end of the text.
-    \row \i Alt+Wheel
-         \i Scrolls the page horizontally (the Wheel is the mouse wheel).
-    \row \i Ctrl+Wheel        \i Zooms the text.
-    \row \i Ctrl+A            \i Selects all text.
+    \header \li Keypresses \li Action
+    \row \li Up        \li Moves one line up.
+    \row \li Down        \li Moves one line down.
+    \row \li Left        \li Moves one character to the left.
+    \row \li Right        \li Moves one character to the right.
+    \row \li PageUp        \li Moves one (viewport) page up.
+    \row \li PageDown        \li Moves one (viewport) page down.
+    \row \li Home        \li Moves to the beginning of the text.
+    \row \li End                \li Moves to the end of the text.
+    \row \li Alt+Wheel
+         \li Scrolls the page horizontally (the Wheel is the mouse wheel).
+    \row \li Ctrl+Wheel        \li Zooms the text.
+    \row \li Ctrl+A            \li Selects all text.
     \endtable
 
     The text edit may be able to provide some meta-information. For
@@ -486,31 +486,31 @@ void QTextEditPrivate::_q_ensureVisible(const QRectF &_rect)
 
     The list of key bindings which are implemented for editing:
     \table
-    \header \i Keypresses \i Action
-    \row \i Backspace \i Deletes the character to the left of the cursor.
-    \row \i Delete \i Deletes the character to the right of the cursor.
-    \row \i Ctrl+C \i Copy the selected text to the clipboard.
-    \row \i Ctrl+Insert \i Copy the selected text to the clipboard.
-    \row \i Ctrl+K \i Deletes to the end of the line.
-    \row \i Ctrl+V \i Pastes the clipboard text into text edit.
-    \row \i Shift+Insert \i Pastes the clipboard text into text edit.
-    \row \i Ctrl+X \i Deletes the selected text and copies it to the clipboard.
-    \row \i Shift+Delete \i Deletes the selected text and copies it to the clipboard.
-    \row \i Ctrl+Z \i Undoes the last operation.
-    \row \i Ctrl+Y \i Redoes the last operation.
-    \row \i Left \i Moves the cursor one character to the left.
-    \row \i Ctrl+Left \i Moves the cursor one word to the left.
-    \row \i Right \i Moves the cursor one character to the right.
-    \row \i Ctrl+Right \i Moves the cursor one word to the right.
-    \row \i Up \i Moves the cursor one line up.
-    \row \i Down \i Moves the cursor one line down.
-    \row \i PageUp \i Moves the cursor one page up.
-    \row \i PageDown \i Moves the cursor one page down.
-    \row \i Home \i Moves the cursor to the beginning of the line.
-    \row \i Ctrl+Home \i Moves the cursor to the beginning of the text.
-    \row \i End \i Moves the cursor to the end of the line.
-    \row \i Ctrl+End \i Moves the cursor to the end of the text.
-    \row \i Alt+Wheel \i Scrolls the page horizontally (the Wheel is the mouse wheel).
+    \header \li Keypresses \li Action
+    \row \li Backspace \li Deletes the character to the left of the cursor.
+    \row \li Delete \li Deletes the character to the right of the cursor.
+    \row \li Ctrl+C \li Copy the selected text to the clipboard.
+    \row \li Ctrl+Insert \li Copy the selected text to the clipboard.
+    \row \li Ctrl+K \li Deletes to the end of the line.
+    \row \li Ctrl+V \li Pastes the clipboard text into text edit.
+    \row \li Shift+Insert \li Pastes the clipboard text into text edit.
+    \row \li Ctrl+X \li Deletes the selected text and copies it to the clipboard.
+    \row \li Shift+Delete \li Deletes the selected text and copies it to the clipboard.
+    \row \li Ctrl+Z \li Undoes the last operation.
+    \row \li Ctrl+Y \li Redoes the last operation.
+    \row \li Left \li Moves the cursor one character to the left.
+    \row \li Ctrl+Left \li Moves the cursor one word to the left.
+    \row \li Right \li Moves the cursor one character to the right.
+    \row \li Ctrl+Right \li Moves the cursor one word to the right.
+    \row \li Up \li Moves the cursor one line up.
+    \row \li Down \li Moves the cursor one line down.
+    \row \li PageUp \li Moves the cursor one page up.
+    \row \li PageDown \li Moves the cursor one page down.
+    \row \li Home \li Moves the cursor to the beginning of the line.
+    \row \li Ctrl+Home \li Moves the cursor to the beginning of the text.
+    \row \li End \li Moves the cursor to the end of the line.
+    \row \li Ctrl+End \li Moves the cursor to the end of the text.
+    \row \li Alt+Wheel \li Scrolls the page horizontally (the Wheel is the mouse wheel).
     \endtable
 
     To select (mark) text hold down the Shift key whilst pressing one
diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
index 015419a879..68a4f20fb6 100644
--- a/src/widgets/widgets/qtoolbutton.cpp
+++ b/src/widgets/widgets/qtoolbutton.cpp
@@ -159,8 +159,8 @@ bool QToolButtonPrivate::hasMenu() const
     adjust it with setPopupDelay().
 
     \table 100%
-    \row \o \inlineimage assistant-toolbar.png Qt Assistant's toolbar with tool buttons
-    \row \o Qt Assistant's toolbar contains tool buttons that are associated
+    \row \li \inlineimage assistant-toolbar.png Qt Assistant's toolbar with tool buttons
+    \row \li Qt Assistant's toolbar contains tool buttons that are associated
          with actions used in other parts of the main window.
     \endtable
 
diff --git a/src/widgets/widgets/qworkspace.cpp b/src/widgets/widgets/qworkspace.cpp
index 5cc8e363f1..36c589be1c 100644
--- a/src/widgets/widgets/qworkspace.cpp
+++ b/src/widgets/widgets/qworkspace.cpp
@@ -878,8 +878,8 @@ QSize QWorkspaceTitleBar::sizeHint() const
     connect menu entries to them.
 
     \table
-    \row \o \inlineimage mdi-cascade.png
-         \o \inlineimage mdi-tile.png
+    \row \li \inlineimage mdi-cascade.png
+         \li \inlineimage mdi-tile.png
     \endtable
 
     If you want your users to be able to work with child windows
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index 0171fc7bef..95fde4e4f6 100644
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -970,8 +970,8 @@ QDomImplementation::~QDomImplementation()
 
     The currently supported features and their versions:
     \table
-    \header \i Feature \i Version
-    \row \i XML \i 1.0
+    \header \li Feature \li Version
+    \row \li XML \li 1.0
     \endtable
 */
 bool QDomImplementation::hasFeature(const QString& feature, const QString& version) const
@@ -2098,22 +2098,22 @@ QDomNode::~QDomNode()
     The meaning of the name depends on the subclass:
 
     \table
-    \header \i Name \i Meaning
-    \row \i QDomAttr \i The name of the attribute
-    \row \i QDomCDATASection \i The string "#cdata-section"
-    \row \i QDomComment \i The string "#comment"
-    \row \i QDomDocument \i The string "#document"
-    \row \i QDomDocumentFragment \i The string "#document-fragment"
-    \row \i QDomDocumentType \i The name of the document type
-    \row \i QDomElement \i The tag name
-    \row \i QDomEntity \i The name of the entity
-    \row \i QDomEntityReference \i The name of the referenced entity
-    \row \i QDomNotation \i The name of the notation
-    \row \i QDomProcessingInstruction \i The target of the processing instruction
-    \row \i QDomText \i The string "#text"
+    \header \li Name \li Meaning
+    \row \li QDomAttr \li The name of the attribute
+    \row \li QDomCDATASection \li The string "#cdata-section"
+    \row \li QDomComment \li The string "#comment"
+    \row \li QDomDocument \li The string "#document"
+    \row \li QDomDocumentFragment \li The string "#document-fragment"
+    \row \li QDomDocumentType \li The name of the document type
+    \row \li QDomElement \li The tag name
+    \row \li QDomEntity \li The name of the entity
+    \row \li QDomEntityReference \li The name of the referenced entity
+    \row \li QDomNotation \li The name of the notation
+    \row \li QDomProcessingInstruction \li The target of the processing instruction
+    \row \li QDomText \li The string "#text"
     \endtable
 
-    \bold{Note:} This function does not take the presence of namespaces into account
+    \b{Note:} This function does not take the presence of namespaces into account
     when processing the names of element and attribute nodes. As a result, the
     returned name can contain any namespace prefix that may be present.
     To obtain the node name of an element or attribute, use localName(); to
@@ -2136,12 +2136,12 @@ QString QDomNode::nodeName() const
 
     The meaning of the value depends on the subclass:
     \table
-    \header \i Name \i Meaning
-    \row \i QDomAttr \i The attribute value
-    \row \i QDomCDATASection \i The content of the CDATA section
-    \row \i QDomComment \i The comment
-    \row \i QDomProcessingInstruction \i The data of the processing instruction
-    \row \i QDomText \i The text
+    \header \li Name \li Meaning
+    \row \li QDomAttr \li The attribute value
+    \row \li QDomCDATASection \li The content of the CDATA section
+    \row \li QDomComment \li The comment
+    \row \li QDomProcessingInstruction \li The data of the processing instruction
+    \row \li QDomText \li The text
     \endtable
 
     All the other subclasses do not have a node value and will return
@@ -3191,11 +3191,11 @@ bool QDomNamedNodeMapPrivate::containsNS(const QString& nsURI, const QString & l
 
     The QDomNamedNodeMap is used in three places:
     \list 1
-    \i QDomDocumentType::entities() returns a map of all entities
+    \li QDomDocumentType::entities() returns a map of all entities
         described in the DTD.
-    \i QDomDocumentType::notations() returns a map of all notations
+    \li QDomDocumentType::notations() returns a map of all notations
         described in the DTD.
-    \i QDomNode::attributes() returns a map of all attributes of an
+    \li QDomNode::attributes() returns a map of all attributes of an
         element.
     \endlist
 
@@ -3427,7 +3427,7 @@ int QDomNamedNodeMap::length() const
     Returns true if the map contains a node called \a name; otherwise
     returns false.
 
-    \bold{Note:} This function does not take the presence of namespaces into account.
+    \b{Note:} This function does not take the presence of namespaces into account.
     Use namedItemNS() to test whether the map contains a node with a specific namespace
     URI and name.
 */
@@ -4950,7 +4950,7 @@ QDomNodeList QDomElement::elementsByTagName(const QString& tagname) const
   Returns true if this element has an attribute called \a name;
   otherwise returns false.
 
-  \bold{Note:} This function does not take the presence of namespaces
+  \b{Note:} This function does not take the presence of namespaces
   into account.  As a result, the specified name will be tested
   against fully-qualified attribute names that include any namespace
   prefixes that may be present.
@@ -6692,17 +6692,17 @@ bool QDomDocument::setContent(const QString& text, bool namespaceProcessing, QSt
 
     Entity references are handled as follows:
     \list
-    \o References to internal general entities and character entities occurring in the
+    \li References to internal general entities and character entities occurring in the
         content are included. The result is a QDomText node with the references replaced
         by their corresponding entity values.
-    \o References to parameter entities occurring in the internal subset are included.
+    \li References to parameter entities occurring in the internal subset are included.
         The result is a QDomDocumentType node which contains entity and notation declarations
         with the references replaced by their corresponding entity values.
-    \o Any general parsed entity reference which is not defined in the internal subset and
+    \li Any general parsed entity reference which is not defined in the internal subset and
         which occurs in the content is represented as a QDomEntityReference node.
-    \o Any parsed entity reference which is not defined in the internal subset and which
+    \li Any parsed entity reference which is not defined in the internal subset and which
         occurs outside of the content is replaced with an empty string.
-    \o Any unparsed entity reference is replaced with an empty string.
+    \li Any unparsed entity reference is replaced with an empty string.
     \endlist
 
     \sa QDomNode::namespaceURI() QDomNode::localName()
@@ -7039,46 +7039,46 @@ QDomNodeList QDomDocument::elementsByTagName(const QString& tagname) const
     The behavior of this function is slightly different depending on
     the node types:
     \table
-    \header \i Node Type \i Behavior
-    \row \i QDomAttr
-         \i The owner element is set to 0 and the specified flag is
+    \header \li Node Type \li Behavior
+    \row \li QDomAttr
+         \li The owner element is set to 0 and the specified flag is
             set to true in the generated attribute. The whole subtree
             of \a importedNode is always imported for attribute nodes:
             \a deep has no effect.
-    \row \i QDomDocument
-         \i Document nodes cannot be imported.
-    \row \i QDomDocumentFragment
-         \i If \a deep is true, this function imports the whole
+    \row \li QDomDocument
+         \li Document nodes cannot be imported.
+    \row \li QDomDocumentFragment
+         \li If \a deep is true, this function imports the whole
             document fragment; otherwise it only generates an empty
             document fragment.
-    \row \i QDomDocumentType
-         \i Document type nodes cannot be imported.
-    \row \i QDomElement
-         \i Attributes for which QDomAttr::specified() is true are
+    \row \li QDomDocumentType
+         \li Document type nodes cannot be imported.
+    \row \li QDomElement
+         \li Attributes for which QDomAttr::specified() is true are
             also imported, other attributes are not imported. If \a
             deep is true, this function also imports the subtree of \a
             importedNode; otherwise it imports only the element node
             (and some attributes, see above).
-    \row \i QDomEntity
-         \i Entity nodes can be imported, but at the moment there is
+    \row \li QDomEntity
+         \li Entity nodes can be imported, but at the moment there is
             no way to use them since the document type is read-only in
             DOM level 2.
-    \row \i QDomEntityReference
-         \i Descendants of entity reference nodes are never imported:
+    \row \li QDomEntityReference
+         \li Descendants of entity reference nodes are never imported:
             \a deep has no effect.
-    \row \i QDomNotation
-         \i Notation nodes can be imported, but at the moment there is
+    \row \li QDomNotation
+         \li Notation nodes can be imported, but at the moment there is
             no way to use them since the document type is read-only in
             DOM level 2.
-    \row \i QDomProcessingInstruction
-         \i The target and value of the processing instruction is
+    \row \li QDomProcessingInstruction
+         \li The target and value of the processing instruction is
             copied to the new node.
-    \row \i QDomText
-         \i The text is copied to the new node.
-    \row \i QDomCDATASection
-         \i The text is copied to the new node.
-    \row \i QDomComment
-         \i The text is copied to the new node.
+    \row \li QDomText
+         \li The text is copied to the new node.
+    \row \li QDomCDATASection
+         \li The text is copied to the new node.
+    \row \li QDomComment
+         \li The text is copied to the new node.
     \endtable
 
     \sa QDomElement::setAttribute() QDomNode::insertBefore()
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index 2a41ce3426..2488d27807 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -516,29 +516,29 @@ private:
 
 
     \list
-        \o "no error occurred"
-        \o "error triggered by consumer"
-        \o "unexpected end of file"
-        \o "more than one document type definition"
-        \o "error occurred while parsing element"
-        \o "tag mismatch"
-        \o "error occurred while parsing content"
-        \o "unexpected character"
-        \o "invalid name for processing instruction"
-        \o "version expected while reading the XML declaration"
-        \o "wrong value for standalone declaration"
-        \o "encoding declaration or standalone declaration expected while reading the XML declaration"
-        \o "standalone declaration expected while reading the XML declaration"
-        \o "error occurred while parsing document type definition"
-        \o "letter is expected"
-        \o "error occurred while parsing comment"
-        \o "error occurred while parsing reference"
-        \o "internal general entity reference not allowed in DTD"
-        \o "external parsed general entity reference not allowed in attribute value"
-        \o "external parsed general entity reference not allowed in DTD"
-        \o "unparsed entity reference n wrong context"
-        \o "recursive entities"
-        \o "error in the text declaration of an external entity"
+        \li "no error occurred"
+        \li "error triggered by consumer"
+        \li "unexpected end of file"
+        \li "more than one document type definition"
+        \li "error occurred while parsing element"
+        \li "tag mismatch"
+        \li "error occurred while parsing content"
+        \li "unexpected character"
+        \li "invalid name for processing instruction"
+        \li "version expected while reading the XML declaration"
+        \li "wrong value for standalone declaration"
+        \li "encoding declaration or standalone declaration expected while reading the XML declaration"
+        \li "standalone declaration expected while reading the XML declaration"
+        \li "error occurred while parsing document type definition"
+        \li "letter is expected"
+        \li "error occurred while parsing comment"
+        \li "error occurred while parsing reference"
+        \li "internal general entity reference not allowed in DTD"
+        \li "external parsed general entity reference not allowed in attribute value"
+        \li "external parsed general entity reference not allowed in DTD"
+        \li "unparsed entity reference n wrong context"
+        \li "recursive entities"
+        \li "error in the text declaration of an external entity"
     \endlist
 
     Note that, if you want to display these error messages to your
@@ -3157,24 +3157,24 @@ bool QXmlSimpleReader::feature(const QString& name, bool *ok) const
 
     The \a name parameter must be one of the following strings:
     \table
-    \header \i Feature \i Default \i Notes
-    \row \i \e http://xml.org/sax/features/namespaces
-         \i true
-         \i If enabled, namespaces are reported to the content handler.
-    \row \i \e http://xml.org/sax/features/namespace-prefixes
-         \i false
-         \i If enabled, the original prefixed names
+    \header \li Feature \li Default \li Notes
+    \row \li \e http://xml.org/sax/features/namespaces
+         \li true
+         \li If enabled, namespaces are reported to the content handler.
+    \row \li \e http://xml.org/sax/features/namespace-prefixes
+         \li false
+         \li If enabled, the original prefixed names
             and attributes used for namespace declarations are
             reported.
-    \row \i \e http://trolltech.com/xml/features/report-whitespace-only-CharData
-         \i true
-         \i If enabled, CharData that consist of
+    \row \li \e http://trolltech.com/xml/features/report-whitespace-only-CharData
+         \li true
+         \li If enabled, CharData that consist of
             only whitespace characters are reported
             using QXmlContentHandler::characters(). If disabled, whitespace is silently
             discarded.
-    \row \i \e http://trolltech.com/xml/features/report-start-end-entity
-         \i false
-         \i If enabled, the parser reports
+    \row \li \e http://trolltech.com/xml/features/report-start-end-entity
+         \li false
+         \li If enabled, the parser reports
             QXmlContentHandler::startEntity() and
             QXmlContentHandler::endEntity() events, so character data
             might be reported in chunks.
author	Casper van Donderen <casper.vandonderen@nokia.com>	2012-03-01 15:28:31 +0100
committer	Qt by Nokia <qt-info@nokia.com>	2012-03-02 23:16:25 +0100
commit	95d83cb1b68cc4a415d5d80859b4e74472ad7112 (patch)
tree	9f6fa892ee78f584224320a195f03419c0fdbc21 /src
parent	15e136d4e116c1513c106dfbb75e1953a7f3463c (diff)
download	qtbase-95d83cb1b68cc4a415d5d80859b4e74472ad7112.tar.gz