2 files changed, 71 insertions, 71 deletions
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}