diff --git a/doc/config/compat.qdocconf b/doc/config/compat.qdocconf
index 5745ed93b08a4b7457421b5cd76580b81d584387..fe793de6b813436f2abf05f235533986681e1bd6 100644
--- a/doc/config/compat.qdocconf
+++ b/doc/config/compat.qdocconf
@@ -1,8 +1,8 @@
 alias.i				= e
-alias.include			= input
 
+macro.li                        = "\\o"
 macro.0                         = "\\\\0"
-macro.b                         = "\\\\b"
+macro.b                         = "\\bold"
 macro.n                         = "\\\\n"
 macro.r                         = "\\\\r"
 macro.i                         = "\\o"
diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf
index 4773a97130d24e16b96d659055f7b7b99b922d75..21b61a87f7d8c26b26bb159ce5c75223c9a6d18e 100644
--- a/doc/config/macros.qdocconf
+++ b/doc/config/macros.qdocconf
@@ -2,17 +2,17 @@ macro.aacute.HTML       = "á"
 macro.Aring.HTML        = "Å"
 macro.aring.HTML        = "å"
 macro.Auml.HTML         = "Ä"
-macro.author            = "\\bold{Author:}"
+macro.author            = "\\b{Author:}"
 macro.br.HTML           = "<br />"
 macro.BR.HTML           = "<br />"
 macro.copyright.HTML    = "&copy;"
 macro.eacute.HTML       = "&eacute;"
-macro.gui               = "\\bold"
+macro.gui               = "\\b"
 macro.hr.HTML           = "<hr />"
 macro.iacute.HTML       = "&iacute;"
-macro.key               = "\\bold"
-macro.menu              = "\\bold"
-macro.note              = "\\bold{Note:}"
+macro.key               = "\\b"
+macro.menu              = "\\b"
+macro.note              = "\\b{Note:}"
 macro.oslash.HTML       = "&oslash;"
 macro.ouml.HTML         = "&ouml;"
 macro.QA                = "Qt Assistant"
diff --git a/doc/src/analyze/creator-analyze.qdoc b/doc/src/analyze/creator-analyze.qdoc
index c130cd2998335dff92e36e6e937f6f155e54f2b8..8a004665f5e695e890fea4d0c2b5058bc88f7d60 100644
--- a/doc/src/analyze/creator-analyze.qdoc
+++ b/doc/src/analyze/creator-analyze.qdoc
@@ -49,14 +49,14 @@
 
     \list
 
-        \o  \l{Profiling QML Applications}{QML Profiler}
+        \li \l{Profiling QML Applications}{QML Profiler}
 
             You can inspect binding evaluations, signal handling, and
             painting operations when running QML code. This is useful for
             identifying potential bottlenecks, especially in the evaluation
             of bindings.
 
-        \o  \l{Using Valgrind Code Analysis Tools}{Valgrind Code Analysis Tools}
+        \li \l{Using Valgrind Code Analysis Tools}{Valgrind Code Analysis Tools}
 
             You can detect problems in memory management by using the Memcheck
             tool and find cache misses in the code by using the Callgrind tool.
diff --git a/doc/src/analyze/creator-valgrind-overview.qdoc b/doc/src/analyze/creator-valgrind-overview.qdoc
index 6b903c96fdccb5e396bf1b42c684216f786931db..820b0cb9c72d249d4cbb6fc80128b63a47053f10 100644
--- a/doc/src/analyze/creator-valgrind-overview.qdoc
+++ b/doc/src/analyze/creator-valgrind-overview.qdoc
@@ -50,11 +50,11 @@
 
     \list
 
-        \o  \l{Detecting Memory Leaks}
+        \li \l{Detecting Memory Leaks}
 
-        \o  \l{Profiling Function Execution}
+        \li \l{Profiling Function Execution}
 
-        \o  \l{Running Valgrind Tools Remotely}
+        \li \l{Running Valgrind Tools Remotely}
 
     \endlist
 
diff --git a/doc/src/analyze/creator-valgrind.qdoc b/doc/src/analyze/creator-valgrind.qdoc
index f317549a9f88397275ac81bda7a17346fc509b9d..c2a805c18088a249e50bca36817aa0f5fea6c64a 100644
--- a/doc/src/analyze/creator-valgrind.qdoc
+++ b/doc/src/analyze/creator-valgrind.qdoc
@@ -44,19 +44,19 @@
 
     \list 1
 
-        \o  In the \gui Projects mode, select a debug build configuration.
+        \li In the \gui Projects mode, select a debug build configuration.
 
-        \o  Select \gui Analyze to open the \gui Analyze mode.
+        \li Select \gui Analyze to open the \gui Analyze mode.
 
-        \o  Select \gui {Analyze Memory} on the toolbar.
+        \li Select \gui {Analyze Memory} on the toolbar.
 
-        \o  Select the
+        \li Select the
             \inlineimage qtcreator-analyze-start-button.png "Start button"
             button to start the application.
 
-        \o  Use the application to analyze it.
+        \li Use the application to analyze it.
 
-        \o  Select the
+        \li Select the
             \inlineimage qtcreator-debug-button-stop.png "Stop button"
             button to view the results of the analysis in the
             \gui {Analysis} view.
@@ -135,19 +135,19 @@
 
     \list 1
 
-        \o  In the \gui Projects mode, select a release build configuration.
+        \li In the \gui Projects mode, select a release build configuration.
 
-        \o  Select \gui Analyze to open the \gui Analyze mode.
+        \li Select \gui Analyze to open the \gui Analyze mode.
 
-        \o  Select \gui Profile on the toolbar.
+        \li Select \gui Profile on the toolbar.
 
-        \o  Select the
+        \li Select the
             \inlineimage qtcreator-analyze-start-button.png "Start button"
             button to start the application.
 
-        \o  Use the application to analyze it.
+        \li Use the application to analyze it.
 
-        \o  Select the
+        \li Select the
             \inlineimage qtcreator-debug-button-stop.png "Stop button"
             button to view the results of the analysis in the \gui Profile
             view.
@@ -209,11 +209,11 @@
 
     \list
 
-        \o  Cache misses on instruction reads (I1mr/I2mr)
+        \li Cache misses on instruction reads (I1mr/I2mr)
 
-        \o  Data read accesses (Dr) and related cache misses (D1mr/D2mr)
+        \li Data read accesses (Dr) and related cache misses (D1mr/D2mr)
 
-        \o  Data write accesses (Dw) and related cache misses (D1mw/D2mw)
+        \li Data write accesses (Dw) and related cache misses (D1mw/D2mw)
 
     \endlist
 
@@ -224,10 +224,10 @@
 
     \list
 
-        \o  Number of conditional branches executed and related predictor misses
+        \li Number of conditional branches executed and related predictor misses
             (Bc/Bcm)
 
-        \o  Executed indirect jumps and related misses of the jump address
+        \li Executed indirect jumps and related misses of the jump address
             predictor (Bi/Bim)
 
     \endlist
@@ -252,12 +252,12 @@
 
     \list 1
 
-        \o  Select \gui {Analyze > Valgrind Memory Analyzer (External)} or
+        \li Select \gui {Analyze > Valgrind Memory Analyzer (External)} or
             \gui {Valgrind Function Profiler (External)}.
 
             \image qtcreator-valgrind-remote-settings.png "Start Analyzer dialog"
 
-        \o  Specify the application to run and analyze, and the \l{glossary-buildandrun-kit}{kit}
+        \li Specify the application to run and analyze, and the \l{glossary-buildandrun-kit}{kit}
             to use.
 
     \endlist
diff --git a/doc/src/analyze/qtquick-profiler.qdoc b/doc/src/analyze/qtquick-profiler.qdoc
index 262e06f8d8aa7b36caa74cf09864b8f01da44020..782972b1243299911c0e577a5400d16503753872 100644
--- a/doc/src/analyze/qtquick-profiler.qdoc
+++ b/doc/src/analyze/qtquick-profiler.qdoc
@@ -34,20 +34,20 @@
 
     \list 1
 
-        \o  To be able to profile an application, you must set up QML debugging
+        \li To be able to profile an application, you must set up QML debugging
             for the project. For more information, see
             \l{Setting Up QML Debugging}.
 
-        \o  In the \gui Projects mode, select Qt 4.7.4 in the \gui {Qt version}
+        \li In the \gui Projects mode, select Qt 4.7.4 in the \gui {Qt version}
             field.
 
             \note To profile applications on devices, you must install Qt 4.7.4
             or later libraries on them.
 
-        \o  Select \gui {Analyze > QML Profiler} to profile the current
+        \li Select \gui {Analyze > QML Profiler} to profile the current
             application.
 
-        \o  Select the
+        \li Select the
             \inlineimage qtcreator-analyze-start-button.png
             (\gui Start) button to start the application from the
             QML Profiler.
@@ -99,17 +99,17 @@
 
     \list
 
-        \o  Painting operations
+        \li Painting operations
 
-        \o  Compiling the QML sources
+        \li Compiling the QML sources
 
-        \o  Creating elements
+        \li Creating elements
 
-        \o  Binding evaluations
+        \li Binding evaluations
 
-        \o  Signal handling
+        \li Signal handling
 
-        \o  Summary of the recorded period
+        \li Summary of the recorded period
 
     \endlist
 
@@ -205,11 +205,11 @@
 
     \list 1
 
-        \o  Select \gui {Projects > Run}.
+        \li Select \gui {Projects > Run}.
 
-        \o  In \gui {Run Environment}, click \gui Add.
+        \li In \gui {Run Environment}, click \gui Add.
 
-        \o  Add the QML_DISABLE_OPTIMIZER variable and set its value to 1.
+        \li Add the QML_DISABLE_OPTIMIZER variable and set its value to 1.
 
     \endlist
 
diff --git a/doc/src/android/androiddev.qdoc b/doc/src/android/androiddev.qdoc
index ece1caec208de75b994879fdf31f5de267733384..fce11320d79fddbe9564b0a177bfe3af9bb1bd7f 100644
--- a/doc/src/android/androiddev.qdoc
+++ b/doc/src/android/androiddev.qdoc
@@ -40,7 +40,7 @@
 
     \list
 
-        \o  OpenJDK Java Development Kit
+        \li OpenJDK Java Development Kit
 
             To check whether you have OpenJDK installed, enter the following
             command:
@@ -51,7 +51,7 @@
 
             \c {sudo apt-get install openjdk-6-jdk}
 
-        \o  \l{http://ant.apache.org/bindownload.cgi}{Apache Ant} 1.8.0, or
+        \li \l{http://ant.apache.org/bindownload.cgi}{Apache Ant} 1.8.0, or
             later
 
             To check the Ant version, enter the following command on the command
@@ -59,7 +59,7 @@
 
             \c {ant -version}
 
-        \o  \l{http://necessitas.kde.org/necessitas/necessitas_sdk_installer.php}
+        \li \l{http://necessitas.kde.org/necessitas/necessitas_sdk_installer.php}
             {Necessitas SDK}
 
     \endlist
@@ -73,37 +73,37 @@
 
     \list 1
 
-        \o  Select \gui Tools > \gui Options > \gui {Build & Run} >
+        \li Select \gui Tools > \gui Options > \gui {Build & Run} >
             \gui {Qt Versions} > \gui Add to add Qt for Android.
 
-        \o  In the \gui {qmake location} field, add the \c qmake path from the
+        \li In the \gui {qmake location} field, add the \c qmake path from the
             Qt for Android SDK
             (\c {/opt/necessitas/Android/<qtversion>/bin/qmake} by default).
 
-        \o  Select \gui Tools > \gui Options > \gui Android to view and edit
+        \li Select \gui Tools > \gui Options > \gui Android to view and edit
             paths to the required software.
 
             \image qtcreator-options-android.png "Android options"
 
-        \o  Select \gui Tools > \gui Options > \gui {Build & Run} >
+        \li Select \gui Tools > \gui Options > \gui {Build & Run} >
             \gui {Qt Versions} and build the GDB Helper to make the debugging
             output for Qt specific constructs clean and easy to read.
 
-        \o  To build the GDB Helper, select Qt for Android, select \gui Details
+        \li To build the GDB Helper, select Qt for Android, select \gui Details
             in the \gui Helpers section, and then select \gui Build in the
             \gui {GDB Helper} field.
 
-        \o  Select \gui {Start Android AVD Manager} to create Android virtual
+        \li Select \gui {Start Android AVD Manager} to create Android virtual
             devices (AVD) that enable you emulate device hardware and software
             on the Android Emulator.
 
-        \o  To specify information for the Android manifest file, select
+        \li To specify information for the Android manifest file, select
             \gui Projects > \gui Run, and then select \gui Details to view the
             \gui {Package configurations}. For more information about the
             options you have, see
             \l{Specifying Run Settings for Android Devices}.
 
-        \o  To specify settings for deploying applications to Android, select
+        \li To specify settings for deploying applications to Android, select
             \gui Details to view the \gui {Deploy configurations}. For more
             information about the options you have, see
             \l{Deploying Applications to Android Devices}.
diff --git a/doc/src/debugger/creator-debugger-example.qdoc b/doc/src/debugger/creator-debugger-example.qdoc
index 7b8070691d4215820ab6c9621eb6486d8d0f60ef..dce4512697fd7e9236dc541bc5d9add2851cfc73 100644
--- a/doc/src/debugger/creator-debugger-example.qdoc
+++ b/doc/src/debugger/creator-debugger-example.qdoc
@@ -40,23 +40,23 @@
 
     \list 1
 
-        \o  Click in between the line number and the window border on the line
+        \li Click in between the line number and the window border on the line
             where we change the cursor position to set a breakpoint.
 
             \image qtcreator-setting-breakpoint1.png
 
-        \o  Select \gui{Debug > Start Debugging > Start Debugging} or press
+        \li Select \gui{Debug > Start Debugging > Start Debugging} or press
             \key{F5}.
 
-        \o  To view the breakpoint, click the \gui{Breakpoints} tab.
+        \li To view the breakpoint, click the \gui{Breakpoints} tab.
 
             \image qtcreator-setting-breakpoint2.png
 
-        \o  To remove a breakpoint, right-click it and select
+        \li To remove a breakpoint, right-click it and select
             \gui{Delete Breakpoint}.
 
 
-        \o  To view the base classes and data members of the TextFinder class,
+        \li To view the base classes and data members of the TextFinder class,
             go to the \gui{Locals and Expressions} view.
 
             \image qtcreator-watcher.png
diff --git a/doc/src/debugger/creator-debugger-setup.qdoc b/doc/src/debugger/creator-debugger-setup.qdoc
index 556ec4f2b74f18bdb36d345720568f61ea53ca49..94b244ec8a35d937ab5a5754f4f51343d36df839 100644
--- a/doc/src/debugger/creator-debugger-setup.qdoc
+++ b/doc/src/debugger/creator-debugger-setup.qdoc
@@ -109,33 +109,33 @@
 
     \table
         \header
-            \o  Platform
-            \o  Compiler
-            \o  Native Debugger
+            \li Platform
+            \li Compiler
+            \li Native Debugger
         \row
-            \o  Linux
-            \o  GCC, ICC
-            \o  GDB
+            \li Linux
+            \li GCC, ICC
+            \li GDB
         \row
-            \o  Unix
-            \o  GCC, ICC
-            \o  GDB
+            \li Unix
+            \li GCC, ICC
+            \li GDB
         \row
-            \o  Mac OS X
-            \o  GCC
-            \o  Apple GDB, FSF GDB (experimental)
+            \li Mac OS X
+            \li GCC
+            \li Apple GDB, FSF GDB (experimental)
         \row
-            \o  Windows/MinGW
-            \o  GCC
-            \o  GDB
+            \li Windows/MinGW
+            \li GCC
+            \li GDB
         \row
-            \o  Windows/MSVC
-            \o  Microsoft Visual C++ Compiler
-            \o  Debugging Tools for Windows/CDB
+            \li Windows/MSVC
+            \li Microsoft Visual C++ Compiler
+            \li Debugging Tools for Windows/CDB
         \row
-            \o  Maemo, MeeGo
-            \o  GCC
-            \o  GDB
+            \li Maemo, MeeGo
+            \li GCC
+            \li GDB
     \endtable
 
     For more information on the debugger modes, see
@@ -153,19 +153,19 @@
 
     \list
 
-        \o  PlainGdbAdapter debugs locally started GUI processes. It is
+        \li PlainGdbAdapter debugs locally started GUI processes. It is
             physically split into parts that are relevant only when Python is
             available, parts relevant only when Python is not available, and
             mixed code.
 
-        \o  TermGdbAdapter debugs locally started processes that need a
+        \li TermGdbAdapter debugs locally started processes that need a
             console.
 
-        \o  AttachGdbAdapter debugs local processes started outside \QC.
+        \li AttachGdbAdapter debugs local processes started outside \QC.
 
-        \o  CoreGdbAdapter debugs core files generated from crashes.
+        \li CoreGdbAdapter debugs core files generated from crashes.
 
-        \o  RemoteGdbAdapter interacts with the GDB server running on Linux.
+        \li RemoteGdbAdapter interacts with the GDB server running on Linux.
 
     \endlist
 
@@ -178,11 +178,11 @@
 
     \table
         \header
-            \o  Native Debugger
-            \o  Notes
+            \li Native Debugger
+            \li Notes
         \row
-            \o  GDB
-            \o  On Linux and Windows, use the Python-enabled GDB versions that
+            \li GDB
+            \li On Linux and Windows, use the Python-enabled GDB versions that
                 are installed when you install \QC and Qt SDK. On Mac OS X,
                 use the GDB provided with Xcode.
                 You can also build your own Python-enabled GDB. Follow the instructions in
@@ -190,8 +190,8 @@
                 {Building GDB}.
 
         \row
-            \o  Debugging tools for Windows
-            \o  To use this engine, you must install the
+            \li Debugging tools for Windows
+            \li To use this engine, you must install the
                 \e{Debugging tools for Windows}. You can download them from
                 \l{http://msdn.microsoft.com/en-us/windows/hardware/gg463009/}
                 {Download and Install Debugging Tools for Windows}.
@@ -213,8 +213,8 @@
                 \l{Setting the Symbol Server in Windows}.
 
        \row
-            \o  Debugging tools for Mac OS X
-            \o  The Qt binary distribution contains both debug and release
+            \li Debugging tools for Mac OS X
+            \li The Qt binary distribution contains both debug and release
                 variants of the libraries. But you have to explicitly tell the
                 runtime linker that you want to use the debug libraries even if
                 your application is compiled as debug, as release is the default
@@ -250,12 +250,12 @@
 
     \list 1
 
-        \o  Select \gui Tools > \gui Options > \gui Debugger > \gui CDB.
+        \li Select \gui Tools > \gui Options > \gui Debugger > \gui CDB.
 
-        \o  In the \gui {Symbol paths} field, open the \gui Insert menu
+        \li In the \gui {Symbol paths} field, open the \gui Insert menu
             and select \gui{Symbol Server}.
 
-        \o  Select a directory where you want to store the cached information
+        \li Select a directory where you want to store the cached information
             and click \gui OK.
 
             Use a subfolder in a temporary directory, such as
@@ -276,50 +276,50 @@
 
     \list 1
 
-        \o  To create a key for signing FSF GDB, select \gui {Keychain Access >
+        \li To create a key for signing FSF GDB, select \gui {Keychain Access >
             Certificate Assistant > Create a Certificate}:
 
         \list 1
 
-            \o  In the \gui {Name} field, input \gui {fsfgdb} to replace
+            \li In the \gui {Name} field, input \gui {fsfgdb} to replace
                 the existing content.
 
-            \o  In the \gui {Certificate Type} field, select
+            \li In the \gui {Certificate Type} field, select
                 \gui {Code Signing}.
 
-            \o  Select the \gui {Let me override defaults} check box.
+            \li Select the \gui {Let me override defaults} check box.
 
-            \o  Select \gui Continue, and follow the instructions of the
+            \li Select \gui Continue, and follow the instructions of the
                 wizard (use the default settings), until the \gui {Specify a
                 Location For The Certificate} dialog opens.
 
-            \o  In the \gui Keychain field, select \gui System.
+            \li In the \gui Keychain field, select \gui System.
 
-            \o  Select \gui {Keychain Access > System}, and locate the
+            \li Select \gui {Keychain Access > System}, and locate the
                 certificate.
 
-            \o  Double click the certificate to view certificate information.
+            \li Double click the certificate to view certificate information.
 
-            \o  In the \gui Trust section, select \gui {Always Trust} in the
+            \li In the \gui Trust section, select \gui {Always Trust} in the
                 \gui {When using this certificate} field, and then close
                 the dialog.
 
         \endlist
 
-        \o  To sign the binary, enter the following command in the terminal:
+        \li To sign the binary, enter the following command in the terminal:
 
             \code
             codesign -f -s "fsfgdb" $INSTALL_LOCATION/fsfgdb
             \endcode
 
-        \o  In \QC, select \gui {Qt Creator > Preferences > Build & Run >
+        \li In \QC, select \gui {Qt Creator > Preferences > Build & Run >
             Kits} > \gui Add to create a kit that uses FSF GDB.
 
-            \o  In the \gui Debugger field, specify the path to FSF GDB
+            \li In the \gui Debugger field, specify the path to FSF GDB
                 (\c $HOME/gdb72/bin/fsfgdb, but with an explicit value for
                 \c $HOME).
 
-        \o  To use the debugger, add the kit in the \gui {Build Settings}
+        \li To use the debugger, add the kit in the \gui {Build Settings}
             of the project.
 
     \endlist
diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc
index 134140135ea5f4372e0b048741846b2c99d244de..3083441230700a2418c57e5c209c1911d308e862 100644
--- a/doc/src/debugger/creator-debugger.qdoc
+++ b/doc/src/debugger/creator-debugger.qdoc
@@ -36,13 +36,13 @@
 
     \list
 
-        \o  \l{Setting Up Debugger}
+        \li \l{Setting Up Debugger}
 
             The debugger plugin automatically selects a suitable
             native debugger for your projects from the ones found
             on your system. Manual overriding of this choice is possible.
 
-        \o  \l{Launching the Debugger}
+        \li \l{Launching the Debugger}
 
             To start an application from an open project under the control
             of a debugger, press the Debug button in the lower left corner
@@ -50,12 +50,12 @@
             options are available in the \gui{Debug} > \gui{Start Debugging}
             menu.
 
-        \o  \l{Interacting with the Debugger}
+        \li \l{Interacting with the Debugger}
 
             You can use the tool views in the \gui Debug mode to inspect the
             state of your application while debugging.
 
-        \o  \l{Using Debugging Helpers}
+        \li \l{Using Debugging Helpers}
 
             \QC is able to show complex data types in a customized,
             user-extensible manner. For this purpose, it takes advantage of
@@ -64,7 +64,7 @@
             debugging with \QC, but they provide you with a powerful
             tool to quickly examine complex data.
 
-        \o  \l{Debugging Qt Quick Projects}
+        \li \l{Debugging Qt Quick Projects}
 
             When debugging a Qt Quick application, you can inspect the state
             of the application while debugging JavaScript functions. You can set
@@ -73,15 +73,15 @@
             objects and user interfaces, as well as execute JavaScript
             expressions.
 
-        \o  \l{Debugging a C++ Example Application}
+        \li \l{Debugging a C++ Example Application}
 
             Illustrates how to debug C++ applications in \QC.
 
-        \o  \l{Debugging a Qt Quick Example Application}
+        \li \l{Debugging a Qt Quick Example Application}
 
             Illustrates how to debug Qt Quick applications in \QC.
 
-        \o  \l{Troubleshooting Debugger}
+        \li \l{Troubleshooting Debugger}
 
             If you encounter problems while debugging, check for possible
             solutions to them.
@@ -140,20 +140,20 @@
 
     \list
 
-       \o  \bold{Start Internal} to debug applications developed inside
+       \li \b{Start Internal} to debug applications developed inside
             \QC such as a Qt based GUI application.
 
-       \o  \bold{Start External} to start and debug processes
+       \li \b{Start External} to start and debug processes
             without a proper \QC project setup, either locally or
             on a remote machine.
 
-       \o  \bold{Attach} to debug processes already started and
+       \li \b{Attach} to debug processes already started and
             running outside \QC, either locally or on a
             remote machine.
 
-       \o  \bold{Core} to debug crashed processes on Unix.
+       \li \b{Core} to debug crashed processes on Unix.
 
-       \o  \bold{Post-mortem} to debug crashed processes on Windows.
+       \li \b{Post-mortem} to debug crashed processes on Windows.
 
     \endlist
 
@@ -276,13 +276,13 @@
 
     \list 1
 
-        \o  Select \gui {Debug > Start Debugging > Attach to Remote
+        \li Select \gui {Debug > Start Debugging > Attach to Remote
             Debug Server}.
 
-        \o  In the \gui {Host and port} field, enter the name of the remote
+        \li In the \gui {Host and port} field, enter the name of the remote
             machine and the port number to use.
 
-        \o  Select \gui{OK} to start debugging.
+        \li Select \gui{OK} to start debugging.
 
     \endlist
 
@@ -296,11 +296,11 @@
 
     \list 1
 
-        \o  Install the \e{Debugging Tools for Windows} on the remote machine.
+        \li Install the \e{Debugging Tools for Windows} on the remote machine.
             The installation folder contains the CDB command line executable
             (cdb.exe).
 
-        \o  Copy the \QC CDB extension library from the Qt installation
+        \li Copy the \QC CDB extension library from the Qt installation
             directory to the a new folder on the remote machine
             (32 or 64 bit version depending on the version of the Debugging
             Tools for Windows
@@ -308,27 +308,27 @@
 
         \list
 
-            \o  \c {\lib\qtcreatorcdbext32\qtcreatorcdbext.dll} (32 bit)
+            \li \c {\lib\qtcreatorcdbext32\qtcreatorcdbext.dll} (32 bit)
 
-            \o  \c {\lib\qtcreatorcdbext64\qtcreatorcdbext.dll} (64 bit)
+            \li \c {\lib\qtcreatorcdbext64\qtcreatorcdbext.dll} (64 bit)
 
         \endlist
 
-        \o  Set the _NT_DEBUGGER_EXTENSION_PATH environment variable to point
+        \li Set the _NT_DEBUGGER_EXTENSION_PATH environment variable to point
             to that folder.
 
-        \o  To use TCP/IP as communication protocol, launch remote CDB as
+        \li To use TCP/IP as communication protocol, launch remote CDB as
             follows:
 
             \code
             cdb.exe -server tcp:port=1234 <executable>
             \endcode
 
-        \o  On the local machine running \QC, select
+        \li On the local machine running \QC, select
             \gui {Debug > Start Debugging > Attach to Remote CDB Session}
 
 
-        \o  In the \gui Connection field enter the connection parameters.
+        \li In the \gui Connection field enter the connection parameters.
             For example, for TCP/IP:
 
             \code
@@ -348,7 +348,7 @@
             ssl:proto=Protocol,{certuser=Cert|machuser=Cert},clicon=Server,port=Socket[,password=Password]
             \endcode
 
-            \o Click \gui{OK} to start debugging.
+            \li  Click \gui{OK} to start debugging.
 
     \endlist
 */
@@ -368,24 +368,24 @@
 
     \list
 
-        \o  Go through a program line-by-line or instruction-by-instruction.
+        \li Go through a program line-by-line or instruction-by-instruction.
 
-        \o  Interrupt running programs.
+        \li Interrupt running programs.
 
-        \o  Set breakpoints.
+        \li Set breakpoints.
 
-        \o  Examine the contents of the call stack.
+        \li Examine the contents of the call stack.
 
-        \o  Examine and modify contents of local and global variables.
+        \li Examine and modify contents of local and global variables.
 
-        \o  Examine and modify registers and memory contents of
+        \li Examine and modify registers and memory contents of
             the debugged program.
 
-        \o  Examine the list of loaded shared libraries.
+        \li Examine the list of loaded shared libraries.
 
-        \o  Disassemble sections of code.
+        \li Disassemble sections of code.
 
-        \o  Create snapshots of the current state of the debugged program
+        \li Create snapshots of the current state of the debugged program
             and re-examine them later.
 
     \endlist
@@ -431,14 +431,14 @@
 
     \list
 
-        \o  Retrieves data representing the call stack at the program's current
+        \li Retrieves data representing the call stack at the program's current
             position.
 
-        \o  Retrieves the contents of local variables.
+        \li Retrieves the contents of local variables.
 
-        \o  Examines \gui Expressions.
+        \li Examines \gui Expressions.
 
-        \o  Updates the \gui Registers, \gui Modules, and \gui Disassembler
+        \li Updates the \gui Registers, \gui Modules, and \gui Disassembler
             views if you are debugging the C++ based applications.
 
     \endlist
@@ -449,15 +449,15 @@
 
     \list
 
-       \o  To finish debugging, press \key{Shift+F5}.
+       \li To finish debugging, press \key{Shift+F5}.
 
-       \o  To execute a line of code as a whole, press \key{F10}.
+       \li To execute a line of code as a whole, press \key{F10}.
 
-       \o  To step into a function or a subfunction, press \key{F11}.
+       \li To step into a function or a subfunction, press \key{F11}.
 
-       \o  To continue running the program, press \key{F5}.
+       \li To continue running the program, press \key{F5}.
 
-       \o  To run to the selected function when you are stepping into a nested
+       \li To run to the selected function when you are stepping into a nested
            function, press \key{Ctrl+F6}.
 
     \endlist
@@ -482,19 +482,19 @@
 
     \list
 
-        \o  Source code files and lines
+        \li Source code files and lines
 
-        \o  Functions
+        \li Functions
 
-        \o  Addresses
+        \li Addresses
 
-        \o  Throwing and catching exceptions
+        \li Throwing and catching exceptions
 
-        \o  Executing and forking processes
+        \li Executing and forking processes
 
-        \o  Executing some system calls
+        \li Executing some system calls
 
-        \o  Changes in a block of memory at a particular address when a
+        \li Changes in a block of memory at a particular address when a
             program is running
 
     \endlist
@@ -514,12 +514,12 @@
 
     \list
 
-        \o  By clicking the breakpoint marker in the text editor.
+        \li By clicking the breakpoint marker in the text editor.
 
-        \o  By selecting the breakpoint in the breakpoint view and pressing
+        \li By selecting the breakpoint in the breakpoint view and pressing
             \key{Delete}.
 
-        \o  By selecting \gui{Delete Breakpoint} from the context
+        \li By selecting \gui{Delete Breakpoint} from the context
             menu in the \gui Breakpoints view.
 
     \endlist
@@ -534,15 +534,15 @@
 
     \list 1
 
-        \o  Right-click in the \gui Breakpoints view to open the context menu,
+        \li Right-click in the \gui Breakpoints view to open the context menu,
             and select \gui {Add Breakpoint}.
 
-        \o  In the \gui {Breakpoint type} field, select \gui {Break on data
+        \li In the \gui {Breakpoint type} field, select \gui {Break on data
             access at fixed address}.
 
-        \o  In the \gui Address field, specify the address of the memory block.
+        \li In the \gui Address field, specify the address of the memory block.
 
-        \o  Select \gui OK.
+        \li Select \gui OK.
 
     \endlist
 
@@ -589,16 +589,16 @@
 
     \table
         \row
-            \o  \bold{Note:}
+            \li \b{Note:}
 
         \row
-            \o  GDB, and therefore \QC's debugger works for optimized
+            \li GDB, and therefore \QC's debugger works for optimized
                 builds on Linux and Mac OS X. Optimization can lead to
                 re-ordering of instructions or removal of some local variables,
                 causing the \gui{Locals and Expressions} view to show unexpected
                 data.
         \row
-            \o  The debug information provided by GCC does not include enough
+            \li The debug information provided by GCC does not include enough
                 information about the time when a variable is initialized.
                 Therefore, \QC can not tell whether the contents of a
                 local variable contains "real data", or "initial noise". If a
@@ -616,11 +616,11 @@
 
     \list
 
-        \o  Select \gui Tools > \gui {Options} > \gui Debugger >
+        \li Select \gui Tools > \gui {Options} > \gui Debugger >
             \gui{Debugging Helper} and check the \gui{Use Debugging Helper}
             checkbox.
 
-        \o  The \gui{Locals and Expressions} view is reorganized to provide a
+        \li The \gui{Locals and Expressions} view is reorganized to provide a
             high-level view of the objects.
 
     \endlist
@@ -686,9 +686,9 @@
 
     \list
 
-        \o \c {C:\qtcreator\bin>qtcreator -debug 2000}
+        \li  \c {C:\qtcreator\bin>qtcreator -debug 2000}
 
-        \o \c {C:\qtcreator\bin>qtcreator -debug core.2000}
+        \li  \c {C:\qtcreator\bin>qtcreator -debug core.2000}
 
     \endlist
 
@@ -723,17 +723,17 @@
 
     \list
 
-        \o  Updating the module list
+        \li Updating the module list
 
-        \o  Loading symbols for modules
+        \li Loading symbols for modules
 
-        \o  Examining modules
+        \li Examining modules
 
-        \o  Editing module files
+        \li Editing module files
 
-        \o  Showing symbols in modules
+        \li Showing symbols in modules
 
-        \o  Showing dependencies between modules (Windows only)
+        \li Showing dependencies between modules (Windows only)
 
     \endlist
 
@@ -863,10 +863,10 @@
 
     \list
 
-        \o  There is no Python-enabled GDB for Mac OS. Mac OS continues
+        \li There is no Python-enabled GDB for Mac OS. Mac OS continues
             injection with C++ based debugging helpers.
 
-        \o  There is no GDB to communicate with MSVC compiled applications on
+        \li There is no GDB to communicate with MSVC compiled applications on
             Windows. So information can be displayed nicely only in a limited
             fashion by using a cdb extension DLL.
 
@@ -898,9 +898,9 @@
 
     \list
 
-       \o  \c d of type \c Dumper
+       \li \c d of type \c Dumper
 
-       \o  \c value of type \c gdb.Value
+       \li \c value of type \c gdb.Value
 
     \endlist
 
@@ -974,40 +974,40 @@
 
     \list
 
-        \o  \gui{__init__(self)} - Initializes the output to an empty string and
+        \li \gui{__init__(self)} - Initializes the output to an empty string and
             empties the child stack. This should not be used in user code.
 
-        \o  \gui{put(self, value)} - Low level method to directly append to the
+        \li \gui{put(self, value)} - Low level method to directly append to the
             output string. That is also the fastest way to append output.
 
-        \o  \gui{putField(self, name, value)} - Appends a name='value' field.
+        \li \gui{putField(self, name, value)} - Appends a name='value' field.
 
-        \o  \gui{childRange(self)} - Returns the range of children specified in
+        \li \gui{childRange(self)} - Returns the range of children specified in
             the current \c Children scope.
 
-        \o  \gui{putItemCount(self, count)} - Appends a field
+        \li \gui{putItemCount(self, count)} - Appends a field
             \c {value='<%d items'} to the output.
 
-        \o  \gui{putEllipsis(self)} - Appends fields
+        \li \gui{putEllipsis(self)} - Appends fields
             \c {'{name="<incomplete>",value="",type="",numchild="0"}'}. This is
             automatically done by \c endChildren if the number of children to
             print is smaller than the number of actual children.
 
-        \o  \gui{putName(self, name)} - Appends a \c {name=''} field.
+        \li \gui{putName(self, name)} - Appends a \c {name=''} field.
 
-        \o  \gui{putType(self, type, priority=0)} - Appends a field \c {type=''}
+        \li \gui{putType(self, type, priority=0)} - Appends a field \c {type=''}
             unless the \a type coincides with the parent's default child type or
             \c putType was already called for the current item with a higher
             value of \c priority.
 
-        \o  \gui{putBetterType(self, type)} - Overrides the last recorded
+        \li \gui{putBetterType(self, type)} - Overrides the last recorded
             \c type.
 
-        \o  \gui{putNumChild(self, numchild)} - Appends a field \c {numchild=''}
+        \li \gui{putNumChild(self, numchild)} - Appends a field \c {numchild=''}
             unless the \c numchild coincides with the parent's default child
             numchild value.
 
-        \o  \gui{putValue(self, value, encoding = None)} - Append a file \c {value=''},
+        \li \gui{putValue(self, value, encoding = None)} - Append a file \c {value=''},
             optionally followed by a field \c {valueencoding=''}. The \c value
             needs to be convertible to a string entirely consisting of
             alphanumerical values. The \c encoding parameter can be used to
@@ -1017,38 +1017,38 @@
 
         \list
 
-            \o  0: unencoded 8 bit data, interpreted as Latin1.
+            \li 0: unencoded 8 bit data, interpreted as Latin1.
 
-            \o  1: base64 encoded 8 bit data, used for QByteArray,
+            \li 1: base64 encoded 8 bit data, used for QByteArray,
                 double quotes are added.
 
-            \o  2: base64 encoded 16 bit data, used for QString,
+            \li 2: base64 encoded 16 bit data, used for QString,
                 double quotes are added.
 
-            \o  3: base64 encoded 32 bit data,
+            \li 3: base64 encoded 32 bit data,
                 double quotes are added.
 
-            \o  4: base64 encoded 16 bit data, without quotes (see 2)
+            \li 4: base64 encoded 16 bit data, without quotes (see 2)
 
-            \o  5: base64 encoded 8 bit data, without quotes (see 1)
+            \li 5: base64 encoded 8 bit data, without quotes (see 1)
 
-            \o  6: %02x encoded 8 bit data (as with \c QByteArray::toHex),
+            \li 6: %02x encoded 8 bit data (as with \c QByteArray::toHex),
                 double quotes are added.
 
-            \o  7: %04x encoded 16 bit data (as with \c QByteArray::toHex),
+            \li 7: %04x encoded 16 bit data (as with \c QByteArray::toHex),
                 double quotes are added.
         \endlist
 
-        \o  \gui{putStringValue(self, value)} - Encodes a QString and calls
+        \li \gui{putStringValue(self, value)} - Encodes a QString and calls
             \c putValue with the correct \c encoding setting.
 
-        \o  \gui{putByteArrayValue(self, value)} - Encodes a QByteArray and calls
+        \li \gui{putByteArrayValue(self, value)} - Encodes a QByteArray and calls
             \c putValue with the correct \c encoding setting.
 
-        \o  \gui{isExpanded()} - Checks whether the current item
+        \li \gui{isExpanded()} - Checks whether the current item
             is expanded in the view.
 
-        \o  \gui{putIntItem(self, name, value)} - Equivalent to:
+        \li \gui{putIntItem(self, name, value)} - Equivalent to:
             \code
             with SubItem(self, name):
                 self.putValue(value)
@@ -1057,7 +1057,7 @@
                 self.putNumChild(0)
             \endcode
 
-        \o  \gui{putBoolItem(self, name, value)} - Equivalent to:
+        \li \gui{putBoolItem(self, name, value)} - Equivalent to:
             \code
             with SubItem(self, name):
                 self.putValue(value)
@@ -1065,7 +1065,7 @@
                 self.putNumChild(0)
             \endcode
 
-        \o  \gui{putCallItem(self, name, value, func, *args)} -
+        \li \gui{putCallItem(self, name, value, func, *args)} -
             Uses GDB to call the function \c func on the value specified by
             \a {value} and output the resulting item. Use \c{putCallItem}
             only if there is no other way to access the data.
@@ -1074,12 +1074,12 @@
             and have the potential to change the state of the debugged
             program.
 
-        \o  \gui{putItem(self, value)} - The "master function", handling
+        \li \gui{putItem(self, value)} - The "master function", handling
             basic types, references, pointers and enums directly, iterates
             over base classes and class members of compound types and calls
             \c qdump__* functions whenever appropriate.
 
-        \o  \gui{putSubItem(self, component, value)} - Equivalent to:
+        \li \gui{putSubItem(self, component, value)} - Equivalent to:
             \code
             with SubItem(self, component):
                 self.putItem(value)
@@ -1203,12 +1203,12 @@
 
     \list 1
 
-        \o  Make sure you use at least \QC 2.1.
+        \li Make sure you use at least \QC 2.1.
 
-        \o  Make sure the debugger is set up properly. For more information,
+        \li Make sure the debugger is set up properly. For more information,
             see \l{Setting Up Debugger}.
 
-        \o  In the \gui Debug mode, select \gui {Windows > Views > Debugger
+        \li In the \gui Debug mode, select \gui {Windows > Views > Debugger
             Log} to open the \gui {Debugger Log} view. Browse the contents of
             the pane on the right hand side to find out what went wrong.
             Always attach the contents of the pane to debugger-related
diff --git a/doc/src/debugger/qtquick-debugger-example.qdoc b/doc/src/debugger/qtquick-debugger-example.qdoc
index 2b0b417b24646296268d61c774b3fa1eae8b47bc..28b2f3d820b709e7ec90e59b99b7acc63e83c106 100644
--- a/doc/src/debugger/qtquick-debugger-example.qdoc
+++ b/doc/src/debugger/qtquick-debugger-example.qdoc
@@ -43,7 +43,7 @@
 
     \list 1
 
-        \o  To look at the code that starts a new game, place a breakpoint in
+        \li To look at the code that starts a new game, place a breakpoint in
             samegame.qml by clicking between the line number and the window
             border on the line where where the \c startNewGame() function is
             called (1).
@@ -53,19 +53,19 @@
             The red circle indicates that a breakpoint is now set on that line
             number.
 
-        \o  Select \gui {Debug > Start Debugging > Start Debugging} or press
+        \li Select \gui {Debug > Start Debugging > Start Debugging} or press
             \key{F5}.
 
-        \o  Once the Same Game application starts, click the \gui {New Game}
+        \li Once the Same Game application starts, click the \gui {New Game}
             button to start a new game.
 
-        \o  When the debugger hits the breakpoint, it interrupts the
+        \li When the debugger hits the breakpoint, it interrupts the
             application. \QC displays the nested function calls leading to the
             current position as a call stack trace (1).
 
             \image qtquick-example-setting-breakpoint2.png
 
-        \o  Click the
+        \li Click the
             \inlineimage qtcreator-debug-button-step-into.png
             (\gui {Step Into}) button on the toolbar or press \key F11 to step
             into the code in the stack. The samegame.js file opens in the code
@@ -73,38 +73,38 @@
 
             \image qtquick-example-stack.png
 
-        \o  Examine the local variables in the \gui {Locals and Expressions}
+        \li Examine the local variables in the \gui {Locals and Expressions}
             view. Step through the code to see how the information changes in
             the view.
 
-        \o  Add a breakpoint at the end of the \c {startNewGame()} function, and
+        \li Add a breakpoint at the end of the \c {startNewGame()} function, and
             click \inlineimage qtcreator-debugging-continue.png
             (\gui Continue) to hit the breakpoint.
 
             \image qtquick-example-setting-breakpoint3.png
 
-        \o  To execute JavaScript commands in the current context, select the
+        \li To execute JavaScript commands in the current context, select the
             \gui {Console} tab.
 
-        \o  To change the score to 1000, enter \c{gameCanvas.score = 1000}
+        \li To change the score to 1000, enter \c{gameCanvas.score = 1000}
             in the console.
 
             \image qtquick-example-script-console.png
 
-        \o  To remove a breakpoint, right-click it and select
+        \li To remove a breakpoint, right-click it and select
             \gui {Delete Breakpoint}.
 
-        \o  Select the \gui {Locals and Expressions} tab to explore the object
+        \li Select the \gui {Locals and Expressions} tab to explore the object
             structure at runtime:
 
             \image qtquick-example-qml-inspector.png
 
-        \o  Click
+        \li Click
             \inlineimage qml-inspector-app-on-top.png
             (\gui {Show Application on Top}) to keep the application visible
             while you interact with the debugger.
 
-        \o  Click
+        \li Click
             \inlineimage qml-inspector-select-button.png
             (\gui Select) to activate selection mode and then click the
             \gui {Quit} button to move into the \gui ButtonLabel component
@@ -112,7 +112,7 @@
 
             \image qtquick-example-property-values.png
 
-        \o  In the \gui {Locals and Expressions} view, double-click the value of
+        \li In the \gui {Locals and Expressions} view, double-click the value of
             the \c text property to change it temporarily from \gui {Quit} to
             \gui {End Game}.
 
diff --git a/doc/src/debugger/qtquick-debugging.qdoc b/doc/src/debugger/qtquick-debugging.qdoc
index 6d519d27afa1bd32240d32f84c383ad9628d5ca6..f71314f9b30ff531b20cfdd5c47cf118b63e0c08 100644
--- a/doc/src/debugger/qtquick-debugging.qdoc
+++ b/doc/src/debugger/qtquick-debugging.qdoc
@@ -50,11 +50,11 @@
 
     \list 1
 
-        \o  In \gui Projects mode \gui {Run Settings}, select the
+        \li In \gui Projects mode \gui {Run Settings}, select the
             \gui {Enable QML} check box in the \gui {Debugger Settings} to
             enable QML debugging.
 
-        \o  For Qt 4.7, compile the QML Inspector debugging helper. For more information,
+        \li For Qt 4.7, compile the QML Inspector debugging helper. For more information,
             see \l{Debugging Helpers for QML}.
 
     \endlist
@@ -63,7 +63,7 @@
 
         \list 1
 
-        \o  Debugging is enabled by default for Qt 4.8, or later. For Qt 4.7,
+        \li Debugging is enabled by default for Qt 4.8, or later. For Qt 4.7,
             select \gui Projects, and then select the
             \gui {Enable QML debugging} check box in the \gui qmake section
             in \gui {Build Steps}.
@@ -79,14 +79,14 @@
             functions. Therefore, you must make sure that the port is properly
             protected by a firewall.
 
-        \o  In the \gui {Run Settings}, \gui {Debugger Settings} section, select
+        \li In the \gui {Run Settings}, \gui {Debugger Settings} section, select
             the \gui {Enable QML} check box to enable
             QML debugging.
 
-        \o  Select \gui {Build > Rebuild Project} to clean and rebuild the
+        \li Select \gui {Build > Rebuild Project} to clean and rebuild the
             project.
 
-        \o  To debug applications on devices, check that Qt 4.7.4, or later,
+        \li To debug applications on devices, check that Qt 4.7.4, or later,
             libraries are installed on the device and
             \l{Running on Multiple Platforms}{select the corresponding kit for the device}
             before you start debugging.
@@ -110,14 +110,14 @@
 
     \list
 
-        \o  Debug JavaScript functions
+        \li Debug JavaScript functions
 
-        \o  Execute JavaScript expressions to get information about the state of
+        \li Execute JavaScript expressions to get information about the state of
             the application
 
-        \o  Change QML code and immediately see the changes at runtime
+        \li Change QML code and immediately see the changes at runtime
 
-        \o  Inspect QML code and change it temporarily at runtime
+        \li Inspect QML code and change it temporarily at runtime
 
     \endlist
 
@@ -125,9 +125,9 @@
 
     \list 1
 
-        \o  Start the application.
+        \li Start the application.
 
-        \o  Select \gui {Debug > Start Debugging > Attach to QML Port}.
+        \li Select \gui {Debug > Start Debugging > Attach to QML Port}.
 
             When debugging on the desktop, you can use the default values for
             the connection. When debugging on devices, enter the device IP
@@ -142,11 +142,11 @@
 
     \list
 
-        \o  \l{Setting Breakpoints}{Setting breakpoints}
+        \li \l{Setting Breakpoints}{Setting breakpoints}
 
-        \o  \l{Viewing Call Stack Trace}{Viewing call stack trace}
+        \li \l{Viewing Call Stack Trace}{Viewing call stack trace}
 
-        \o  \l{Locals and Expressions}{Viewing locals and expressions}
+        \li \l{Locals and Expressions}{Viewing locals and expressions}
 
     \endlist
 
@@ -192,11 +192,11 @@
 
     \list
 
-        \o  Expand the element in the object tree.
+        \li Expand the element in the object tree.
 
-        \o  Select the element in the code editor.
+        \li Select the element in the code editor.
 
-        \o  Click
+        \li Click
             \inlineimage qml-inspector-select-button.png
             (\gui Select) to activate selection mode and then click an element
             in the running application.
diff --git a/doc/src/editors/creator-coding-edit-mode.qdoc b/doc/src/editors/creator-coding-edit-mode.qdoc
index 1b37d0ca175350c9d66f4e8ccf607e900e341c30..bf40121c645df5102db65dab0a9842259ac574c3 100644
--- a/doc/src/editors/creator-coding-edit-mode.qdoc
+++ b/doc/src/editors/creator-coding-edit-mode.qdoc
@@ -68,14 +68,14 @@
 
     \list
 
-        \o  To split the editor view into a top and bottom view, select
+        \li To split the editor view into a top and bottom view, select
             \gui Window > \gui Split, press \key{Ctrl+E, 2}, or select the
             \inlineimage qtcreator-split-button.png
             (\gui Split) button and then select \gui Split.
 
             Split command creates views below the currently active editor view.
 
-        \o  To split the editor view into adjacent views, select
+        \li To split the editor view into adjacent views, select
             \gui Window > \gui{Split Side by Side}, press \key{Ctrl+E, 3}, or
             select \gui {Split > Split Side by Side}.
 
@@ -101,11 +101,11 @@
 
     \list
 
-        \o  Right-click the line number and select \gui{Toggle Bookmark}.
+        \li Right-click the line number and select \gui{Toggle Bookmark}.
 
-        \o  Press \key Shift and click the left margin at a line.
+        \li Press \key Shift and click the left margin at a line.
 
-        \o  Press \key{Ctrl+M} when the cursor is on a line.
+        \li Press \key{Ctrl+M} when the cursor is on a line.
 
     \endlist
 
diff --git a/doc/src/editors/creator-coding.qdoc b/doc/src/editors/creator-coding.qdoc
index 9528a5e999556b3f44af7799470170e507189972..45210856379e5bb80785eb536823a25d9230f226 100644
--- a/doc/src/editors/creator-coding.qdoc
+++ b/doc/src/editors/creator-coding.qdoc
@@ -34,28 +34,28 @@
 
     \list
 
-        \o  \l{Writing Code}
+        \li \l{Writing Code}
 
             Writing, editing, and navigating in source code are core tasks in
             application development. Therefore, the code editor is one of the
             key components of \QC. You can use the code editor in the \gui Edit
             mode.
 
-        \o  \l{Finding}
+        \li \l{Finding}
 
             Use the incremental and advanced search to search from currently
             open projects or files on the file system or use the locator to
             browse through projects, files, classes, methods, documentation and
             file systems.
 
-        \o  \l{Refactoring}
+        \li \l{Refactoring}
 
             Code refactoring is the process of improving and simplifying code
             without modifying the existing functionality of an application. You
             can easily find and rename symbols and apply predefined actions to
             refactor code.
 
-        \o  \l{Configuring the Editor}
+        \li \l{Configuring the Editor}
 
             You can change the fonts, colors, highlighting, and indentation.
             If you are used to the the Vim editor, you can even run the main
@@ -67,7 +67,7 @@
 
     \list
 
-        \o  \l{Editing MIME Types}
+        \li \l{Editing MIME Types}
 
             \QC uses the MIME type of a file to determine which mode and editor
             to use for opening the file. If your files do not match the
diff --git a/doc/src/editors/creator-editors-options-text.qdoc b/doc/src/editors/creator-editors-options-text.qdoc
index 0ae9159d7667c083fa7e86a9eeefd9141556b9c5..6f1d26dd43d507ecec6129ead9419ead666b5bbf 100644
--- a/doc/src/editors/creator-editors-options-text.qdoc
+++ b/doc/src/editors/creator-editors-options-text.qdoc
@@ -58,14 +58,14 @@
 
     \list 1
 
-        \o  Select \gui {Tools > Options > Text Editor > Fonts & Color > Copy}.
+        \li Select \gui {Tools > Options > Text Editor > Fonts & Color > Copy}.
 
-        \o  Enter a name for the color scheme and click \gui OK.
+        \li Enter a name for the color scheme and click \gui OK.
 
-        \o  In the \gui Foreground field, specify the color of the selected
+        \li In the \gui Foreground field, specify the color of the selected
             code element.
 
-        \o  In the \gui Background field, select the background
+        \li In the \gui Background field, select the background
             color for the code element.
 
         The backgound of the \gui Text element determines the background of the
diff --git a/doc/src/editors/creator-editors-options.qdoc b/doc/src/editors/creator-editors-options.qdoc
index ad7395e697ee8808c819320a0412ac5811765d3a..113997b9a4247b02bfe58848d73254c26a5bf284 100644
--- a/doc/src/editors/creator-editors-options.qdoc
+++ b/doc/src/editors/creator-editors-options.qdoc
@@ -46,29 +46,29 @@
 
     \list
 
-        \o  Set the \l{Specifying Text Editor Settings}{font preferences and
+        \li Set the \l{Specifying Text Editor Settings}{font preferences and
             apply color schemes} for syntax highlighting in \gui{Font & Colors}.
 
-        \o  Specify \l{Generic Highlighting}
+        \li Specify \l{Generic Highlighting}
             {definition files for syntax highlighting} for other types of files
              than C++ or QML in \gui{Generic Highlighter}.
 
-        \o  Set \l{Indenting Code}{tabs, indentation, the handling of
+        \li Set \l{Indenting Code}{tabs, indentation, the handling of
             whitespace, and mouse operations} in \gui Behavior.
 
-        \o  Set various display properties, for example,
+        \li Set various display properties, for example,
             \l{Highlighting and folding blocks}
             {highlighting and folding blocks}, text wrapping or
             \l{Moving to symbol definition or declaration}
             {moving to symbol definition or declaration} in \gui Display.
 
-        \o  Add, modify, and remove \l{Editing Code Snippets}{code snippets} in
+        \li Add, modify, and remove \l{Editing Code Snippets}{code snippets} in
             \gui Snippets.
 
-        \o  View and remove \l{Using Text Editing Macros}{text editing macros}
+        \li View and remove \l{Using Text Editing Macros}{text editing macros}
             in \gui Macros.
 
-        \o  Configure \l{Completing Code}{code completion} in \gui Completion.
+        \li Configure \l{Completing Code}{code completion} in \gui Completion.
 
     \endlist
 
@@ -76,7 +76,7 @@
 
     \list
 
-        \o  \l{Using FakeVim Mode}
+        \li \l{Using FakeVim Mode}
 
             Run the main editor in a manner similar to the Vim editor in the
             FakeVim mode.
diff --git a/doc/src/editors/creator-editors-writing-code.qdoc b/doc/src/editors/creator-editors-writing-code.qdoc
index 623bfcbdf672ff103a003989ba5d4c76b0e6bf27..e40eda8ca21926215659083d9659024f840d32a6 100644
--- a/doc/src/editors/creator-editors-writing-code.qdoc
+++ b/doc/src/editors/creator-editors-writing-code.qdoc
@@ -36,20 +36,20 @@
 
     \list
 
-        \o  \l{Working in Edit Mode}
+        \li \l{Working in Edit Mode}
 
             You can use the editor toolbar to navigate between open files
             and symbols in use. You can also split the view to work on
             several files simultaneously, add bookmarks, and move between
             symbol definitions and declarations.
 
-        \o  \l{Semantic Highlighting}
+        \li \l{Semantic Highlighting}
 
             \QC enables you to write well formatted code by highlighting
             code elements and blocks. You can use syntax highlighting
             also for other types of files than C++ or QML.
 
-        \o  \l{Checking Code Syntax}
+        \li \l{Checking Code Syntax}
 
             \QC checks for errors when you write code and displays inline
             error and warning messages.
@@ -58,17 +58,17 @@
             static checks on the QML and JavaScript code in your project to find
             common problems.
 
-        \o  \l{Completing Code}
+        \li \l{Completing Code}
 
             \QC anticipates what you are going to write and completes code
             and code snippets for elements, properties, and IDs.
 
-        \o  \l{Indenting Code}
+        \li \l{Indenting Code}
 
             \QC indents code according to rules that you specify either
             globally for all files or separately for text, C++, or QML files.
 
-        \o  \l{Using Qt Quick Toolbars}
+        \li \l{Using Qt Quick Toolbars}
 
             When you edit QML code in the code editor, you specify the
             properties of QML components. For some properties, such as
@@ -76,14 +76,14 @@
             few people can visualize the color #18793f. To easily edit these
             properties, you can use the Qt Quick Toolbars.
 
-        \o  \l{Pasting and Fetching Code Snippets}
+        \li \l{Pasting and Fetching Code Snippets}
 
             You can cooperate with other developers by pasting and fetching
             snippets of code from a server. For example, you might ask
             colleagues to review a change that you plan to submit to a
             version control system.
 
-        \o  \l{Using Text Editing Macros}
+        \li \l{Using Text Editing Macros}
 
             When you have a file open in the code editor, you can record a
             keyboard sequence as a macro. You can then play the macro to
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc
index 60527ccb0ea4560e88446ebd361a391f2c2ceeb5..77ef60a8c10f515ba2a4cd8621402a7ce09a5d30 100644
--- a/doc/src/editors/creator-editors.qdoc
+++ b/doc/src/editors/creator-editors.qdoc
@@ -37,13 +37,13 @@
 
     \list
 
-        \o  Types (such as classes, structs, and type definitions)
+        \li Types (such as classes, structs, and type definitions)
 
-        \o  Local variables
+        \li Local variables
 
-        \o  Class fields
+        \li Class fields
 
-        \o  Virtual methods
+        \li Virtual methods
 
     \endlist
 
@@ -79,35 +79,35 @@
 
     \list 1
 
-        \o  Select \gui {Tools > Options > Text Editor > Generic
+        \li Select \gui {Tools > Options > Text Editor > Generic
             Highlighter}.
 
             \image qtcreator-generic-highlighter.png "Generic Highlighter options"
 
-        \o  In the \gui Location field, specify the path to the primary
+        \li In the \gui Location field, specify the path to the primary
             location for highlight definition files.
 
-        \o  Click \gui {Download Definitions} to open a list of highlight
+        \li Click \gui {Download Definitions} to open a list of highlight
             definition files available for download.
 
             \image qtcreator-manage-definitions.png "Download Definitions dialog"
 
-        \o  Select highlight definition files in the list and click
+        \li Select highlight definition files in the list and click
             \gui {Download Selected Definitions}.
 
-        \o  Select the \gui {Use fallback location} check box to specify the
+        \li Select the \gui {Use fallback location} check box to specify the
             secondary location where the editor will look for highlight
             definition files.
 
-        \o  Click \gui Autodetect to allow \QC to look for highlight
+        \li Click \gui Autodetect to allow \QC to look for highlight
             definition files on your system, or click \gui Browse to locate
             them in the file system yourself.
 
-        \o  In the \gui {Ignored file patterns} field, specify file patterns.
+        \li In the \gui {Ignored file patterns} field, specify file patterns.
             You will not receive alerts if the highlight definitions for the
             specified files are not found.
 
-        \o  Click \gui OK to save your changes.
+        \li Click \gui OK to save your changes.
 
     \endlist
 
@@ -155,14 +155,14 @@
 
     \list
 
-        \o  Syntax errors are underlined in red.
+        \li Syntax errors are underlined in red.
 
             In the following figure, a semicolon is missing at the end of the
             line.
 
             \image qtcreator-syntaxerror.png
 
-        \o  Semantic errors and warnings are underlined in olive.
+        \li Semantic errors and warnings are underlined in olive.
 
             In the following figure, the variable is not used.
 
@@ -208,366 +208,366 @@
 
     \table
     \header
-        \o Id
-        \o Severity
-        \o Message
-        \o Description
+        \li  Id
+        \li  Severity
+        \li  Message
+        \li  Description
 
     \row
-        \o M1
-        \o Error
-        \o Invalid value for enum
-        \o
+        \li  M1
+        \li  Error
+        \li  Invalid value for enum
+        \li
 
     \row
-        \o M2
-        \o Error
-        \o Enum value must be a string or a number
-        \o
+        \li  M2
+        \li  Error
+        \li  Enum value must be a string or a number
+        \li
 
     \row
-        \o M3
-        \o Error
-        \o Number value expected
-        \o
+        \li  M3
+        \li  Error
+        \li  Number value expected
+        \li
 
     \row
-        \o M4
-        \o Error
-        \o Boolean value expected
-        \o
+        \li  M4
+        \li  Error
+        \li  Boolean value expected
+        \li
 
     \row
-        \o M5
-        \o Error
-        \o String value expected
-        \o
+        \li  M5
+        \li  Error
+        \li  String value expected
+        \li
 
     \row
-        \o M6
-        \o Error
-        \o Invalid URL
-        \o
+        \li  M6
+        \li  Error
+        \li  Invalid URL
+        \li
 
     \row
-        \o M7
-        \o Warning
-        \o File or directory does not exist
-        \o
+        \li  M7
+        \li  Warning
+        \li  File or directory does not exist
+        \li
 
     \row
-        \o M8
-        \o Error
-        \o Invalid color
-        \o
+        \li  M8
+        \li  Error
+        \li  Invalid color
+        \li
 
     \row
-        \o M9
-        \o Error
-        \o Anchor line expected
-        \o
+        \li  M9
+        \li  Error
+        \li  Anchor line expected
+        \li
 
     \row
-        \o M10
-        \o Error
-        \o Duplicate property binding
-        \o
+        \li  M10
+        \li  Error
+        \li  Duplicate property binding
+        \li
 
     \row
-        \o M11
-        \o Error
-        \o Id expected
-        \o
+        \li  M11
+        \li  Error
+        \li  Id expected
+        \li
 
     \row
-        \o M14
-        \o Error
-        \o Invalid id
-        \o
+        \li  M14
+        \li  Error
+        \li  Invalid id
+        \li
 
     \row
-        \o M15
-        \o Error
-        \o Duplicate id
-        \o Ids in a file must be unique.
+        \li  M15
+        \li  Error
+        \li  Duplicate id
+        \li  Ids in a file must be unique.
 
     \row
-        \o M16
-        \o Error
-        \o Invalid property name 'name'
-        \o
+        \li  M16
+        \li  Error
+        \li  Invalid property name 'name'
+        \li
 
     \row
-        \o M17
-        \o Error
-        \o 'Name' does not have members
-        \o
+        \li  M17
+        \li  Error
+        \li  'Name' does not have members
+        \li
 
     \row
-        \o M18
-        \o Error
-        \o 'Field' is not a member of 'object'
-        \o
+        \li  M18
+        \li  Error
+        \li  'Field' is not a member of 'object'
+        \li
 
     \row
-        \o M19
-        \o Warning
-        \o Assignment in condition
-        \o It could be a typing error. If it is intentional, wrap the
+        \li  M19
+        \li  Warning
+        \li  Assignment in condition
+        \li  It could be a typing error. If it is intentional, wrap the
            assignment in parentheses.
 
     \row
-        \o M20
-        \o Warning
-        \o Unterminated non-empty case block
-        \o Case blocks should either be empty or end in a flow control
+        \li  M20
+        \li  Warning
+        \li  Unterminated non-empty case block
+        \li  Case blocks should either be empty or end in a flow control
            statement such as 'break', 'return' or 'continue'.
            Alternatively you can indicate intentional fall through by
            ending with a '// fall through' comment.
 
     \row
-        \o M23
-        \o Warning
-        \o Do not use 'eval'
-        \o
+        \li  M23
+        \li  Warning
+        \li  Do not use 'eval'
+        \li
 
     \row
-        \o M28
-        \o Warning
-        \o Unreachable
-        \o Indicates that the underlined statement will never be
+        \li  M28
+        \li  Warning
+        \li  Unreachable
+        \li  Indicates that the underlined statement will never be
            executed.
 
     \row
-        \o M29
-        \o Warning
-        \o Do not use 'with'
-        \o
+        \li  M29
+        \li  Warning
+        \li  Do not use 'with'
+        \li
 
     \row
-        \o M30
-        \o Warning
-        \o Do not use comma expressions
-        \o
+        \li  M30
+        \li  Warning
+        \li  Do not use comma expressions
+        \li
 
     \row
-        \o M31
-        \o Warning
-        \o Unnecessary message suppression
-        \o
+        \li  M31
+        \li  Warning
+        \li  Unnecessary message suppression
+        \li
 
     \row
-        \o M103
-        \o Warning
-        \o 'Name' is already a formal parameter
-        \o
+        \li  M103
+        \li  Warning
+        \li  'Name' is already a formal parameter
+        \li
 
     \row
-        \o M104
-        \o Warning
-        \o 'Name' is already a function
-        \o
+        \li  M104
+        \li  Warning
+        \li  'Name' is already a function
+        \li
 
     \row
-        \o M105
-        \o Warning
-        \o Var 'name' is used before its declaration
-        \o
+        \li  M105
+        \li  Warning
+        \li  Var 'name' is used before its declaration
+        \li
 
     \row
-        \o M106
-        \o Warning
-        \o 'Name' is already a var
-        \o
+        \li  M106
+        \li  Warning
+        \li  'Name' is already a var
+        \li
 
     \row
-        \o M107
-        \o Warning
-        \o 'Name' is declared more than once
-        \o Variables declared in a function are always visible everywhere
+        \li  M107
+        \li  Warning
+        \li  'Name' is declared more than once
+        \li  Variables declared in a function are always visible everywhere
            in the function, even when declared in nested blocks or
            'for' statement conditions. Redeclaring a variable has no
            effect.
 
     \row
-        \o M108
-        \o Warning
-        \o Function 'name' is used before its declaration
-        \o
+        \li  M108
+        \li  Warning
+        \li  Function 'name' is used before its declaration
+        \li
 
     \row
-        \o M109
-        \o Warning
-        \o Do not use 'Boolean' as a constructor
-        \o
+        \li  M109
+        \li  Warning
+        \li  Do not use 'Boolean' as a constructor
+        \li
 
     \row
-        \o M110
-        \o Warning
-        \o Do not use 'String' as a constructor
-        \o
+        \li  M110
+        \li  Warning
+        \li  Do not use 'String' as a constructor
+        \li
 
     \row
-        \o M111
-        \o Warning
-        \o Do not use 'Object' as a constructor
-        \o
+        \li  M111
+        \li  Warning
+        \li  Do not use 'Object' as a constructor
+        \li
 
     \row
-        \o M112
-        \o Warning
-        \o Do not use 'Array' as a constructor
-        \o
+        \li  M112
+        \li  Warning
+        \li  Do not use 'Array' as a constructor
+        \li
 
     \row
-        \o M113
-        \o Warning
-        \o Do not use 'Function' as a constructor
-        \o
+        \li  M113
+        \li  Warning
+        \li  Do not use 'Function' as a constructor
+        \li
 
     \row
-        \o M114
-        \o Hint
-        \o The 'function' keyword and the opening parenthesis should be separated by a single space
-        \o
+        \li  M114
+        \li  Hint
+        \li  The 'function' keyword and the opening parenthesis should be separated by a single space
+        \li
 
     \row
-        \o M115
-        \o Warning
-        \o Do not use stand-alone blocks
-        \o Blocks do not affect variable scoping. Thus blocks that are
+        \li  M115
+        \li  Warning
+        \li  Do not use stand-alone blocks
+        \li  Blocks do not affect variable scoping. Thus blocks that are
            not associated to 'if', 'while', etc. have no effect and
            should be avoided.
 
     \row
-        \o M116
-        \o Warning
-        \o Do not use void expressions
-        \o
+        \li  M116
+        \li  Warning
+        \li  Do not use void expressions
+        \li
 
     \row
-        \o M117
-        \o Warning
-        \o Confusing pluses
-        \o
+        \li  M117
+        \li  Warning
+        \li  Confusing pluses
+        \li
 
     \row
-        \o M119
-        \o Warning
-        \o Confusing minuses
-        \o
+        \li  M119
+        \li  Warning
+        \li  Confusing minuses
+        \li
 
     \row
-        \o M121
-        \o Hint
-        \o Declare all function vars on a single line
-        \o
+        \li  M121
+        \li  Hint
+        \li  Declare all function vars on a single line
+        \li
 
     \row
-        \o M123
-        \o Hint
-        \o Unnecessary parentheses
-        \o
+        \li  M123
+        \li  Hint
+        \li  Unnecessary parentheses
+        \li
 
     \row
-        \o M126
-        \o Warning
-        \o == and != may perform type coercion, use === or !== to avoid
-        \o The non-strict equality comparison is allowed to convert its
+        \li  M126
+        \li  Warning
+        \li  == and != may perform type coercion, use === or !== to avoid
+        \li  The non-strict equality comparison is allowed to convert its
            arguments to a common type. That can lead to unexpected
            results such as \c {' \t\r\n' == 0} being true. Prefer to use the
            strict equality operators === and !== and be explicit about
            conversions you require.
     \row
-        \o M305
-        \o Warning
-        \o == and != perform type coercion, use === or !== to avoid
-        \o (see above)
+        \li  M305
+        \li  Warning
+        \li  == and != perform type coercion, use === or !== to avoid
+        \li  (see above)
 
     \row
-        \o M127
-        \o Warning
-        \o Expression statements should be assignments, calls or delete expressions only
-        \o
+        \li  M127
+        \li  Warning
+        \li  Expression statements should be assignments, calls or delete expressions only
+        \li
 
     \row
-        \o M201
-        \o Hint
-        \o Var declarations should be at the start of a function
-        \o
+        \li  M201
+        \li  Hint
+        \li  Var declarations should be at the start of a function
+        \li
 
     \row
-        \o M202
-        \o Hint
-        \o Only use one statement per line
-        \o
+        \li  M202
+        \li  Hint
+        \li  Only use one statement per line
+        \li
 
     \row
-        \o M300
-        \o Error
-        \o Unknown component
-        \o
+        \li  M300
+        \li  Error
+        \li  Unknown component
+        \li
 
     \row
-        \o M301
-        \o Error
-        \o Could not resolve the prototype 'name' of 'object'
-        \o
+        \li  M301
+        \li  Error
+        \li  Could not resolve the prototype 'name' of 'object'
+        \li
 
     \row
-        \o M302
-        \o Error
-        \o Could not resolve the prototype 'name'
-        \o
+        \li  M302
+        \li  Error
+        \li  Could not resolve the prototype 'name'
+        \li
 
     \row
-        \o M303
-        \o Error
-        \o Prototype cycle, the last non-repeated component is 'name'
-        \o
+        \li  M303
+        \li  Error
+        \li  Prototype cycle, the last non-repeated component is 'name'
+        \li
 
     \row
-        \o M304
-        \o Error
-        \o Invalid property type 'name'
-        \o
+        \li  M304
+        \li  Error
+        \li  Invalid property type 'name'
+        \li
 
     \row
-        \o M306
-        \o Warning
-        \o Calls of functions that start with an uppercase letter should use 'new'
-        \o By convention, functions that start with an uppercase letter
+        \li  M306
+        \li  Warning
+        \li  Calls of functions that start with an uppercase letter should use 'new'
+        \li  By convention, functions that start with an uppercase letter
            are constructor functions that should only be used with 'new'.
 
     \row
-        \o M307
-        \o Warning
-        \o 'new' should only be used with functions that start with an uppercase letter
-        \o
+        \li  M307
+        \li  Warning
+        \li  'new' should only be used with functions that start with an uppercase letter
+        \li
 
     \row
-        \o M308
-        \o Warning
-        \o Do not use 'Number' as a constructor
-        \o
+        \li  M308
+        \li  Warning
+        \li  Do not use 'Number' as a constructor
+        \li
 
     \row
-        \o M309
-        \o Hint
-        \o Use spaces around binary operators
-        \o
+        \li  M309
+        \li  Hint
+        \li  Use spaces around binary operators
+        \li
 
     \row
-        \o M310
-        \o Warning
-        \o Unintentional empty block, use ({}) for empty object literal
-        \o
+        \li  M310
+        \li  Warning
+        \li  Unintentional empty block, use ({}) for empty object literal
+        \li
 
     \row
-        \o M311
-        \o Hint
-        \o Use 'type' instead of 'var' or 'variant' to improve performance
-        \o
+        \li  M311
+        \li  Hint
+        \li  Use 'type' instead of 'var' or 'variant' to improve performance
+        \li
 
     \endtable
 
@@ -609,65 +609,65 @@
 
     \table
         \header
-            \o Icon
-            \o Description
+            \li  Icon
+            \li  Description
         \row
-            \o  \inlineimage completion/class.png
-            \o  A class
+            \li \inlineimage completion/class.png
+            \li A class
         \row
-            \o  \inlineimage completion/enum.png
-            \o  An enum
+            \li \inlineimage completion/enum.png
+            \li An enum
         \row
-            \o  \inlineimage completion/enumerator.png
-            \o  An enumerator (value of an enum)
+            \li \inlineimage completion/enumerator.png
+            \li An enumerator (value of an enum)
         \row
-            \o  \inlineimage completion/func.png
-            \o  A function
+            \li \inlineimage completion/func.png
+            \li A function
         \row
-            \o  \inlineimage completion/func_priv.png
-            \o  A private function
+            \li \inlineimage completion/func_priv.png
+            \li A private function
         \row
-            \o  \inlineimage completion/func_prot.png
-            \o  A protected function
+            \li \inlineimage completion/func_prot.png
+            \li A protected function
         \row
-            \o  \inlineimage completion/var.png
-            \o  A variable
+            \li \inlineimage completion/var.png
+            \li A variable
         \row
-            \o  \inlineimage completion/var_priv.png
-            \o  A private variable
+            \li \inlineimage completion/var_priv.png
+            \li A private variable
         \row
-            \o  \inlineimage completion/var_prot.png
-            \o  A protected variable
+            \li \inlineimage completion/var_prot.png
+            \li A protected variable
         \row
-            \o  \inlineimage completion/signal.png
-            \o  A signal
+            \li \inlineimage completion/signal.png
+            \li A signal
         \row
-            \o  \inlineimage completion/slot.png
-            \o  A slot
+            \li \inlineimage completion/slot.png
+            \li A slot
         \row
-            \o  \inlineimage completion/slot_priv.png
-            \o  A private slot
+            \li \inlineimage completion/slot_priv.png
+            \li A private slot
         \row
-            \o  \inlineimage completion/slot_prot.png
-            \o  A protected slot
+            \li \inlineimage completion/slot_prot.png
+            \li A protected slot
         \row
-            \o  \inlineimage completion/keyword.png
-            \o  A C++ keyword
+            \li \inlineimage completion/keyword.png
+            \li A C++ keyword
         \row
-            \o  \inlineimage completion/snippet.png
-            \o  A C++ code snippet
+            \li \inlineimage completion/snippet.png
+            \li A C++ code snippet
         \row
-            \o  \inlineimage completion/element.png
-            \o  A QML element
+            \li \inlineimage completion/element.png
+            \li A QML element
         \row
-            \o  \inlineimage completion/qmlsnippet.png
-            \o  A QML code snippet
+            \li \inlineimage completion/qmlsnippet.png
+            \li A QML code snippet
         \row
-            \o  \inlineimage completion/macro.png
-            \o  A macro
+            \li \inlineimage completion/macro.png
+            \li A macro
         \row
-            \o  \inlineimage completion/namespace.png
-            \o  A namespace
+            \li \inlineimage completion/namespace.png
+            \li A namespace
     \endtable
 
     \section2 Completing Code Snippets
@@ -693,12 +693,12 @@
 
     \list
 
-        \o  Text snippets, which can contain any text string. For example, code
+        \li Text snippets, which can contain any text string. For example, code
             comments
 
-        \o  C++ code snippets, which specify C++ code constructs
+        \li C++ code snippets, which specify C++ code constructs
 
-        \o  QML code snippets, which specify QML code constructs
+        \li QML code snippets, which specify QML code constructs
 
     \endlist
 
@@ -714,13 +714,13 @@
 
     \list
 
-        \o  Highlighting
+        \li Highlighting
 
-        \o  Indentation
+        \li Indentation
 
-        \o  Parentheses matching
+        \li Parentheses matching
 
-        \o  Basic code completion
+        \li Basic code completion
 
     \endlist
 
@@ -774,15 +774,15 @@
 
     \list
 
-        \o  \gui{CodePaster}
+        \li \gui{CodePaster}
 
-        \o  \gui{Pastebin.Com}
+        \li \gui{Pastebin.Com}
 
-        \o  \gui{Pastebin.Ca}
+        \li \gui{Pastebin.Ca}
 
-        \o  \gui{Paste.KDE.Org}
+        \li \gui{Paste.KDE.Org}
 
-        \o  \gui{Shared network drives}
+        \li \gui{Shared network drives}
 
     \endlist
 
@@ -913,11 +913,11 @@
 
     \list
 
-        \o  Text files
+        \li Text files
 
-        \o  C++ files
+        \li C++ files
 
-        \o  QML files
+        \li QML files
 
     \endlist
 
@@ -945,16 +945,16 @@
 
     \list 1
 
-        \o  Select \gui {Tools > Options > C++}.
+        \li Select \gui {Tools > Options > C++}.
 
-        \o  In the \gui {Current settings} field, select the settings to modify
+        \li In the \gui {Current settings} field, select the settings to modify
             and click \gui Copy.
 
             \image qtcreator-options-code-style-cpp.png "C++ Code Style options"
 
-        \o  Give a name to the settings and click \gui OK.
+        \li Give a name to the settings and click \gui OK.
 
-        \o  Click \gui Edit to specify code style settings for the project.
+        \li Click \gui Edit to specify code style settings for the project.
 
             \image qtcreator-code-style-settings-edit-cpp.png "Edit Code Style Settings dialog"
 
@@ -965,15 +965,15 @@
 
     \list
 
-        \o  Interpret the \key Tab and \key Backspace key presses.
+        \li Interpret the \key Tab and \key Backspace key presses.
 
-        \o  Indent the contents of classes, methods, blocks, and namespaces.
+        \li Indent the contents of classes, methods, blocks, and namespaces.
 
-        \o  Indent braces in classes, namespaces, enums, methods, and blocks.
+        \li Indent braces in classes, namespaces, enums, methods, and blocks.
 
-        \o  Control switch statements and their contents.
+        \li Control switch statements and their contents.
 
-        \o  Align continuation lines.
+        \li Align continuation lines.
 
     \endlist
 
@@ -988,16 +988,16 @@
 
     \list 1
 
-        \o  Select \gui {Tools > Options >Qt Quick}.
+        \li Select \gui {Tools > Options >Qt Quick}.
 
-        \o  In the \gui {Current settings} field, select the settings to modify
+        \li In the \gui {Current settings} field, select the settings to modify
             and click \gui Copy.
 
             \image qtcreator-options-code-style-qml.png "QML Code Style options"
 
-        \o  Give a name to the settings and click \gui OK.
+        \li Give a name to the settings and click \gui OK.
 
-        \o  Click \gui Edit to specify code style settings for the project.
+        \li Click \gui Edit to specify code style settings for the project.
 
             \image qtcreator-code-style-settings-edit-qtquick.png "Edit Code Style Settings dialog"
 
@@ -1015,17 +1015,17 @@
 
     \list
 
-        \o  Global settings for all files
+        \li Global settings for all files
 
-        \o  Global C++ settings for C++ files
+        \li Global C++ settings for C++ files
 
-        \o  Global Qt Quick settings for QML files
+        \li Global Qt Quick settings for QML files
 
-        \o  Project specific settings for all editors of files in the project
+        \li Project specific settings for all editors of files in the project
 
-        \o  Project specific settings for C++ files in the project
+        \li Project specific settings for C++ files in the project
 
-        \o  Project specific settings for QML files in the project
+        \li Project specific settings for QML files in the project
 
     \endlist
 
@@ -1117,14 +1117,14 @@
 
     \list 1
 
-        \o  Press \key Ctrl+F or select \gui Edit > \gui Find/Replace >
+        \li Press \key Ctrl+F or select \gui Edit > \gui Find/Replace >
             \gui{Find/Replace}.
 
-        \o  Enter the text you are looking for.
+        \li Enter the text you are looking for.
 
             If the text is found, all occurrences are highlighted as you type.
 
-        \o  To go to the next occurrence, click \inlineimage qtcreator-next.png
+        \li To go to the next occurrence, click \inlineimage qtcreator-next.png
             (\gui {Find Next}), or press \key F3. To go to the previous
             occurrence click
             \inlineimage qtcreator-previous.png
@@ -1137,13 +1137,13 @@
 
     \list
 
-        \o  To make your search case sensitive, select
+        \li To make your search case sensitive, select
             \gui {Case Sensitive}.
 
-        \o  To search only whole words, select
+        \li To search only whole words, select
             \gui {Whole Words Only}.
 
-        \o  To search using regular expressions, select
+        \li To search using regular expressions, select
             \gui {Regular Expressions}.
             Regular expressions used in \QC are modeled on Perl regular
             expressions. For more information on using regular expressions, see
@@ -1160,15 +1160,15 @@
 
     \list
 
-        \o  To replace the selected occurrence and move to the next one,
+        \li To replace the selected occurrence and move to the next one,
             click \gui {Find Next}
             or press \key Ctrl+=.
 
-        \o  To replace the selected occurrence and move to the previous one,
+        \li To replace the selected occurrence and move to the previous one,
             click \gui {Find Previous}
             .
 
-        \o  To replace all occurrences in the file, click \gui{Replace All}.
+        \li To replace all occurrences in the file, click \gui{Replace All}.
 
     \endlist
 
@@ -1180,15 +1180,15 @@
 
     \list
 
-        \o All upper-case occurrences are replaced with the upper-case new text.
+        \li  All upper-case occurrences are replaced with the upper-case new text.
 
-        \o All lower-case occurrences are replaced with the lower-case new text.
+        \li  All lower-case occurrences are replaced with the lower-case new text.
 
-        \o Capitalized occurrences are replaced with the capitalized new text.
+        \li  Capitalized occurrences are replaced with the capitalized new text.
 
-        \o Other occurrences are replaced with the new text as entered.
+        \li  Other occurrences are replaced with the new text as entered.
 
-        \o If an occurrence and the new text have the same prefix or suffix,
+        \li  If an occurrence and the new text have the same prefix or suffix,
            then the case of the prefix and/or suffix are preserved, and the
            other rules are applied on the rest of the occurrence only.
 
@@ -1201,14 +1201,14 @@
 
     \list 1
 
-        \o  Press \key Ctrl+Shift+F or select \gui Edit > \gui Find/Replace >
+        \li Press \key Ctrl+Shift+F or select \gui Edit > \gui Find/Replace >
             \gui{Advanced Find} > \gui{Open Advanced Find}.
 
-        \o  Select the scope of your search:
+        \li Select the scope of your search:
 
             \list
 
-                \o  \gui{All Projects} searches files matching the defined file
+                \li \gui{All Projects} searches files matching the defined file
                     pattern in all currently open projects.
 
                     For example, to search for \tt previewer only in \tt .cpp
@@ -1217,17 +1217,17 @@
 
                     \image qtcreator-search-allprojects.png
 
-                \o  \gui{Current Project} searches files matching the defined
+                \li \gui{Current Project} searches files matching the defined
                     file pattern only in the project you are currently editing.
 
-                \o  \gui{Files on File System} recursively searches files
+                \li \gui{Files on File System} recursively searches files
                     matching the defined file pattern in the selected directory.
 
-                \o  \gui{Current File} searches only the current file.
+                \li \gui{Current File} searches only the current file.
 
             \endlist
 
-        \o  Enter the text you are looking for and click \gui Search.
+        \li Enter the text you are looking for and click \gui Search.
 
             \image qtcreator-searchresults.png
 
@@ -1236,12 +1236,12 @@
 
             \list
 
-                \o  To see all occurrences in a file, double-click the file name
+                \li To see all occurrences in a file, double-click the file name
                     in the list.
 
-                \o  To go to an occurrence, double-click it.
+                \li To go to an occurrence, double-click it.
 
-                \o  To repeat the search after you have made changes to the
+                \li To repeat the search after you have made changes to the
                     listed files, for example, select \gui {Search Again}.
 
             \endlist
@@ -1269,13 +1269,13 @@
 
     \list
 
-        \o  Improve internal quality of your application
+        \li Improve internal quality of your application
 
-        \o  Improve performance and extensibility
+        \li Improve performance and extensibility
 
-        \o  Improve code readability and maintainability
+        \li Improve code readability and maintainability
 
-        \o  Simplify code structure
+        \li Simplify code structure
 
     \endlist
 
@@ -1286,16 +1286,16 @@
 
     \list 1
 
-        \o  In the editor, place the cursor on the symbol or component, and
+        \li In the editor, place the cursor on the symbol or component, and
             select:
 
         \list
 
-            \o  \gui {Tools > C++ > Find Usages}
+            \li \gui {Tools > C++ > Find Usages}
 
-            \o  \gui {Tools > QML/JS > Find Usages}
+            \li \gui {Tools > QML/JS > Find Usages}
 
-            \o  \key Ctrl+Shift+U
+            \li \key Ctrl+Shift+U
 
         \endlist
 
@@ -1303,12 +1303,12 @@
 
         \list
 
-            \o  Files listed as a part of the project
+            \li Files listed as a part of the project
 
-            \o  Files directly used by the project files (for example, generated
+            \li Files directly used by the project files (for example, generated
                 files)
 
-            \o  Header files of used frameworks and libraries
+            \li Header files of used frameworks and libraries
 
         \endlist
 
@@ -1319,7 +1319,7 @@
 
         \image qtcreator-search-cpp-symbols.png
 
-        \o  The \gui{Search Results} pane opens and shows the location and
+        \li The \gui{Search Results} pane opens and shows the location and
             number of instances of the symbol in the current project.
 
             \image qtcreator-refactoring-find.png
@@ -1330,20 +1330,20 @@
 
     \list
 
-        \o  To go directly to an instance, double-click the instance in the
+        \li To go directly to an instance, double-click the instance in the
             \gui{Search Results} pane.
 
-        \o  To move between instances, click
+        \li To move between instances, click
             \inlineimage qtcreator-forward.png
             and
             \inlineimage qtcreator-back.png
             in the \gui{Search Results} pane.
 
-        \o  To expand and collapse the list of all instances, click
+        \li To expand and collapse the list of all instances, click
             \inlineimage qtcreator-expand.png
             .
 
-        \o  To clear the search results, click \inlineimage qtcreator-clear.png
+        \li To clear the search results, click \inlineimage qtcreator-clear.png
             .
 
     \endlist
@@ -1354,7 +1354,7 @@
 
     \list 1
 
-        \o  In the editor, place the cursor on the symbol you would like to
+        \li In the editor, place the cursor on the symbol you would like to
             change and select \gui Tools > \gui C++ >
             \gui{Rename Symbol Under Cursor} or \gui Tools > \gui QML/JS >
             \gui{Rename Symbol Under Cursor}. Alternatively, press
@@ -1365,7 +1365,7 @@
 
             \image qtcreator-refactoring-replace.png
 
-        \o  To replace all selected instances, enter the name of the new symbol
+        \li To replace all selected instances, enter the name of the new symbol
             in the \gui{Replace with} text box and click \gui Replace.
 
             To omit an instance, uncheck the check-box next to the instance.
@@ -1403,18 +1403,18 @@
 
    \list
 
-        \o  Change binary operands
+        \li Change binary operands
 
-        \o  Simplify if and while conditions (for example, move declarations out
+        \li Simplify if and while conditions (for example, move declarations out
             of if conditions)
 
-        \o  Modify strings (for example, set the encoding for a string to
+        \li Modify strings (for example, set the encoding for a string to
             Latin-1, mark strings translatable, and convert symbol names to
             camel case)
 
-        \o  Create variable declarations
+        \li Create variable declarations
 
-        \o  Create method declarations and definitions
+        \li Create method declarations and definitions
 
    \endlist
 
@@ -1424,12 +1424,12 @@
 
     \table
         \header
-            \o Refactoring Action
-            \o Description
-            \o Activation
+            \li  Refactoring Action
+            \li  Description
+            \li  Activation
         \row
-            \o Add Curly Braces
-            \o Adds curly braces to an if statement that does not contain a
+            \li  Add Curly Braces
+            \li  Adds curly braces to an if statement that does not contain a
             compound statement. For example, rewrites
 
     \code
@@ -1444,10 +1444,10 @@
         b;
     }
     \endcode
-            \o if
+            \li  if
         \row
-            \o Move Declaration out of Condition
-            \o Moves a declaration out of an if or while condition to simplify the
+            \li  Move Declaration out of Condition
+            \li  Moves a declaration out of an if or while condition to simplify the
             condition. For example, rewrites
 
     \code
@@ -1460,10 +1460,10 @@
     Type name = foo;
     if (name) {}
     \endcode
-            \o Name of the introduced variable
+            \li  Name of the introduced variable
         \row
-            \o Rewrite Condition Using ||
-            \o Rewrites the expression according to De Morgan's laws. For example,
+            \li  Rewrite Condition Using ||
+            \li  Rewrites the expression according to De Morgan's laws. For example,
              rewrites:
     \code
     !a && !b
@@ -1474,15 +1474,15 @@
     \code
     !(a || b)
     \endcode
-            \o &&
+            \li  &&
         \row
-            \o Rewrite Using \e operator
-            \o Rewrites an expression negating it and using the inverse operator. For
+            \li  Rewrite Using \e operator
+            \li  Rewrites an expression negating it and using the inverse operator. For
             example, rewrites:
 
             \list
 
-    \o     \code
+    \li    \code
     a op b
     \endcode
 
@@ -1492,7 +1492,7 @@
     !(a invop b)
     \endcode
 
-    \o     \code
+    \li    \code
     (a op b)
     \endcode
 
@@ -1502,7 +1502,7 @@
     !(a invop b)
     \endcode
 
-    \o    \code
+    \li   \code
     !(a op b)
     \endcode
 
@@ -1514,10 +1514,10 @@
 
     \endlist
 
-            \o <= < > >= == !=
+            \li  <= < > >= == !=
         \row
-            \o Split Declaration
-            \o Splits a simple declaration into several declarations. For example,
+            \li  Split Declaration
+            \li  Splits a simple declaration into several declarations. For example,
             rewrites:
     \code
     int *a, b;
@@ -1529,10 +1529,10 @@
     int *a;
     int b;
     \endcode
-            \o Type name or variable name
+            \li  Type name or variable name
         \row
-            \o Split if Statement
-            \o Splits an if statement into several statements. For example, rewrites:
+            \li  Split if Statement
+            \li  Splits an if statement into several statements. For example, rewrites:
     \code
     if (something && something_else) {
     }
@@ -1563,10 +1563,10 @@
         x;
     \endcode
 
-            \o && ||
+            \li  && ||
         \row
-            \o Swap Operands
-            \o Rewrites an expression in the inverse order using the inverse operator.
+            \li  Swap Operands
+            \li  Rewrites an expression in the inverse order using the inverse operator.
             For example, rewrites:
     \code
     a op b
@@ -1576,22 +1576,22 @@
     \code
     b flipop a
     \endcode
-            \o <= < > >= == != && ||
+            \li  <= < > >= == != && ||
         \row
-            \o Convert to Decimal
-            \o Converts an integer literal to decimal representation
-            \o Numeric literal
+            \li  Convert to Decimal
+            \li  Converts an integer literal to decimal representation
+            \li  Numeric literal
         \row
-            \o Convert to Hexadecimal
-            \o Converts an integer literal to hexadecimal representation
-            \o Numeric literal
+            \li  Convert to Hexadecimal
+            \li  Converts an integer literal to hexadecimal representation
+            \li  Numeric literal
         \row
-            \o Convert to Octal
-            \o Converts an integer literal to octal representation
-            \o Numeric literal
+            \li  Convert to Octal
+            \li  Converts an integer literal to octal representation
+            \li  Numeric literal
         \row
-            \o Convert to Objective-C String Literal
-            \o Converts a string literal to an Objective-C string literal
+            \li  Convert to Objective-C String Literal
+            \li  Converts a string literal to an Objective-C string literal
             if the file type is Objective-C(++). For example, rewrites the following strings
 
     \code
@@ -1605,10 +1605,10 @@
     \code
     @"abcd"
     \endcode
-            \o String literal
+            \li  String literal
         \row
-            \o Enclose in QLatin1Char()
-            \o Sets the encoding for a character to Latin-1, unless the character is
+            \li  Enclose in QLatin1Char()
+            \li  Sets the encoding for a character to Latin-1, unless the character is
             already enclosed in QLatin1Char, QT_TRANSLATE_NOOP, tr, trUtf8,
             QLatin1Literal, or QLatin1String. For example, rewrites
 
@@ -1621,10 +1621,10 @@
     \code
     QLatin1Char('a')
     \endcode
-            \o String literal
+            \li  String literal
         \row
-            \o Enclose in QLatin1String()
-            \o Sets the encoding for a string to Latin-1, unless the string is
+            \li  Enclose in QLatin1String()
+            \li  Sets the encoding for a string to Latin-1, unless the string is
             already enclosed in QLatin1Char, QT_TRANSLATE_NOOP, tr, trUtf8,
             QLatin1Literal, or QLatin1String. For example, rewrites
     \code
@@ -1637,11 +1637,11 @@
     QLatin1String("abcd")
     \endcode
 
-            \o String literal
+            \li  String literal
 
         \row
-            \o Mark as Translatable
-            \o Marks a string translatable. For example, rewrites \c "abcd" with
+            \li  Mark as Translatable
+            \li  Marks a string translatable. For example, rewrites \c "abcd" with
             one of the following options, depending on which of them is available:
 
     \code
@@ -1650,39 +1650,39 @@
     QT_TRANSLATE_NOOP("GLOBAL", "abcd")
     \endcode
 
-            \o String literal
+            \li  String literal
 
         \row
-            \o #include Header File
-            \o Adds the matching #include statement for a forward-declared class or struct
-            \o Forward-declared class or struct
+            \li  #include Header File
+            \li  Adds the matching #include statement for a forward-declared class or struct
+            \li  Forward-declared class or struct
         \row
-            \o Add Definition in 'filename'
-            \o Inserts a definition stub for a member function declaration in the
+            \li  Add Definition in 'filename'
+            \li  Inserts a definition stub for a member function declaration in the
             implementation file. The definition is placed after that of the
             preceding declaration. Qualified names are minimized when possible,
             instead of always being fully expanded.
 
-            \o Method name
+            \li  Method name
         \row
-            \o Add 'Function' Declaration
-            \o Inserts the member function declaration that matches the member function
+            \li  Add 'Function' Declaration
+            \li  Inserts the member function declaration that matches the member function
             definition into the class declaration. The function can be public,
             protected, private, public slot, protected slot, or private slot.
-            \o Method name
+            \li  Method name
         \row
-            \o Switch with Next/Previous Parameter
-            \o Moves a parameter down or up one position in a parameter list.
-            \o Parameter in the declaration or definition of a function or method
+            \li  Switch with Next/Previous Parameter
+            \li  Moves a parameter down or up one position in a parameter list.
+            \li  Parameter in the declaration or definition of a function or method
         \row
-            \o Extract Method
-            \o Moves the selected code to a new method and replaces the block of
+            \li  Extract Method
+            \li  Moves the selected code to a new method and replaces the block of
             code with a call to the new method. Enter a name for the method in
             the \gui {Extract Function Refactoring} dialog.
-            \o Block of code selected
+            \li  Block of code selected
         \row
-            \o Add Local Declaration
-            \i
+            \li  Add Local Declaration
+            \li
             Adds the type of an assignee, if the type of the right-hand side of the assignment
             is known. For example, rewrites
 
@@ -1698,43 +1698,43 @@
 
     where Type is the return type of \c {foo()}
 
-            \o Assignee
+            \li  Assignee
 
         \row
-            \o Convert to Camel Case
-            \o Converts a symbol name to camel case, where elements of the name are joined
+            \li  Convert to Camel Case
+            \li  Converts a symbol name to camel case, where elements of the name are joined
             without delimiter characters and the initial character of each element is
             capitalized. For example, rewrites \c an_example_symbol
             as \c anExampleSymbol and \c AN_EXAMPLE_SYMBOL as \c AnExampleSymbol
-            \o Identifier
+            \li  Identifier
         \row
-            \o Complete Switch Statement
-            \o Adds all possible cases to a switch statement of the type \c enum
-            \o Switch
+            \li  Complete Switch Statement
+            \li  Adds all possible cases to a switch statement of the type \c enum
+            \li  Switch
         \row
-            \o Generate Missing Q_PROPERTY Members
-            \o Adds missing members to a Q_PROPERTY:
+            \li  Generate Missing Q_PROPERTY Members
+            \li  Adds missing members to a Q_PROPERTY:
             \list
-                \o \c read method
-                \o \c write method, if there is a WRITE
-                \o \c {onChanged} signal, if there is a NOTIFY
-                \o data member with the name \c {m_<propertyName>}
+                \li  \c read method
+                \li  \c write method, if there is a WRITE
+                \li  \c {onChanged} signal, if there is a NOTIFY
+                \li  data member with the name \c {m_<propertyName>}
             \endlist
-            \o Q_PROPERTY
+            \li  Q_PROPERTY
         \row
-            \o  Apply Changes
-            \o  Keeps function declarations and definitions synchronized by
+            \li Apply Changes
+            \li Keeps function declarations and definitions synchronized by
                 checking for the matching declaration or definition when you
                 edit a function signature and by applying the changes to the
                 matching code.
-            \o  Function signature. When this action is available, a light bulb
+            \li Function signature. When this action is available, a light bulb
                 icon appears:
                 \inlineimage qml-toolbar-indicator.png
         \row
-            \o  Add #include for undeclared identifier
-            \o  Adds an #include directive to the current file to make the
+            \li Add #include for undeclared identifier
+            \li Adds an #include directive to the current file to make the
                 declaration of a symbol available.
-            \o  Undeclared identifier
+            \li Undeclared identifier
     \endtable
 
    \section2 Refactoring QML Code
@@ -1743,11 +1743,11 @@
 
    \list
 
-        \o Rename IDs
+        \li  Rename IDs
 
-        \o Split initializers
+        \li  Split initializers
 
-        \o Move a QML element into a separate file to reuse it in other
+        \li  Move a QML element into a separate file to reuse it in other
         .qml files
 
    \endlist
@@ -1758,17 +1758,17 @@
 
     \table
         \header
-            \o Refactoring Action
-            \o Description
-            \o Activation
+            \li  Refactoring Action
+            \li  Description
+            \li  Activation
 
         \row
-            \o Move Component into 'filename.qml'
-            \o Moves a QML element into a separate file
-            \o Element name
+            \li  Move Component into 'filename.qml'
+            \li  Moves a QML element into a separate file
+            \li  Element name
         \row
-            \o Split Initializer
-            \o Reformats a one-line element into a multi-line element. For example,
+            \li  Split Initializer
+            \li  Reformats a one-line element into a multi-line element. For example,
             rewrites
     \code
     Item { x: 10; y: 20; width: 10 }
@@ -1783,17 +1783,17 @@
         width: 10
     }
     \endcode
-            \o Element property
+            \li  Element property
         \row
-            \o Wrap in Loader
-            \o Wraps the element in a Component element and loads it dynamically in
+            \li  Wrap in Loader
+            \li  Wraps the element in a Component element and loads it dynamically in
                a Loader element. This is usually done to improve startup time.
-            \o Element name
+            \li  Element name
         \row
-            \o Add a message suppression comment
-            \o Prepends the line with an annotation comment that stops the message
+            \li  Add a message suppression comment
+            \li  Prepends the line with an annotation comment that stops the message
                from being generated.
-            \o Error, warning or hint from static analysis
+            \li  Error, warning or hint from static analysis
 
     \endtable
    */
@@ -1817,17 +1817,17 @@
 
     \list 1
 
-        \o  Activate the locator by pressing \key Ctrl+K.
+        \li Activate the locator by pressing \key Ctrl+K.
 
-        \o  Enter \tt{main.cpp}.
+        \li Enter \tt{main.cpp}.
 
             \image qtcreator-locator-open.png
 
-        \o  Press \key Enter.
+        \li Press \key Enter.
 
             The main.cpp file opens in the editor.
 
-        \o  To move to a line in the file, enter the line number in the locator.
+        \li To move to a line in the file, enter the line number in the locator.
 
     \endlist
 
@@ -1847,43 +1847,43 @@
 
     \list
 
-        \o  To match any number of any or no characters, enter \bold{*}.
+        \li To match any number of any or no characters, enter \b{*}.
 
-        \o  To match a single instance of any character, enter \bold{?}.
+        \li To match a single instance of any character, enter \b{?}.
 
     \endlist
 
     \section1 Using Locator Filters
 
     The locator enables you to browse not only files, but any items defined by
-    \bold{locator filters}. By default, the locator contains filters for:
+    \b{locator filters}. By default, the locator contains filters for:
 
     \list
 
-        \o  Locating any open document
+        \li Locating any open document
 
-        \o  Locating files anywhere on your file system
+        \li Locating files anywhere on your file system
 
-        \o  Locating files belonging to your project, such as source, header
+        \li Locating files belonging to your project, such as source, header
             resource, and .ui files
 
-        \o  Locating class and method definitions in your project or anywhere
+        \li Locating class and method definitions in your project or anywhere
             referenced from your project
 
-        \o  Locating class and method definitions in the current document
+        \li Locating class and method definitions in the current document
 
-        \o  Locating a specific line in the document displayed in your editor
+        \li Locating a specific line in the document displayed in your editor
 
-        \o  Opening help topics, including Qt documentation
+        \li Opening help topics, including Qt documentation
 
-        \o  Performing web searches
+        \li Performing web searches
 
-        \o  Running text editing macros that you record and save. For more
+        \li Running text editing macros that you record and save. For more
             information, see \l{Using Text Editing Macros}
 
-        \o  Executing shell commands
+        \li Executing shell commands
 
-        \o  Executing version control system commands. For more information, see
+        \li Executing version control system commands. For more information, see
             \l{Using Version Control Systems}
 
     \endlist
@@ -1896,9 +1896,9 @@
 
     \list 1
 
-        \o  Activate the locator.
+        \li Activate the locator.
 
-        \o  Enter \tt{\bold{: QDataStream}} (: (colon) followed by a
+        \li Enter \tt{\b{: QDataStream}} (: (colon) followed by a
             \key Space and the symbol name (QDataStream)).
 
             The locator lists the results.
@@ -1912,11 +1912,11 @@
 
     \list
 
-        \o  Going to a line in the current file (l).
+        \li Going to a line in the current file (l).
 
-        \o  Going to an open file (o).
+        \li Going to an open file (o).
 
-        \o  Going to a file in any open project (a).
+        \li Going to a file in any open project (a).
 
     \endlist
 
@@ -1930,18 +1930,18 @@
 
     \list 1
 
-        \o  In the locator, click \inlineimage qtcreator-locator-magnify.png
+        \li In the locator, click \inlineimage qtcreator-locator-magnify.png
             (\gui {Options}) and select \gui Configure to open the \gui Locator
             options.
 
-        \o  Select a filter, and then select \gui Edit.
+        \li Select a filter, and then select \gui Edit.
 
-        \o  Specify the prefix string.
+        \li Specify the prefix string.
 
-        \o  To show only results matching this filter, select
+        \li To show only results matching this filter, select
             \gui{Limit to prefix}.
 
-        \o  Specify other available options. For more information, see
+        \li Specify other available options. For more information, see
             \l{Adding Web Search Engines}.
 
     \endlist
@@ -1961,18 +1961,18 @@
 
     \list 1
 
-        \o  Select \gui {Tools > Options > Environment > Locator >
+        \li Select \gui {Tools > Options > Environment > Locator >
             Web Search (prefix: r) >
             Edit}.
 
-        \o  Select \gui Add to add a new entry to the list.
+        \li Select \gui Add to add a new entry to the list.
 
             \image qtcreator-add-online-doc.png "Filter Configuration dialog"
 
-        \o  Double-click the new entry to specify a URL and a search command.
+        \li Double-click the new entry to specify a URL and a search command.
             For example, http://www.google.com/search?q=%1.
 
-        \o  Click \gui OK.
+        \li Click \gui OK.
 
     \endlist
 
@@ -1986,26 +1986,26 @@
 
     \list 1
 
-        \o  In the locator, select \gui {Options > Configure} to open the
+        \li In the locator, select \gui {Options > Configure} to open the
             \gui Locator options.
 
             \image qtcreator-locator-customize.png
 
-        \o  Click \gui Add.
+        \li Click \gui Add.
 
-        \o  In the \gui{Filter Configuration} dialog:
+        \li In the \gui{Filter Configuration} dialog:
 
         \list
 
-            \o  Name your filter.
+            \li Name your filter.
 
-            \o  Select at least one directory. The locator searches directories
+            \li Select at least one directory. The locator searches directories
                 recursively.
 
-            \o  Define the file pattern as a comma separated list. For example,
-                to search all .h and .cpp files, enter \bold{*.h,*.cpp}
+            \li Define the file pattern as a comma separated list. For example,
+                to search all .h and .cpp files, enter \b{*.h,*.cpp}
 
-            \o  Specify the prefix string.
+            \li Specify the prefix string.
 
                 To show only results matching this filter, select
                 \gui{Limit to prefix}.
@@ -2014,7 +2014,7 @@
 
         \endlist
 
-        \o Click OK.
+        \li  Click OK.
 
     \endlist
 
@@ -2032,9 +2032,9 @@
 
     \list 1
 
-        \o  Select \gui {Tools > Options > Environment > Locator}.
+        \li Select \gui {Tools > Options > Environment > Locator}.
 
-        \o  In \gui{Refresh interval}, define new time in minutes.
+        \li In \gui{Refresh interval}, define new time in minutes.
 
     \endlist
 
diff --git a/doc/src/editors/creator-finding.qdoc b/doc/src/editors/creator-finding.qdoc
index c3bb00e1046a44579eab715eff7f724a6b44a980..0ca439c8594aefde3b4fb361826757acc5eb1c72 100644
--- a/doc/src/editors/creator-finding.qdoc
+++ b/doc/src/editors/creator-finding.qdoc
@@ -32,7 +32,7 @@
 
     \list
 
-        \o  \l{Finding and Replacing}
+        \li \l{Finding and Replacing}
 
             The incremental search highlights the matching strings in the
             window while typing and the advanced search enables you to
@@ -42,7 +42,7 @@
             In addition, you can search for symbols when you want to
             refactor code.
 
-        \o  \l{Searching with the Locator}
+        \li \l{Searching with the Locator}
 
             The locator provides one of the easiest ways in \QC to browse
             through projects, files, classes, methods, documentation and
diff --git a/doc/src/editors/creator-mime-types.qdoc b/doc/src/editors/creator-mime-types.qdoc
index 517e5aee8bcc646f3126f01eb1e05f252af6acea..41ecf874656dbe4cb4a639f00300069fe3c100b4 100644
--- a/doc/src/editors/creator-mime-types.qdoc
+++ b/doc/src/editors/creator-mime-types.qdoc
@@ -56,28 +56,28 @@
 
     \list 1
 
-        \o  Select \gui {Tools > Options > Environment > MIME Types}.
+        \li Select \gui {Tools > Options > Environment > MIME Types}.
 
             \image qtcreator-mime-types.png "MIME Types"
 
-        \o  In \gui {MIME Type}, select a MIME type.
+        \li In \gui {MIME Type}, select a MIME type.
 
-        \o  In \gui Patterns, add the filename extension for the type of files
+        \li In \gui Patterns, add the filename extension for the type of files
             that you want to identify as having this MIME type.
 
-        \o  Click \gui Add to add \gui {Magic Headers}.
+        \li Click \gui Add to add \gui {Magic Headers}.
 
             \image qtcreator-mime-types-magic-header.png "Magic Header"
 
-        \o  In the \gui Value field, specify a text string or bytes that
+        \li In the \gui Value field, specify a text string or bytes that
             appear in the files.
 
-        \o  In the \gui Type field, select the type of the value.
+        \li In the \gui Type field, select the type of the value.
 
             \note You are recommended not to change the range and priority,
             because it might cause problems when opening files in \QC.
 
-        \o  Click \gui OK.
+        \li Click \gui OK.
 
     \endlist
 
diff --git a/doc/src/howto/creator-cli.qdoc b/doc/src/howto/creator-cli.qdoc
index 2fb12005f3a51d24ed594e98c882e3d95f839817..8fc090892429f6167dab6581aab7f36ca20301ac 100644
--- a/doc/src/howto/creator-cli.qdoc
+++ b/doc/src/howto/creator-cli.qdoc
@@ -46,11 +46,11 @@
 
     \list
 
-        \o  \c {C:\qtcreator\bin>qtcreator -help}
+        \li \c {C:\qtcreator\bin>qtcreator -help}
 
-        \o  \c {C:\qtcreator\bin>qtcreator C:\TextFinder\textfinder.cpp:100}
+        \li \c {C:\qtcreator\bin>qtcreator C:\TextFinder\textfinder.cpp:100}
 
-        \o  \c {C:\qtcreator\bin>qtcreator C:\TextFinder\textfinder.cpp +100}
+        \li \c {C:\qtcreator\bin>qtcreator C:\TextFinder\textfinder.cpp +100}
 
     \endlist
 
@@ -64,55 +64,55 @@
 
     \table
         \header
-            \o Option
-            \o Description
+            \li  Option
+            \li  Description
 
         \row
-            \o -help
-            \o Display help on command line options.
+            \li  -help
+            \li  Display help on command line options.
 
         \row
-            \o -version
-            \o Display \QC version.
+            \li  -version
+            \li  Display \QC version.
 
         \row
-            \o -client
-            \o Attempt to connect to an already running instance of \QC.
+            \li  -client
+            \li  Attempt to connect to an already running instance of \QC.
 
         \row
-            \o -noload <plugin>
-            \o Do not load the specified plugin.
+            \li  -noload <plugin>
+            \li  Do not load the specified plugin.
 
         \row
-            \o -profile
-            \o Output plugin start up and shut down profiling data.
+            \li  -profile
+            \li  Output plugin start up and shut down profiling data.
 
         \row
-            \o -settingspath <path>
-            \o Override the default path where user settings are stored.
+            \li  -settingspath <path>
+            \li  Override the default path where user settings are stored.
 
         \row
-            \o -color <color>
-            \o Core plugin: override the selected UI color.
+            \li  -color <color>
+            \li  Core plugin: override the selected UI color.
 
         \row
-            \o -debug <PID-or-corefile>
-            \o Debugger plugin: attach to process ID or core file.
+            \li  -debug <PID-or-corefile>
+            \li  Debugger plugin: attach to process ID or core file.
 
         \row
-            \o -wincrashevent <event-handle>
-            \o Debugger plugin: Attach to crashed processes by using the specified
+            \li  -wincrashevent <event-handle>
+            \li  Debugger plugin: Attach to crashed processes by using the specified
             event handle.
 
         \row
-            \o -customwizard-verbose
-            \o ProjectExplorer plugin: display additional information when loading
+            \li  -customwizard-verbose
+            \li  ProjectExplorer plugin: display additional information when loading
             custom wizards. For more information about custom wizards, see
             \l{Adding New Custom Wizards}
 
         \row
-            \o -lastsession
-            \o ProjectExplorer plugin: load the last session when \QC starts.
+            \li  -lastsession
+            \li  ProjectExplorer plugin: load the last session when \QC starts.
             Open the projects and files that were open when you last exited \QC.
             For more information about managing sessions, see \l{Managing Sessions}.
 
diff --git a/doc/src/howto/creator-external-tools.qdoc b/doc/src/howto/creator-external-tools.qdoc
index 530d85769efc9a7cc8a4f8141a83494c91a147b5..0d8240255f7f56c33a147a4e72c8bef9cc8f3a34 100644
--- a/doc/src/howto/creator-external-tools.qdoc
+++ b/doc/src/howto/creator-external-tools.qdoc
@@ -103,31 +103,31 @@
 
     \list 1
 
-        \o  Select \gui {Tools > External > Configure}.
+        \li Select \gui {Tools > External > Configure}.
 
-        \o  Select \gui {Add > Add Tool}
+        \li Select \gui {Add > Add Tool}
             to add a new tool. You can also select \gui {Add Category} to add a
             new category.
 
-        \o  In the \gui Executable field, specify the executable to run. If the
+        \li In the \gui Executable field, specify the executable to run. If the
             executable is found in your system PATH variable, do not specify
             the path to it.
 
-        \o  In the \gui Arguments field, specify optional arguments for running
+        \li In the \gui Arguments field, specify optional arguments for running
             the executable.
 
-        \o  In the \gui {Working directory} field, specify the path to the
+        \li In the \gui {Working directory} field, specify the path to the
             working directory.
 
-        \o  In the \gui {Output pane}, select how to handle output from the
+        \li In the \gui {Output pane}, select how to handle output from the
             tool. You can ignore the output, view it in the \gui {General
             Messages} output pane, or replace the selected text with the
             output in the code editor.
 
-        \o  In the \gui {Error output pane}, select how to handle error messages
+        \li In the \gui {Error output pane}, select how to handle error messages
             from the tool.
 
-        \o  In the \gui Input field, specify text that is passed as standard
+        \li In the \gui Input field, specify text that is passed as standard
             input to the tool.
 
     \endlist
diff --git a/doc/src/howto/creator-help.qdoc b/doc/src/howto/creator-help.qdoc
index 042b0056b4ed17c0d04ddc6114441697ba5eda38..b11f4dad2b88f9bfb49c2af8432d83b68547041f 100644
--- a/doc/src/howto/creator-help.qdoc
+++ b/doc/src/howto/creator-help.qdoc
@@ -35,19 +35,19 @@
 
     \list
 
-        \o  To view documentation, switch to \gui Help mode.
+        \li To view documentation, switch to \gui Help mode.
 
-        \o  To view context sensitive help on a Qt class or function as a
+        \li To view context sensitive help on a Qt class or function as a
             tooltip, move the mouse cursor over the class or function. If help
             is not available, the tooltip displays type information for the
             symbol.
 
-        \o  To display the full help on a Qt class or function, press \key F1.
+        \li To display the full help on a Qt class or function, press \key F1.
             The documentation is displayed in a
             pane next to the code editor, or, if there is not enough vertical
             space, in the fullscreen \gui Help mode.
 
-        \o  To select and configure how the documentation is displayed in the
+        \li To select and configure how the documentation is displayed in the
             \gui Help mode, select \gui Tools > \gui Options > \gui Help.
 
     \endlist
@@ -75,19 +75,19 @@
 
     \list
 
-        \o  \gui Bookmarks to view a list of pages on which you have added
+        \li \gui Bookmarks to view a list of pages on which you have added
             bookmarks.
 
-        \o  \gui Contents to see all the documentation installed on the
+        \li \gui Contents to see all the documentation installed on the
             development PC and to browse the documentation contents.
 
-        \o  \gui Index to find information based on a list of keywords in all
+        \li \gui Index to find information based on a list of keywords in all
             the installed documents.
 
-        \o  \gui {Open Pages} to view a list of currently open documentation
+        \li \gui {Open Pages} to view a list of currently open documentation
             pages.
 
-        \o  \gui Search to search from all the installed documents.
+        \li \gui Search to search from all the installed documents.
 
     \endlist
 
@@ -104,11 +104,11 @@
 
     \list 1
 
-        \o  Click the
+        \li Click the
             \inlineimage qtcreator-help-add-bookmark.png
             (\gui {Add Bookmark}) button on the toolbar.
 
-        \o  In the \gui {Add Bookmark} dialog, click \gui OK to save the
+        \li In the \gui {Add Bookmark} dialog, click \gui OK to save the
             page title as a bookmark in the \gui Bookmarks folder.
 
     \endlist
@@ -131,16 +131,16 @@
 
     \list
 
-        \o  \c deep lists all the documents that contain the word \c deep.
+        \li \c deep lists all the documents that contain the word \c deep.
             The search is not case sensitive.
 
-        \o  \c{deep*} lists all the documents that contain a word beginning
+        \li \c{deep*} lists all the documents that contain a word beginning
             with \c deep
 
-        \o  \c{deep copy} lists all documents that contain both \c deep and
+        \li \c{deep copy} lists all documents that contain both \c deep and
             \c copy
 
-        \o  \c{"deep copy"} lists all documents that contain the phrase
+        \li \c{"deep copy"} lists all documents that contain the phrase
             \c{deep copy}
 
     \endlist
@@ -172,14 +172,14 @@
 
     \list 1
 
-        \o  Create a .qch file from your documentation.
+        \li Create a .qch file from your documentation.
 
             For information on how to prepare your documentation and create a
             .qch file, see
             \l{http://qt-project.org/doc/qt-4.8/qthelp-framework.html}
             {The Qt Help Framework}.
 
-        \o  To add the .qch file to \QC, select \gui Tools > \gui Options >
+        \li To add the .qch file to \QC, select \gui Tools > \gui Options >
             \gui Help > \gui Documentation > \gui Add.
 
     \endlist
@@ -232,18 +232,18 @@
 
     \list 1
 
-        \o  Select \gui {Tools > Options > Help > Filters > Add}.
+        \li Select \gui {Tools > Options > Help > Filters > Add}.
 
-        \o  Enter a name for the filter and press \gui {OK}.
+        \li Enter a name for the filter and press \gui {OK}.
 
-        \o  In \gui Attributes, select the documents that you want to include
+        \li In \gui Attributes, select the documents that you want to include
             in the filter.
 
             \image qtcreator-help-filter-attributes.png "Help filter attributes"
 
-        \o  Click \gui OK.
+        \li Click \gui OK.
 
-        \o  In the \gui Help mode, select the filter in the \gui {Filtered by}
+        \li In the \gui Help mode, select the filter in the \gui {Filtered by}
             field to see the filtered documentation in the sidebar.
 
     \endlist
diff --git a/doc/src/howto/creator-keyboard-shortcuts.qdoc b/doc/src/howto/creator-keyboard-shortcuts.qdoc
index 86a5842b7230da209db04953a84fe6b2baa4945b..a428373e85ada96d0d91a3798dee5192ffe860b6 100644
--- a/doc/src/howto/creator-keyboard-shortcuts.qdoc
+++ b/doc/src/howto/creator-keyboard-shortcuts.qdoc
@@ -59,14 +59,14 @@
 
     \list 1
 
-        \o  Select \gui Tools > \gui Options > \gui Environment > \gui Keyboard.
+        \li Select \gui Tools > \gui Options > \gui Environment > \gui Keyboard.
 
-        \o  Select a command from the list.
+        \li Select a command from the list.
 
-        \o  In \gui{Key Sequence} enter the shortcut key you want to associate
+        \li In \gui{Key Sequence} enter the shortcut key you want to associate
             with the selected command.
 
-        \o  To revert to the default shortcut, select \gui Reset.
+        \li To revert to the default shortcut, select \gui Reset.
 
     \endlist
 
@@ -74,11 +74,11 @@
 
     \list
 
-        \o  To import a keyboard shortcut mapping scheme, click \gui Import
+        \li To import a keyboard shortcut mapping scheme, click \gui Import
             and select the .kms file containing the keyboard shortcut mapping scheme
             you want to import.
 
-        \o  To export the current keyboard shortcut mapping scheme, click
+        \li To export the current keyboard shortcut mapping scheme, click
             \gui Export and select the location where you want to save the
             exported .kms file.
 
@@ -93,599 +93,599 @@
 
     \table
         \header
-            \o Action
-            \o Keyboard shortcut
+            \li  Action
+            \li  Keyboard shortcut
         \row
-            \o Open file or project
-            \o Ctrl+O
+            \li  Open file or project
+            \li  Ctrl+O
         \row
-            \o New file or project
-            \o Ctrl+N
+            \li  New file or project
+            \li  Ctrl+N
         \row
-            \o Open in external editor
-            \o Alt+V, Alt+I
+            \li  Open in external editor
+            \li  Alt+V, Alt+I
         \row
-            \o Select all
-            \o Ctrl+A
+            \li  Select all
+            \li  Ctrl+A
         \row
-            \o Delete
-            \o Del
+            \li  Delete
+            \li  Del
         \row
-            \o Cut
-            \o Ctrl+X
+            \li  Cut
+            \li  Ctrl+X
         \row
-            \o Copy
-            \o Ctrl+C
+            \li  Copy
+            \li  Ctrl+C
         \row
-            \o Paste
-            \o Ctrl+V
+            \li  Paste
+            \li  Ctrl+V
         \row
-            \o Redo
-            \o Ctrl+Y
+            \li  Redo
+            \li  Ctrl+Y
         \row
-            \o Print
-            \o Ctrl+P
+            \li  Print
+            \li  Ctrl+P
         \row
-            \o Save
-            \o Ctrl+S
+            \li  Save
+            \li  Ctrl+S
         \row
-            \o Save all
-            \o Ctrl+Shift+S
+            \li  Save all
+            \li  Ctrl+Shift+S
         \row
-            \o Close window
-            \o Ctrl+W
+            \li  Close window
+            \li  Ctrl+W
         \row
-            \o Close all
-            \o Ctrl+Shift+W
+            \li  Close all
+            \li  Ctrl+Shift+W
         \row
-            \o Close current file
-            \o Ctrl+F4
+            \li  Close current file
+            \li  Ctrl+F4
         \row
-            \o Go back
-            \o Alt+Left
+            \li  Go back
+            \li  Alt+Left
         \row
-            \o Go forward
-            \o Alt+Right
+            \li  Go forward
+            \li  Alt+Right
         \row
-            \o Go to line
-            \o Ctrl+L
+            \li  Go to line
+            \li  Ctrl+L
         \row
-            \o Next open document in history
-            \o Ctrl+Shift+Tab
+            \li  Next open document in history
+            \li  Ctrl+Shift+Tab
         \row
-            \o Go to other split
-            \o Ctrl+E, O
+            \li  Go to other split
+            \li  Ctrl+E, O
         \row
-            \o Previous open document in history
-            \o Ctrl+Tab
+            \li  Previous open document in history
+            \li  Ctrl+Tab
         \row
-            \o Activate \gui Locator
-            \o Ctrl+K
+            \li  Activate \gui Locator
+            \li  Ctrl+K
         \row
-            \o Switch to \gui Welcome mode
-            \o Ctrl+1
+            \li  Switch to \gui Welcome mode
+            \li  Ctrl+1
         \row
-            \o Switch to \gui Edit mode
-            \o Ctrl+2
+            \li  Switch to \gui Edit mode
+            \li  Ctrl+2
         \row
-            \o Switch to \gui Design mode
-            \o Ctrl+3
+            \li  Switch to \gui Design mode
+            \li  Ctrl+3
         \row
-            \o Switch to \gui Debug mode
-            \o Ctrl+4
+            \li  Switch to \gui Debug mode
+            \li  Ctrl+4
         \row
-            \o Switch to \gui Projects mode
-            \o Ctrl+5
+            \li  Switch to \gui Projects mode
+            \li  Ctrl+5
         \row
-            \o Switch to \gui Analyze mode
-            \o Ctrl+6
+            \li  Switch to \gui Analyze mode
+            \li  Ctrl+6
         \row
-            \o Switch to \gui Help mode
-            \o Ctrl+7
+            \li  Switch to \gui Help mode
+            \li  Ctrl+7
         \row
-            \o Toggle \gui{Issues} pane
-            \o Alt+1 (Cmd+1 on Mac OS X)
+            \li  Toggle \gui{Issues} pane
+            \li  Alt+1 (Cmd+1 on Mac OS X)
         \row
-            \o Toggle \gui{Search Results} pane
-            \o Alt+2 (Cmd+2 on Mac OS X)
+            \li  Toggle \gui{Search Results} pane
+            \li  Alt+2 (Cmd+2 on Mac OS X)
         \row
-            \o Toggle \gui{Application Output} pane
-            \o Alt+3 (Cmd+3 on Mac OS X)
+            \li  Toggle \gui{Application Output} pane
+            \li  Alt+3 (Cmd+3 on Mac OS X)
         \row
-            \o Toggle \gui{Compile Output} pane
-            \o Alt+4 (Cmd+4 on Mac OS X)
+            \li  Toggle \gui{Compile Output} pane
+            \li  Alt+4 (Cmd+4 on Mac OS X)
         \row
-            \o Toggle other output panes
-            \o Alt+number (Cmd+number on Mac OS X)
+            \li  Toggle other output panes
+            \li  Alt+number (Cmd+number on Mac OS X)
 
             Where the number is the number of the output pane.
         \row
-            \o Activate \gui Bookmarks pane
-            \o Alt+M
+            \li  Activate \gui Bookmarks pane
+            \li  Alt+M
         \row
-            \o Activate \gui{File System} pane
-            \o Alt+Y
+            \li  Activate \gui{File System} pane
+            \li  Alt+Y
         \row
-            \o Activate \gui{Open Documents} pane
-            \o Alt+O
+            \li  Activate \gui{Open Documents} pane
+            \li  Alt+O
         \row
-            \o Maximize output panes
-            \o Alt+9
+            \li  Maximize output panes
+            \li  Alt+9
         \row
-            \o Move to next item in output panes
-            \o F6
+            \li  Move to next item in output panes
+            \li  F6
         \row
-            \o Move to previous item in output panes
-            \o Shift+F6
+            \li  Move to previous item in output panes
+            \li  Shift+F6
         \row
-            \o Activate \gui Projects pane
-            \o Alt+X
+            \li  Activate \gui Projects pane
+            \li  Alt+X
         \row
-            \o Full screen
-            \o Ctrl+Shift+F11
+            \li  Full screen
+            \li  Ctrl+Shift+F11
         \row
-            \o Toggle the sidebar
-            \o Alt+0 (Cmd+0 on Mac OS X)
+            \li  Toggle the sidebar
+            \li  Alt+0 (Cmd+0 on Mac OS X)
         \row
-            \o Undo
-            \o Ctrl+Z
+            \li  Undo
+            \li  Ctrl+Z
         \row
-            \o Move to \gui Edit mode
+            \li  Move to \gui Edit mode
 
                In \gui Edit mode:
                \list
-                \o The first press moves focus to the editor
-                \o The second press closes secondary windows
+                \li  The first press moves focus to the editor
+                \li  The second press closes secondary windows
                \endlist
-            \o Esc
+            \li  Esc
         \row
-            \o Exit \QC
-            \o Ctrl+Q
+            \li  Exit \QC
+            \li  Ctrl+Q
     \endtable
 
     \section2 Editing Keyboard Shortcuts
 
     \table
         \header
-            \o Action
-            \o Keyboard shortcut
+            \li  Action
+            \li  Keyboard shortcut
         \row
-            \o Auto-indent selection
-            \o Ctrl+I
+            \li  Auto-indent selection
+            \li  Ctrl+I
         \row
-            \o Collapse
-            \o Ctrl+<
+            \li  Collapse
+            \li  Ctrl+<
         \row
-            \o Expand
-            \o Ctrl+>
+            \li  Expand
+            \li  Ctrl+>
         \row
-            \o Trigger a completion in this scope
-            \o Ctrl+Space
+            \li  Trigger a completion in this scope
+            \li  Ctrl+Space
         \row
-            \o Copy line
-            \o Ctrl+Ins
+            \li  Copy line
+            \li  Ctrl+Ins
         \row
-            \o Copy line down
-            \o Ctrl+Alt+Down
+            \li  Copy line down
+            \li  Ctrl+Alt+Down
         \row
-            \o Copy line up
-            \o Ctrl+Alt+Up
+            \li  Copy line up
+            \li  Ctrl+Alt+Up
         \row
-            \o Paste from the clipboard history
-            \o Ctrl+Shift+V
+            \li  Paste from the clipboard history
+            \li  Ctrl+Shift+V
 
                Subsequent presses move you back in the history
         \row
-            \o Cut line
-            \o Shift+Del
+            \li  Cut line
+            \li  Shift+Del
         \row
-            \o Join lines
-            \o Ctrl+J
+            \li  Join lines
+            \li  Ctrl+J
         \row
-            \o Insert line above current line
-            \o Ctrl+Shift+Enter
+            \li  Insert line above current line
+            \li  Ctrl+Shift+Enter
         \row
-            \o Insert line below current line
-            \o Ctrl+Enter
+            \li  Insert line below current line
+            \li  Ctrl+Enter
         \row
-            \o Decrease font size
-            \o Ctrl+- (Ctrl+Roll mouse wheel down)
+            \li  Decrease font size
+            \li  Ctrl+- (Ctrl+Roll mouse wheel down)
         \row
-            \o Increase font size
-            \o Ctrl++ (Ctrl+Roll mouse wheel up)
+            \li  Increase font size
+            \li  Ctrl++ (Ctrl+Roll mouse wheel up)
         \row
-            \o Reset font size
-            \o Ctrl+0
+            \li  Reset font size
+            \li  Ctrl+0
         \row
-            \o Toggle Vim-style editing
-            \o Alt+V, Alt+V
+            \li  Toggle Vim-style editing
+            \li  Alt+V, Alt+V
         \row
-            \o Split
-            \o Ctrl+E, 2
+            \li  Split
+            \li  Ctrl+E, 2
         \row
-            \o Split side by side
-            \o Ctrl+E, 3
+            \li  Split side by side
+            \li  Ctrl+E, 3
         \row
-            \o Remove all splits
-            \o Ctrl+E, 1
+            \li  Remove all splits
+            \li  Ctrl+E, 1
         \row
-            \o Remove current split
-            \o Ctrl+E, 0
+            \li  Remove current split
+            \li  Ctrl+E, 0
         \row
-            \o Select all
-            \o Ctrl+A
+            \li  Select all
+            \li  Ctrl+A
         \row
-            \o Go to block end
-            \o Ctrl+]
+            \li  Go to block end
+            \li  Ctrl+]
         \row
-            \o Go to block start
-            \o Ctrl+[
+            \li  Go to block start
+            \li  Ctrl+[
         \row
-            \o Go to block end with selection
-            \o Ctrl+}
+            \li  Go to block end with selection
+            \li  Ctrl+}
         \row
-            \o Go to block start with selection
-            \o Ctrl+{
+            \li  Go to block start with selection
+            \li  Ctrl+{
         \row
-            \o Move current line down
-            \o Ctrl+Shift+Down
+            \li  Move current line down
+            \li  Ctrl+Shift+Down
         \row
-            \o Move current line up
-            \o Ctrl+Shift+Up
+            \li  Move current line up
+            \li  Ctrl+Shift+Up
         \row
-            \o Trigger a refactoring action in this scope
-            \o Alt+Enter
+            \li  Trigger a refactoring action in this scope
+            \li  Alt+Enter
         \row
-            \o Rewrap paragraph
-            \o Ctrl+E, R
+            \li  Rewrap paragraph
+            \li  Ctrl+E, R
         \row
-            \o Select the current block
+            \li  Select the current block
 
                The second press extends the selection to the parent block
-            \o Ctrl+U
+            \li  Ctrl+U
         \row
-            \o Enable text wrapping
-            \o Ctrl+E, Ctrl+W
+            \li  Enable text wrapping
+            \li  Ctrl+E, Ctrl+W
         \row
-            \o Toggle comment for selection
-            \o Ctrl+/
+            \li  Toggle comment for selection
+            \li  Ctrl+/
         \row
-            \o Visualize whitespace
-            \o Ctrl+E, Ctrl+V
+            \li  Visualize whitespace
+            \li  Ctrl+E, Ctrl+V
         \row
-            \o Adjust size
-            \o Ctrl+J
+            \li  Adjust size
+            \li  Ctrl+J
         \row
-            \o Lay out in a grid
-            \o Ctrl+G
+            \li  Lay out in a grid
+            \li  Ctrl+G
         \row
-            \o Lay out horizontally
-            \o Ctrl+H
+            \li  Lay out horizontally
+            \li  Ctrl+H
         \row
-            \o Lay out vertically
-            \o Ctrl+L
+            \li  Lay out vertically
+            \li  Ctrl+L
         \row
-            \o Preview
-            \o Alt+Shift+R
+            \li  Preview
+            \li  Alt+Shift+R
         \row
-            \o Edit signals and slots
-            \o F4
+            \li  Edit signals and slots
+            \li  F4
         \row
-            \o Toggle bookmark
-            \o Ctrl+M
+            \li  Toggle bookmark
+            \li  Ctrl+M
         \row
-            \o Go to next bookmark
-            \o Ctrl+.
+            \li  Go to next bookmark
+            \li  Ctrl+.
         \row
-            \o Go to previous bookmark
-            \o Ctrl+,
+            \li  Go to previous bookmark
+            \li  Ctrl+,
         \row
-            \o Fetch snippet
-            \o Alt+C, Alt+F
+            \li  Fetch snippet
+            \li  Alt+C, Alt+F
         \row
-            \o Paste snippet
-            \o Alt+C, Alt+P
+            \li  Paste snippet
+            \li  Alt+C, Alt+P
         \row
-            \o Find usages
-            \o Ctrl+Shift+U
+            \li  Find usages
+            \li  Ctrl+Shift+U
         \row
-            \o Follow symbol under cursor
+            \li  Follow symbol under cursor
 
                Works with namespaces, classes, methods, variables, include
                statements and macros
-            \o F2
+            \li  F2
         \row
-            \o Rename symbol under cursor
-            \o Ctrl+Shift+R
+            \li  Rename symbol under cursor
+            \li  Ctrl+Shift+R
         \row
-            \o Switch between method declaration and definition
-            \o Shift+F2
+            \li  Switch between method declaration and definition
+            \li  Shift+F2
         \row
-            \o Open type hierarchy
-            \o Ctrl+Shift+T
+            \li  Open type hierarchy
+            \li  Ctrl+Shift+T
         \row
-            \o Switch between header and source file
-            \o F4
+            \li  Switch between header and source file
+            \li  F4
         \row
-            \o Turn selected text into lowercase
-            \o Alt+U
+            \li  Turn selected text into lowercase
+            \li  Alt+U
         \row
-            \o Turn selected text into uppercase
-            \o Alt+Shift+U
+            \li  Turn selected text into uppercase
+            \li  Alt+Shift+U
         \row
-            \o Run static checks on JavaScript code to find common problems
-            \o Ctrl+Shift+C
+            \li  Run static checks on JavaScript code to find common problems
+            \li  Ctrl+Shift+C
         \row
-            \o Find and replace
-            \o Ctrl+F
+            \li  Find and replace
+            \li  Ctrl+F
         \row
-            \o Find next
-            \o F3
+            \li  Find next
+            \li  F3
         \row
-            \o Find previous
-            \o Shift+F3
+            \li  Find previous
+            \li  Shift+F3
         \row
-            \o Find next occurrence of selected text
-            \o Ctrl+F3
+            \li  Find next occurrence of selected text
+            \li  Ctrl+F3
         \row
-            \o Find previous occurrence of selected text
-            \o Ctrl+Shift+F3
+            \li  Find previous occurrence of selected text
+            \li  Ctrl+Shift+F3
         \row
-            \o Replace next
-            \o Ctrl+=
+            \li  Replace next
+            \li  Ctrl+=
         \row
-            \o Open advanced find
-            \o Ctrl+Shift+F
+            \li  Open advanced find
+            \li  Ctrl+Shift+F
         \row
-            \o Record a text-editing macro
-            \o Alt+(
+            \li  Record a text-editing macro
+            \li  Alt+(
         \row
-            \o Stop recording a macro
-            \o Alt+)
+            \li  Stop recording a macro
+            \li  Alt+)
         \row
-            \o Play last macro
-            \o Alt+R
+            \li  Play last macro
+            \li  Alt+R
         \row
-            \o Show Qt Quick toolbars
-            \o Ctrl+Alt+Space
+            \li  Show Qt Quick toolbars
+            \li  Ctrl+Alt+Space
         \row
-            \o Execute user actions in FakeVim mode
-            \o Alt+V, n, where n is the number of the user action, from 1 to 9
+            \li  Execute user actions in FakeVim mode
+            \li  Alt+V, n, where n is the number of the user action, from 1 to 9
     \endtable
 
     \section2 Image Viewer Shortcuts
 
     \table
         \header
-            \o Action
-            \o Keyboard shortcut
+            \li  Action
+            \li  Keyboard shortcut
         \row
-            \o Switch to background
-            \o Ctrl+[
+            \li  Switch to background
+            \li  Ctrl+[
         \row
-            \o Switch to outline
-            \o Ctrl+]
+            \li  Switch to outline
+            \li  Ctrl+]
         \row
-            \o Zoom in
-            \o Ctrl++
+            \li  Zoom in
+            \li  Ctrl++
         \row
-            \o Zoom out
-            \o Ctrl+-
+            \li  Zoom out
+            \li  Ctrl+-
         \row
-            \o Fit to screen
-            \o Ctrl+=
+            \li  Fit to screen
+            \li  Ctrl+=
         \row
-            \o Original size
-            \o Ctrl+0
+            \li  Original size
+            \li  Ctrl+0
     \endtable
 
     \section2 Qt Quick Designer Keyboard Shortcuts
 
     \table
         \header
-            \o Action
-            \o Keyboard shortcut
+            \li  Action
+            \li  Keyboard shortcut
         \row
-            \o Open the QML file that defines the selected component
-            \o F2
+            \li  Open the QML file that defines the selected component
+            \li  F2
         \row
-            \o Move between code editor and visual editor
-            \o F4
+            \li  Move between code editor and visual editor
+            \li  F4
         \row
-            \o Toggle left sidebar
-            \o Ctrl+Alt+0
+            \li  Toggle left sidebar
+            \li  Ctrl+Alt+0
         \row
-            \o Toggle right sidebar
-            \o Ctrl+Alt+Shift+0
+            \li  Toggle right sidebar
+            \li  Ctrl+Alt+Shift+0
     \endtable
 
     \section2 Debugging Keyboard Shortcuts
 
     \table
         \header
-            \o Action
-            \o Keyboard shortcut
+            \li  Action
+            \li  Keyboard shortcut
         \row
-            \o Start or continue debugging
-            \o F5
+            \li  Start or continue debugging
+            \li  F5
         \row
-            \o Exit debugger
-            \o Shift+F5
+            \li  Exit debugger
+            \li  Shift+F5
         \row
-            \o Step over
-            \o F10
+            \li  Step over
+            \li  F10
         \row
-            \o Step into
-            \o F11
+            \li  Step into
+            \li  F11
         \row
-            \o Step out
-            \o Shift+F11
+            \li  Step out
+            \li  Shift+F11
         \row
-            \o Toggle breakpoint
-            \o F9
+            \li  Toggle breakpoint
+            \li  F9
         \row
-            \o Run to selected function
-            \o Ctrl+F6
+            \li  Run to selected function
+            \li  Ctrl+F6
         \row
-            \o Run to line
-            \o Ctrl+F10
+            \li  Run to line
+            \li  Ctrl+F10
         \row
-            \o Reverse direction
-            \o F12
+            \li  Reverse direction
+            \li  F12
     \endtable
 
     \section2 Project Keyboard Shortcuts
 
     \table
         \header
-            \o Action
-            \o Keyboard shortcut
+            \li  Action
+            \li  Keyboard shortcut
         \row
-            \o Build project
-            \o Ctrl+B
+            \li  Build project
+            \li  Ctrl+B
         \row
-            \o Build all
-            \o Ctrl+Shift+B
+            \li  Build all
+            \li  Ctrl+Shift+B
         \row
-            \o New project
-            \o Ctrl+Shift+N
+            \li  New project
+            \li  Ctrl+Shift+N
         \row
-            \o Open project
-            \o Ctrl+Shift+O
+            \li  Open project
+            \li  Ctrl+Shift+O
         \row
-            \o Select the \l{glossary-buildandrun-kit}{kit} to build and run your project with
-            \o Ctrl+T
+            \li  Select the \l{glossary-buildandrun-kit}{kit} to build and run your project with
+            \li  Ctrl+T
         \row
-            \o Run
-            \o Ctrl+R
+            \li  Run
+            \li  Ctrl+R
     \endtable
 
     \section2 Help Keyboard Shortcuts
 
     \table
         \header
-            \o Action
-            \o Keyboard shortcut
+            \li  Action
+            \li  Keyboard shortcut
         \row
-            \o View context-sensitive help
-            \o F1
+            \li  View context-sensitive help
+            \li  F1
         \row
-            \o Activate contents in \gui Help mode
-            \o Ctrl+T
+            \li  Activate contents in \gui Help mode
+            \li  Ctrl+T
         \row
-            \o Add bookmark in \gui Help mode
-            \o Ctrl+M
+            \li  Add bookmark in \gui Help mode
+            \li  Ctrl+M
         \row
-            \o Activate index in \gui Help mode
-            \o Ctrl+I
+            \li  Activate index in \gui Help mode
+            \li  Ctrl+I
         \row
-            \o Reset font size
-            \o Ctrl+0
+            \li  Reset font size
+            \li  Ctrl+0
         \row
-            \o Activate search in \gui Help mode
-            \o Ctrl+S
+            \li  Activate search in \gui Help mode
+            \li  Ctrl+S
     \endtable
 
     \section2 Version Control Keyboard Shortcuts
 
     \table
         \header
-            \o {1,2} Action
-            \o {6,1} Version control system
+            \li  {1,2} Action
+            \li  {6,1} Version control system
         \header
-            \o Bazaar
-            \o CVS
-            \o Git
-            \o Mercurial
-            \o Perforce
-            \o Subversion
-        \row
-            \o Add
-            \o
-            \o Alt+C, Alt+A
-            \o Alt+G, Alt+A
-            \o
-            \o Alt+P, Alt+A
-            \o Alt+S, Alt+A
-        \row
-            \o Commit/Submit
-            \o Alt+Z, Alt+C
-            \o Alt+C, Alt+C
-            \o Alt+G, Alt+C
-            \o Alt+H, Alt+C
-            \o Alt+P, Alt+S
-            \o Alt+S, Alt+C
-        \row
-            \o Diff
-            \o Alt+Z, Alt+D
-            \o Alt+C, Alt+D
-            \o Alt+G, Alt+D
-            \o Alt+H, Alt+D
-            \o
-            \o Alt+S, Alt+D
-        \row
-            \o Diff project
-            \o
-            \o
-            \o Alt+G, Alt+Shift+D
-            \o
-            \o Alt+P, Alt+D
-            \o
-        \row
-            \o Blame/Annotate
-            \o
-            \o
-            \o Alt+G, Alt+B
-            \o
-            \o
-            \o
-        \row
-            \o Log/Filelog
-            \o Alt+Z, Alt+L
-            \o
-            \o Alt+G, Alt+L
-            \o Alt+H, Alt+L
-            \o Alt+P, Alt+F
-            \o
-        \row
-            \o Log project
-            \o
-            \o
-            \o Alt+G, Alt+K
-            \o
-            \o
-            \o
-        \row
-            \o Status
-            \o Alt+Z, Alt+S
-            \o
-            \o
-            \o Alt+H, Alt+S
-            \o
-            \o
-        \row
-            \o Undo changes/Revert
-            \o
-            \o
-            \o Alt+G, Alt+U
-            \o
-            \o Alt+P, Alt+R
-            \o
-        \row
-            \o Edit
-            \o
-            \o
-            \o
-            \o
-            \o Alt+P, Alt+E
-            \o
-        \row
-            \o Opened
-            \o
-            \o
-            \o
-            \o
-            \o Alt+P, Alt+O
-            \o
+            \li  Bazaar
+            \li  CVS
+            \li  Git
+            \li  Mercurial
+            \li  Perforce
+            \li  Subversion
+        \row
+            \li  Add
+            \li
+            \li  Alt+C, Alt+A
+            \li  Alt+G, Alt+A
+            \li
+            \li  Alt+P, Alt+A
+            \li  Alt+S, Alt+A
+        \row
+            \li  Commit/Submit
+            \li  Alt+Z, Alt+C
+            \li  Alt+C, Alt+C
+            \li  Alt+G, Alt+C
+            \li  Alt+H, Alt+C
+            \li  Alt+P, Alt+S
+            \li  Alt+S, Alt+C
+        \row
+            \li  Diff
+            \li  Alt+Z, Alt+D
+            \li  Alt+C, Alt+D
+            \li  Alt+G, Alt+D
+            \li  Alt+H, Alt+D
+            \li
+            \li  Alt+S, Alt+D
+        \row
+            \li  Diff project
+            \li
+            \li
+            \li  Alt+G, Alt+Shift+D
+            \li
+            \li  Alt+P, Alt+D
+            \li
+        \row
+            \li  Blame/Annotate
+            \li
+            \li
+            \li  Alt+G, Alt+B
+            \li
+            \li
+            \li
+        \row
+            \li  Log/Filelog
+            \li  Alt+Z, Alt+L
+            \li
+            \li  Alt+G, Alt+L
+            \li  Alt+H, Alt+L
+            \li  Alt+P, Alt+F
+            \li
+        \row
+            \li  Log project
+            \li
+            \li
+            \li  Alt+G, Alt+K
+            \li
+            \li
+            \li
+        \row
+            \li  Status
+            \li  Alt+Z, Alt+S
+            \li
+            \li
+            \li  Alt+H, Alt+S
+            \li
+            \li
+        \row
+            \li  Undo changes/Revert
+            \li
+            \li
+            \li  Alt+G, Alt+U
+            \li
+            \li  Alt+P, Alt+R
+            \li
+        \row
+            \li  Edit
+            \li
+            \li
+            \li
+            \li
+            \li  Alt+P, Alt+E
+            \li
+        \row
+            \li  Opened
+            \li
+            \li
+            \li
+            \li
+            \li  Alt+P, Alt+O
+            \li
     \endtable
 */
diff --git a/doc/src/howto/creator-sessions.qdoc b/doc/src/howto/creator-sessions.qdoc
index a4b66052214f087b6ba386fea896436ff58de5d9..4b125e8ca0a23087658f1b3e2433898f678fd4e5 100644
--- a/doc/src/howto/creator-sessions.qdoc
+++ b/doc/src/howto/creator-sessions.qdoc
@@ -38,13 +38,13 @@
 
     \list
 
-        \o  Open projects with their dependencies (including SUBDIRS projects)
+        \li Open projects with their dependencies (including SUBDIRS projects)
 
-        \o  Open editors
+        \li Open editors
 
-        \o  Breakpoints and expressions
+        \li Breakpoints and expressions
 
-        \o  Bookmarks
+        \li Bookmarks
 
     \endlist
 
diff --git a/doc/src/howto/creator-task-lists.qdoc b/doc/src/howto/creator-task-lists.qdoc
index d5edd1c8a1992dfe91b8244e1938e6d0218ecc7b..02062ac405a947b9fdc0a3aba2776ed4f6a27cc4 100644
--- a/doc/src/howto/creator-task-lists.qdoc
+++ b/doc/src/howto/creator-task-lists.qdoc
@@ -61,13 +61,13 @@
 
     \list
 
-        \o  \c description
+        \li \c description
 
-        \o  \c{type\tdescription}
+        \li \c{type\tdescription}
 
-        \o  \c{file\ttype\tdescription}
+        \li \c{file\ttype\tdescription}
 
-        \o  \c{file\tline\ttype\tdescription}
+        \li \c{file\tline\ttype\tdescription}
 
     \endlist
 
@@ -75,12 +75,12 @@
 
     \list
 
-        \o  A string starting with \c err, which displays the error icon in the
+        \li A string starting with \c err, which displays the error icon in the
             beginning of the line
 
-        \o  A string starting with \c warn, which displays the warning icon
+        \li A string starting with \c warn, which displays the warning icon
 
-        \o  Any other value, which sets the task type to Unknown and does not
+        \li Any other value, which sets the task type to Unknown and does not
             display an icon
 
     \endlist
diff --git a/doc/src/howto/creator-tips.qdoc b/doc/src/howto/creator-tips.qdoc
index 7fef2f893ef731b6f1c992dfea8626156a03087e..781cf1a2a8ff9348b9b4c020b126185ceb961dd0 100644
--- a/doc/src/howto/creator-tips.qdoc
+++ b/doc/src/howto/creator-tips.qdoc
@@ -37,13 +37,13 @@
 
     \list
 
-        \o  \gui Welcome mode \key Ctrl+1
-        \o  \gui Edit mode \key Ctrl+2
-        \o  \gui Design mode \key Ctrl+3
-        \o  \gui Debug mode \key Ctrl+4
-        \o  \gui Projects mode \key Ctrl+5
-        \o  \gui Analyze mode \key Ctrl+6
-        \o  \gui Help mode \key Ctrl+7
+        \li \gui Welcome mode \key Ctrl+1
+        \li \gui Edit mode \key Ctrl+2
+        \li \gui Design mode \key Ctrl+3
+        \li \gui Debug mode \key Ctrl+4
+        \li \gui Projects mode \key Ctrl+5
+        \li \gui Analyze mode \key Ctrl+6
+        \li \gui Help mode \key Ctrl+7
 
     \endlist
 
@@ -69,9 +69,9 @@
 
     \list
 
-        \o  The first press moves focus to the editor
+        \li The first press moves focus to the editor
 
-        \o  The second press closes secondary windows
+        \li The second press closes secondary windows
 
     \endlist
 
@@ -90,13 +90,13 @@
 
     \list
 
-        \o  \gui{Issues} pane Alt+1 (Cmd+1 on Mac OS X)
+        \li \gui{Issues} pane Alt+1 (Cmd+1 on Mac OS X)
 
-        \o  \gui{Search Results} pane Alt+2 (Cmd+2 on Mac OS X)
+        \li \gui{Search Results} pane Alt+2 (Cmd+2 on Mac OS X)
 
-        \o  \gui{Application Output} pane Alt+3 (Cmd+3 on Mac OS X)
+        \li \gui{Application Output} pane Alt+3 (Cmd+3 on Mac OS X)
 
-        \o  \gui{Compile Output} pane Alt+4 (Cmd+4 on Mac OS X)
+        \li \gui{Compile Output} pane Alt+4 (Cmd+4 on Mac OS X)
 
     \endlist
 
@@ -178,10 +178,10 @@
     To switch off the debugging helpers:
     \list 1
 
-        \o  Select \gui Tools > \gui Options > \gui Debugger >
+        \li Select \gui Tools > \gui Options > \gui Debugger >
             \gui{Debugging Helper}.
 
-        \o  Uncheck the \gui{Use Debugging Helper} checkbox.
+        \li Uncheck the \gui{Use Debugging Helper} checkbox.
 
     \endlist
 
@@ -192,9 +192,9 @@
 
     \list 1
 
-        \o  Select \gui Tools > \gui Options > \gui Debugger > \gui General.
+        \li Select \gui Tools > \gui Options > \gui Debugger > \gui General.
 
-        \o  Select the \gui {Use tooltips in main editor while debugging} check
+        \li Select the \gui {Use tooltips in main editor while debugging} check
             box.
 
     \endlist
@@ -230,14 +230,14 @@
 
     \list 1
 
-        \o  \c %YEAR%: Year
-        \o  \c %MONTH%: Month
-        \o  \c %DAY%: Day of the month
-        \o  \c %DATE%: Date
-        \o  \c %USER%: User name
-        \o  \c %FILENAME%: File name
-        \o  \c %CLASS%: Class name (if applicable)
-        \o  \c %$VARIABLE%: Contents of environment variable \c{VARIABLE}.
+        \li \c %YEAR%: Year
+        \li \c %MONTH%: Month
+        \li \c %DAY%: Day of the month
+        \li \c %DATE%: Date
+        \li \c %USER%: User name
+        \li \c %FILENAME%: File name
+        \li \c %CLASS%: Class name (if applicable)
+        \li \c %$VARIABLE%: Contents of environment variable \c{VARIABLE}.
 
     \endlist
 
diff --git a/doc/src/howto/creator-ui.qdoc b/doc/src/howto/creator-ui.qdoc
index 580fdb266ccb47d49bb5895b42bd2ed15a2ab78d..df766618eefbf2330769c547e26eb825de49eb76 100644
--- a/doc/src/howto/creator-ui.qdoc
+++ b/doc/src/howto/creator-ui.qdoc
@@ -34,15 +34,15 @@
 
     \list
 
-        \o  Open recent sessions and projects
+        \li Open recent sessions and projects
 
-        \o  Create and open projects
+        \li Create and open projects
 
-        \o  Open tutorials and example projects
+        \li Open tutorials and example projects
 
-        \o  Read news from the online community and Qt labs
+        \li Read news from the online community and Qt labs
 
-        \o  Send feedback to the development team
+        \li Send feedback to the development team
 
     \endlist
 
@@ -75,26 +75,26 @@
 
     \list
 
-        \o  \gui Welcome mode for opening projects.
+        \li \gui Welcome mode for opening projects.
 
-        \o  \gui{\l{Coding}{Edit}} mode for editing project and source
+        \li \gui{\l{Coding}{Edit}} mode for editing project and source
             files.
 
-        \o  \gui{\l{Designing User Interfaces}{Design}} mode for designing and
+        \li \gui{\l{Designing User Interfaces}{Design}} mode for designing and
             developing application user interfaces. This mode is available for
             UI files.
 
-        \o  \gui{\l{Debugging}{Debug}} mode for inspecting the state of your
+        \li \gui{\l{Debugging}{Debug}} mode for inspecting the state of your
             application while debugging.
 
-        \o  \gui{\l{Specifying Build Settings}{Projects}} mode for configuring
+        \li \gui{\l{Specifying Build Settings}{Projects}} mode for configuring
             project building and execution. This mode is available when a
             project is open.
 
-        \o  \gui{\l{Analyzing Code}{Analyze}} mode for using code analysis tools
+        \li \gui{\l{Analyzing Code}{Analyze}} mode for using code analysis tools
             to detect memory leaks and profile C++ or QML code.
 
-        \o  \gui{\l{Getting Help}{Help}} mode for viewing Qt documentation.
+        \li \gui{\l{Getting Help}{Help}} mode for viewing Qt documentation.
 
     \endlist
 
@@ -114,23 +114,23 @@
 
     \list
 
-        \o  \gui Projects shows a list of projects open in the current
+        \li \gui Projects shows a list of projects open in the current
             session.
 
-        \o  \gui{Open Documents} shows currently open files.
+        \li \gui{Open Documents} shows currently open files.
 
-        \o  \gui Bookmarks shows all bookmarks for the current session.
+        \li \gui Bookmarks shows all bookmarks for the current session.
 
-        \o  \gui{File System} shows all files in the currently selected
+        \li \gui{File System} shows all files in the currently selected
              directory.
 
-        \o  \gui {Class View} shows the class hierarchy of the currently
+        \li \gui {Class View} shows the class hierarchy of the currently
             open projects.
 
-        \o  \gui Outline shows the symbol hierachy of a C++ file and the element
+        \li \gui Outline shows the symbol hierarchy of a C++ file and the element
             hierarchy of a QML file.
 
-        \o  \gui {Type Hierarchy} shows the base classes of a class.
+        \li \gui {Type Hierarchy} shows the base classes of a class.
 
     \endlist
 
@@ -138,14 +138,14 @@
 
     \list
 
-        \o  To toggle the sidebar, click \inlineimage qtcreator-togglebutton.png
+        \li To toggle the sidebar, click \inlineimage qtcreator-togglebutton.png
             (\gui {Hide Sidebar/Show Sidebar}) or press \key Alt+0
             (\key Cmd+0 on Mac OS X).
 
-        \o  To split the sidebar, click \inlineimage qtcreator-splitbar.png
+        \li To split the sidebar, click \inlineimage qtcreator-splitbar.png
             (\gui {Split}). Select new content to view in the split view.
 
-        \o  To close a sidebar view, click
+        \li To close a sidebar view, click
             \inlineimage qtcreator-closesidebar.png
             (\gui {Close}).
 
@@ -165,29 +165,29 @@
 
     \list
 
-        \o  To open files that belong to a project, double-click them in the
+        \li To open files that belong to a project, double-click them in the
             project tree. Files open in the appropriate editor, according to the
             file type. For example, code source files open in the code editor
             and image files in the \l{Viewing Images}{image viewer}.
 
-        \o  To bring up a context menu containing the actions most commonly
+        \li To bring up a context menu containing the actions most commonly
             needed right-click an item in the project tree. For example, through
             the menu of the project root directory you can, among other actions,
             build, re-build, clean and run the project.
 
-        \o  To hide the categories and sort project files alphabetically, click
+        \li To hide the categories and sort project files alphabetically, click
             \inlineimage qtcreator-filter.png
             (\gui {Filter Tree}) and select \gui{Simplify Tree}.
 
-        \o  To hide source files which are automatically generated by the build
+        \li To hide source files which are automatically generated by the build
             system, select \gui {Filter Tree > Hide Generated Files}.
 
-        \o  To keep the position in the project tree synchronized with the file
+        \li To keep the position in the project tree synchronized with the file
             currently opened in the editor, click
             \inlineimage qtcreator-synchronizefocus.png
             (\gui {Synchronize with Editor}).
 
-        \o  To see the absolute path of a file, move the mouse pointer over the
+        \li To see the absolute path of a file, move the mouse pointer over the
             file name.
 
     \endlist
@@ -213,10 +213,10 @@
 
     \list
 
-        \o  To see a complete list of all bindings, select \gui {Filter Tree >
+        \li To see a complete list of all bindings, select \gui {Filter Tree >
             Show All Bindings}.
 
-        \o  To keep the position in the view synchronized with the element
+        \li To keep the position in the view synchronized with the element
             selected in the editor, select \gui {Synchronize with Editor}.
 
     \endlist
@@ -232,19 +232,19 @@
 
     \list
 
-       \o  \gui{Issues}
+       \li \gui{Issues}
 
-       \o  \gui{Search Results}
+       \li \gui{Search Results}
 
-       \o  \gui{Application Output}
+       \li \gui{Application Output}
 
-       \o  \gui{Compile Output}
+       \li \gui{Compile Output}
 
-       \o  \gui {To-Do Entries}
+       \li \gui {To-Do Entries}
 
-       \o  \gui{Version Control}
+       \li \gui{Version Control}
 
-       \o  \gui{General Messages}
+       \li \gui{General Messages}
 
     \endlist
 
@@ -268,22 +268,22 @@
 
     \list
 
-        \o  \gui Analyzer - Errors encountered while running the
+        \li \gui Analyzer - Errors encountered while running the
             \l{Analyzing Code}{Valgrind code analysis tools}.
 
-        \o  \gui {Build System} - Errors and warnings encountered during a
+        \li \gui {Build System} - Errors and warnings encountered during a
             build.
 
-        \o  \gui Compile - Selected output from the compiler. Open the
+        \li \gui Compile - Selected output from the compiler. Open the
             \gui {Compile Output} pane for more detailed information.
 
-        \o  \gui {My Tasks} - Entries from a task list file (.tasks) generated
+        \li \gui {My Tasks} - Entries from a task list file (.tasks) generated
             by \l{Showing Task List Files in Issues Pane}
             {code scanning and analysis tools}.
 
-        \o  \gui QML - Errors in QML syntax.
+        \li \gui QML - Errors in QML syntax.
 
-        \o  \gui {QML Analysis} - Results of the JavaScript
+        \li \gui {QML Analysis} - Results of the JavaScript
             \l{Checking JavaScript and QML Syntax}
             {code syntax and validation checks}
 
@@ -382,15 +382,15 @@
 
     \list
 
-        \o  Switch between background and outline modes
+        \li Switch between background and outline modes
 
-        \o  Zoom in and out
+        \li Zoom in and out
 
-        \o  Fit images to screen
+        \li Fit images to screen
 
-        \o  Return to original size
+        \li Return to original size
 
-        \o  Play and pause animated GIF and MNG images
+        \li Play and pause animated GIF and MNG images
 
     \endlist
 
diff --git a/doc/src/howto/creator-vcs.qdoc b/doc/src/howto/creator-vcs.qdoc
index f3514e448b7d37b184d18c6a0e58a454f821534d..49684e7616d55cf143f7a5c05ff18b8fd673e8f4 100644
--- a/doc/src/howto/creator-vcs.qdoc
+++ b/doc/src/howto/creator-vcs.qdoc
@@ -33,37 +33,37 @@
     Version control systems supported by \QC are:
     \table
         \header
-            \o Version Control System
-            \o Address
-            \o Notes
+            \li  Version Control System
+            \li  Address
+            \li  Notes
         \row
-            \o  Bazaar
-            \o  \l{http://bazaar.canonical.com/}
-            \o  \QC 2.2 and later
+            \li Bazaar
+            \li \l{http://bazaar.canonical.com/}
+            \li \QC 2.2 and later
         \row
-            \o  ClearCase
-            \o  \l{http://www-01.ibm.com/software/awdtools/clearcase/}
-            \i  Experimental plugin in \QC 2.6
+            \li ClearCase
+            \li \l{http://www-01.ibm.com/software/awdtools/clearcase/}
+            \li  Experimental plugin in \QC 2.6
         \row
-            \o  CVS
-            \o  \l{http://www.cvshome.org}
-            \i
+            \li CVS
+            \li \l{http://www.cvshome.org}
+            \li
         \row
-            \o  Git
-            \o  \l{http://git-scm.com/}
-            \i
+            \li Git
+            \li \l{http://git-scm.com/}
+            \li
         \row
-            \o  Mercurial
-            \o  \l{http://mercurial.selenic.com/}
-            \o  \QC 2.0 and later
+            \li Mercurial
+            \li \l{http://mercurial.selenic.com/}
+            \li \QC 2.0 and later
         \row
-            \o  Perforce
-            \o  \l{http://www.perforce.com}
-            \o  Server version 2006.1 and later
+            \li Perforce
+            \li \l{http://www.perforce.com}
+            \li Server version 2006.1 and later
         \row
-            \o  Subversion
-            \o  \l{http://subversion.apache.org/}
-            \i
+            \li Subversion
+            \li \l{http://subversion.apache.org/}
+            \li
     \endtable
 
     \section1 Setting Up Version Control Systems
@@ -101,13 +101,13 @@
 
     \list
 
-        \o  \gui{Submit message check script} is a script or program that
+        \li \gui{Submit message check script} is a script or program that
             can be used to perform checks on the submit message before
             submitting. The submit message is passed in as the script's first
             parameter. If there is an error, the script should output a
             message on standard error and return a non-zero exit code.
 
-        \o  \gui{User/alias configuration file} takes a file in mailmap format
+        \li \gui{User/alias configuration file} takes a file in mailmap format
             that lists user names and aliases. For example:
 
             \code
@@ -121,7 +121,7 @@
             displays a context menu with \gui{Insert name} that pops up a
             dialog letting the user select a name.
 
-        \o  \gui{User fields configuration file} is a simple text file
+        \li \gui{User fields configuration file} is a simple text file
             consisting of lines specifying submit message fields that take
             user names, for example:
 
@@ -135,7 +135,7 @@
             \e{User/alias configuration file} as well as a button that opens the
             aforementioned user name dialog.
 
-        \o  \gui{SSH prompt command} specifies an ssh-askpass command that you
+        \li \gui{SSH prompt command} specifies an ssh-askpass command that you
             can use (on Linux) to prompt the user for a password when using SSH.
             For example, \c ssh-askpass or \c x11-ssh-askpass, depending on the
             ssh-askpass implementation that you use.
@@ -255,14 +255,14 @@
 
     \list
 
-        \o  \gui{Undo Unstaged Changes} reverts all changes and resets the
+        \li \gui{Undo Unstaged Changes} reverts all changes and resets the
             working directory to the state of the index.
 
-        \o  \gui{Undo Uncommitted Changes} reverts all changes, discarding the
+        \li \gui{Undo Uncommitted Changes} reverts all changes, discarding the
             index. This returns your working copy to the state it was in right
             after the last commit.
 
-        \o  \gui{Reset...} opens a dialog where you can select the SHA1 to reset
+        \li \gui{Reset...} opens a dialog where you can select the SHA1 to reset
             the working directory to. This is useful after applying patches for
             review, for example.
 
@@ -297,14 +297,14 @@
 
     \table
         \header
-            \o  Menu Item
-            \o  Description
+            \li Menu Item
+            \li Description
         \row
-            \o  \gui{Pull}
-            \o  Turn the branch into a mirror of another branch.
+            \li \gui{Pull}
+            \li Turn the branch into a mirror of another branch.
         \row
-            \o  \gui{Push}
-            \o  Update a mirror of the branch.
+            \li \gui{Push}
+            \li Update a mirror of the branch.
 
     \endtable
 
@@ -321,27 +321,27 @@
 
     \table
         \header
-            \o  Menu Item
-            \o  Description
+            \li Menu Item
+            \li Description
         \row
-            \o  \gui{Check In}
-            \o  Create a permanent new version of the current file or all files
+            \li \gui{Check In}
+            \li Create a permanent new version of the current file or all files
                 in the versioned object base (VOB).
         \row
-            \o  \gui{Check In Activity}
-            \o  Check in checked-out versions in the change set of the current
+            \li \gui{Check In Activity}
+            \li Check in checked-out versions in the change set of the current
                 Unified Change Management (UCM) activity.
         \row
-            \o  \gui{Check Out}
-            \o  Create a writable copy of a branch. If you check out files in a
+            \li \gui{Check Out}
+            \li Create a writable copy of a branch. If you check out files in a
                 UCM view, they are added to the change set of the UCM activity.
         \row
-            \o  \gui{Undo Check Out}
-            \o  Cancel the checkout for a file and delete the checked-out
+            \li \gui{Undo Check Out}
+            \li Cancel the checkout for a file and delete the checked-out
                 version.
         \row
-            \o  \gui{Undo Hijack}
-            \o  Resolve hijacked files. If you change the read-only attribute of
+            \li \gui{Undo Hijack}
+            \li Resolve hijacked files. If you change the read-only attribute of
                 a file that is loaded into a snapshot view and modify the file
                 without checking it out, you \e hijack the file.
     \endtable
@@ -354,14 +354,14 @@
 
     \table
         \header
-            \o  Menu Item
-            \o  Description
+            \li Menu Item
+            \li Description
         \row
-            \o  \gui{Edit}
-            \o  Open a file for editing.
+            \li \gui{Edit}
+            \li Open a file for editing.
         \row
-            \o  \gui{Unedit}
-            \o  Discard the changes that you made in a file.
+            \li \gui{Unedit}
+            \li Discard the changes that you made in a file.
 
     \endtable
 
@@ -378,53 +378,53 @@
 
     \table
         \header
-            \o  Menu Item
-            \o  Description
+            \li Menu Item
+            \li Description
         \row
-            \o  \gui {Patch > Apply from Editor/Apply from File}
-            \o  Patches are rewriting instructions that can be applied to a set
+            \li \gui {Patch > Apply from Editor/Apply from File}
+            \li Patches are rewriting instructions that can be applied to a set
                 of files. You can either apply a patch file that is open in \QC
                 or select the patch file to apply from the file system.
         \row
-            \o  \gui{Pull}
-            \o  Pull changes from the remote repository. If there are locally
+            \li \gui{Pull}
+            \li Pull changes from the remote repository. If there are locally
                 modified files, you are prompted to stash those changes. Select
                 \gui{Tools > Options > Version Control > Git} and select the
                 \gui {Pull with rebase} check box to perform a rebase operation
                 while pulling.
 
         \row
-            \o  \gui{Clean/Clean Project}
-            \o  All files that are not under version control (with the exception
+            \li \gui{Clean/Clean Project}
+            \li All files that are not under version control (with the exception
                 of patches and project files) are displayed in the \gui {Clean
                 Repository} dialog. Select the files to delete and click
                 \gui Delete. This allows you to clean a build completely.
         \row
-            \o  \gui{Launch gitk}
-            \o  Start the commit viewer for Git, gitk.
+            \li \gui{Launch gitk}
+            \li Start the commit viewer for Git, gitk.
         \row
-            \o  \gui{Branches}
-            \o  Manage local and remote branches.
+            \li \gui{Branches}
+            \li Manage local and remote branches.
         \row
-            \o  \gui Remotes
-            \o  Manage remote repositories available in Git.
+            \li \gui Remotes
+            \li Manage remote repositories available in Git.
         \row
-            \o  \gui {Stage File for Commit}
-            \o  Mark new or modified files for committing to the repository.
+            \li \gui {Stage File for Commit}
+            \li Mark new or modified files for committing to the repository.
                 To undo this function, select \gui {Unstage File from Commit}.
         \row
-            \o  \gui{Show Commit}
-            \o  Select a commit to view. Enter the SHA of the commit
+            \li \gui{Show Commit}
+            \li Select a commit to view. Enter the SHA of the commit
                 in the \gui Change field.
         \row
-            \o  \gui Stash
-            \o  Store local changes temporarily.
+            \li \gui Stash
+            \li Store local changes temporarily.
         \row
-            \o  \gui{Amend Last Commit}
-            \o  Revert the last commit.
+            \li \gui{Amend Last Commit}
+            \li Revert the last commit.
         \row
-            \o  \gui Gerrit
-            \o  View, apply, and check out changes from Gerrit.
+            \li \gui Gerrit
+            \li View, apply, and check out changes from Gerrit.
 
     \endtable
 
@@ -440,27 +440,27 @@
 
     \table
         \header
-            \o  Menu Item
-            \o  Description
+            \li Menu Item
+            \li Description
         \row
-            \o  \gui{Add}
-            \o  Create new tracking and non-tracking branches.
+            \li \gui{Add}
+            \li Create new tracking and non-tracking branches.
         \row
-            \o  \gui{Checkout}
-            \o  Check out the selected branch and make it current.
+            \li \gui{Checkout}
+            \li Check out the selected branch and make it current.
         \row
-            \o  \gui{Remove}
-            \o  Remove a local branch. You cannot delete remote branches.
+            \li \gui{Remove}
+            \li Remove a local branch. You cannot delete remote branches.
         \row
-            \o  \gui{Diff}
-            \o  Show the differences between the selected and the current
+            \li \gui{Diff}
+            \li Show the differences between the selected and the current
                 branch.
         \row
-            \o  \gui{Log}
-            \o  Show the changes in a branch.
+            \li \gui{Log}
+            \li Show the changes in a branch.
         \row
-            \o  \gui{Refresh}
-            \o  Refresh the list of branches.
+            \li \gui{Refresh}
+            \li Refresh the list of branches.
     \endtable
 
     \section3 Working with Remote Repositories
@@ -472,21 +472,21 @@
 
     \table
         \header
-            \o  Menu Item
-            \o  Description
+            \li Menu Item
+            \li Description
         \row
-            \o  \gui{Add}
-            \o  Add a new remote repository.
+            \li \gui{Add}
+            \li Add a new remote repository.
         \row
-            \o  \gui{Fetch}
-            \o  Fetch all the branches and change information from a remote
+            \li \gui{Fetch}
+            \li Fetch all the branches and change information from a remote
                 repository.
         \row
-            \o  \gui{Remove}
-            \o  Remove a remote repository.
+            \li \gui{Remove}
+            \li Remove a remote repository.
         \row
-            \o  \gui{Refresh}
-            \o  Refresh the list of remote repositories.
+            \li \gui{Refresh}
+            \li Refresh the list of remote repositories.
     \endtable
 
 
@@ -501,27 +501,27 @@
 
     \table
         \header
-            \o  Menu Item
-            \o  Description
+            \li Menu Item
+            \li Description
         \row
-            \o  \gui{Stashes}
-            \o  Display a dialog that shows all known stashes with options to
+            \li \gui{Stashes}
+            \li Display a dialog that shows all known stashes with options to
                 restore, display or delete them.
         \row
-            \o  \gui{Stash}
-            \o  Stash all local changes. The working copy is then reset to
+            \li \gui{Stash}
+            \li Stash all local changes. The working copy is then reset to
                 the state it had right after the last commit.
         \row
-            \o  \gui{Stash Snapshot}
-            \o  Save a snapshot of your current work under a name for later
+            \li \gui{Stash Snapshot}
+            \li Save a snapshot of your current work under a name for later
                 reference. The working copy is unchanged.
 
                 For example, if you want to try something and find out later
                 that it does not work, you can discard it and return to the
                 state of the snapshot.
         \row
-            \o  \gui{Stash Pop}
-            \o  Remove a single stashed state from the stash list and apply it
+            \li \gui{Stash Pop}
+            \li Remove a single stashed state from the stash list and apply it
                 on top of the current working tree state.
     \endtable
 
@@ -559,25 +559,25 @@
 
     \table
         \header
-            \o  Menu Item
-            \o  Description
+            \li Menu Item
+            \li Description
         \row
-            \o  \gui{Import}
-            \o  Apply changes from a patch file.
+            \li \gui{Import}
+            \li Apply changes from a patch file.
         \row
-            \o  \gui{Incoming}
-            \o  Monitor the status of a remote repository by listing
+            \li \gui{Incoming}
+            \li Monitor the status of a remote repository by listing
                 the changes that will be pulled.
         \row
-            \o  \gui{Outgoing}
-            \o  Monitor the status of a remote repository by listing
+            \li \gui{Outgoing}
+            \li Monitor the status of a remote repository by listing
                 the changes that will be pushed.
         \row
-            \o  \gui{Pull}
-            \o  Pull changes from the remote repository.
+            \li \gui{Pull}
+            \li Pull changes from the remote repository.
         \row
-            \o  \gui{Push}
-            \o  Push changes to the remote repository.
+            \li \gui{Push}
+            \li Push changes to the remote repository.
      \endtable
 
     \section2 Using Additional Perforce Functions
@@ -603,20 +603,20 @@
 
     \table
         \header
-            \o  Menu Item
-            \o  Description
+            \li Menu Item
+            \li Description
         \row
-            \o  \gui{Describe}
-            \o  View information about changelists and the files in them.
+            \li \gui{Describe}
+            \li View information about changelists and the files in them.
         \row
-            \o  \gui{Edit File}
-            \o  Open a file for editing.
+            \li \gui{Edit File}
+            \li Open a file for editing.
         \row
-            \o  \gui{Opened}
-            \o  List files that are open for editing.
+            \li \gui{Opened}
+            \li List files that are open for editing.
         \row
-            \o  \gui{Pending Changes}
-            \o  Group files for commit.
+            \li \gui{Pending Changes}
+            \li Group files for commit.
     \endtable
 
     \section2 Using Additional Subversion Functions
@@ -627,11 +627,11 @@
 
     \table
         \header
-            \o  Menu Item
-            \o  Description
+            \li Menu Item
+            \li Description
         \row
-            \o  \gui{Describe}
-            \o  Display commit log messages for a revision.
+            \li \gui{Describe}
+            \li Display commit log messages for a revision.
     \endtable
 
 */
diff --git a/doc/src/howto/qtcreator-faq.qdoc b/doc/src/howto/qtcreator-faq.qdoc
index 3a8425ec54acb2b6ca7c08dcb8b76f7ca62cdeee..dfdfe4fb411405e45e884664e023afd70d4cb596 100644
--- a/doc/src/howto/qtcreator-faq.qdoc
+++ b/doc/src/howto/qtcreator-faq.qdoc
@@ -32,29 +32,29 @@
 
     \section1 General Questions
 
-    \bold {How do I reset all \QC settings?}
+    \b {How do I reset all \QC settings?}
 
     \QC creates the following files and directories:
 
     \list
 
-        \o  QtCreator.db
+        \li QtCreator.db
 
-        \o  QtCreator.ini
+        \li QtCreator.ini
 
-        \o  qtversion.xml
+        \li qtversion.xml
 
-        \o  toolChains.xml
+        \li toolChains.xml
 
-        \o  qtcreator
+        \li qtcreator
 
-        \o  qtc-debugging-helper
+        \li qtc-debugging-helper
 
-        \o  qtc-qmldbg
+        \li qtc-qmldbg
 
-        \o  qtc-qmldump
+        \li qtc-qmldump
 
-        \o  qtc-qmlobserver
+        \li qtc-qmlobserver
 
     \endlist
 
@@ -72,11 +72,11 @@
     \c {<drive>:\Users\<username>\AppData\Roaming\QtProject} and
     \c {<drive>:\Users\<username>\AppData\Local\QtProject}.
 
-    \bold {\QC comes with MinGW, should I use this version with Qt?}
+    \b {\QC comes with MinGW, should I use this version with Qt?}
 
     Use the version that was built against the Qt version.
 
-    \bold {\QC does not find a helper application, such as Git or a
+    \b {\QC does not find a helper application, such as Git or a
     compiler. What should I do?}
 
     Make sure that the application is in your system PATH when starting \QC.
@@ -87,7 +87,7 @@
     This is especially relevant for the Mac OS where \c {/usr/local/bin} might
     not be in the path when \QC is started.
 
-    \bold {How do I change the interface language for \QC?}
+    \b {How do I change the interface language for \QC?}
 
     \QC has been localized into several languages. If the system
     language is one of the supported languages, it is automatically selected.
@@ -95,18 +95,18 @@
     select a language in the \gui Language field. The change takes effect after
     you restart \QC.
 
-    \bold {Has a reported issue been addressed?}
+    \b {Has a reported issue been addressed?}
 
     You can look up any issue in the
     \l{https://bugreports.qt-project.org/}{Qt bug tracker}.
 
     \if defined(qcmanual)
-    \input widgets/creator-faq-qtdesigner.qdocinc
+    \include widgets/creator-faq-qtdesigner.qdocinc
     \endif
 
     \section1 Help Questions
 
-    \bold {The Qt API Reference Documentation is missing and context help does
+    \b {The Qt API Reference Documentation is missing and context help does
     not find topics. What can I do?}
 
     \QC comes fully integrated with Qt documentation and examples using
@@ -124,7 +124,7 @@
     For information on troubleshooting debugger, see
     \l{Troubleshooting Debugger}.
 
-    \bold {If I have a choice of GDB versions, which should I use?}
+    \b {If I have a choice of GDB versions, which should I use?}
 
     On Linux and Windows, use the Python-enabled GDB versions that are
     installed when you install \QC and Qt SDK. On Mac OS X, use the GDB
@@ -136,7 +136,7 @@
 
     For more information on setting up debugger, see \l{Setting Up Debugger}.
 
-    \bold {How do I generate a core file in \QC?}
+    \b {How do I generate a core file in \QC?}
 
     To trigger the GDB command that generates a core file while debugging,
     select \gui {Window > Views > Debugger Log}. In the \gui Command field,
@@ -150,7 +150,7 @@
 
     \section1 Compiler Questions
 
-    \bold {How can I make use of my multi-core CPU with \QC?}
+    \b {How can I make use of my multi-core CPU with \QC?}
 
     On Linux and Mac OS X, go to \gui Project mode, select your configuration
     in the \gui {Build Settings}, locate the \gui {Build Steps}, and add the
@@ -169,13 +169,13 @@
 
     \section1 Qt SDK Questions
 
-    \bold {I cannot use QSslSocket with the SDK. What should I do?}
+    \b {I cannot use QSslSocket with the SDK. What should I do?}
 
     The Qt build in the SDK is built with QT_NO_OPENSSL defined. Rebuilding it
      is possible. For more information, see
      \l{http://www.qtcentre.org/threads/19222-Qssl}.
 
-    \bold {Which development packages from the distribution are needed on
+    \b {Which development packages from the distribution are needed on
     Ubuntu or Debian?}
 
     \code
@@ -190,16 +190,16 @@
 
     \section1 Platform Related Questions
 
-    \bold {Where is application output shown in \QC?}
+    \b {Where is application output shown in \QC?}
 
-    \bold {On Unix (Linux and Mac OS):} \c qDebug() and related functions use
+    \b {On Unix (Linux and Mac OS):} \c qDebug() and related functions use
     the standard output and error output. When you run or debug the
     application, you can view the output in the \gui{Application Output} pane.
 
     For console applications that require input, select \gui {Projects > Run
     Settings > Run in terminal}.
 
-    \bold {On Windows:} Output is displayed differently for \e{console
+    \b {On Windows:} Output is displayed differently for \e{console
     applications} and \e{GUI applications}.
 
     The setting \c {CONFIG += console} in the .pro file specifies that the
@@ -224,30 +224,30 @@
 
     \section1 Questions about New Features
 
-    \bold {Will a requested feature be implemented?}
+    \b {Will a requested feature be implemented?}
 
     If it is a scheduled feature, you can see this in the task tracker. If a
     feature already has been implemented, it is mentioned in the
     \l{http://qt.gitorious.org/qt-creator/qt-creator/trees/master/dist}{changes file}
     for the upcoming release.
 
-    \bold {Why does \QC not use tabs for editors?}
+    \b {Why does \QC not use tabs for editors?}
 
     This question comes up from time to time, so we have considered it
     carefully. Here are our main reasons for not using tabs:
 
     \list
 
-        \o  Tabs do not scale. They work fine if you have 5 to 6 editors open,
+        \li Tabs do not scale. They work fine if you have 5 to 6 editors open,
             they become cumbersome with 10, and if you need more horizontal
             space than the tab bar, the interface does not work at all.
 
-        \o  Tabs do not adapt to your working set.
+        \li Tabs do not adapt to your working set.
 
-        \o  The common solution is to give the user the ability to reorder
+        \li The common solution is to give the user the ability to reorder
             tabs. Now user has to manage tabs instead of writing code.
 
-        \o  Tabs force you to limit the amount of open editors, because
+        \li Tabs force you to limit the amount of open editors, because
             otherwise you get confused.
 
     \endlist
@@ -273,11 +273,11 @@
 
     \list
 
-        \o  Press \key F4 to switch between header and source.
+        \li Press \key F4 to switch between header and source.
 
-        \o  Press \key Alt+Left to move backwards in the navigation history.
+        \li Press \key Alt+Left to move backwards in the navigation history.
 
-        \o  Use the locator (Ctrl+K) to simply tell \QC where to go.
+        \li Use the locator (Ctrl+K) to simply tell \QC where to go.
 
     \endlist
 
diff --git a/doc/src/linux-mobile/creator-madde-emulator.qdoc b/doc/src/linux-mobile/creator-madde-emulator.qdoc
index 762287dda3dbfddd42540b8a8ef8e2ae01746d51..b0372c65a56c935cf6381e2221a00ae985ec72ef 100644
--- a/doc/src/linux-mobile/creator-madde-emulator.qdoc
+++ b/doc/src/linux-mobile/creator-madde-emulator.qdoc
@@ -92,81 +92,81 @@
 
     \table
         \header
-            \o Device Key
-            \o Keyboard Shortcut
-        \row
-            \o \list
-                \o Alphabet keys
-                \o Comma (,)
-                \o Period (.)
-                \o Space
-                \o Arrow keys
-                \o Enter
-                \o Backspace
+            \li  Device Key
+            \li  Keyboard Shortcut
+        \row
+            \li  \list
+                \li  Alphabet keys
+                \li  Comma (,)
+                \li  Period (.)
+                \li  Space
+                \li  Arrow keys
+                \li  Enter
+                \li  Backspace
                \endlist
-            \o Respective keys on the development PC keyboard.
+            \li  Respective keys on the development PC keyboard.
         \row
-            \o Shift
-            \o Left Shift key (Maemo 5)
+            \li  Shift
+            \li  Left Shift key (Maemo 5)
 
                Shift (Harmattan)
         \row
-            \o Ctrl
-            \o Left Ctrl key (Maemo 5)
+            \li  Ctrl
+            \li  Left Ctrl key (Maemo 5)
 
                Ctrl (Harmattan)
         \row
-            \o Mode
-            \o Left Alt key (Maemo 5)
+            \li  Mode
+            \li  Left Alt key (Maemo 5)
 
                Alt (Harmattan)
         \row
-            \o Power
-            \o Esc
+            \li  Power
+            \li  Esc
         \row
-            \o Keypad slider open and close
-            \o F1
+            \li  Keypad slider open and close
+            \li  F1
         \row
-            \o Keypad lock (Maemo 5 only)
-            \o F2
+            \li  Keypad lock (Maemo 5 only)
+            \li  F2
         \row
-            \o Camera lens open and close (Maemo 5 only)
-            \o F3
+            \li  Camera lens open and close (Maemo 5 only)
+            \li  F3
         \row
-            \o Camera focus
-            \o F4
+            \li  Camera focus
+            \li  F4
         \row
-            \o Camera take picture
-            \o F5
+            \li  Camera take picture
+            \li  F5
 
             \note The actual camera functionality is not emulated.
         \row
-            \o Stereo headphones connect and disconnect (Maemo 5 only)
-            \o F6
+            \li  Stereo headphones connect and disconnect (Maemo 5 only)
+            \li  F6
         \row
-            \o Volume down
-            \o F7
+            \li  Volume down
+            \li  F7
         \row
-            \o Volume up
-            \o F8
+            \li  Volume up
+            \li  F8
         \row
-            \o Accelerometer x axis, negative
-            \o 1
+            \li  Accelerometer x axis, negative
+            \li  1
         \row
-            \o Accelerometer x axis, positive
-            \o 2
+            \li  Accelerometer x axis, positive
+            \li  2
         \row
-            \o Accelerometer z axis, negative
-            \o 4
+            \li  Accelerometer z axis, negative
+            \li  4
         \row
-            \o Accelerometer z axis, positive
-            \o 5
+            \li  Accelerometer z axis, positive
+            \li  5
         \row
-            \o Accelerometer y axis, negative
-            \o 7
+            \li  Accelerometer y axis, negative
+            \li  7
         \row
-            \o Accelerometer y axis, positive
-            \o 8
+            \li  Accelerometer y axis, positive
+            \li  8
 
     \endtable
 
diff --git a/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc b/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc
index ff35cae55e4d93dd72601a83accb8cdedad30933..ddf2aad00a9a685906abe6d80ee2288013a4f127 100644
--- a/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc
+++ b/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc
@@ -2,17 +2,17 @@
 
     \list 1
 
-        \o  Build and run the application for \l{Running on Qt Simulator}
+        \li Build and run the application for \l{Running on Qt Simulator}
             {\QS}.
 
-        \o  Build and run the application for a device:
+        \li Build and run the application for a device:
 
         \list 1
 
-            \o  Specify a connection to the device. For more information, see
+            \li Specify a connection to the device. For more information, see
                 \l{Connecting Embedded Linux Devices}.
 
-            \o  Click the \gui Run button.
+            \li Click the \gui Run button.
 
         \endlist
 
diff --git a/doc/src/linux-mobile/creator-projects-running-madde.qdocinc b/doc/src/linux-mobile/creator-projects-running-madde.qdocinc
index b3259e0d5e135713a42a20cfb53a9f43fd4fc080..6d45946e86865fb7abed80107bb8bcc51f3c62ca 100644
--- a/doc/src/linux-mobile/creator-projects-running-madde.qdocinc
+++ b/doc/src/linux-mobile/creator-projects-running-madde.qdocinc
@@ -2,24 +2,24 @@
 
     \list 1
 
-        \o  Build and run the application for \l{Running on Qt Simulator}
+        \li Build and run the application for \l{Running on Qt Simulator}
             {\QS}.
 
-        \o  Build and run the application for
+        \li Build and run the application for
             \l{Using Maemo or MeeGo Harmattan Emulator}
             {the Maemo or MeeGo Harmattan emulator}.
 
-        \o  Alternatively, you can build and run the application for a device:
+        \li Alternatively, you can build and run the application for a device:
 
         \list 1
 
-            \o  Configure the device and specify a connection to it. For more
+            \li Configure the device and specify a connection to it. For more
                 information, see \l{Connecting Maemo Devices} and
                 \l{Connecting MeeGo Harmattan Devices}.
 
-            \o  Connect the device to the development PC.
+            \li Connect the device to the development PC.
 
-            \o  Click the \gui Run button.
+            \li Click the \gui Run button.
 
         \endlist
 
diff --git a/doc/src/linux-mobile/creator-publish-maemo-extras-devel.qdoc b/doc/src/linux-mobile/creator-publish-maemo-extras-devel.qdoc
index f3c03199c4ed5b3e5038a500ae8e7b370eab80fe..790b830f8823e8abea5c350b0f507d68f7bb506c 100644
--- a/doc/src/linux-mobile/creator-publish-maemo-extras-devel.qdoc
+++ b/doc/src/linux-mobile/creator-publish-maemo-extras-devel.qdoc
@@ -60,22 +60,22 @@
 
     \list 1
 
-        \o  Select the \l{glossary-buildandrun-kit}{kit} with \gui {Maemo5} device type
+        \li Select the \l{glossary-buildandrun-kit}{kit} with \gui {Maemo5} device type
             for your project.
 
-        \o  Choose \gui {Build > Publish Project}.
+        \li Choose \gui {Build > Publish Project}.
 
-        \o  Select \gui {Publish for Fremantle Extras-devel Free Repository},
+        \li Select \gui {Publish for Fremantle Extras-devel Free Repository},
             and then select \gui {Start Wizard}.
 
-        \o  Select the Qt version and device type to build against and click
+        \li Select the Qt version and device type to build against and click
             \gui Next.
 
             To create a source archive without uploading it to the build
             server, select the \gui {Only create source package, do not upload}
             check box.
 
-        \o  In the \gui {Garage account name} field, enter your login name, or
+        \li In the \gui {Garage account name} field, enter your login name, or
             select \gui {Get an account} to create a new account.
 
             \image qtcreator-publish-maemo-extras.png "Upload Settings dialog"
@@ -83,10 +83,10 @@
             You can also select \gui {Request upload rights} to use the Maemo
             Extras Assistant to validate your Garage account.
 
-        \o  Select \gui Commit to select the files to include in the source
+        \li Select \gui Commit to select the files to include in the source
             package.
 
-        \o  Select \gui OK to build the source package, and optionally, publish
+        \li Select \gui OK to build the source package, and optionally, publish
             the application.
 
     \endlist
diff --git a/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc b/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc
index c84f908ed270e3765fe15f916182bd8c16ea516d..4f0e2e48d0944419a4a9e36c823177e7215805c3 100644
--- a/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc
+++ b/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc
@@ -40,17 +40,17 @@
 
     \list
 
-        \o  Package filename must include the application name and version
+        \li Package filename must include the application name and version
             number using three digits. For example: myapplication_1_0_1.deb
 
-        \o  Application files must be installed to the opt folder on the ext3
+        \li Application files must be installed to the opt folder on the ext3
             partition.
 
-        \o  Debian packages must be given the category user/hidden.
+        \li Debian packages must be given the category user/hidden.
 
-        \o  Application cannot crash or hang during use.
+        \li Application cannot crash or hang during use.
 
-        \o  The application must handle different memory situations correctly.
+        \li The application must handle different memory situations correctly.
 
     \endlist
 
diff --git a/doc/src/linux-mobile/linuxdev-keys.qdocinc b/doc/src/linux-mobile/linuxdev-keys.qdocinc
index 8bfd0f3379cf41a255071706f1c62e9c8f70dd40..0b5b386c265afb2b43deb4019aa7302458af7ad6 100644
--- a/doc/src/linux-mobile/linuxdev-keys.qdocinc
+++ b/doc/src/linux-mobile/linuxdev-keys.qdocinc
@@ -10,17 +10,17 @@
 
     \list 1
 
-        \o  Select \gui Tools > \gui Options > \gui Devices > \gui {Create New}.
+        \li Select \gui Tools > \gui Options > \gui Devices > \gui {Create New}.
 
             \image qtcreator-ssh-key-configuration.png "SSH Key Configuration dialog"
 
-        \o  In the \gui {Private key file} field, select the location to save
+        \li In the \gui {Private key file} field, select the location to save
             the private key.
 
             The \gui {Public key file} field displays the location to save the
             corresponding public key.
 
-        \o  Select \gui {Generate And Save Key Pair} to generate and save the
+        \li Select \gui {Generate And Save Key Pair} to generate and save the
             keys at the specified locations.
 
     \endlist
diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc
index 95188d0bdea2f83921f0f2c1dab0be35090c8eb7..ebd4d8f22e2e56af5699c305656bb19d1e356f75 100644
--- a/doc/src/linux-mobile/linuxdev.qdoc
+++ b/doc/src/linux-mobile/linuxdev.qdoc
@@ -51,63 +51,63 @@
 
     \list 1
 
-        \o  Make sure that your device can be reached via an IP address.
+        \li Make sure that your device can be reached via an IP address.
 
-        \o  Select \gui {Tools > Options > Build & Run > Qt Versions > Add} to
+        \li Select \gui {Tools > Options > Build & Run > Qt Versions > Add} to
             add the Qt version
             for the embedded Linux.
 
-        \o  Select \gui {Tools > Options > Build & Run > Compilers > Add} to
+        \li Select \gui {Tools > Options > Build & Run > Compilers > Add} to
             add the compiler
             for building the applications.
 
-        \o  To deploy applications and run them remotely on devices, specify
+        \li To deploy applications and run them remotely on devices, specify
             parameters for accessing the devices:
 
             \list 1
 
-                \o  Select \gui Tools > \gui Options > \gui Devices > \gui Add
+                \li Select \gui Tools > \gui Options > \gui Devices > \gui Add
                     > \gui {Generic Linux Device} > \gui {Start Wizard}.
 
                     \image qtcreator-screenshot-devconf-linux.png "Connection Data wizard"
 
-                \o  In the \gui {The name to identify this configuration} field,
+                \li In the \gui {The name to identify this configuration} field,
                     enter a name for the connection.
 
-                \o  In the \gui {The device's host name or IP address} field,
+                \li In the \gui {The device's host name or IP address} field,
                     enter the host name or IP address of the device.
 
-                \o  In the \gui {The user name to log into the device} field,
+                \li In the \gui {The user name to log into the device} field,
                     enter the user name to log into the device and run the
                     application as.
 
-                \o  In the \gui {The authentication type} field, select whether
+                \li In the \gui {The authentication type} field, select whether
                     to use \gui Password or \gui Key authentication, and enter
                     the user's password or the file that contains the user's
                     private key.
 
-                \o Click \gui {Next} to create the connection.
+                \li  Click \gui {Next} to create the connection.
 
             \endlist
 
-        \o  Select \gui Tools > \gui Options > \gui {Build & Run} > \gui Kits
+        \li Select \gui Tools > \gui Options > \gui {Build & Run} > \gui Kits
             > \gui Add to add a kit for building for the device. Select the
             Qt version, compiler, and device that you added above, and choose
             \gui {Generic Linux Device} for the device type.
 
-        \o  To specify build settings:
+        \li To specify build settings:
 
         \list 1
 
-            \o  Open a project for an application you want to develop for the
+            \li Open a project for an application you want to develop for the
                 device.
 
-            \o  Select \gui Projects > \gui {Build & Run} > \gui {Add Kit} to
+            \li Select \gui Projects > \gui {Build & Run} > \gui {Add Kit} to
                 add the kit that you specified above.
 
         \endlist
 
-        \o  Select \gui Run to specify run settings.
+        \li Select \gui Run to specify run settings.
 
                 \image qtcreator-run-settings-linux-devices.png "Run settings for embedded Linux devices"
 
diff --git a/doc/src/linux-mobile/maemodev.qdoc b/doc/src/linux-mobile/maemodev.qdoc
index 042558fc98232bc9dac4258d82aee93a120a707d..4255c35116c77afb26da52ddbde8d81f63e61e74 100644
--- a/doc/src/linux-mobile/maemodev.qdoc
+++ b/doc/src/linux-mobile/maemodev.qdoc
@@ -52,14 +52,14 @@
     To build and run Qt applications for Maemo 5, you need the following:
     \list
 
-        \o  Maemo 5 device: Nokia N900 with software update release 1.3
+        \li Maemo 5 device: Nokia N900 with software update release 1.3
                     (V20.2010.36-2) or later installed.
        \if defined(qcmanual)
-       \o  MADDE cross-platform Maemo development
+       \li MADDE cross-platform Maemo development
            tool (installed as part of the Qt 4 SDK).
        \endif
 
-       \o Nokia USB drivers.
+       \li  Nokia USB drivers.
 
        Only needed if you develop on Windows and if you use a USB connection
        to run applications on the device. The drivers are
@@ -106,23 +106,23 @@
     To install and configure Mad Developer:
 
      \list 1
-         \o On the Nokia N900, select \gui{App Manager > Download} > \gui{Development} > \gui{mad-developer}
+         \li  On the Nokia N900, select \gui{App Manager > Download} > \gui{Development} > \gui{mad-developer}
          to install the Mad Developer software package.
-         \o Click \gui {Mad Developer} to start the Mad Developer application.
+         \li  Click \gui {Mad Developer} to start the Mad Developer application.
 
-         \o To use a WLAN connection, activate WLAN on the device and connect
+         \li  To use a WLAN connection, activate WLAN on the device and connect
          to the same network as the development PC. You can see the network
          address in the \gui wlan0 field.
 
-         \o To use a USB connection:
+         \li  To use a USB connection:
 
          \list a
 
-         \o If you are using Microsoft Windows as development host, you must
+         \li  If you are using Microsoft Windows as development host, you must
          change the driver loaded for instantiating the connection.
          In the Mad Developer, select \gui{Manage USB} and select \gui{Load g_ether}.
 
-         \o To set up the USB settings, click \gui Edit on the \gui usb0 row and
+         \li  To set up the USB settings, click \gui Edit on the \gui usb0 row and
          confirm by clicking \gui Configure.
 
           \note By default, you do not need to make changes. The \gui usb0 row
@@ -130,8 +130,8 @@
 
           \endlist
 
-       \o Select \gui{Developer Password} to generate a password for a freshly
-          created user called \bold developer. The password stays valid for as long
+       \li  Select \gui{Developer Password} to generate a password for a freshly
+          created user called \b developer. The password stays valid for as long
           as the password generation dialog is open. You enter the password when
           you configure the connection in \QC.
 
@@ -149,15 +149,15 @@
 
     \list 1
 
-        \o On the device, in \gui Programs, select \c {X Terminal} to open a
+        \li  On the device, in \gui Programs, select \c {X Terminal} to open a
         terminal window.
 
-        \o To install Qt Mobility libraries, enter the following command:
+        \li  To install Qt Mobility libraries, enter the following command:
         \c{/usr/lib/mad-developer/devrootsh apt-get install libqtm-*}
 
-        \o To confirm the installation, enter: \c Y
+        \li  To confirm the installation, enter: \c Y
 
-        \o Close the terminal.
+        \li  Close the terminal.
 
     \endlist
 
@@ -192,18 +192,18 @@
 
     \list 1
 
-    \o Open the Network Connections window.
+    \li  Open the Network Connections window.
 
-    \o Select the Linux USB Ethernet
+    \li  Select the Linux USB Ethernet
     connection that is displayed as a new Local Area Connection.
 
-    \o Edit the \gui {Internet Protocol Version 4 (TCP/IPv4)} properties
+    \li  Edit the \gui {Internet Protocol Version 4 (TCP/IPv4)} properties
     to specify the IP address for the connection.
     In the \gui {Use the following IP address} field, enter the following values:
     \list
-       \o  \gui {IP Address}: \bold {192.168.2.14}
-       \o  \gui SubnetMask: \bold {255.255.255.0}
-       \o  \gui {Default gateway}: leave this field empty
+       \li \gui {IP Address}: \b {192.168.2.14}
+       \li \gui SubnetMask: \b {255.255.255.0}
+       \li \gui {Default gateway}: leave this field empty
     \endlist
 
     \endlist
@@ -269,94 +269,94 @@
 
     \list 1
 
-        \o  To deploy applications and run them remotely on devices,
+        \li To deploy applications and run them remotely on devices,
             specify parameters for accessing devices:
 
             \list a
 
-            \o Connect your device to the development PC via a USB cable or
+            \li  Connect your device to the development PC via a USB cable or
             a WLAN. For a USB connection, you are prompted to select the mode
             to use. Choose \gui{PC suite mode}.
 
             \note If you experience connection problems due to a USB port issue,
             switch to a different port or use WLAN to connect to the device.
 
-            \o  Select \gui Tools > \gui Options > \gui Devices > \gui Add.
+            \li Select \gui Tools > \gui Options > \gui Devices > \gui Add.
 
-            \o  Select \gui {Maemo5/Fremantle} > \gui {Start Wizard}.
+            \li Select \gui {Maemo5/Fremantle} > \gui {Start Wizard}.
 
             \image qtcreator-dev-conf-maemo.png "Maemo device"
 
-            \o In the \gui {The name to identify this configuration} field,
+            \li  In the \gui {The name to identify this configuration} field,
             enter a name for the connection.
 
-            \o In the \gui {The kind of device} field, select
+            \li  In the \gui {The kind of device} field, select
             \gui {Hardware device}.
 
-            \o In the \gui {The device's host name or IP address} field, enter
+            \li  In the \gui {The device's host name or IP address} field, enter
             the IP address from the connectivity tool on the device.
 
-            \o In the \gui {The SSH server port} field, enter the port number to
+            \li  In the \gui {The SSH server port} field, enter the port number to
             use for SSH connections.
 
-            \o Click \gui Next.
+            \li  Click \gui Next.
 
-            \o Follow the instructions of the wizard to create the connection.
+            \li  Follow the instructions of the wizard to create the connection.
 
             \endlist
 
         \if defined(qcmanual)
 
-        \o To test applications on the emulator (QEMU) separately, you must
+        \li  To test applications on the emulator (QEMU) separately, you must
            create a connection to it from the development PC. If you installed
            Qt 4 SDK, the connection is created automatically and you can omit this
            step.
 
             \list a
 
-                \o  In \QC, select \gui Tools > \gui Options > \gui Devices >
+                \li In \QC, select \gui Tools > \gui Options > \gui Devices >
                     \gui Add to add a new configuration.
 
-                \o In the \gui {The kind of device} field, select
+                \li  In the \gui {The kind of device} field, select
                 \gui Emulator.
 
-                \o Click \gui Next.
+                \li  Click \gui Next.
 
-                \o Follow the instructions of the wizard to create and test the
+                \li  Follow the instructions of the wizard to create and test the
                 connection.
 
             \endlist
     \endif
 
-            \o  Select \gui Tools > \gui Options > \gui {Build & Run} >
+            \li Select \gui Tools > \gui Options > \gui {Build & Run} >
                 \gui Kits > \gui Add to add a kit for building for the device:
 
             \list a
 
-                \o  In the \gui {Device type} field, select
+                \li In the \gui {Device type} field, select
                     \gui {Maemo5/Fremantle}.
 
-                \o  In the \gui Device field, select the device that you added
+                \li In the \gui Device field, select the device that you added
                     above.
 
-                \o  In the \gui Sysroot field, specify the path to the sysroot.
+                \li In the \gui Sysroot field, specify the path to the sysroot.
                     By default, the Qt 4 SDK installer places sysroot in the
                     following folder:
                     \c{QtSDK\Maemo\4.6.2\sysroots\fremantle-arm-sysroot-20.2010.36-2-slim}.
 
-                \o  In the \gui {Compiler type} field, select GCC.
+                \li In the \gui {Compiler type} field, select GCC.
 
-                \o  In the \gui Compiler field, specify the path to the GCC
+                \li In the \gui Compiler field, specify the path to the GCC
                     compiler. By default, the Qt 4 SDK installer places the
                     compiler in the following folder:
                     \c{QtSDK\Maemo\4.6.2\targets\fremantle-pr13\bin\}.
 
-                \o  In the \gui Debugger field, specify the path to GDB. By
+                \li In the \gui Debugger field, specify the path to GDB. By
                     default, the Qt 4 SDK installer places the debugger
                     in the following folder:
                     \c{QtSDK\Maemo\4.6.2\targets\fremantle-pr13\bin\}.
 
-                \o  In the \gui {Qt version} field, choose the MADDE Qt version
+                \li In the \gui {Qt version} field, choose the MADDE Qt version
                     for Maemo5/Fremantle. By default, the Qt 4 SDK installer
                     places qmake in the following folder:
                     \c{QtSDK\Maemo\4.6.2\targets\fremantle-pr13\bin\}.
@@ -365,15 +365,15 @@
 
                 You can leave the \gui {Qt mkspec} field empty.
 
-            \o  Open a project for an application you want to develop for your
+            \li Open a project for an application you want to develop for your
                 device.
 
-            \o  Select \gui Projects > \gui {Build & Run} > \gui {Add Kit} to
+            \li Select \gui Projects > \gui {Build & Run} > \gui {Add Kit} to
                 add the kit that you specified above.
 
-            \o  Select \gui Run to specify run settings for the project.
+            \li Select \gui Run to specify run settings for the project.
 
-            \o  The mobile application wizard automatically sets the folder
+            \li The mobile application wizard automatically sets the folder
                 where the file is installed on the device in the \gui {Remote
                 Directory} field. For example, \c {/opt/usr/bin}. If the text
                 \gui {<no target path set>} is displayed, click it to specify a
@@ -389,15 +389,15 @@
 
     \list 1
 
-        \o  On the device, in \gui Programs, select \c {X Terminal} to open a
+        \li On the device, in \gui Programs, select \c {X Terminal} to open a
             terminal window.
 
-        \o  To specify the password, enter the following command:
+        \li To specify the password, enter the following command:
             \c{/usr/lib/mad-developer/devrootsh passwd user}
 
-        \o  In \QC, select \gui Tools > \gui Options > \gui Devices.
+        \li In \QC, select \gui Tools > \gui Options > \gui Devices.
 
-        \o  Specify the username \c user and the password in the device
+        \li Specify the username \c user and the password in the device
             configuration.
 
     \endlist
@@ -411,24 +411,24 @@
     \table
 
         \header
-            \o IP Address and Network on Device
-            \o USB Network on Development PC
-            \o Host Name in \QC Build Settings
+            \li  IP Address and Network on Device
+            \li  USB Network on Development PC
+            \li  Host Name in \QC Build Settings
 
         \row
-            \o 172.30.7.15 255.255.255.0
-            \o 172.30.7.14 255.255.255.0
-            \o 172.30.7.15
+            \li  172.30.7.15 255.255.255.0
+            \li  172.30.7.14 255.255.255.0
+            \li  172.30.7.15
 
         \row
-            \o 10.133.133.15
-            \o 10.133.133.14
-            \o 10.133.133.15
+            \li  10.133.133.15
+            \li  10.133.133.14
+            \li  10.133.133.15
 
         \row
-            \o 192.168.133.15
-            \o 192.168.133.14
-            \o 192.168.133.15
+            \li  192.168.133.15
+            \li  192.168.133.14
+            \li  192.168.133.15
 
             \note You cannot use the value localhost for connections to a device.
 
diff --git a/doc/src/linux-mobile/meegodev.qdoc b/doc/src/linux-mobile/meegodev.qdoc
index 59790a47bdba0a5d3e9ad4444e82aa7c8e5519f9..928e56e4b437870f54b3f9a93079546817ef3ab9 100644
--- a/doc/src/linux-mobile/meegodev.qdoc
+++ b/doc/src/linux-mobile/meegodev.qdoc
@@ -82,16 +82,16 @@
 
     \list
 
-        \o  On the device, select \gui {Settings > Security > Developer
+        \li On the device, select \gui {Settings > Security > Developer
             mode} to turn on developer mode.
 
-        \o  Select \gui {Applications > SDK Connectivity} to start the SDK
+        \li Select \gui {Applications > SDK Connectivity} to start the SDK
             Connectivity application.
 
-        \o  Select \gui {Select Connection} and then select the type of the
+        \li Select \gui {Select Connection} and then select the type of the
             connection to create: \gui WLAN or \gui USB.
 
-        \o  For a USB connection, select the operating system of the
+        \li For a USB connection, select the operating system of the
             development PC in \gui {Select Module}.
 
     \endlist
@@ -130,16 +130,16 @@
 
     \list
 
-        \o  Open the network settings.
+        \li Open the network settings.
 
-        \o  Click the + button on the network settings panel.
+        \li Click the + button on the network settings panel.
 
-        \o  When the interface is available, select \gui {Configure IPv4 > Using
+        \li When the interface is available, select \gui {Configure IPv4 > Using
             DHCP with manual address}.
 
-        \o Enter the address 192.168.2.14 into the IP address field.
+        \li  Enter the address 192.168.2.14 into the IP address field.
 
-        \o Click \gui Apply.
+        \li  Click \gui Apply.
 
         The network connection between your device and workstation is now
         configured.
@@ -160,7 +160,7 @@
 
     \list 1
 
-        \o  Open the \gui {Network and Sharing Center} and select \gui {Change
+        \li Open the \gui {Network and Sharing Center} and select \gui {Change
             adapter settings}.
 
             The Linux USB Ethernet connection you just installed is displayed
@@ -170,18 +170,18 @@
             \note If you cannot see \gui {Linux USB Ethernet/RNDIS gadget}, try
             to unplug and replug the USB cable.
 
-        \o  Right-click \gui {Linux USB Ethernet/RNDIS gadget} and select
+        \li Right-click \gui {Linux USB Ethernet/RNDIS gadget} and select
             \gui Properties.
 
-    \o  Edit the \gui {Internet Protocol Version 4 (TCP/IPv4)} properties
+    \li Edit the \gui {Internet Protocol Version 4 (TCP/IPv4)} properties
         to specify the IP address for the connection. In the \gui {Use the
         following IP address} field, enter the following values:
 
         \list
 
-           \o  \gui {IP Address}: \bold {192.168.2.14}
-           \o  \gui SubnetMask: \bold {255.255.255.0}
-           \o  \gui {Default gateway}: leave this field empty
+           \li \gui {IP Address}: \b {192.168.2.14}
+           \li \gui SubnetMask: \b {255.255.255.0}
+           \li \gui {Default gateway}: leave this field empty
 
         \endlist
 
@@ -203,20 +203,20 @@
 
     \list 1
 
-    \o  Open the Network Connections window.
+    \li Open the Network Connections window.
 
-    \o  Select the Linux USB Ethernet connection that is displayed as a new
+    \li Select the Linux USB Ethernet connection that is displayed as a new
         Local Area Connection.
 
-    \o  Edit the \gui {Internet Protocol Version 4 (TCP/IPv4)} properties
+    \li Edit the \gui {Internet Protocol Version 4 (TCP/IPv4)} properties
         to specify the IP address for the connection. In the \gui {Use the
         following IP address} field, enter the following values:
 
         \list
 
-           \o  \gui {IP Address}: \bold {192.168.2.14}
-           \o  \gui SubnetMask: \bold {255.255.255.0}
-           \o  \gui {Default gateway}: leave this field empty
+           \li \gui {IP Address}: \b {192.168.2.14}
+           \li \gui SubnetMask: \b {255.255.255.0}
+           \li \gui {Default gateway}: leave this field empty
 
         \endlist
 
@@ -280,12 +280,12 @@
 
     \list 1
 
-        \o  To deploy applications and run them remotely on devices,
+        \li To deploy applications and run them remotely on devices,
             specify parameters for accessing devices:
 
             \list a
 
-                \o  Connect your device to the development PC via a USB cable or
+                \li Connect your device to the development PC via a USB cable or
                     a WLAN. For a USB connection, you are prompted to select the
                     mode to use. Choose \gui{PC suite mode}.
 
@@ -293,56 +293,56 @@
                     port issue, switch to a different port or use WLAN to
                     connect to the device.
 
-                \o  Select \gui Tools > \gui Options > \gui Devices > \gui Add.
+                \li Select \gui Tools > \gui Options > \gui Devices > \gui Add.
 
-                \o  Select \gui {MeeGo 1.2 Harmattan} > \gui {Start Wizard} to
+                \li Select \gui {MeeGo 1.2 Harmattan} > \gui {Start Wizard} to
                     add a new configuration for a device.
 
                     \image qtcreator-screenshot-devconf.png
 
-                \o  In the \gui {The name to identify this configuration} field,
+                \li In the \gui {The name to identify this configuration} field,
                     enter a name for the connection.
 
-                \o  In the \gui {The kind of device} field, select
+                \li In the \gui {The kind of device} field, select
                     \gui {Hardware device}.
 
-                \o  In the \gui {The device's host name or IP address} field,
+                \li In the \gui {The device's host name or IP address} field,
                     enter the IP address from the connectivity tool on the
                     device.
 
-                \o  In the \gui {The SSH server port} field, enter the port
+                \li In the \gui {The SSH server port} field, enter the port
                     number to use for SSH connections.
 
-                \o  Click \gui Next.
+                \li Click \gui Next.
 
-                \o  Follow the instructions of the wizard to create the
+                \li Follow the instructions of the wizard to create the
                     configuration.
 
             \endlist
 
         \if defined(qcmanual)
 
-        \o  To test applications on the emulator (QEMU), you must
+        \li To test applications on the emulator (QEMU), you must
             create a connection to it from the development PC. If you installed
             Qt 4 SDK, the connection is created automatically and you can omit this
             step.
 
             \list a
 
-                \o  In \QC, select \gui Tools > \gui Options > \gui Devices >
+                \li In \QC, select \gui Tools > \gui Options > \gui Devices >
                     \gui Add to add a new configuration.
 
-                \o  Select \gui {MeeGo 1.2 Harmattan} > \gui {Start Wizard}.
+                \li Select \gui {MeeGo 1.2 Harmattan} > \gui {Start Wizard}.
 
-                \o  In the \gui {The name to identify this configuration} field,
+                \li In the \gui {The name to identify this configuration} field,
                     enter a name for the connection.
 
-                \o  In the \gui {The kind of device} field, select
+                \li In the \gui {The kind of device} field, select
                     \gui Emulator.
 
-                \o  Click \gui Next.
+                \li Click \gui Next.
 
-                \o  Follow the instructions of the wizard to create the
+                \li Follow the instructions of the wizard to create the
                     connection.
 
                     SDK Connectivity is not needed for emulator connections, and
@@ -353,35 +353,35 @@
 
         \endif
 
-            \o  Select \gui Tools > \gui Options > \gui {Build & Run} >
+            \li Select \gui Tools > \gui Options > \gui {Build & Run} >
                 \gui Kits > \gui Add to add a kit for building for the device:
 
             \list a
 
-                \o  In the \gui {Device type} field, select
+                \li In the \gui {Device type} field, select
                     \gui {MeeGo 1.2 Harmattan}.
 
-                \o  In the \gui Device field, select the device that you added
+                \li In the \gui Device field, select the device that you added
                     above.
 
-                \o  In the \gui Sysroot field, specify the path to the sysroot.
+                \li In the \gui Sysroot field, specify the path to the sysroot.
                     By default, the Qt 4 SDK installer places sysroot in the
                     following folder:
                     \c{QtSDK\Madde\bin\sysroots\harmattan_sysroot_10.2011.34-1_slim}.
 
-                \o  In the \gui {Compiler type} field, select GCC.
+                \li In the \gui {Compiler type} field, select GCC.
 
-                \o  In the \gui Compiler field, specify the path to the GCC
+                \li In the \gui Compiler field, specify the path to the GCC
                     compiler. By default, the Qt 4 SDK installer places the
                     compiler in the following folder:
                     \c{QtSDK\Madde\targets\harmattan_10.2011.34-1_rt1.2\bin\}.
 
-                \o  In the \gui Debugger field, specify the path to GDB. By
+                \li In the \gui Debugger field, specify the path to GDB. By
                     default, the Qt 4 SDK installer places the debugger
                     in the following folder:
                     \c{QtSDK\Madde\targets\harmattan_10.2011.34-1_rt1.2\bin\}.
 
-                \o  In the \gui {Qt version} field, choose the MADDE Qt version
+                \li In the \gui {Qt version} field, choose the MADDE Qt version
                     for MeeGo 1.2 Harmattan. By default, the Qt 4 SDK installer
                     places qmake in the following folder:
                     \c{QtSDK\Madde\targets\harmattan_10.2011.34-1_rt1.2\bin\}.
@@ -390,15 +390,15 @@
 
                 You can leave the \gui {Qt mkspec} field empty.
 
-                    \o  Open a project for an application you want to develop
+                    \li Open a project for an application you want to develop
                         for your device.
 
-            \o  Select \gui Projects > \gui {Build & Run} > \gui {Add Kit} to
+            \li Select \gui Projects > \gui {Build & Run} > \gui {Add Kit} to
                 add the kit that you specified above.
 
-                \o  Select \gui Run to specify run settings for the project.
+                \li Select \gui Run to specify run settings for the project.
 
-            \o  The Qt Quick project wizards automatically set the folder
+            \li The Qt Quick project wizards automatically set the folder
                 where the file is installed on the device in the \gui {Remote
                 Directory} field. For example, \c {/opt/usr/bin}. If the text
                 \gui {<no target path set>} is displayed, click it to specify a
@@ -416,21 +416,21 @@
 
     \list 1
 
-        \o  On the device, select \gui Terminal to open a
+        \li On the device, select \gui Terminal to open a
             terminal window.
 
-        \o  To specify the password, enter the following command:
+        \li To specify the password, enter the following command:
             \c{/usr/lib/mad-developer/devrootsh passwd user}
 
-        \o  In \QC, select \gui Tools > \gui Options > \gui Devices.
+        \li In \QC, select \gui Tools > \gui Options > \gui Devices.
 
-        \o  Specify the username \c user and the password in the device
+        \li Specify the username \c user and the password in the device
             configuration.
 
     \endlist
 
-    \input linux-mobile/linuxdev-keys.qdocinc
-    \input linux-mobile/linuxdev-processes.qdocinc
+    \include linux-mobile/linuxdev-keys.qdocinc
+    \include linux-mobile/linuxdev-processes.qdocinc
 
     \endif
 
@@ -443,24 +443,24 @@
     \table
 
         \header
-            \o IP Address and Network on Device
-            \o USB Network on Development PC
-            \o Host Name in \QC Build Settings
+            \li  IP Address and Network on Device
+            \li  USB Network on Development PC
+            \li  Host Name in \QC Build Settings
 
         \row
-            \o 172.30.7.15 255.255.255.0
-            \o 172.30.7.14 255.255.255.0
-            \o 172.30.7.15
+            \li  172.30.7.15 255.255.255.0
+            \li  172.30.7.14 255.255.255.0
+            \li  172.30.7.15
 
         \row
-            \o 10.133.133.15
-            \o 10.133.133.14
-            \o 10.133.133.15
+            \li  10.133.133.15
+            \li  10.133.133.14
+            \li  10.133.133.15
 
         \row
-            \o 192.168.133.15
-            \o 192.168.133.14
-            \o 192.168.133.15
+            \li  192.168.133.15
+            \li  192.168.133.14
+            \li  192.168.133.15
 
             \note You cannot use the value localhost for connections to a
             device.
diff --git a/doc/src/overview/creator-acknowledgements.qdoc b/doc/src/overview/creator-acknowledgements.qdoc
index aeb08c016269c5ce9a2249aea596cd5dcaf92877..fbb02e7d3056661336860216e38f84f06fccdb82 100644
--- a/doc/src/overview/creator-acknowledgements.qdoc
+++ b/doc/src/overview/creator-acknowledgements.qdoc
@@ -35,30 +35,30 @@
 
     \list
 
-        \o  \bold{Open Source front-end for C++ (license MIT)}, enhanced for use
+        \li \b{Open Source front-end for C++ (license MIT)}, enhanced for use
             in \QC.\br
             Roberto Raggi <roberto.raggi@gmail.com>\br
             QtCreator/src/shared/cplusplus\br\br
 
-        \o  \bold{Botan, a C++ crypto library. Version 1.8.8}\br
+        \li \b{Botan, a C++ crypto library. Version 1.8.8}\br
 
             \list
-                \o  Copyright (C) 1999-2004 The Botan Project. All rights
+                \li Copyright (C) 1999-2004 The Botan Project. All rights
                     reserved.
-                \o  Copyright (C) 1999-2009 Jack Lloyd
-                \o  2001 Peter J Jones
-                \o  2004-2007 Justin Karneges
-                \o  2005 Matthew Gregan
-                \o  2005-2006 Matt Johnston
-                \o  2006 Luca Piccarreta
-                \o  2007 Yves Jerschow
-                \o  2007-2008 FlexSecure GmbH
-                \o  2007-2008 Technische Universitat Darmstadt
-                \o  2007-2008 Falko Strenzke
-                \o  2007-2008 Martin Doering
-                \o  2007 Manuel Hartl
-                \o  2007 Christoph Ludwig
-                \o  2007 Patrick Sona
+                \li Copyright (C) 1999-2009 Jack Lloyd
+                \li 2001 Peter J Jones
+                \li 2004-2007 Justin Karneges
+                \li 2005 Matthew Gregan
+                \li 2005-2006 Matt Johnston
+                \li 2006 Luca Piccarreta
+                \li 2007 Yves Jerschow
+                \li 2007-2008 FlexSecure GmbH
+                \li 2007-2008 Technische Universitat Darmstadt
+                \li 2007-2008 Falko Strenzke
+                \li 2007-2008 Martin Doering
+                \li 2007 Manuel Hartl
+                \li 2007 Christoph Ludwig
+                \li 2007 Patrick Sona
             \endlist
 
         All rights reserved.\br\br
@@ -89,8 +89,8 @@
         The source code of Botan C++ crypto library can be found
         here:
         \list
-        \o QtCreator/src/libs/3rdparty
-        \o \l{http://qt.gitorious.org/qt-creator/qt-creator/trees/master/src/libs/3rdparty}
+        \li  QtCreator/src/libs/3rdparty
+        \li  \l{http://qt.gitorious.org/qt-creator/qt-creator/trees/master/src/libs/3rdparty}
         \endlist
         \br\br
 
diff --git a/doc/src/overview/creator-advanced.qdoc b/doc/src/overview/creator-advanced.qdoc
index f4dbc9f34839fdb6ecddaef2460607a200f71f63..0bc3ff39eb870a215f829be8c08e4fb6a15f24a4 100644
--- a/doc/src/overview/creator-advanced.qdoc
+++ b/doc/src/overview/creator-advanced.qdoc
@@ -45,30 +45,30 @@
 
     \list
 
-        \o  \l{Supported Platforms}
+        \li \l{Supported Platforms}
 
             You can install and run \QC on several operating systems to create
             applications for multiple desktop and mobile device platforms.
 
-        \o  \l{Using Other Build Systems}
+        \li \l{Using Other Build Systems}
 
             \QC is integrated with cross-platform systems for build automation:
             qmake and CMake. In addition, you can import generic projects that
             do not use qmake or CMake, and specify that \QC ignores your build
             system.
 
-        \o  \l{Using Command Line Options}
+        \li \l{Using Command Line Options}
 
             You can start \QC and specify some options for running it from the
             command line.
 
-        \o  \l{Keyboard Shortcuts}
+        \li \l{Keyboard Shortcuts}
 
             \QC provides various keyboard shortcuts to speed up your development
             process. You can change the keyboard shortcuts, as well as import
             and export keyboard shortcut mapping schemes.
 
-        \o  \l{Using External Tools}
+        \li \l{Using External Tools}
 
             You can use external tools directly from \QC. Qt Linguist,
             QML preview tools (QML Viewer and QML Scene), the default text
@@ -82,7 +82,7 @@
 
     \list
 
-        \o  \l{Showing Task List Files in Issues Pane}
+        \li \l{Showing Task List Files in Issues Pane}
 
             You can load report files created by code scanning and analysis
             tools to the \gui Issues output pane. You can navigate to the
diff --git a/doc/src/overview/creator-deployment-overview.qdoc b/doc/src/overview/creator-deployment-overview.qdoc
index fda4c1b385a0330666548276ecc40e8a6e16205a..4174b4f0fb740637bf3d600a5578ec7f0ce5d679 100644
--- a/doc/src/overview/creator-deployment-overview.qdoc
+++ b/doc/src/overview/creator-deployment-overview.qdoc
@@ -37,12 +37,12 @@
 
     \list
 
-        \o  \l{Deploying Applications to Android Devices}
+        \li \l{Deploying Applications to Android Devices}
 
             When you deploy the application on an Android device, \QC copies
             the application files to the device. In addition, you can determine
             the Qt libraries to use.
-        \o  \l{Deploying Applications to Linux-Based Devices}
+        \li \l{Deploying Applications to Linux-Based Devices}
 
             When you deploy the application on a Linux-based device, such
             as embedded Linux, MeeGo 1.2 Harmattan, or Maemo 5/Fremantle, \QC
@@ -50,7 +50,7 @@
             can test and debug the application on the device.
             You can create Debian installation packages for MeeGo Harmattan and
             Maemo 5/Fremantle devices.
-        \o \l{Deploying Applications to QNX Devices}
+        \li  \l{Deploying Applications to QNX Devices}
 
             When you deploy the application on a BlackBerry, \QC  generates a
             BAR package in the build directory and deploys it to the connected
@@ -62,7 +62,7 @@
     \section1 Related Topics
 
     \list
-        \o  \l{Publishing}
+        \li \l{Publishing}
 
             When you are ready to publish the application on a publishing
             channel, you must make sure that the installation file meets the
diff --git a/doc/src/overview/creator-deployment-ovi.qdoc b/doc/src/overview/creator-deployment-ovi.qdoc
index 9688720b662ea2a0a0c7ebcd2d749bae8101aba0..158072f3fbdaa71469fb3ac34bb6be1fb1ab45c6 100644
--- a/doc/src/overview/creator-deployment-ovi.qdoc
+++ b/doc/src/overview/creator-deployment-ovi.qdoc
@@ -44,19 +44,19 @@
 
     \list
 
-        \o  \l{Publishing Qt Content for MeeGo Harmattan Devices}
+        \li \l{Publishing Qt Content for MeeGo Harmattan Devices}
 
             \QC generates installation packages that you can publish to
             Nokia Store. However, you must make sure that the packages meet
             the requirements of the Nokia Store.
 
-        \o  \l{Publishing Qt Content for Maemo Devices}
+        \li \l{Publishing Qt Content for Maemo Devices}
 
             \QC generates installation packages that you can publish to
             Nokia Store. However, you must make sure that the packages meet
             the requirements of the Nokia Store.
 
-        \o  \l{Publishing Maemo Applications to Extras-devel}
+        \li \l{Publishing Maemo Applications to Extras-devel}
 
             You can use the \gui {Publish for Fremantle Extras-devel Free
             Repository} wizard to create a source archive and, optionally,
diff --git a/doc/src/overview/creator-design-overview.qdoc b/doc/src/overview/creator-design-overview.qdoc
index d378d20401cec03356494f3929f58c76a02ef7d2..89203c9f0b9393213eaac825be9fee5d799dfb7c 100644
--- a/doc/src/overview/creator-design-overview.qdoc
+++ b/doc/src/overview/creator-design-overview.qdoc
@@ -37,7 +37,7 @@
 
     \list
 
-        \o  \l{Developing Qt Quick Applications}
+        \li \l{Developing Qt Quick Applications}
 
             You can either create Qt Quick projects from scratch or import
             existing projects to \QC. You can use the code editor (Edit mode)
@@ -45,7 +45,7 @@
             However, the visual editor only supports Qt Quick 1, which is
             offered in Qt 5 only for compatibility with Qt 4. We recommend that
             you use Qt Quick 2 for new Qt 5 applications.
-        \o  \l{Developing Widget Based Applications}
+        \li \l{Developing Widget Based Applications}
 
             Widgets and forms created with \QD are integrated seamlessly with
             programmed code by using the Qt signals and slots mechanism that
@@ -53,7 +53,7 @@
             properties set in \QD can be changed dynamically within the code.
             Furthermore, features such as widget promotion and custom
             plugins allow you to use your own widgets with \QD.
-        \o  \l{Optimizing Applications for Mobile Devices}
+        \li \l{Optimizing Applications for Mobile Devices}
 
             Mobile devices have been designed for use when mobile. Keep the
             characteristics of mobile devices in mind when you create
@@ -65,7 +65,7 @@
 
     \list
 
-        \o  \l{Adding Qt Designer Plugins}
+        \li \l{Adding Qt Designer Plugins}
 
             You can use Qt APIs to create plugins that extend Qt applications.
             This enables you to add your own widgets to \QD.
diff --git a/doc/src/overview/creator-getting-started.qdoc b/doc/src/overview/creator-getting-started.qdoc
index 47fb41aef3ded31ed91fd06a9ee0c8355d9cf44f..d61e726eab514b5921a35d67145e487008ac4bad 100644
--- a/doc/src/overview/creator-getting-started.qdoc
+++ b/doc/src/overview/creator-getting-started.qdoc
@@ -32,27 +32,27 @@
 
     \table
         \row
-            \o  \inlineimage creator-gs-01.png
-            \o  \inlineimage creator-gs-02.png
-            \o  \inlineimage creator-gs-03.png
-            \o  \inlineimage creator-gs-04.png
+            \li \inlineimage creator-gs-01.png
+            \li \inlineimage creator-gs-02.png
+            \li \inlineimage creator-gs-03.png
+            \li \inlineimage creator-gs-04.png
         \row
-            \o  \bold {\l{IDE Overview}}
+            \li \b {\l{IDE Overview}}
 
                 If you have not used an integrated development environment (IDE)
                 before, or want to know what kind of IDE \QC is, go to
                 \l{IDE Overview}.
-            \o  \bold {\l{User Interface}}
+            \li \b {\l{User Interface}}
 
                 If you have not used \QC before, and want to become familiar
                 with the parts of the user interface, go to \l{User Interface}.
-            \o  \bold {\l{Building and Running an Example}}
+            \li \b {\l{Building and Running an Example}}
 
                 To check that \l{glossary-buildandrun-kit}{kits} for building and running were
                 successfully installed as part of the \QSDK installation, open
                 an example application and run it. If you have not done so
                 before, go to \l{Building and Running an Example}.
-            \o  \bold {\l{Tutorials}}
+            \li \b {\l{Tutorials}}
 
                 Now you are ready to start developing your own applications.
                 Pick a tutorial to follow in \l{Tutorials}
diff --git a/doc/src/overview/creator-glossary.qdoc b/doc/src/overview/creator-glossary.qdoc
index 3ec2bafbff5d3b6a232a96fbc8821367a22f44be..9226d75e31290c3042ba85834c9709234105d257 100644
--- a/doc/src/overview/creator-glossary.qdoc
+++ b/doc/src/overview/creator-glossary.qdoc
@@ -32,13 +32,13 @@
 
     \table
         \header
-            \o  Term
-            \o  Meaning
+            \li Term
+            \li Meaning
 
         \row
-            \o  Build configuration
+            \li Build configuration
                 \target glossary-build-config
-            \o  Contains all the information you need to compile the sources
+            \li Contains all the information you need to compile the sources
                 into binaries. Different build configurations allow you to
                 quickly build the project for different purposes.
                 By default, \QC creates \e {debug build} and \e {release build}
@@ -50,9 +50,9 @@
                 release configuration for creating the final installation file.
 
         \row
-            \o  Build step
+            \li Build step
                 \target glossary-build-step
-            \o  A command that \QC executes to accomplish a basic step in a
+            \li A command that \QC executes to accomplish a basic step in a
                 complex task such as cleaning, building, or deploying a project.
                 \QC executes build steps in sequence to complete the task.
                 The number and type of necessary build steps depends on the
@@ -61,9 +61,9 @@
                 and \c make.
 
         \row
-            \o  Component
+            \li Component
                 \target glossary-component
-            \o  An instantiable QML definition, typically
+            \li An instantiable QML definition, typically
                 contained in a .qml file. For instance, a Button component may
                 be defined in Button.qml. The QML runtime may instantiate this
                 Button component to create Button objects. Alternatively, a
@@ -72,26 +72,26 @@
                 {Component} element.
 
         \row
-            \o  Deploy configuration
+            \li Deploy configuration
                 \target glossary-deploy-config
-            \o  Handles the packaging and copying of the necessary files to a
+            \li Handles the packaging and copying of the necessary files to a
                 location you want to run the executable at. The files can be
                 copied to a location in the file system of the development PC or
                 a mobile device.
 
         \row
-            \o  Kit
+            \li Kit
                 \target glossary-buildandrun-kit
-            \o  \QC groups build and run specific settings as kits to make
+            \li \QC groups build and run specific settings as kits to make
                 cross-platform development easier. Each kit consists of a set
                 of values that define one environment, such as a device,
                 tool chain, Qt version, and debugger command to use. Configure kits at
                 \gui {Tools > Options > Build & Run > Kits}.
 
         \row
-            \o  Mode
+            \li Mode
                 \target glossary-mode
-            \o  Adapts the \QC user interface to the different application
+            \li Adapts the \QC user interface to the different application
                 development tasks at hand. Each mode has its own view that shows
                 only the information required for performing a particular task,
                 and provides only the most relevant features and functions
@@ -99,25 +99,25 @@
                 is always dedicated to actual application development tasks.
 
         \row
-            \o  Project
+            \li Project
                 \target glossary-project
-            \o  Groups together a set of source files, forms, and resource files
+            \li Groups together a set of source files, forms, and resource files
                 that you can build, deploy, and run for different desktop and
                 mobile device platforms, as
                 specified by a \e {build configuration}, \e {deploy
                 configuration}, and \e {run configuration}.
 
         \row
-            \o  Qt version
+            \li Qt version
                 \target glossary-project-qt
-            \o  \QC allows you to have multiple versions of Qt installed on your
+            \li \QC allows you to have multiple versions of Qt installed on your
                 development PC and use different versions to build your projects
                 for different purposes.
 
         \row
-            \o  Run configuration
+            \li Run configuration
                 \target glossary-run-config
-            \o  Starts the application in the location where it was copied by
+            \li Starts the application in the location where it was copied by
                 the \e {deploy configuration}. By default, when you run a
                 project, \QC builds it, deploys it to the device specified in the selected
                 \l{glossary-buildandrun-kit}{kit},
@@ -126,9 +126,9 @@
                 runs it again.
 
         \row
-            \o  Shadow build
+            \li Shadow build
                 \target glossary-shadow-build
-            \o  Shadow building means building a project in a separate
+            \li Shadow building means building a project in a separate
                 directory, the \e{build directory}. The build directory is
                 different from the \e {source directory}. One of the benefits of
                 shadow building is that it keeps your source directory clean,
diff --git a/doc/src/overview/creator-help-overview.qdoc b/doc/src/overview/creator-help-overview.qdoc
index c96198ed93a3436d56e3c813d99328bf8a4c382e..2ab9e1f2fa1b9adef93afb7246632a49bf41b85f 100644
--- a/doc/src/overview/creator-help-overview.qdoc
+++ b/doc/src/overview/creator-help-overview.qdoc
@@ -34,7 +34,7 @@
 
     \list
 
-        \o  \l{Using the Help Mode}
+        \li \l{Using the Help Mode}
 
             \QC comes fully integrated with Qt documentation and examples using
             the Qt Help plugin. You can add external documentation to the
@@ -42,21 +42,21 @@
             information faster. In addition, you can add bookmarks to help
             pages.
 
-        \o  \l{FAQ}
+        \li \l{FAQ}
 
             Contains answers to some frequently asked questions about \QC.
 
-        \o  \l{Tips and Tricks}
+        \li \l{Tips and Tricks}
 
             Lists useful \QC features.
 
-        \o  \l{Known Issues}
+        \li \l{Known Issues}
 
             Lists known issues in \QC version \qtcversion. The development team
             is aware of them, and therefore, you do not need to report them as
             bugs.
 
-        \o  \l{Glossary}
+        \li \l{Glossary}
 
             Lists special terms used in \QC.
 
@@ -66,11 +66,11 @@
 
     \list
 
-        \o  \l{Technical Support}
+        \li \l{Technical Support}
 
             Lists Qt support sites and other useful sites.
 
-        \o  \l{Acknowledgements}
+        \li \l{Acknowledgements}
 
             Lists the third-party components in \QC.
 
diff --git a/doc/src/overview/creator-issues.qdoc b/doc/src/overview/creator-issues.qdoc
index 3598f962837898b30106e0a78ee3fc3f93ec8012..bb6aaa4ddf51dfad308b7df2e05a7f3812299109 100644
--- a/doc/src/overview/creator-issues.qdoc
+++ b/doc/src/overview/creator-issues.qdoc
@@ -42,11 +42,11 @@
 
     \list
 
-        \o  If you change the Input Languages in Windows, \QC might not
+        \li  If you change the Input Languages in Windows, \QC might not
             respond for 30 seconds. This is a known issue in the Advanced Text
             Service of Microsoft Windows.
 
-        \o  \QC uses SQLite for storing some of its settings. SQLite is
+        \li  \QC uses SQLite for storing some of its settings. SQLite is
             known to have problems with certain NFS servers (most notably the
             nfs-user-server 2.2beta), since they can lock up the application
             when it tries to lock the database. If your home directory is on an
@@ -54,20 +54,20 @@
             switch to the nfs-kernel-server, or create a symlink so that the
             settings are stored locally.
 
-        \o  Qt 4.7.4 is known to contain a bug exposed by g++ 4.6 which triggers
+        \li  Qt 4.7.4 is known to contain a bug exposed by g++ 4.6 which triggers
             a crash in \QC. For more information, see
             \l{https://bugreports.qt-project.org/browse/QTBUG-21265}{QTBUG-21265}
 
-        \o  The Okteta KDE custom widget plugin might be installed as part of
+        \li  The Okteta KDE custom widget plugin might be installed as part of
             some Linux distributions. It can cause Qt Designer to crash. For
             more information, see:
 
             \list
 
-                \o  \l{https://bugs.launchpad.net/ubuntu/+source/kdeutils/+bug/662005}
+                \li  \l{https://bugs.launchpad.net/ubuntu/+source/kdeutils/+bug/662005}
                     {Ubuntu bug 662005}
 
-                \o  \l{https://bugreports.qt-project.org/browse/QTBUG-12025}
+                \li  \l{https://bugreports.qt-project.org/browse/QTBUG-12025}
                     {QTBUG-12025}
 
            \endlist
@@ -86,7 +86,7 @@
 
     \list
 
-        \o Code completion does not support typedefs for nested classes.
+        \li Code completion does not support typedefs for nested classes.
 
     \endlist
 
@@ -94,7 +94,7 @@
 
     \list
 
-        \o  Paths or file names containing spaces or special characters
+        \li  Paths or file names containing spaces or special characters
             (such as colons, dollar signs, and hash marks) may cause problems.
             This is because some of the tools \QC uses in the background have
             restrictions on the characters allowed in file and directory names.
@@ -102,15 +102,15 @@
             items with names consisting of plain characters, numbers,
             underscores, and hyphens.
 
-        \o  Creating new CMake projects with \QC is not supported.
+        \li  Creating new CMake projects with \QC is not supported.
 
         \if defined(qcmanual)
-        \o  On Windows, you must create projects for Maemo 5 and Harmattan
+        \li  On Windows, you must create projects for Maemo 5 and Harmattan
             device types on the same partition where you installed Qt 4 SDK, \QC, and
             MADDE.
         \endif
 
-        \o  If error messages displayed in the \gui {Compile Output} pane contain
+        \li  If error messages displayed in the \gui {Compile Output} pane contain
             paths where slashes are missing (for example, C:QtSDK),
             check your PATH variable. For more information, see
             \l{Troubleshooting MinGW Compilation Errors}.
@@ -121,29 +121,29 @@
 
     \list
 
-        \o  When debugging executables created by the GNU Compiler version 4.5.0
+        \li  When debugging executables created by the GNU Compiler version 4.5.0
             (all platforms), some data types will not be displayed in the
             \gui{Locals and Expressions} view due to missing debug information.
 
-        \o  GDB on Windows may not work if the 'Embassy \reg Security Center'
+        \li  GDB on Windows may not work if the 'Embassy \reg Security Center'
             software by 'Wave \reg Systems' is installed and active (causing
             crashes in \c{vxvault.dll)}).
 
-        \o  GDB may take long to load debugging symbols, especially from large
+        \li  GDB may take long to load debugging symbols, especially from large
             libraries.
 
-        \o  Setting breakpoints in code that is compiled into the binary more
+        \li  Setting breakpoints in code that is compiled into the binary more
             than once does not work.
 
-        \o  Setting breakpoints in files that do not have unique absolute
+        \li  Setting breakpoints in files that do not have unique absolute
             paths may fail. For example, remounting parts of a file system
             using the --bind mount option.
 
-        \o  A regression in GCC 4.5.0 causes return value optimization to
+        \li  A regression in GCC 4.5.0 causes return value optimization to
             produce inaccurate debug info that GCC applies also to
             non-optimized builds. For more information, see
             \l{http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44731}
-            {GCC Bugzilla – Bug 44731}.
+            {GCC Bugzilla � Bug 44731}.
 
     \endlist
 
@@ -151,7 +151,7 @@
 
     \list
 
-        \o  \QMLD uses external processes (QML Puppet) to render and preview
+        \li  \QMLD uses external processes (QML Puppet) to render and preview
             images and to collect data. Executing C++ code might cause the QML
             Puppet to crash. If it crashes, an error message is displayed and
             you can continue editing the QML file in the code editor.
diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc
index f47898616efd6cf4e1692ee83845abcc417e8039..d7d92f785f7ab9caf66b85b038f4d2cbe36b589a 100644
--- a/doc/src/overview/creator-mobile-targets.qdoc
+++ b/doc/src/overview/creator-mobile-targets.qdoc
@@ -42,7 +42,7 @@
 
     \list
 
-        \o  \l{Connecting Android Devices}
+        \li \l{Connecting Android Devices}
 
             Qt applications for Android are compiled as \c {shared objects} that
             are loaded by a Java launcher generated by the Qt for Android SDK.
@@ -51,20 +51,20 @@
             Android version 1.6, or later. You must install the Qt for Android
             SDK to develop for Android devices.
 
-        \o  \l{Connecting Embedded Linux Devices}
+        \li \l{Connecting Embedded Linux Devices}
 
             If you have a tool chain for building applications for embedded
             Linux devices (with no MADDE support) installed on the development
             PC, you can add it and the device to \QC.
 
-        \o  \l{Connecting Maemo Devices}
+        \li \l{Connecting Maemo Devices}
 
             Maemo 5 (Fremantle) is a Linux-based software platform developed by
             Nokia and delivered on the Nokia N900. Use a connectivity tool (Mad
             Developer) to create the device-side end point for USB and WLAN
             connections.
 
-       \o  \l{Connecting MeeGo Harmattan Devices}
+       \li \l{Connecting MeeGo Harmattan Devices}
 
             MeeGo Harmattan is a Linux-based software platform developed by
             Nokia and preinstalled on Nokia N950 and Nokia N9. It enables
@@ -72,7 +72,7 @@
             Use the SDK Connectivity tool that is preinstalled on the device to
             create the device-side end point for USB and WLAN connections.
 
-        \o  \l{Connecting QNX Devices}
+        \li \l{Connecting QNX Devices}
 
             You can connect QNX devices to the development PC to deploy, run and
             debug applications on them from within \QC. This is currently only
diff --git a/doc/src/overview/creator-overview.qdoc b/doc/src/overview/creator-overview.qdoc
index 2df0b13be58e630df62b97a1fcfa952269e84458..891f0c0cf5d88fb9464c7c2fe5cdafa86c42dc16 100644
--- a/doc/src/overview/creator-overview.qdoc
+++ b/doc/src/overview/creator-overview.qdoc
@@ -40,11 +40,11 @@
 
     \table
         \row
-            \o  \inlineimage creator_managingprojects.png
-            \o  \inlineimage creator_designinguserinterface.png
-            \o  \inlineimage creator_coding.png
+            \li \inlineimage creator_managingprojects.png
+            \li \inlineimage creator_designinguserinterface.png
+            \li \inlineimage creator_coding.png
         \row
-            \o  \bold {\l{Managing Projects}}
+            \li \b {\l{Managing Projects}}
 
                 To be able to build and run applications, \QC needs the same
                 information as a compiler would need. This information is
@@ -55,7 +55,7 @@
                 the necessary files, and specifies settings depending on the
                 choices you make. For more information, see
                 \l{Managing Projects}.
-            \o  \bold {\l{Designing User Interfaces}}
+            \li \b {\l{Designing User Interfaces}}
 
                 \QC provides two integrated visual editors, \QMLD and \QD.
                 To create intuitive, modern-looking, fluid user interfaces, you
@@ -65,7 +65,7 @@
                 structured and enforces a platform look and feel, you can use
                 the integrated \QD. For more information, see
                 \l{Designing User Interfaces}.
-            \o  \bold {\l{Coding}}
+            \li \b {\l{Coding}}
 
                 As an IDE, \QC differs from a text editor in that it knows how
                 to build and run applications. It understands the C++ and QML
@@ -74,11 +74,11 @@
                 checking code syntax, code completion, and refactoring actions.
                 For more information, see \l{Coding}.
         \row
-            \o  \inlineimage creator_buildingrunning.png
-            \o  \inlineimage creator_testing.png
-            \o  \inlineimage creator_publishing.png
+            \li \inlineimage creator_buildingrunning.png
+            \li \inlineimage creator_testing.png
+            \li \inlineimage creator_publishing.png
         \row
-            \o  \bold {\l{Building and Running}}
+            \li \b {\l{Building and Running}}
 
                 \QC is integrated with cross-platform systems for build
                 automation: qmake and CMake. In addition, you can import
@@ -92,7 +92,7 @@
                 different setups and target platforms.
 
                 For more information, see \l{Building and Running}.
-            \o  \bold {\l{Debugging and Analyzing}}
+            \li \b {\l{Debugging and Analyzing}}
 
                 \QC is integrated to several external native debuggers: GNU
                 Symbolic Debugger (GDB), Microsoft Console Debugger (CDB), and
@@ -106,7 +106,7 @@
                 Qt Quick applications.
 
                 For more information, see \l{Debugging and Analyzing}.
-            \o  \bold {\l{Publishing}}
+            \li \b {\l{Publishing}}
 
                 \QC allows you to create installation packages for mobile
                 devices that are suitable for publishing to application stores
diff --git a/doc/src/overview/creator-supported-platforms.qdoc b/doc/src/overview/creator-supported-platforms.qdoc
index f4ffeae53f987a96239e0bd29d97f79503ca846b..45a438fc790815512e5ea477ebeaa5e791c6459e 100644
--- a/doc/src/overview/creator-supported-platforms.qdoc
+++ b/doc/src/overview/creator-supported-platforms.qdoc
@@ -40,54 +40,54 @@
 
     \list
 
-        \o  Windows 7
+        \li Windows 7
 
-        \o  Windows XP Service Pack 2
+        \li Windows XP Service Pack 2
 
-        \o  Windows Vista
+        \li Windows Vista
 
-        \o  (K)Ubuntu Linux 10.04 (32-bit and 64-bit) or later, with the
+        \li (K)Ubuntu Linux 10.04 (32-bit and 64-bit) or later, with the
             following:
 
             \list
 
-                \o  g++
+                \li g++
 
-                \o  make
+                \li make
 
-                \o  libglib2.0-dev
+                \li libglib2.0-dev
 
-                \o  libSM-dev
+                \li libSM-dev
 
-                \o  libxrender-dev
+                \li libxrender-dev
 
-                \o  libfontconfig1-dev
+                \li libfontconfig1-dev
 
-                \o  libxext-dev
+                \li libxext-dev
 
-                \o  libfreetype6-dev
+                \li libfreetype6-dev
 
-                \o  libx11-dev
+                \li libx11-dev
 
-                \o  libxcursor-dev
+                \li libxcursor-dev
 
-                \o  libxfixes-dev
+                \li libxfixes-dev
 
-                \o  libxft-dev
+                \li libxft-dev
 
-                \o  libxi-dev
+                \li libxi-dev
 
-                \o  libxrandr-dev
+                \li libxrandr-dev
 
-                \o  If you are using QtOpenGL, libgl-dev and libglu-dev
+                \li If you are using QtOpenGL, libgl-dev and libglu-dev
 
             \endlist
 
-        \o  Mac OS 10.5 or later with the following:
+        \li Mac OS 10.5 or later with the following:
 
             \list
 
-                \o  Xcode tools for your Mac OS X version available from your
+                \li Xcode tools for your Mac OS X version available from your
                     Mac OS X installation DVDs or at
                     \l http://developer.apple.com.
 
@@ -100,5 +100,5 @@
     To build \QC from the source, see the requirements and instructions in the
     readme file that is located in the source repository.
 
-    \input overview/creator-target-platforms.qdocinc
+    \include overview/creator-target-platforms.qdocinc
 */
diff --git a/doc/src/overview/creator-target-platforms.qdocinc b/doc/src/overview/creator-target-platforms.qdocinc
index c977d45278db09196669f172968df8aa58d09af5..e991116f6fe741069ff532aa3c0f00b54f0ceab3 100644
--- a/doc/src/overview/creator-target-platforms.qdocinc
+++ b/doc/src/overview/creator-target-platforms.qdocinc
@@ -4,19 +4,19 @@
 
     \list
 
-        \o  Desktop
+        \li Desktop
 
-        \o  \QS
+        \li \QS
 
-        \o  Maemo 5
+        \li Maemo 5
 
-        \o  MeeGo Harmattan
+        \li MeeGo Harmattan
 
-        \o  Generic remote Linux
+        \li Generic remote Linux
 
-        \o  QNX
+        \li QNX
 
-        \o  Android
+        \li Android
 
     \endlist
 
@@ -25,45 +25,45 @@
 
     \table
         \header
-            \o  {1,8} Operating system
-            \o  {8,1} Platform
+            \li {1,8} Operating system
+            \li {8,1} Platform
         \header
-            \o  Desktop
-            \o  \QS
-            \o  Maemo 5
-            \o  MeeGo Harmattan
-            \o  Generic Remote Linux
-            \o  QNX
-            \o  Android
+            \li Desktop
+            \li \QS
+            \li Maemo 5
+            \li MeeGo Harmattan
+            \li Generic Remote Linux
+            \li QNX
+            \li Android
 
         \row
-            \o  Windows
-            \o  Yes
-            \o  Yes
-            \o  Yes
-            \o  Yes
-            \o  Yes
-            \o  Yes (see \l{Running on QNX Devices} for limitations)
-            \o  Yes
+            \li Windows
+            \li Yes
+            \li Yes
+            \li Yes
+            \li Yes
+            \li Yes
+            \li Yes (see \l{Running on QNX Devices} for limitations)
+            \li Yes
 
         \row
-            \o  Linux
-            \o  Yes
-            \o  Yes
-            \o  Yes
-            \o  Yes
-            \o  Yes
-            \o  Yes
-            \o  Yes
+            \li Linux
+            \li Yes
+            \li Yes
+            \li Yes
+            \li Yes
+            \li Yes
+            \li Yes
+            \li Yes
         \row
-            \o  Mac OS X
-            \o  Yes
-            \o  Yes
-            \o  Yes
-            \o  Yes
-            \o  Yes
-            \o  Yes
-            \o  Yes
+            \li Mac OS X
+            \li Yes
+            \li Yes
+            \li Yes
+            \li Yes
+            \li Yes
+            \li Yes
+            \li Yes
     \endtable
 
     \note Symbian support has been removed from \QC 2.6. To develop for Symbian,
diff --git a/doc/src/overview/creator-tech-support.qdoc b/doc/src/overview/creator-tech-support.qdoc
index c297db1f4edfecf37db5400f3447ed2eca217d90..e62cfb29d8f9cd3779fcb2f9bb9e615d769c339a 100644
--- a/doc/src/overview/creator-tech-support.qdoc
+++ b/doc/src/overview/creator-tech-support.qdoc
@@ -36,37 +36,37 @@
 
     \table
         \header
-            \o  What Do You Want to Do
-            \o  Where to Go
+            \li What Do You Want to Do
+            \li Where to Go
 
         \row
-            \o  Learn more about Qt
-            \o  \l{http://qt.digia.com/product/learning/}{Learning}
+            \li Learn more about Qt
+            \li \l{http://qt.digia.com/product/learning/}{Learning}
                 from Digia
 
                 \l{http://qt-project.org/wiki/developer-guides}
                 {Qt Developer Guides} from Qt Project
 
         \row
-            \o  Develop Qt applications for desktop and mobile devices
-            \o  \l{http://qt-project.org}{Qt Developer Network}
+            \li Develop Qt applications for desktop and mobile devices
+            \li \l{http://qt-project.org}{Qt Developer Network}
 
         \row
-            \o  Develop Qt applications for Nokia mobile devices
-            \o  \l{http://www.developer.nokia.com/Develop/Qt/}
+            \li Develop Qt applications for Nokia mobile devices
+            \li \l{http://www.developer.nokia.com/Develop/Qt/}
                 {Nokia Developer - Qt}
 
         \row
-            \o  Participate in Qt development
-            \o  \l{http://qt-project.org/contribute}{Contribute to Qt}
+            \li Participate in Qt development
+            \li \l{http://qt-project.org/contribute}{Contribute to Qt}
 
         \row
-            \o  Find free Qt-based applications
-            \o  \l{http://qt-apps.org/}{Qt Apps}
+            \li Find free Qt-based applications
+            \li \l{http://qt-apps.org/}{Qt Apps}
 
         \row
-            \o  Develop with a commercial Qt license and support - Qt by Digia
-            \o  \l{http://qt.digia.com/Product/Licensing/}{Qt Licensing}
+            \li Develop with a commercial Qt license and support - Qt by Digia
+            \li \l{http://qt.digia.com/Product/Licensing/}{Qt Licensing}
     \endtable
 
 */
diff --git a/doc/src/overview/creator-testing.qdoc b/doc/src/overview/creator-testing.qdoc
index 628b881dfdb42ed4f887ab06938e47a3d6a07dc7..f79b460c6f0657e2a823a3dd9f2d9336e9177b25 100644
--- a/doc/src/overview/creator-testing.qdoc
+++ b/doc/src/overview/creator-testing.qdoc
@@ -34,7 +34,7 @@
 
     \list
 
-        \o  \l{Debugging}
+        \li \l{Debugging}
 
             If you install \QC as part of \QSDK, the GNU Symbolic Debugger
             is installed automatically and you should be ready to start
@@ -43,7 +43,7 @@
             example. You can connect mobile devices to your development PC
             and debug processes running on the devices.
 
-        \o  \l{Analyzing Code}
+        \li \l{Analyzing Code}
 
             \QC integrates Valgrind code analysis tools for detecting memory
             leaks and profiling function execution. You must download and
diff --git a/doc/src/overview/creator-tutorials.qdoc b/doc/src/overview/creator-tutorials.qdoc
index 85ee7c4035740c6bbf893ea61cced798cf28d6c4..6749c62f19452273b6e17f21c59e425200cdc2e6 100644
--- a/doc/src/overview/creator-tutorials.qdoc
+++ b/doc/src/overview/creator-tutorials.qdoc
@@ -38,11 +38,11 @@
 
     \list
 
-        \o  \l{Creating a Qt Quick 1 Application}
+        \li \l{Creating a Qt Quick 1 Application}
 
             Learn how to use \QMLD to create a Qt Quick 1 application.
 
-        \o  \l{Creating a Qt Widget Based Application}
+        \li \l{Creating a Qt Widget Based Application}
 
             Learn how to create a Qt widget based application for the desktop.
 
diff --git a/doc/src/overview/mobile-app-design.qdoc b/doc/src/overview/mobile-app-design.qdoc
index 10f154b0a8117f352043d3337ad47fb85207a30c..11790c833c5f71cb86400216c93453b242b8e30d 100644
--- a/doc/src/overview/mobile-app-design.qdoc
+++ b/doc/src/overview/mobile-app-design.qdoc
@@ -41,13 +41,13 @@
 
     \list
 
-        \o  Know your users
+        \li Know your users
 
             Find out who will use the application, what they will use it for,
             and which mobile devices they have. Then design the application to
             fit a specific context of use.
 
-        \o  Design for small screens
+        \li Design for small screens
 
             The screen size of mobile devices is significantly smaller than that
             available on desktop devices. Carefully consider what is the most
@@ -55,21 +55,21 @@
             be reasonable to try and fit as much content into the screen as you
             might have in a desktop application.
 
-        \o  Design for multiple screen sizes
+        \li Design for multiple screen sizes
 
             Relate the position and size of each control to the dimensions of
             the display. This enables the same set of information to be
             presented on the screen in all resolutions; higher resolution
             devices just display finer graphics.
 
-        \o  Design for changing screen orientation
+        \li Design for changing screen orientation
 
             Some devices support screen rotation. On these devices, applications
             can be displayed in portrait or landscape orientation. Account for
             orientation and dynamically adjust the display when the screen is
             rotated.
 
-        \o  Design intuitive ways of moving within applications
+        \li Design intuitive ways of moving within applications
 
             Mobile devices lack a mouse and full-size keyboard, so users must
             use the touch screen or five way navigation pad to move within
@@ -77,7 +77,7 @@
             hand. To create an optimized user experience, allow users to access
             information with one click; do not make them scroll and type.
 
-        \o  Design for limited input methods
+        \li Design for limited input methods
 
             Applications collect information from users on the task at hand. In
             addition to touch screen input, some devices contain physical keys
@@ -85,27 +85,27 @@
             enter information by using screen controls, such as lists, check
             boxes, radio buttons, and text fields.
 
-        \o  Keep response times short
+        \li Keep response times short
 
             Latency can cause delays in user interaction. If users perceive
             an application as being slow, they are likely to get frustrated and
             stop using it.
 
-        \o  Save battery time
+        \li Save battery time
 
             Mobile devices are not constantly connected to a power source but
             run on battery power. Optimize power consumption to keep the total
             consumption at an acceptable level and to prevent users from running
             out of battery time.
 
-        \o  Consider network issues
+        \li Consider network issues
 
             If users do not have a flat-rate data plan or WLAN support, mobile
             network connections cost them money. Also, when users move around
             with the devices, the networks available for connections constantly
             change.
 
-        \o  Remember the processing limits of the device
+        \li Remember the processing limits of the device
 
             The memory available on devices is limited and you should use it
             carefully. Although all mobile devices have common functionality,
diff --git a/doc/src/projects/creator-projects-autotools.qdoc b/doc/src/projects/creator-projects-autotools.qdoc
index dc80ffd9b776fd84d5ad736b6f701aeeb4044bd4..9f6e165b2d120eaac7a7069598b51f6b744b6d63 100644
--- a/doc/src/projects/creator-projects-autotools.qdoc
+++ b/doc/src/projects/creator-projects-autotools.qdoc
@@ -45,26 +45,26 @@
 
         \list 1
 
-            \o Select \gui{File > Open File or Project}.
-            \o Select the Makefile.am file from your project. This is the only
+            \li  Select \gui{File > Open File or Project}.
+            \li  Select the Makefile.am file from your project. This is the only
                way you can use the autotools plugin.
-            \o Select the build directory. Only in-source building is currently
+            \li  Select the build directory. Only in-source building is currently
                supported.
-            \o Select \gui Finish.
+            \li  Select \gui Finish.
                \QC displays the project tree structure. The root node displays
                the project name. All project files are listed below it and you
                can open them from the list.
 
                \image qtcreator-autotools-buildrun.png
 
-            \o Select \gui Run to build and run the application. The predefined
+            \li  Select \gui Run to build and run the application. The predefined
                build steps (autogen.sh or autoreconf, configure, and make) are
                executed.
 
                The first time you run the application you must choose the
                executable.
 
-            \o To check and edit autotools build steps, select
+            \li  To check and edit autotools build steps, select
                \gui{Projects > Build Settings}.
 
                You can add parameters to the predefined autotools build steps.
diff --git a/doc/src/projects/creator-projects-build-run-tutorial.qdoc b/doc/src/projects/creator-projects-build-run-tutorial.qdoc
index 0595012c81e6a801ae3f0b2e03e965c5da5fb9db..a4de638789fd5a9a7e1ad7fb3d593e07a0b678ac 100644
--- a/doc/src/projects/creator-projects-build-run-tutorial.qdoc
+++ b/doc/src/projects/creator-projects-build-run-tutorial.qdoc
@@ -35,11 +35,11 @@
 
     \list 1
 
-        \o  On the \gui Welcome page, select \gui Examples (1).
+        \li On the \gui Welcome page, select \gui Examples (1).
 
             \image qtcreator-gs-build-example-open.png "Selecting an example"
 
-        \o  Select an example in the list of examples. You can also search for
+        \li Select an example in the list of examples. You can also search for
             examples (2).
 
             \note The project opens in the \gui Edit mode, and the documentation
@@ -47,17 +47,17 @@
             instructions, select \gui {Previous Page} on the toolbar or
             press \key {Alt+Left}.
 
-        \o  To check that the application code can be compiled and linked for a
+        \li To check that the application code can be compiled and linked for a
             device, click the \gui {Kit Selector} and select a kit for the
             device.
 
             \image qtcreator-gs-build-example-kit-selector.png "Selecting a kit to build with"
 
-        \o  Click
+        \li Click
             \inlineimage qtcreator-run.png
             (\gui Run) to build and run the application.
 
-        \o  To see the compilation progress, press \key{Alt+4} to open the
+        \li To see the compilation progress, press \key{Alt+4} to open the
             \gui {Compile Output} pane.
 
             The \gui Build progress bar on the toolbar turns green when the
diff --git a/doc/src/projects/creator-projects-building-running.qdoc b/doc/src/projects/creator-projects-building-running.qdoc
index 114110711467b7d0f274f67f6bedbb614fcbad13..05abf5c86df6bad953176e1e44774487faca609b 100644
--- a/doc/src/projects/creator-projects-building-running.qdoc
+++ b/doc/src/projects/creator-projects-building-running.qdoc
@@ -39,13 +39,13 @@
     device type and other settings to use when building and running your project.
 
     \list
-        \o  \l{Building for Multiple Platforms}
+        \li \l{Building for Multiple Platforms}
 
             \e {Build configurations} contain everything you need to compile
             the sources into binaries. Build configurations use the tools and settings
             defined in their corresponding \l{glossary-buildandrun-kit}{kit}.
 
-        \o  \l{Running on Multiple Platforms}
+        \li \l{Running on Multiple Platforms}
 
             \e {Run configurations} start the application in the location
             where it was copied by the \e{deploy configuration}. By default,
@@ -55,14 +55,14 @@
             if you have not made any changes to the project since you last
             built and deployed it, \QC simply runs it again.
 
-        \o  \l{Deploying to Mobile Devices}
+        \li \l{Deploying to Mobile Devices}
 
             \e {Deploy configurations} handle the packaging and copying of
             the necessary files to a location you want to run the executable
             at. The files can be copied to a location in the file system of
             the development PC or a mobile device.
 
-        \o  \l{Connecting Mobile Devices}
+        \li \l{Connecting Mobile Devices}
 
             When you install tool chains for device types as part of an SDK,
             the build and run settings for mobile device types might be set up
@@ -76,13 +76,13 @@
 
     \list
 
-        \o  \l{Customizing the Build Process}
+        \li \l{Customizing the Build Process}
 
             By default, running an application also builds it and deploys it to
             a location from where it can be run on the device. You can change
             the relationship between the build, run, and deploy configurations.
 
-        \o  \l{http://doc.qt.digia.com/qtsimulator/index.html}
+        \li \l{http://doc.qt.digia.com/qtsimulator/index.html}
             {Using Qt Simulator}
 
             You can use the \QS to test Qt applications that are
@@ -97,7 +97,7 @@
             with \gui Desktop device type and the Qt Simulator Qt version for
             building and running your projects.
 
-        \o  \l{Using Maemo or MeeGo Harmattan Emulator}
+        \li \l{Using Maemo or MeeGo Harmattan Emulator}
 
             You cannot use \QS to test applications that use device
             specific libraries, such as native device APIs. To test such
diff --git a/doc/src/projects/creator-projects-building.qdoc b/doc/src/projects/creator-projects-building.qdoc
index f7fe3dd1192cca1cb5836c864724b4d2c25715b3..f10deca3a693300ae1c35dcb5a060304da36cc86 100644
--- a/doc/src/projects/creator-projects-building.qdoc
+++ b/doc/src/projects/creator-projects-building.qdoc
@@ -48,11 +48,11 @@
 
     \list 1
 
-        \o Select a \l{glossary-buildandrun-kit}{kit} for the project.
+        \li  Select a \l{glossary-buildandrun-kit}{kit} for the project.
 
         \image qtcreator-kit-selector.png "Kit selector"
 
-        \o Choose \gui {Build > Build Project} or press \key {Ctrl+B}.
+        \li  Choose \gui {Build > Build Project} or press \key {Ctrl+B}.
 
     \endlist
 
diff --git a/doc/src/projects/creator-projects-cmake.qdoc b/doc/src/projects/creator-projects-cmake.qdoc
index 74dae5d51e6b3ad1b821e8b677932416eab51b6c..ab97d641734b05a6db45b80e205af55a5c64b4e9 100644
--- a/doc/src/projects/creator-projects-cmake.qdoc
+++ b/doc/src/projects/creator-projects-cmake.qdoc
@@ -66,9 +66,9 @@
 
     \list 1
 
-        \o  Select \gui{File} > \gui{Open File or Project}.
+        \li Select \gui{File} > \gui{Open File or Project}.
 
-        \o  Select the \c{CMakeLists.txt} file from your \c CMake project.
+        \li Select the \c{CMakeLists.txt} file from your \c CMake project.
 
     \endlist
 
@@ -94,7 +94,7 @@
     \c nmake depending on your platform. The build errors and warnings are
     parsed and displayed in the \gui{Issues} output pane.
 
-    By default, \QC builds the \bold{all} target. You can specify which
+    By default, \QC builds the \b{all} target. You can specify which
     targets to build in \gui{Project} mode, under \gui{Build Settings}.
 
     \image qtcreator-cmake-build-settings.png
diff --git a/doc/src/projects/creator-projects-compilers.qdoc b/doc/src/projects/creator-projects-compilers.qdoc
index 1bae99f03a45ef9a283f544641ff3cece347ab0c..03ecf4133e9da679242ae05d29128bf3f7b6c707 100644
--- a/doc/src/projects/creator-projects-compilers.qdoc
+++ b/doc/src/projects/creator-projects-compilers.qdoc
@@ -43,18 +43,18 @@
 
     \list
 
-        \o  GNU Compiler Collection (GCC) is a compiler for Linux and
+        \li GNU Compiler Collection (GCC) is a compiler for Linux and
             Mac OS X.
 
-        \o  MinGW (Minimalist GNU for Windows) is a native software port of GCC
+        \li MinGW (Minimalist GNU for Windows) is a native software port of GCC
             and GNU Binutils for use in the development of native Microsoft
             Windows applications on Windows. MinGW is
             distributed together with \QC and Qt SDK for Windows.
 
-        \o  Linux ICC (Intel C++ Compiler) is a group of C and C++ compilers
+        \li Linux ICC (Intel C++ Compiler) is a group of C and C++ compilers
             for Linux.
 
-        \o  Clang is a C, C++, Objective C, and Objective C++ front-end for the
+        \li Clang is a C, C++, Objective C, and Objective C++ front-end for the
             LLVM compiler for Windows, Linux, and Mac OS X.
     \endlist
 
@@ -70,16 +70,16 @@
 
     \list 1
 
-        \o  Select \gui {Tools > Options > Build & Run > Compilers > Add} and
+        \li Select \gui {Tools > Options > Build & Run > Compilers > Add} and
             select a compiler in the list.
 
             \image qtcreator-toolchains.png
 
             To clone the selected compiler, select \gui {Clone}.
 
-        \o  In the \gui Name column, double-click the name to change it.
+        \li In the \gui Name column, double-click the name to change it.
 
-        \o  In the \gui{Compiler path} field, enter the path to the directory
+        \li In the \gui{Compiler path} field, enter the path to the directory
             where the compiler is located.
 
             The other settings to specify depend on the compiler.
diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc
index 18348e6e2f626db7b333769a4dc637668bde6925..a91942fddbfc9990e5e4da2911c44692d2868ce6 100644
--- a/doc/src/projects/creator-projects-creating.qdoc
+++ b/doc/src/projects/creator-projects-creating.qdoc
@@ -34,13 +34,13 @@
 
     \list
 
-        \o  Group files together
+        \li Group files together
 
-        \o  Add custom build steps
+        \li Add custom build steps
 
-        \o  Include forms and resource files
+        \li Include forms and resource files
 
-        \o  Specify settings for running applications
+        \li Specify settings for running applications
 
     \endlist
 
@@ -95,17 +95,17 @@
 
     \list
 
-        \o  Applications
+        \li Applications
 
         \list
 
             \if defined(qcmanual)
-            \o  Qt GUI Application
+            \li Qt GUI Application
 
                 Use \QD forms to design a Qt widget based user interface for the
                 desktop and C++ to implement the application logic
 
-            \o  Mobile Qt Application
+            \li Mobile Qt Application
 
                 Use \QD forms to design a Qt widget based user interface for
                 mobile devices and C++ to implement the application logic.
@@ -113,33 +113,33 @@
                 Qt 4.6.x
             \endif
 
-            \o  Qt Quick Application (Built-in Elements)
+            \li Qt Quick Application (Built-in Elements)
 
                 Use built-in QML elements to design user interfaces based on
                 Qt Quick 1 (Qt 4.7.1, or later) or Qt Quick 2 (Qt 5) with a
                 custom look and feel and QML and C++ code to implement the
                 application logic
 
-            \o  Qt Quick 1 Application for MeeGo Harmattan
+            \li Qt Quick 1 Application for MeeGo Harmattan
 
                 Use Qt Quick Components for MeeGo Harmattan to design a user
                 interface with the platform look and feel
 
-            \o  Qt Quick 1 Application (from Existing QML File)
+            \li Qt Quick 1 Application (from Existing QML File)
 
                 Convert existing Qt Quick 1 applications to projects that you
                 can run in \QC or deploy to mobile devices
 
-            \o  Qt Console Application
+            \li Qt Console Application
 
                 Use a single main.cpp file
 
-            \o  HTML5 Application
+            \li HTML5 Application
 
                 Use a QtWebKit view to design the user interface and HTML5 and
                 C++ code to implement the application logic
 
-            \o  Qt Quick UI
+            \li Qt Quick UI
 
                 Use a single QML file that contains the main view. You can
                 review Qt Quick UI projects in a \l{Previewing QML Files}
@@ -150,82 +150,82 @@
 
         \endlist
 
-        \o  Libraries
+        \li Libraries
 
         \list
 
-            \o  C++ Library
+            \li C++ Library
 
                 Shared or static C++ library based on qmake
 
-            \o  Qt Quick 1 Extension Plugin
+            \li Qt Quick 1 Extension Plugin
 
                 C++ plugin that makes it possible to offer extensions that can
                 be loaded dynamically into Qt Quick 1 applications by using the
                 QDeclarativeEngine class
 
-            \o  Qt Quick 2 Extension Plugin
+            \li Qt Quick 2 Extension Plugin
 
                 C++ plugin that makes it possible to offer extensions that can
                 be loaded dynamically into Qt Quick 2 applications by using the
                 QQmlEngine class
 
-            \o  \QC Plugin
+            \li \QC Plugin
 
 
         \endlist
 
-        \o  Other Projects
+        \li Other Projects
 
         \list
 
-            \o  Qt Unit Test
+            \li Qt Unit Test
 
                 Qt unit tests for features or classes
 
-            \o  Qt Custom Designer Widgets
+            \li Qt Custom Designer Widgets
 
                 Custom \QD widget or widget collection
 
-            \o  Empty Qt Project
+            \li Empty Qt Project
 
                 Empty Qt project that is based on qmake but does not use any
                 default classes
 
-            \o  Subdirs Project
+            \li Subdirs Project
 
                 Subprojects that enable you to structure your qmake projects as
                 a tree hierarchy
 
         \endlist
 
-        \o  Non-Qt Projects
+        \li Non-Qt Projects
 
         \list
 
-            \o  Plain C or C++ Project
+            \li Plain C or C++ Project
 
                 Plain C or C++ project that uses qmake but does not use the Qt
                 library
 
-            \o  Plain C or C++ Project (CMake Build)
+            \li Plain C or C++ Project (CMake Build)
 
                 Plain C or C++ project that uses CMake but does not use the Qt
                 library
 
         \endlist
 
-        \o  Import Project
+        \li Import Project
 
         \list
 
-        \o  Project from version control
+        \li Project from version control
 
             Import a project from a supported version control system. For more
             information on how version control systems are integrated in
             \QC, see \l{Using Version Control Systems}
 
-        \o  Import Existing Project
+        \li Import Existing Project
 
             Import an existing project that does not use any of the supported
             build systems: qmake, CMake, or Autotools. This enables you to use
@@ -260,7 +260,7 @@
 
     \list
 
-        \o  C++
+        \li C++
 
             C++ class, source, or header files that you can use to write the
             application logic in both Qt Quick projects and
@@ -268,41 +268,41 @@
             Qt widget based projects
             \endif
 
-        \o  Qt
+        \li Qt
 
         \list
 
             \if defined(qcmanual)
-            \o  \QD forms and \QD form classes, which specify parts of user
+            \li \QD forms and \QD form classes, which specify parts of user
                 interfaces in Qt widget based projects
             \endif
 
-        \o  Qt resource files, which allow you to store binary files in the
+        \li Qt resource files, which allow you to store binary files in the
             application executable
 
-        \o  QML files, which specify elements in Qt Quick projects.
+        \li QML files, which specify elements in Qt Quick projects.
             \gui {Qt Quick 1} creates a QML file that imports Qt Quick 1.1 and
             \gui {Qt Quick 2} creates a QML file that imports Qt Quick 2.0.
             Select \gui {Qt Quick 1} to add files to a Qt Quick 1 application
             and \gui {Qt Quick 2} to add files to a Qt Quick 2 application.
 
-        \o  JavaScript files that you can use to write the application logic in
+        \li JavaScript files that you can use to write the application logic in
             Qt Quick projects
 
         \endlist
 
-        \o  GLSL
+        \li GLSL
 
             GLSL files that define fragment and vertex shaders in both Qt Quick
             projects and Qt widget based projects
 
-        \o  General
+        \li General
 
         \list
 
-            \o  Text files
+            \li Text files
 
-            \o  Scratch buffers that use temporary files. You can create this
+            \li Scratch buffers that use temporary files. You can create this
                 type of files for temporarily storing information that you do
                 not intend to save
 
@@ -403,11 +403,11 @@
     \section1 Related Topics
 
     \list
-        \o \l{Opening Projects}
-        \o \l{Adding Libraries to Projects}
-        \o \l{Adding New Custom Wizards}
-        \o \l{Setting Up a CMake Project}
-        \o \l{Setting Up a Generic Project}
+        \li  \l{Opening Projects}
+        \li  \l{Adding Libraries to Projects}
+        \li  \l{Adding New Custom Wizards}
+        \li  \l{Setting Up a CMake Project}
+        \li  \l{Setting Up a Generic Project}
     \endlist
 
 */
diff --git a/doc/src/projects/creator-projects-custom-wizards.qdoc b/doc/src/projects/creator-projects-custom-wizards.qdoc
index c4f5c2bad0d8e7551175b727ff588dea6ea9d158..b3e27cc8d46605ef6fa462ca8157d432d30bef34 100644
--- a/doc/src/projects/creator-projects-custom-wizards.qdoc
+++ b/doc/src/projects/creator-projects-custom-wizards.qdoc
@@ -64,13 +64,13 @@
 
     \list 1
 
-        \o  Template-based, where source files that contain placeholders for
+        \li Template-based, where source files that contain placeholders for
             the field names are provided. During processing, the placeholders
             are replaced by the values from the wizard page. Optionally,
             modifier characters are applied. For more information, see
             \l{Processing Template Files}.
 
-        \o  Generator script, where a script is called to create the files.
+        \li Generator script, where a script is called to create the files.
 
             \note This option mainly exists to accommodate existing generator
             scripts or cases where complicated algorithmic logic is required
@@ -84,12 +84,12 @@
 
     \list
 
-        \o  \c{share/qtcreator/templates/wizards}
+        \li \c{share/qtcreator/templates/wizards}
 
-        \o  the local user's configuration folder,
+        \li the local user's configuration folder,
             \c{$HOME/.config/QtProject/qtcreator/templates/wizards}
 
-        \o  \c{%APPDATA%\QtProject\qtcreator\templates\wizards}
+        \li \c{%APPDATA%\QtProject\qtcreator\templates\wizards}
 
     \endlist
 
@@ -102,12 +102,12 @@
 
     \list 1
 
-        \o  Make a copy of the \c {share/qtcreator/templates/wizards/helloworld}
+        \li Make a copy of the \c {share/qtcreator/templates/wizards/helloworld}
             or \c {share/qtcreator/templates/wizards/listmodel} folder.
 
-        \o  Modify the wizard_example.xml file.
+        \li Modify the wizard_example.xml file.
 
-        \o  The following code determines the type of the wizard and its place
+        \li The following code determines the type of the wizard and its place
             in the \gui New dialog:
 
             \code
@@ -120,32 +120,32 @@
 
         \list
 
-            \o  \c version is the version of the file contents. Do not modify
+            \li \c version is the version of the file contents. Do not modify
                 this value.
 
-            \o  \c kind specifies the type of the wizard: \c project or
+            \li \c kind specifies the type of the wizard: \c project or
                 \c class.
 
-            \o  \c class specifies the type of the project. This attribute is
+            \li \c class specifies the type of the project. This attribute is
                 optional. Use the value \c qt4project to add Qt 4 specific pages.
 
-            \o  \c firstpage specifies the place of the new page in the standard
+            \li \c firstpage specifies the place of the new page in the standard
                 project wizard. The value 10 ensures that the custom page
                 appears after the standard pages, as the last page of the
                 wizard.
 
-            \o  \c id is the unique identifier for your wizard. The letter
+            \li \c id is the unique identifier for your wizard. The letter
                 specifies the position of the wizard within the \c category. The
                 HelloWorld wizard appears as the first wizard in the second
                 category in the \gui New dialog.
 
-            \o  \c category is the category in which to place the wizard in the
+            \li \c category is the category in which to place the wizard in the
                 list. The letter specifies the position of the category in the
                 list in the \gui New dialog.
 
         \endlist
 
-        \o  The following code specifies the icon and text that appear in the
+        \li The following code specifies the icon and text that appear in the
             \gui New dialog:
 
             \code
@@ -162,13 +162,13 @@
 
         \list
 
-            \o  \c displayCategory appears in the \gui New dialog, under
+            \li \c displayCategory appears in the \gui New dialog, under
                 \gui Projects.
 
-            \o  \c icon appears next to the \c displayName in the middle panel
+            \li \c icon appears next to the \c displayName in the middle panel
                 when \c displayCategory is selected.
 
-            \o  \c description appears in the right-most panel when
+            \li \c description appears in the right-most panel when
                 \c displayCategory is selected.
 
                 You can add translations as values for the text elements. Specify the target
@@ -177,11 +177,11 @@
 
         \endlist
 
-        \o  Files to be added to the project:
+        \li Files to be added to the project:
 
         \list
 
-            \o  Template-based: The following code specifies the files to add to
+            \li Template-based: The following code specifies the files to add to
                 the project:
                 \code
                 <files>
@@ -192,29 +192,29 @@
 
             \list
 
-                \o  \c source specifies the file to copy to the project. The
+                \li \c source specifies the file to copy to the project. The
                     files must be located in the wizard folder.
 
-                \o  \c openeditor indicates that the file is to be opened in an
+                \li \c openeditor indicates that the file is to be opened in an
                     editor after the wizard has finished.
 
-                \o  \c binary indicates that the file is a binary file (for
+                \li \c binary indicates that the file is a binary file (for
                     example, an image file). It is to be copied to the target
                     folder as is. Placeholders are not replaced with values.
 
-                \o  \c target specifies the new filename for the file. The
+                \li \c target specifies the new filename for the file. The
                     \c {%ProjectName%} variable is replaced with the string that
                     users specify in the \gui Name field on the first page of
                     the wizard.
 
-                \o  \c openproject indicates that the file is a project file
+                \li \c openproject indicates that the file is a project file
                     which is to be opened after the wizard has finished.
 
             \endlist
 
             See also \l{Processing Template Files}.
 
-            \o  Generator-script: The following code specifies that the script
+            \li Generator-script: The following code specifies that the script
                 \c generate.pl is to be used to create the files:
 
                 \code
@@ -233,12 +233,12 @@
 
             \list
 
-                \o  \c omit-empty specifies that complete argument is to be
+                \li \c omit-empty specifies that complete argument is to be
                     omitted when all placeholders expand to empty values. In
                     the above example, the option \c --source-suffix will
                     not be passed to the script if the value is empty.
 
-                \o  \c write-file indicates that instead of the expanded
+                \li \c write-file indicates that instead of the expanded
                     value, the value will be written to a temporary file and
                     its file name will be passed to the script instead. This
                     is useful for multi-line text fields.
@@ -249,7 +249,7 @@
 
         \endlist
 
-        \o  The following code creates a page that specifies settings for the project:
+        \li The following code creates a page that specifies settings for the project:
 
             \code
             <!-- Create a 2nd wizard page with parameters -->
@@ -266,24 +266,24 @@
 
         \list
 
-            \o  \c fieldpagetitle specifies the title of the page.
+            \li \c fieldpagetitle specifies the title of the page.
 
-            \o  \c field specifies whether the field is mandatory (\c true or
+            \li \c field specifies whether the field is mandatory (\c true or
                 \c false). You can use the value of the \c name field as a
                 variable in other files (for example, \c {%MESSAGE%}.
 
-            \o  \c fieldcontrol specifies the field. \c class specifies the
+            \li \c fieldcontrol specifies the field. \c class specifies the
                 field type. You can use interface objects from the QWidget class
                 to create fields. This example uses QLineEdit to create an input
                 field.
 
-            \o  \c validator specifies a regular expression to check the
+            \li \c validator specifies a regular expression to check the
                 characters allowed in the field.
 
-            \o  \c defaulttext specifies text that appears in the field by
+            \li \c defaulttext specifies text that appears in the field by
                 default.
 
-            \o  \c fielddescription specifies the field name that appears on the
+            \li \c fielddescription specifies the field name that appears on the
                 wizard page.
 
          \endlist
@@ -299,7 +299,7 @@
 
     \list 1
 
-        \o  The following code specifies settings for the wizard:
+        \li The following code specifies settings for the wizard:
 
             \code
 
@@ -319,7 +319,7 @@
             For more information about the elements and their values, see
             \l {Creating Project Wizards}.
 
-        \o  The following code specifies the files to add to the project:
+        \li The following code specifies the files to add to the project:
 
             \code
 
@@ -335,11 +335,11 @@
 
             \list
 
-            \o  \c {%ClassName:l%} is replaced with the value of the
+            \li \c {%ClassName:l%} is replaced with the value of the
                 \c ClassName field. The modifier \c l converts the string to
                 lower case, to observe Qt conventions.
 
-            \o  \c {%CppSourceSuffix%} and \c {%CppHeaderSuffix%} are
+            \li \c {%CppSourceSuffix%} and \c {%CppHeaderSuffix%} are
                 pre-defined. For more information, see
                 \l{Pre-defined Standard Variables}.
 
@@ -388,11 +388,11 @@
 
     \list
 
-        \o  \c{l} for lower case.
+        \li \c{l} for lower case.
 
-        \o  \c{u} for upper case.
+        \li \c{u} for upper case.
 
-        \o  \c{c} for upper case initial letter ("project" > "Project").
+        \li \c{c} for upper case initial letter ("project" > "Project").
 
     \endlist
 
@@ -419,30 +419,30 @@
 
     \list
 
-        \o  \c {%ProjectName%} is replaced by the name of the project in the
+        \li \c {%ProjectName%} is replaced by the name of the project in the
             case of project wizards.
 
-        \o  \c {%Path%} is replaced by the path to the target directory. For
+        \li \c {%Path%} is replaced by the path to the target directory. For
             classes, this is the directory, where the files are created. For
             project wizards, an additional subdirectory named after the project
             is created.
 
-        \o  \c {%TargetPath%} is replaced by the path to the directory where the
+        \li \c {%TargetPath%} is replaced by the path to the directory where the
             actual files are created. For non-project wizards, it is identical
             to \c %Path%. For project wizards, it is \c %Path%/%ProjectName%.
 
-        \o  \c {%CppSourceSuffix%} is replaced by the default source suffix,
+        \li \c {%CppSourceSuffix%} is replaced by the default source suffix,
             which is defined in \QC in \gui {Tools > Options > C++ >
-            File Naming}. For example, if users enter \bold MyClass, the
+            File Naming}. For example, if users enter \b MyClass, the
             filename becomes myclass.cpp when the project is created.
 
-        \o  \c {%CppHeaderSuffix%} is replaced by the default header suffix,
+        \li \c {%CppHeaderSuffix%} is replaced by the default header suffix,
             which is also defined in \gui {File Naming}.
 
-        \o  \c {%CurrentDate%} is replaced by the current date in the format
+        \li \c {%CurrentDate%} is replaced by the current date in the format
             \c {yyyy-MM-dd}.
 
-        \o  \c {%CurrentTime%} is replaced by the current time in the short
+        \li \c {%CurrentTime%} is replaced by the current time in the short
             format of the locale.
 
     \endlist
@@ -481,7 +481,7 @@
 
     \list 1
 
-    \o  Determine file names and attributes: The script is called with the
+    \li Determine file names and attributes: The script is called with the
         command line \c{--dry-run} option and the field values. It then prints
         the relative path names of the files it intends to create, followed by
         comma-separated attributes matching those of the \c{<file>} element, for
@@ -493,7 +493,7 @@
         myproject.pro,openproject
         \endcode
 
-    \o  Create files: The script is called with the parameters only in the
+    \li Create files: The script is called with the parameters only in the
         working directory. It then actually creates the files. If directories
         are needed, the script should create them, too.
 
diff --git a/doc/src/projects/creator-projects-generic.qdoc b/doc/src/projects/creator-projects-generic.qdoc
index 59ba717fcfb28b195d954dfdc6ce4298c8487422..f7c6f67c5243e14d8b3377a453b547c1405bf6cb 100644
--- a/doc/src/projects/creator-projects-generic.qdoc
+++ b/doc/src/projects/creator-projects-generic.qdoc
@@ -45,10 +45,10 @@
 
     \list 1
 
-        \o  Select \gui File > \gui{New File or Project} > \gui{Other Project}
+        \li Select \gui File > \gui{New File or Project} > \gui{Other Project}
             > \gui{Import Existing Project}.
 
-        \o  In \gui{Import Existing Project}, enter the project name
+        \li In \gui{Import Existing Project}, enter the project name
             and select the location of the project file you want to import.
 
            \QC automatically generates the following files in the
@@ -56,13 +56,13 @@
 
            \list
 
-               \o   \l{Specifying Files}{.files}
+               \li  \l{Specifying Files}{.files}
 
-               \o   \l{Specifying Include Paths}{.includes}
+               \li  \l{Specifying Include Paths}{.includes}
 
-               \o   \l{Specifying Defines}{.config}
+               \li  \l{Specifying Defines}{.config}
 
-               \o   .creator
+               \li  .creator
 
            \endlist
 
@@ -128,9 +128,9 @@
 
     \list 1
 
-        \o  Click \gui Add and select \gui{Custom Executable}.
+        \li Click \gui Add and select \gui{Custom Executable}.
 
-        \o  Define the configuration name, the location of the executable, any
+        \li Define the configuration name, the location of the executable, any
             additional arguments and the working directory.
 
     \endlist
diff --git a/doc/src/projects/creator-projects-libraries.qdoc b/doc/src/projects/creator-projects-libraries.qdoc
index 9eb85c5eb46fd3eca990c2fd29721437c59ae613..313610191e6d10f2001470b142047163cfd35640 100644
--- a/doc/src/projects/creator-projects-libraries.qdoc
+++ b/doc/src/projects/creator-projects-libraries.qdoc
@@ -81,11 +81,11 @@
 
     \list 1
 
-        \o  In the \gui Projects pane, right-click the project name to open the
+        \li In the \gui Projects pane, right-click the project name to open the
             context menu and select
             \gui {Add Library}.
 
-        \o  Follow the instructions of the wizard.
+        \li Follow the instructions of the wizard.
 
     \endlist
 
@@ -100,29 +100,29 @@
 
     \list 1
 
-        \o  Choose \gui {File > New File or Project > Libraries >
+        \li Choose \gui {File > New File or Project > Libraries >
             C++ Library} to create the library.
 
             The \gui {Introduction and Product Location} dialog opens.
 
             \image qtcreator-add-library-wizard-ex-1.png "Introduction and Product Location dialog"
 
-        \o  In the \gui Type field, select \gui {Statically Linked Library}.
+        \li In the \gui Type field, select \gui {Statically Linked Library}.
 
-        \o  In the \gui Name field, give a name for the library. For example,
-            \bold mylib.
+        \li In the \gui Name field, give a name for the library. For example,
+            \b mylib.
 
-        \o  Follow the instructions of the wizard until you get to the
+        \li Follow the instructions of the wizard until you get to the
             \gui {Project Management} dialog. In the \gui {Add to project}
-            list, select a project. For example, \bold myapp.
+            list, select a project. For example, \b myapp.
 
-        \o  In the \gui Projects pane, right-click the project name to open the
+        \li In the \gui Projects pane, right-click the project name to open the
             context menu and select
             \gui {Add Library > Internal Library > Next}.
 
-        \o  In the \gui Library field, select \bold mylib and click \gui Next.
+        \li In the \gui Library field, select \b mylib and click \gui Next.
 
-        \o  Click \gui Finish to add the following library declaration to the
+        \li Click \gui Finish to add the following library declaration to the
             project file:
 
             \code
diff --git a/doc/src/projects/creator-projects-opening.qdoc b/doc/src/projects/creator-projects-opening.qdoc
index c32d352f7f0e92b6faf52fb665b8166a53863276..a9fa6cf2bb7c803d724d10b09ed0a076078f0f34 100644
--- a/doc/src/projects/creator-projects-opening.qdoc
+++ b/doc/src/projects/creator-projects-opening.qdoc
@@ -68,10 +68,10 @@
 
     \list 1
 
-        \o  Select \gui File > \gui{Open File or Project} and select the project
+        \li Select \gui File > \gui{Open File or Project} and select the project
             to open.
 
-        \o  In the \gui {Configure Project} tab, select kits for building and running your
+        \li In the \gui {Configure Project} tab, select kits for building and running your
             project, and click \gui {Configure Project}.
 
     \endlist
diff --git a/doc/src/projects/creator-projects-other.qdoc b/doc/src/projects/creator-projects-other.qdoc
index 83a34ab450c714cfa2b8b2dcf98e4df78c9ef65b..655504c20c67def7b6368cd12f71a76b450a5ff6 100644
--- a/doc/src/projects/creator-projects-other.qdoc
+++ b/doc/src/projects/creator-projects-other.qdoc
@@ -35,17 +35,17 @@
 
     \list
 
-        \o  \l{Setting Up a CMake Project}
+        \li \l{Setting Up a CMake Project}
 
             CMake is an alternative to qmake for automating the generation of
             build configurations.
 
-        \o  \l{Setting Up an Autotools Project}
+        \li \l{Setting Up an Autotools Project}
 
             \QC can open projects that use the Autotools build system. You can
             build and run the projects directly from \QC.
 
-        \o  \l{Setting Up a Generic Project}
+        \li \l{Setting Up a Generic Project}
 
             \QC supports generic projects, so you can import existing projects
             that do not use qmake or CMake. This enables you to use \QC as a
diff --git a/doc/src/projects/creator-projects-overview.qdoc b/doc/src/projects/creator-projects-overview.qdoc
index 589243cff52975823777ff3bbb3ddfcff49edfb5..f9f2bd5b83adcbae19cfc5880c6ea0e1289becbc 100644
--- a/doc/src/projects/creator-projects-overview.qdoc
+++ b/doc/src/projects/creator-projects-overview.qdoc
@@ -38,14 +38,14 @@
 
     \list
 
-        \o  \l{Creating Projects}
+        \li \l{Creating Projects}
 
             To set up a project, you first have to decide what kind of an
             application you want to develop: do you want a user interface based
             on Qt Quick or HTML5 or Qt widgets. Second, you have to choose the
             language to implement the application logic: C++ or JavaScript.
 
-        \o  \l{Using Version Control Systems}
+        \li \l{Using Version Control Systems}
 
             The recommended way to set up a project is to use a version control
             system. Store and edit only project source files and build system
@@ -53,7 +53,7 @@
             Do not store files generated by the build system or \QC, such as
             makefiles, .pro.user, and object files.
 
-        \o  \l{Configuring Projects}
+        \li \l{Configuring Projects}
 
             \QC allows you to specify separate build settings for each
             development platform. By default, \l{glossary-shadow-build}
@@ -64,7 +64,7 @@
             {scopes} to select the file to process depending on which platform
             qmake is run on.
 
-        \o  \l{Managing Sessions}
+        \li \l{Managing Sessions}
 
             Items such as open files, breakpoints, and evaluated expressions
             are stored in sessions. They are not considered to be part of
@@ -75,7 +75,7 @@
     \section1 Related Topics
 
     \list
-        \o  \l{Using Other Build Systems}
+        \li \l{Using Other Build Systems}
     \endlist
 
 */
diff --git a/doc/src/projects/creator-projects-qt-versions.qdoc b/doc/src/projects/creator-projects-qt-versions.qdoc
index b7ded12267a300e45f0c3af7b2eaf0f0cdff9c9e..23861f54e3fdffb44af23e1776516ae37f0e907f 100644
--- a/doc/src/projects/creator-projects-qt-versions.qdoc
+++ b/doc/src/projects/creator-projects-qt-versions.qdoc
@@ -51,20 +51,20 @@
 
         \list 1
 
-            \o  Select \gui {Tools > Options > Build & Run > Qt Versions > Add}.
+            \li Select \gui {Tools > Options > Build & Run > Qt Versions > Add}.
 
                 \image qtcreator-qt4-qtversions-add.png
 
-            \o  In the \gui{Version name} field, edit the name that \QC
+            \li In the \gui{Version name} field, edit the name that \QC
                 suggests for the Qt version.
 
-            \o  In the \gui{qmake location} field, enter the path to the
+            \li In the \gui{qmake location} field, enter the path to the
                 directory where the qmake executable is located.
 
                 \QC automatically determines the path to the binaries in
                 the Qt installation and displays it in the dialog.
 
-            \o  In the \gui Helpers section, you can build the debugging
+            \li In the \gui Helpers section, you can build the debugging
                 helpers that are available for the Qt version. This is
                 necessary, because the internal data structures of Qt can
                 change between versions. For more information, see
@@ -73,7 +73,7 @@
         \endlist
 
     \if defined(qcmanual)
-    \input qnx/creator-projects-qt-version-qnx.qdocinc
+    \include qnx/creator-projects-qt-version-qnx.qdocinc
     \endif
 
 */
diff --git a/doc/src/projects/creator-projects-running-desktop.qdocinc b/doc/src/projects/creator-projects-running-desktop.qdocinc
index 0a7b810b9b0b01d7ff990425780a279a99840d14..57826226584cce69a9937b8e657ada3d1457ad12 100644
--- a/doc/src/projects/creator-projects-running-desktop.qdocinc
+++ b/doc/src/projects/creator-projects-running-desktop.qdocinc
@@ -2,10 +2,10 @@
 
     \list 1
 
-        \o  Select \gui Desktop as the build and run \l{glossary-buildandrun-kit}{kit}.
+        \li Select \gui Desktop as the build and run \l{glossary-buildandrun-kit}{kit}.
 
             \image qtcreator-kit-selector.png "Kit selector"
 
-        \o  Click the \gui Run button.
+        \li Click the \gui Run button.
 
     \endlist
diff --git a/doc/src/projects/creator-projects-running-simulator.qdocinc b/doc/src/projects/creator-projects-running-simulator.qdocinc
index c778848b5171796c768efe8af90d258a4b6eeafa..f343b521b88f6b26922031e6e9e8d1dae6830639 100644
--- a/doc/src/projects/creator-projects-running-simulator.qdocinc
+++ b/doc/src/projects/creator-projects-running-simulator.qdocinc
@@ -7,9 +7,9 @@
 
     \list 1
 
-        \o  Select \gui {\QS} as the build and run \l{glossary-buildandrun-kit}{kit}.
+        \li Select \gui {\QS} as the build and run \l{glossary-buildandrun-kit}{kit}.
 
-        \o  Click the \gui Run button.
+        \li Click the \gui Run button.
 
     \endlist
 
diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/src/projects/creator-projects-running.qdoc
index 0d31515c3f36bf3788b6ca6c04e4e9f94db3f1d7..88efbc4bd284abe0f387ca9dc65570e2d06f0d59 100644
--- a/doc/src/projects/creator-projects-running.qdoc
+++ b/doc/src/projects/creator-projects-running.qdoc
@@ -42,15 +42,15 @@
     \l{Specifying Run Settings}.
 
     \if defined(qcmanual)
-    \input projects/creator-projects-running-desktop.qdocinc
+    \include projects/creator-projects-running-desktop.qdocinc
     \endif
 
-    \input projects/creator-projects-running-simulator.qdocinc
+    \include projects/creator-projects-running-simulator.qdocinc
 
     \if defined(qcmanual)
-    \input linux-mobile/creator-projects-running-generic-linux.qdocinc
-    \input linux-mobile/creator-projects-running-madde.qdocinc
-    \input qnx/creator-projects-running-qnx.qdocinc
+    \include linux-mobile/creator-projects-running-generic-linux.qdocinc
+    \include linux-mobile/creator-projects-running-madde.qdocinc
+    \include qnx/creator-projects-running-qnx.qdocinc
     \endif
 
 */
diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc
index ba6e17be4f9cc39d9841621381fd46c4a3c0d2ed..838ff5ded22b26c5c1eff14f7376458e52b3a92f 100644
--- a/doc/src/projects/creator-projects-settings-build.qdoc
+++ b/doc/src/projects/creator-projects-settings-build.qdoc
@@ -31,8 +31,8 @@
     \title Specifying Build Settings
 
     Different build configurations allow you to quickly switch between
-    different build settings. By default, \QC creates \bold debug
-    and \bold release build configurations. A debug build contains additional
+    different build settings. By default, \QC creates \b debug
+    and \b release build configurations. A debug build contains additional
     debug symbols that you need for debugging the application but that you
     can leave out from the release version. Generally, you use the debug
     configuration for testing and the release configuration for creating
@@ -64,9 +64,9 @@
 
     \list
 
-        \o  Maemo5
+        \li Maemo5
 
-        \o  MeeGo Harmattan
+        \li MeeGo Harmattan
 
     \endlist
 
@@ -109,9 +109,9 @@
 
     \list
 
-        \o %{buildDir}
+        \li  %{buildDir}
 
-        \o %{sourceDir}
+        \li  %{sourceDir}
 
     \endlist
 
@@ -150,15 +150,15 @@
 
     \list
 
-        \o  To add a clean step using make or a custom process, click
+        \li To add a clean step using make or a custom process, click
             \gui{Add Clean Step} and select the type of step you want to add.
 
             By default, custom steps are enabled. To disable a custom step,
             select the \gui Disable button.
 
-        \o  To remove a clean step, click \gui{Remove Item}.
+        \li To remove a clean step, click \gui{Remove Item}.
 
-        \o  To change the order of steps, click
+        \li To change the order of steps, click
             \inlineimage qtcreator-movestep.png
             (\gui {Move Up} and \gui {Move Down}).
     \endlist
@@ -166,7 +166,7 @@
     \section1 Build Environment
 
     You can specify the environment you want to use for building in the
-    \bold{Build Environment} section. By default, the environment in which \QC
+    \b{Build Environment} section. By default, the environment in which \QC
     was started is used and modified to include the Qt version.
     Depending on the selected Qt version, \QC automatically sets the
     necessary environment variables. You can edit existing environment
@@ -192,9 +192,9 @@
 
     \list
 
-        \o  \l{Adding Kits}
-        \o  \l{Adding Qt Versions}
-        \o  \l{Adding Compilers}
+        \li \l{Adding Kits}
+        \li \l{Adding Qt Versions}
+        \li \l{Adding Compilers}
 
     \endlist
 
diff --git a/doc/src/projects/creator-projects-settings-code-style.qdoc b/doc/src/projects/creator-projects-settings-code-style.qdoc
index 60cee3e1d0e1f632fa9ddee18ccf878b962e799d..8949691eaca57eb5f995c841ed51822163730d85 100644
--- a/doc/src/projects/creator-projects-settings-code-style.qdoc
+++ b/doc/src/projects/creator-projects-settings-code-style.qdoc
@@ -51,16 +51,16 @@
 
     \list 1
 
-        \o  Select \gui {Projects > Code Style Settings}.
+        \li Select \gui {Projects > Code Style Settings}.
 
-        \o  In the \gui Language field, select \gui C++ or \gui {Qt Quick}.
+        \li In the \gui Language field, select \gui C++ or \gui {Qt Quick}.
 
-        \o  In the \gui {Current settings} field, select the settings to modify
+        \li In the \gui {Current settings} field, select the settings to modify
             and click \gui Copy.
 
-        \o  Give a name to the settings and click \gui OK.
+        \li Give a name to the settings and click \gui OK.
 
-        \o  Click \gui Edit to specify code style settings for the project.
+        \li Click \gui Edit to specify code style settings for the project.
 
             \image qtcreator-code-style-settings-edit-cpp.png "Edit Code Style Settings dialog"
 
diff --git a/doc/src/projects/creator-projects-settings-dependencies.qdoc b/doc/src/projects/creator-projects-settings-dependencies.qdoc
index 7ff8535868bb88bbf1dde3ab79f1d97f20936e60..41cfe28a973e14daa29938948f372ed993b55dc4 100644
--- a/doc/src/projects/creator-projects-settings-dependencies.qdoc
+++ b/doc/src/projects/creator-projects-settings-dependencies.qdoc
@@ -44,11 +44,11 @@
 
     \list 1
 
-        \o  In \gui Projects, select a project.
+        \li In \gui Projects, select a project.
 
-        \o  Click \gui Dependencies.
+        \li Click \gui Dependencies.
 
-        \o  Select projects that must be built before the current project is
+        \li Select projects that must be built before the current project is
             built.
 
     \endlist
diff --git a/doc/src/projects/creator-projects-settings-editor.qdoc b/doc/src/projects/creator-projects-settings-editor.qdoc
index 4a3ac00de5d5b9db9e71c8c24409b1b1f248f4f9..40098f0abf1ffff9ae2938ffb6342a374554832b 100644
--- a/doc/src/projects/creator-projects-settings-editor.qdoc
+++ b/doc/src/projects/creator-projects-settings-editor.qdoc
@@ -43,11 +43,11 @@
 
     \list 1
 
-        \o  Select \gui {Projects > Editor Settings}.
+        \li Select \gui {Projects > Editor Settings}.
 
-        \o  In the \gui {Editor Settings} field, select \gui {Custom}.
+        \li In the \gui {Editor Settings} field, select \gui {Custom}.
 
-        \o  Specify text editor settings for the project.
+        \li Specify text editor settings for the project.
 
     \endlist
 
@@ -59,13 +59,13 @@
 
     \list
 
-        \o  \l{Indenting Code}
+        \li \l{Indenting Code}
 
-        \o  \l{File Encoding}
+        \li \l{File Encoding}
 
-        \o  \l{Moving to Symbol Definition or Declaration}
+        \li \l{Moving to Symbol Definition or Declaration}
 
-        \o  \l{Configuring Fonts}
+        \li \l{Configuring Fonts}
 
     \endlist
 
diff --git a/doc/src/projects/creator-projects-settings-overview.qdoc b/doc/src/projects/creator-projects-settings-overview.qdoc
index 6f2db6ed3d45f119ab14ebbedad4ff47e0d42919..3f8b7f16a90b3405d0eeb6a79ecebfcc778b2c2e 100644
--- a/doc/src/projects/creator-projects-settings-overview.qdoc
+++ b/doc/src/projects/creator-projects-settings-overview.qdoc
@@ -56,13 +56,13 @@
 
     \list
 
-        \o  \l{Adding Kits}{Build & Run}
+        \li \l{Adding Kits}{Build & Run}
 
             \list
 
-                \o  \l{Specifying Build Settings}{Build Settings}
+                \li \l{Specifying Build Settings}{Build Settings}
 
-                \o  \l{Specifying Run Settings}{Run Settings}
+                \li \l{Specifying Run Settings}{Run Settings}
 
             \endlist
 
@@ -70,11 +70,11 @@
                     \gui {Build & Run} tab is replaced by the \l{Opening Projects}
                     {Configure Projects} tab.
 
-        \o  \l{Specifying Editor Settings}{Editor Settings}
+        \li \l{Specifying Editor Settings}{Editor Settings}
 
-        \o  \l{Specifying Code Style Settings}{Code Style Settings}
+        \li \l{Specifying Code Style Settings}{Code Style Settings}
 
-        \o  \l{Specifying Dependencies}{Dependencies}
+        \li \l{Specifying Dependencies}{Dependencies}
 
     \endlist
 
diff --git a/doc/src/projects/creator-projects-settings-run-analyze.qdocinc b/doc/src/projects/creator-projects-settings-run-analyze.qdocinc
index f53563feefbde79918e822b17f56f2d7b4502508..2a10641a10dad9b99d8fad23c367ff314fd857e7 100644
--- a/doc/src/projects/creator-projects-settings-run-analyze.qdocinc
+++ b/doc/src/projects/creator-projects-settings-run-analyze.qdocinc
@@ -11,9 +11,9 @@
 
     \list 1
 
-        \o  In the \gui {Analyzer Settings} section, select \gui Custom.
+        \li In the \gui {Analyzer Settings} section, select \gui Custom.
 
-        \o  Specify analyzer settings for the project.
+        \li Specify analyzer settings for the project.
 
             \image qtcreator-analyzer-settings.png "Analyzer Settings"
 
@@ -23,9 +23,9 @@
 
     \list
 
-        \o  \l{Selecting Options for Memory Analysis}
+        \li \l{Selecting Options for Memory Analysis}
 
-        \o  \l{Selecting Profiling Options}
+        \li \l{Selecting Profiling Options}
 
     \endlist
 
diff --git a/doc/src/projects/creator-projects-settings-run.qdoc b/doc/src/projects/creator-projects-settings-run.qdoc
index ffbcec5405780c89fffb5ebdc74e31a756dd765b..815aa0754360caa5e2d465e27d7dab2acd16df78 100644
--- a/doc/src/projects/creator-projects-settings-run.qdoc
+++ b/doc/src/projects/creator-projects-settings-run.qdoc
@@ -46,12 +46,12 @@
     see \l{Starting External Processes}.
 
     \if defined(qcmanual)
-    \input projects/creator-projects-settings-run-desktop.qdocinc
-    \input projects/creator-projects-settings-run-analyze.qdocinc
-    \input projects/creator-projects-settings-run-debug.qdocinc
-    \input linux-mobile/creator-projects-settings-run-linux.qdocinc
-    \input qnx/creator-projects-settings-run-qnx.qdocinc
-    \input android/creator-projects-settings-run-android.qdocinc
+    \include projects/creator-projects-settings-run-desktop.qdocinc
+    \include projects/creator-projects-settings-run-analyze.qdocinc
+    \include projects/creator-projects-settings-run-debug.qdocinc
+    \include linux-mobile/creator-projects-settings-run-linux.qdocinc
+    \include qnx/creator-projects-settings-run-qnx.qdocinc
+    \include android/creator-projects-settings-run-android.qdocinc
     \endif
 
     \section1 Specifying a Custom Executable to Run
@@ -66,5 +66,5 @@
 
     \image qmldesigner-run-custom-exe.png "Run settings for custom executables"
 
-    \input qtquick/creator-projects-settings-run-qtquick.qdocinc
+    \include qtquick/creator-projects-settings-run-qtquick.qdocinc
 */
diff --git a/doc/src/projects/creator-projects-targets.qdoc b/doc/src/projects/creator-projects-targets.qdoc
index 11070269fb40934156caec3c5a2c03d84f10a23f..125dc2b6a718e88e0bd29de8cb63443c7c43be84 100644
--- a/doc/src/projects/creator-projects-targets.qdoc
+++ b/doc/src/projects/creator-projects-targets.qdoc
@@ -42,15 +42,15 @@
 
     \list
 
-        \o  Android Device
+        \li Android Device
 
-        \o  Generic Linux Device
+        \li Generic Linux Device
 
-        \o  Maemo5/Fremantle Device
+        \li Maemo5/Fremantle Device
 
-        \o  MeeGo 1.2 Harmattan Device
+        \li MeeGo 1.2 Harmattan Device
 
-        \o  QNX Device
+        \li QNX Device
 
     \endlist
 
@@ -58,16 +58,16 @@
 
     \list 1
 
-        \o  Select \gui Tools > \gui Options > \gui {Build & Run} > \gui Kits
+        \li Select \gui Tools > \gui Options > \gui {Build & Run} > \gui Kits
             > \gui Add.
 
             \image qtcreator-targets.png
 
             To clone the selected kit, select \gui Clone.
 
-        \o  In the \gui Name column, double-click the kit name to change it.
+        \li In the \gui Name column, double-click the kit name to change it.
 
-        \o  In the \gui{Device type} field, select the type of the device.
+        \li In the \gui{Device type} field, select the type of the device.
 
             Double-click the icon next to the field to select the image that is
             displayed in the kit selector for this kit. You can use any
@@ -76,32 +76,32 @@
             logo as an icon allows you to easily see, which compiler is used to
             build the project for the selected kit.
 
-        \o  In the \gui Device field, select a device.
+        \li In the \gui Device field, select a device.
 
-        \o  In the \gui Sysroot field, specify the directory where the device
+        \li In the \gui Sysroot field, specify the directory where the device
             image is located. If you are not cross-compiling, leave this field
             empty.
 
-        \o  In the \gui {Compiler} field, select the compiler required
+        \li In the \gui {Compiler} field, select the compiler required
             to build the project. You can add compilers to the list
             if they are installed on the development PC, but were not detected
             automatically. For more information, see \l{Adding Compilers}.
 
-        \o  In the \gui Debugger field, select \gui Manage to automatically
+        \li In the \gui Debugger field, select \gui Manage to automatically
             detect a suitable debugger or to edit the currently selected
             debugger. For more information, see \l{Selecting the Debugger}.
 
-        \o  In the \gui {Qt version} field, select the Qt version to use for
+        \li In the \gui {Qt version} field, select the Qt version to use for
             building the project. You can add Qt versions to the list if they
             are installed on the development PC, but were not detected
             automatically. For more information, see \l{Adding Qt Versions}.
 
             \QC checks the directories listed in the \c{PATH} environment
             variable for the qmake executable. If a qmake executable is found,
-            it is referred to as \bold{Qt in PATH} and selected as the Qt
+            it is referred to as \b{Qt in PATH} and selected as the Qt
             version to use for the \gui Desktop kit that is created by default.
 
-        \o  In the \gui {Qt mkspec} field, specify build instructions for qmake.
+        \li In the \gui {Qt mkspec} field, specify build instructions for qmake.
             If you leave this field empty, the default value is used.
 
     \endlist
@@ -127,10 +127,10 @@
 
     \list
 
-        \o  For debugging on embedded devices using a different ABI, you must
+        \li For debugging on embedded devices using a different ABI, you must
             provide a special executable.
 
-        \o  For debugging on Windows using MinGW, select a Windows executable of
+        \li For debugging on Windows using MinGW, select a Windows executable of
             GDB with Python scripting enabled. You can download it from
             \l{http://builds.qt-project.org/job/gdb-windows}.
 
diff --git a/doc/src/qnx/creator-developing-qnx.qdoc b/doc/src/qnx/creator-developing-qnx.qdoc
index 4e040adaf057040494bf79dc3473e4ad7c4cfb52..ee7def3e6e241bd4e3cdce8ce11bb881b4e50e58 100644
--- a/doc/src/qnx/creator-developing-qnx.qdoc
+++ b/doc/src/qnx/creator-developing-qnx.qdoc
@@ -86,24 +86,24 @@
     \image qtcreator-qnx-device-configurations-wizard-1.png "Connection details"
 
     \list
-        \o In the \gui{The name to identify this configuration} field, enter a
+        \li  In the \gui{The name to identify this configuration} field, enter a
         name for the device.
-        \o In the \gui{The device's host name or IP address} field, enter the
+        \li  In the \gui{The device's host name or IP address} field, enter the
         host name or IP address of the device.
-        \o In the \gui{Device password} field, enter the password for the device.
-        \o In the \gui{Device type} field, select whether it is a \gui{Physical
+        \li  In the \gui{Device password} field, enter the password for the device.
+        \li  In the \gui{Device type} field, select whether it is a \gui{Physical
         device} or a \gui{Simulator} you are connecting to.
-        \o In the \gui{Debug token} field, enter the path to the debug token
+        \li  In the \gui{Debug token} field, enter the path to the debug token
         that is also installed on the device. This is only necessary if you are
         connecting to a \gui{Physical device}.
-        \o Click \gui{Next} to continue.
+        \li  Click \gui{Next} to continue.
     \endlist
 
     \image qtcreator-qnx-device-configurations-wizard-2.png "SSH Key Setup"
 
-    For the \gui{SSH Key Setup}, you can either select an existing \bold{4096}-bit
+    For the \gui{SSH Key Setup}, you can either select an existing \b{4096}-bit
     key, or click \gui{Generate} to create a new key. The generated key will be
-    stored next to the \QC settings, in a \bold{qnx} sub-directory.
+    stored next to the \QC settings, in a \b{qnx} sub-directory.
 
     Click \gui{Next} and then \gui{Finish} to complete setting up the device
     connection.
diff --git a/doc/src/qnx/creator-projects-qt-version-qnx.qdocinc b/doc/src/qnx/creator-projects-qt-version-qnx.qdocinc
index a969c815100a83e5021eca95d10ce8447e396fc6..1085c9496ed006d1ee65b2e539890475ca25e0ea 100644
--- a/doc/src/qnx/creator-projects-qt-version-qnx.qdocinc
+++ b/doc/src/qnx/creator-projects-qt-version-qnx.qdocinc
@@ -13,9 +13,9 @@
     add this manually to Qt Creator using the above dialog:
 
     \list 1
-        \o Select \gui {Tools > Options > Build & Run > Qt Versions > Add}.
-        \o Navigate to and select the qmake application that is part of your Qt for QNX build and select
+        \li  Select \gui {Tools > Options > Build & Run > Qt Versions > Add}.
+        \li  Navigate to and select the qmake application that is part of your Qt for QNX build and select
         \gui {Open}.
-        \o In the \gui {Blackberry Native SDK} or \gui{QNX SDK} field enter the path to your installed Blackberry NDK or QNX SDK respectively.
-        \o Select \gui {OK}.
+        \li  In the \gui {Blackberry Native SDK} or \gui{QNX SDK} field enter the path to your installed Blackberry NDK or QNX SDK respectively.
+        \li  Select \gui {OK}.
     \endlist
diff --git a/doc/src/qnx/creator-projects-running-qnx.qdocinc b/doc/src/qnx/creator-projects-running-qnx.qdocinc
index 7b0c57565f868c9a56e517ce567682a93eae8d48..ab50217aa1420e211ca7f7af883a2aa443f3e5fd 100644
--- a/doc/src/qnx/creator-projects-running-qnx.qdocinc
+++ b/doc/src/qnx/creator-projects-running-qnx.qdocinc
@@ -2,15 +2,15 @@
 
     \list 1
 
-        \o  Connect the device to the development PC or to the Wi-Fi network.
+        \li Connect the device to the development PC or to the Wi-Fi network.
 
-        \o  Configure the device and specify a connection to it. For more
+        \li Configure the device and specify a connection to it. For more
             information, see \l{Connecting QNX Devices}.
 
-        \o  If you are running on a BlackBerry device, create an Application
+        \li If you are running on a BlackBerry device, create an Application
             Descriptor File if it does not already exist. For more information, see \l{Deploying Applications to QNX Devices}.
 
-        \o  Click the \gui Run button.
+        \li Click the \gui Run button.
 
     \endlist
 
diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc
index 3cd53e11c62e13535d6972394b124e1d149c035f..442531398e9e7e5c918272eb27bf9750801265ff 100644
--- a/doc/src/qtcreator.qdoc
+++ b/doc/src/qtcreator.qdoc
@@ -37,101 +37,101 @@
 
     \table
         \row
-            \o  \inlineimage creator_gettingstarted.png
-            \o  \inlineimage creator_managingprojects.png
-            \o  \inlineimage creator_designinguserinterface.png
+            \li \inlineimage creator_gettingstarted.png
+            \li \inlineimage creator_managingprojects.png
+            \li \inlineimage creator_designinguserinterface.png
         \row
-            \o  \list
-                \o  \bold {\l{Getting Started}}
+            \li \list
+                \li \b {\l{Getting Started}}
                 \list
-                    \o  \l{IDE Overview}
-                    \o  \l{User Interface}
-                    \o  \l{Building and Running an Example}
-                    \o  \l{Tutorials}
+                    \li \l{IDE Overview}
+                    \li \l{User Interface}
+                    \li \l{Building and Running an Example}
+                    \li \l{Tutorials}
                 \endlist
             \endlist
-            \o  \list
-                \o  \bold {\l{Managing Projects}}
+            \li \list
+                \li \b {\l{Managing Projects}}
                 \list
-                    \o  \l{Creating Projects}
-                    \o  \l{Using Version Control Systems}
-                    \o  \l{Configuring Projects}
-                    \o  \l{Managing Sessions}
+                    \li \l{Creating Projects}
+                    \li \l{Using Version Control Systems}
+                    \li \l{Configuring Projects}
+                    \li \l{Managing Sessions}
                 \endlist
             \endlist
-            \o  \list
-            \o  \bold {\l{Designing User Interfaces}}
+            \li \list
+            \li \b {\l{Designing User Interfaces}}
                 \list
-                    \o  \l{Developing Qt Quick Applications}
-                    \o  \l{Developing Widget Based Applications}
-                    \o  \l{Optimizing Applications for Mobile Devices}
+                    \li \l{Developing Qt Quick Applications}
+                    \li \l{Developing Widget Based Applications}
+                    \li \l{Optimizing Applications for Mobile Devices}
                 \endlist
             \endlist
         \row
-            \o  \inlineimage creator_coding.png
-            \o  \inlineimage creator_buildingrunning.png
-            \o  \inlineimage creator_testing.png
+            \li \inlineimage creator_coding.png
+            \li \inlineimage creator_buildingrunning.png
+            \li \inlineimage creator_testing.png
         \row
-            \o  \list
-            \o  \bold {\l{Coding}}
+            \li \list
+            \li \b {\l{Coding}}
                 \list
-                    \o  \l{Writing Code}
-                    \o  \l{Finding}
-                    \o  \l{Refactoring}
-                    \o  \l{Configuring the Editor}
+                    \li \l{Writing Code}
+                    \li \l{Finding}
+                    \li \l{Refactoring}
+                    \li \l{Configuring the Editor}
                 \endlist
             \endlist
-            \o  \list
-            \o  \bold {\l{Building and Running}}
+            \li \list
+            \li \b {\l{Building and Running}}
                 \list
-                    \o  \l{Building for Multiple Platforms}
-                    \o  \l{Running on Multiple Platforms}
-                    \o  \l{Deploying to Mobile Devices}
-                    \o  \l{Connecting Mobile Devices}
+                    \li \l{Building for Multiple Platforms}
+                    \li \l{Running on Multiple Platforms}
+                    \li \l{Deploying to Mobile Devices}
+                    \li \l{Connecting Mobile Devices}
                 \endlist
             \endlist
-            \o  \list
-            \o  \bold {\l{Debugging and Analyzing}}
+            \li \list
+            \li \b {\l{Debugging and Analyzing}}
                 \list
-                    \o  \l{Debugging}
-                    \o  \l{Analyzing Code}
+                    \li \l{Debugging}
+                    \li \l{Analyzing Code}
                 \endlist
             \endlist
         \row
-            \o  \inlineimage creator_publishing.png
-            \o  \inlineimage creator_advanceduse.png
-            \o  \inlineimage creator_gettinghelp.png
+            \li \inlineimage creator_publishing.png
+            \li \inlineimage creator_advanceduse.png
+            \li \inlineimage creator_gettinghelp.png
         \row
-            \o  \list
-            \o  \bold {\l{Publishing}}
+            \li \list
+            \li \b {\l{Publishing}}
                 \list
-                    \o  \l{Publishing Qt Content for MeeGo Harmattan Devices}
-                    \o  \l{Publishing Qt Content for Maemo Devices}
-                    \o  \l{Publishing Maemo Applications to Extras-devel}
+                    \li \l{Publishing Qt Content for MeeGo Harmattan Devices}
+                    \li \l{Publishing Qt Content for Maemo Devices}
+                    \li \l{Publishing Maemo Applications to Extras-devel}
                 \endlist
             \endlist
-            \o  \list
-            \o  \bold {\l{Advanced Use}}
+            \li \list
+            \li \b {\l{Advanced Use}}
                 \list
-                    \o  \l{Supported Platforms}
-                    \o  \l{Using Other Build Systems}
-                    \o  \l{Using Command Line Options}
-                    \o  \l{Keyboard Shortcuts}
-                    \o  \l{Using External Tools}
+                    \li \l{Supported Platforms}
+                    \li \l{Using Other Build Systems}
+                    \li \l{Using Command Line Options}
+                    \li \l{Keyboard Shortcuts}
+                    \li \l{Using External Tools}
                 \endlist
             \endlist
-            \o  \list
-            \o  \bold {\l{Getting Help}}
+            \li \list
+            \li \b {\l{Getting Help}}
                 \list
-                    \o  \l{Using the Help Mode}
-                    \o  \l{FAQ}
-                    \o  \l{Tips and Tricks}
-                    \o  \l{Known Issues}
-                    \o  \l{Glossary}
+                    \li \l{Using the Help Mode}
+                    \li \l{FAQ}
+                    \li \l{Tips and Tricks}
+                    \li \l{Known Issues}
+                    \li \l{Glossary}
                 \endlist
             \endlist
         \row
-            \o  {3,1} \note To report bugs and suggestions to the Qt Bug
+            \li {3,1} \note To report bugs and suggestions to the Qt Bug
                 Tracker, select \gui {Help > Report Bug}.
 
                 You can also join the \QC mailing list at:
@@ -143,166 +143,166 @@
     \section1 Table Of Contents
 
     \list
-        \o  \l{Getting Started}
+        \li \l{Getting Started}
         \list
-            \o  \l{IDE Overview}
-            \o  \l{User Interface}
-            \o  \l{Building and Running an Example}
-            \o  \l{Tutorials}
+            \li \l{IDE Overview}
+            \li \l{User Interface}
+            \li \l{Building and Running an Example}
+            \li \l{Tutorials}
             \list
-                \o  \l{Creating a Qt Quick Application}
-                \o  \l{Creating a Qt Widget Based Application}
+                \li \l{Creating a Qt Quick Application}
+                \li \l{Creating a Qt Widget Based Application}
             \endlist
         \endlist
-        \o  \l{Managing Projects}
+        \li \l{Managing Projects}
         \list
-            \o  \l{Creating Projects}
+            \li \l{Creating Projects}
             \list
-                \o  \l{Opening Projects}
-                \o  \l{Adding Libraries to Projects}
-                \o  \l{Adding New Custom Wizards}
+                \li \l{Opening Projects}
+                \li \l{Adding Libraries to Projects}
+                \li \l{Adding New Custom Wizards}
             \endlist
-            \o  \l{Using Version Control Systems}
-            \o  \l{Configuring Projects}
+            \li \l{Using Version Control Systems}
+            \li \l{Configuring Projects}
             \list
-                \o  \l{Specifying Build Settings}
+                \li \l{Specifying Build Settings}
                 \list
-                    \o  \l{Adding Kits}
-                    \o  \l{Adding Qt Versions}
-                    \o  \l{Adding Compilers}
+                    \li \l{Adding Kits}
+                    \li \l{Adding Qt Versions}
+                    \li \l{Adding Compilers}
                 \endlist
-                \o  \l{Specifying Run Settings}
-                \o  \l{Specifying Editor Settings}
-                \o  \l{Specifying Code Style Settings}
-                \o  \l{Specifying Dependencies}
-                \o  \l{Sharing Project Settings}
+                \li \l{Specifying Run Settings}
+                \li \l{Specifying Editor Settings}
+                \li \l{Specifying Code Style Settings}
+                \li \l{Specifying Dependencies}
+                \li \l{Sharing Project Settings}
             \endlist
-            \o  \l{Managing Sessions}
+            \li \l{Managing Sessions}
         \endlist
-        \o  \l{Designing User Interfaces}
+        \li \l{Designing User Interfaces}
         \list
-            \o  \l{Developing Qt Quick Applications}
+            \li \l{Developing Qt Quick Applications}
             \list
-                \o  \l {Creating Qt Quick Projects}
-                \o  \l {Using Qt Quick Designer}
-                \o  \l {Creating Components}
-                \o  \l {Creating Buttons}
-                \o  \l {Creating Scalable Buttons and Borders}
-                \o  \l {Creating Screens}
-                \o  \l {Animating Screens}
-                \o  \l {Adding User Interaction Methods}
-                \o  \l {Exporting Designs from Graphics Software}
-                \o  \l {Implementing Application Logic}
-                \o  \l {Using QML Modules with Plugins}
+                \li \l {Creating Qt Quick Projects}
+                \li \l {Using Qt Quick Designer}
+                \li \l {Creating Components}
+                \li \l {Creating Buttons}
+                \li \l {Creating Scalable Buttons and Borders}
+                \li \l {Creating Screens}
+                \li \l {Animating Screens}
+                \li \l {Adding User Interaction Methods}
+                \li \l {Exporting Designs from Graphics Software}
+                \li \l {Implementing Application Logic}
+                \li \l {Using QML Modules with Plugins}
             \endlist
-            \o  \l{Developing Widget Based Applications}
+            \li \l{Developing Widget Based Applications}
             \list
-                \o \l{Adding Qt Designer Plugins}
+                \li  \l{Adding Qt Designer Plugins}
             \endlist
-            \o  \l{Optimizing Applications for Mobile Devices}
+            \li \l{Optimizing Applications for Mobile Devices}
         \endlist
-        \o  \l{Coding}
+        \li \l{Coding}
         \list
-        \o  \l{Writing Code}
+        \li \l{Writing Code}
             \list
-                \o  \l{Working in Edit Mode}
-                \o  \l{Semantic Highlighting}
-                \o  \l{Checking Code Syntax}
-                \o  \l{Completing Code}
-                \o  \l{Indenting Code}
-                \o  \l{Using Qt Quick Toolbars}
-                \o  \l{Pasting and Fetching Code Snippets}
-                \o  \l{Using Text Editing Macros}
+                \li \l{Working in Edit Mode}
+                \li \l{Semantic Highlighting}
+                \li \l{Checking Code Syntax}
+                \li \l{Completing Code}
+                \li \l{Indenting Code}
+                \li \l{Using Qt Quick Toolbars}
+                \li \l{Pasting and Fetching Code Snippets}
+                \li \l{Using Text Editing Macros}
             \endlist
-            \o  \l{Finding}
+            \li \l{Finding}
             \list
-                \o  \l{Finding and Replacing}
-                \o  \l{Searching with the Locator}
+                \li \l{Finding and Replacing}
+                \li \l{Searching with the Locator}
             \endlist
-            \o  \l{Refactoring}
-            \o  \l{Configuring the Editor}
+            \li \l{Refactoring}
+            \li \l{Configuring the Editor}
             \list
-                \o  \l{Specifying Text Editor Settings}
-                \o  \l{Using FakeVim Mode}
+                \li \l{Specifying Text Editor Settings}
+                \li \l{Using FakeVim Mode}
             \endlist
-            \o  \l{Editing MIME Types}
+            \li \l{Editing MIME Types}
         \endlist
-        \o  \l{Building and Running}
+        \li \l{Building and Running}
         \list
-            \o  \l{Building for Multiple Platforms}
-            \o  \l{Running on Multiple Platforms}
-            \o  \l{Deploying to Mobile Devices}
+            \li \l{Building for Multiple Platforms}
+            \li \l{Running on Multiple Platforms}
+            \li \l{Deploying to Mobile Devices}
             \list
-                \o  \l{Deploying Applications to Android Devices}
-                \o  \l{Deploying Applications to Linux-Based Devices}
-                \o  \l{Deploying Applications to QNX Devices}
+                \li \l{Deploying Applications to Android Devices}
+                \li \l{Deploying Applications to Linux-Based Devices}
+                \li \l{Deploying Applications to QNX Devices}
             \endlist
-            \o  \l{Connecting Mobile Devices}
+            \li \l{Connecting Mobile Devices}
             \list
-                \o  \l{Connecting Android Devices}
-                \o  \l{Connecting Embedded Linux Devices}
-                \o  \l{Connecting Maemo Devices}
-                \o  \l{Connecting MeeGo Harmattan Devices}
-                \o  \l{Connecting QNX Devices}
+                \li \l{Connecting Android Devices}
+                \li \l{Connecting Embedded Linux Devices}
+                \li \l{Connecting Maemo Devices}
+                \li \l{Connecting MeeGo Harmattan Devices}
+                \li \l{Connecting QNX Devices}
 
             \endlist
-            \o  \l{Customizing the Build Process}
-            \o  \l{Using Maemo or MeeGo Harmattan Emulator}
+            \li \l{Customizing the Build Process}
+            \li \l{Using Maemo or MeeGo Harmattan Emulator}
         \endlist
-        \o  \l{Debugging and Analyzing}
+        \li \l{Debugging and Analyzing}
         \list
-            \o  \l{Debugging}
+            \li \l{Debugging}
             \list
-                \o  \l{Setting Up Debugger}
-                \o  \l{Launching the Debugger}
-                \o  \l{Interacting with the Debugger}
-                \o  \l{Using Debugging Helpers}
-                \o  \l{Debugging Qt Quick Projects}
-                \o  \l{Debugging a C++ Example Application}
-                \o  \l{Debugging a Qt Quick Example Application}
-                \o  \l{Troubleshooting Debugger}
+                \li \l{Setting Up Debugger}
+                \li \l{Launching the Debugger}
+                \li \l{Interacting with the Debugger}
+                \li \l{Using Debugging Helpers}
+                \li \l{Debugging Qt Quick Projects}
+                \li \l{Debugging a C++ Example Application}
+                \li \l{Debugging a Qt Quick Example Application}
+                \li \l{Troubleshooting Debugger}
             \endlist
-            \o  \l{Analyzing Code}
+            \li \l{Analyzing Code}
             \list
-                \o  \l{Profiling QML Applications}
-                \o  \l{Using Valgrind Code Analysis Tools}
+                \li \l{Profiling QML Applications}
+                \li \l{Using Valgrind Code Analysis Tools}
                 \list
-                    \o  \l{Detecting Memory Leaks}
-                    \o  \l{Profiling Function Execution}
-                    \o  \l{Running Valgrind Tools Remotely}
+                    \li \l{Detecting Memory Leaks}
+                    \li \l{Profiling Function Execution}
+                    \li \l{Running Valgrind Tools Remotely}
                 \endlist
             \endlist
 
         \endlist
-        \o  \l{Publishing}
+        \li \l{Publishing}
         \list
-            \o  \l{Publishing Qt Content for Maemo Devices}
-            \o  \l{Publishing Qt Content for MeeGo Harmattan Devices}
-            \o  \l{Publishing Maemo Applications to Extras-devel}
+            \li \l{Publishing Qt Content for Maemo Devices}
+            \li \l{Publishing Qt Content for MeeGo Harmattan Devices}
+            \li \l{Publishing Maemo Applications to Extras-devel}
         \endlist
-        \o  \l{Advanced Use}
+        \li \l{Advanced Use}
         \list
-            \o  \l{Supported Platforms}
-            \o  \l{Using Other Build Systems}
+            \li \l{Supported Platforms}
+            \li \l{Using Other Build Systems}
             \list
-                \o  \l{Setting Up a CMake Project}
-                \o  \l{Setting Up an Autotools Project}
-                \o  \l{Setting Up a Generic Project}
+                \li \l{Setting Up a CMake Project}
+                \li \l{Setting Up an Autotools Project}
+                \li \l{Setting Up a Generic Project}
             \endlist
-            \o  \l{Using Command Line Options}
-            \o  \l{Keyboard Shortcuts}
-            \o  \l{Using External Tools}
-            \o  \l{Showing Task List Files in Issues Pane}
+            \li \l{Using Command Line Options}
+            \li \l{Keyboard Shortcuts}
+            \li \l{Using External Tools}
+            \li \l{Showing Task List Files in Issues Pane}
         \endlist
-        \o \l{Getting Help}
+        \li  \l{Getting Help}
         \list
-            \o  \l{Using the Help Mode}
-            \o  \l{FAQ}
-            \o  \l{Tips and Tricks}
-            \o  \l{Known Issues}
-            \o  \l{Glossary}
-            \o  \l{Technical Support}
-            \o  \l{Acknowledgements}
+            \li \l{Using the Help Mode}
+            \li \l{FAQ}
+            \li \l{Tips and Tricks}
+            \li \l{Known Issues}
+            \li \l{Glossary}
+            \li \l{Technical Support}
+            \li \l{Acknowledgements}
         \endlist
     \endlist
     \endomit
diff --git a/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc b/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc
index 09d36b33fd72526c212f93da768906928012d096..36435e56d204ca9c7ab9e6df46346f2bf4f0583f 100644
--- a/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc
+++ b/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc
@@ -4,10 +4,10 @@
 
     \list
 
-        \o  In the \gui Arguments field, you can specify command line arguments
+        \li In the \gui Arguments field, you can specify command line arguments
             to be passed to the executable.
 
-        \o  In the \gui {Main QML file}, select the file that \QQV will be
+        \li In the \gui {Main QML file}, select the file that \QQV will be
             started with.
 
     \endlist
diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/qtquick-app-development.qdoc
index b5f75e19f9e0b2845686a5ba7414cd0d8a5311f1..383a81bd23dbc790e1398ed5b6c1b0644e0367cc 100644
--- a/doc/src/qtquick/qtquick-app-development.qdoc
+++ b/doc/src/qtquick/qtquick-app-development.qdoc
@@ -42,22 +42,22 @@
 
     \table
         \row
-            \o  \inlineimage creator_createproject.png
-            \o  \inlineimage creator_createcomponents.png
-            \o  \inlineimage creator_createscreen.png
+            \li \inlineimage creator_createproject.png
+            \li \inlineimage creator_createcomponents.png
+            \li \inlineimage creator_createscreen.png
         \row
-            \o  \l {Creating Qt Quick Projects}{Create or import projects.}
-            \o  \l {Creating Components}{Create components.}
-            \o  \l {Creating Screens}{Create screens.}
+            \li \l {Creating Qt Quick Projects}{Create or import projects.}
+            \li \l {Creating Components}{Create components.}
+            \li \l {Creating Screens}{Create screens.}
         \row
-            \o  \inlineimage creator_createanimation.png
-            \o  \inlineimage creator_createuserinter.png
-            \o  \inlineimage creator_createcode.png
+            \li \inlineimage creator_createanimation.png
+            \li \inlineimage creator_createuserinter.png
+            \li \inlineimage creator_createcode.png
         \row
-            \o  \l {Animating Screens}{Add animation to screens.}
-            \o  \l {Adding User Interaction Methods}
+            \li \l {Animating Screens}{Add animation to screens.}
+            \li \l {Adding User Interaction Methods}
                 {Add user interaction methods.}
-            \o  \l {Implementing Application Logic}
+            \li \l {Implementing Application Logic}
                 {Implement the application logic.}
     \endtable
 
@@ -65,12 +65,12 @@
 
     \list
         \if defined(qcmanual)
-        \o  \l {Using Qt Quick Designer}
-        \o  \l {Creating Buttons}
-        \o  \l {Creating Scalable Buttons and Borders}
+        \li \l {Using Qt Quick Designer}
+        \li \l {Creating Buttons}
+        \li \l {Creating Scalable Buttons and Borders}
         \endif
-        \o  \l {Exporting Designs from Graphics Software}
-        \o  \l {Using QML Modules with Plugins}
+        \li \l {Exporting Designs from Graphics Software}
+        \li \l {Using QML Modules with Plugins}
 
     \endlist
 
diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc
index 8d0cb0eef6e1aa59951970734b265ce5edcca9ff..d479a9e4fa659ddb8eb662f93377553ca21af885 100644
--- a/doc/src/qtquick/qtquick-app-tutorial.qdoc
+++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc
@@ -54,28 +54,28 @@
 
     \list 1
 
-        \o  Select \gui{File > New File or Project > Applications >
+        \li Select \gui{File > New File or Project > Applications >
             Qt Quick 1 Application (Built-in Elements) > Choose}.
 
-        \o  In the \gui{Name} field, type \bold {Transitions}.
+        \li In the \gui{Name} field, type \b {Transitions}.
 
-        \o  In the \gui {Create in} field, enter the path for the project files.
+        \li In the \gui {Create in} field, enter the path for the project files.
             For example, \c {C:\Qt\examples}, and then click \gui{Next} (on
             Windows and Linux) or \gui Continue (on Mac OS).
 
-        \o  Select \l{glossary-buildandrun-kit}{kits} for running and building your project,
+        \li Select \l{glossary-buildandrun-kit}{kits} for running and building your project,
             and then click \gui{Next}.
 
             \note Kits are listed if they have been specified in \gui Tools >
             \gui Options > \gui {Build & Run} > \gui Kits.
 
-        \o  Select \gui Next in the following dialogs to use the default
+        \li Select \gui Next in the following dialogs to use the default
             settings.
 
-        \o  Review the project settings, and click \gui{Finish} (on Windows and
+        \li Review the project settings, and click \gui{Finish} (on Windows and
             Linux) or \gui Done (on Mac OS) to create the project.
 
-        \o  Press \key {Ctrl+R} (or \key {Cmd+R})to run the application.
+        \li Press \key {Ctrl+R} (or \key {Cmd+R})to run the application.
 
     \endlist
 
@@ -98,62 +98,62 @@
 
     \list 1
 
-        \o  In the \gui Projects view, double-click the main.qml file
+        \li In the \gui Projects view, double-click the main.qml file
             to open it in the code editor.
 
-        \o  Click \gui Design to open the file in \QMLD.
+        \li Click \gui Design to open the file in \QMLD.
 
             \image qmldesigner-tutorial-desing-mode.png "Transitions project in Design Mode"
 
-        \o  In the \gui Navigator pane, select \gui Text and press \key Delete to
+        \li In the \gui Navigator pane, select \gui Text and press \key Delete to
             delete it.
 
-        \o  Select \gui Rectangle to edit its properties.
+        \li Select \gui Rectangle to edit its properties.
 
             \image qmldesigner-tutorial-page.png "Page properties"
 
         \list a
 
-            \o  In the \gui Id field, enter \e page, to be able to reference the
+            \li In the \gui Id field, enter \e page, to be able to reference the
                 rectangle from other places.
 
-            \o  In the \gui Colors group, \gui Rectangle field, set the color to
+            \li In the \gui Colors group, \gui Rectangle field, set the color to
                 #343434.
 
         \endlist
 
-        \o  In the \gui Library view, \gui Resources tab, select states.png and
+        \li In the \gui Library view, \gui Resources tab, select states.png and
             drag and drop it to the canvas.
 
             \image qmldesigner-tutorial-user-icon.png "Image properties"
 
         \list a
 
-            \o  In the \gui Id field, enter \e icon.
+            \li In the \gui Id field, enter \e icon.
 
-            \o  In the \gui Position field, set \gui X to 10 and \gui Y to 20.
+            \li In the \gui Position field, set \gui X to 10 and \gui Y to 20.
 
         \endlist
 
-        \o  In the \gui Library view, \gui Items tab, select \gui Rectangle,
+        \li In the \gui Library view, \gui Items tab, select \gui Rectangle,
             drag and drop it to the canvas, and edit its properties.
 
             \image qmldesigner-tutorial-topleftrect.png "Rectangle properties"
 
         \list a
 
-            \o  In the \gui Id field, enter \e topLeftRect.
+            \li In the \gui Id field, enter \e topLeftRect.
 
-            \o  In the \gui Size field, set \gui W and \gui H to 64, for the
+            \li In the \gui Size field, set \gui W and \gui H to 64, for the
                 rectangle size to match the image size.
 
-            \o  In the \gui Colors group, \gui Rectangle field, click the
+            \li In the \gui Colors group, \gui Rectangle field, click the
                 \inlineimage qmldesigner-transparent-button.png
                 (\gui Transparent) button to make the rectangle transparent.
 
-            \o  In the \gui Border field, set the border color to #808080.
+            \li In the \gui Border field, set the border color to #808080.
 
-            \o  In the \gui Rectangle group, \gui Border field, set the border
+            \li In the \gui Rectangle group, \gui Border field, set the border
                 width to 1.
 
                 \note If the \gui Border field does not appear after you set the
@@ -162,34 +162,34 @@
                 \inlineimage qmldesigner-solid-color-button.png
                 (\gui {Solid Color}) button.
 
-            \o  In the \gui Radius field, select 6 to create rounded corners for
+            \li In the \gui Radius field, select 6 to create rounded corners for
                 the rectangle.
 
-            \o  Click \gui {Layout}, and then click the top and left anchor
+            \li Click \gui {Layout}, and then click the top and left anchor
                 buttons to anchor the rectangle to the top left corner of the
                 page.
 
                 \image qmldesigner-tutorial-topleftrect-layout.png "Layout tab"
 
-            \o  In the \gui Margin field, select 20 for the top anchor and 10
+            \li In the \gui Margin field, select 20 for the top anchor and 10
                 for the left anchor.
 
         \endlist
 
-        \o  In the \gui Navigator pane, drag and drop the \gui {Mouse Area}
+        \li In the \gui Navigator pane, drag and drop the \gui {Mouse Area}
             element from \e page to \e topLeftRect to make it apply only to the
             rectangle and not to the whole page.
 
-        \o Edit \gui {Mouse Area} properties:
+        \li  Edit \gui {Mouse Area} properties:
 
         \list a
 
-            \o  Click \gui {Layout}, and then click the
+            \li Click \gui {Layout}, and then click the
                 \inlineimage qmldesigner-anchor-fill-screen.png
                 (\gui {Fill to Parent}) button to anchor the mouse area to the
                 rectangle.
 
-            \o  In the code editor, edit the pointer to the clicked expression
+            \li In the code editor, edit the pointer to the clicked expression
                 in the mouse area element, as illustrated by the following code
                 snippet:
 
@@ -209,25 +209,25 @@
 
             \snippet transitions/qml/Transitions/main.qml 0
 
-        \o  In the \gui Navigator pane, copy topLeftRect (by pressing
+        \li In the \gui Navigator pane, copy topLeftRect (by pressing
             \key {Ctrl+C}) and paste it to the canvas twice (by pressing
             \key {Ctrl+V}). \QC renames the new instances of the element
             topLeftRect1 and topLeftRect2.
 
-        \o Select topLeftRect1 and edit its properties:
+        \li  Select topLeftRect1 and edit its properties:
 
         \list a
 
-            \o  In the \gui Id field, enter \e middleRightRect.
+            \li In the \gui Id field, enter \e middleRightRect.
 
-            \o  In \gui {Layout}, select the vertical center anchor button and
+            \li In \gui {Layout}, select the vertical center anchor button and
                 then the right anchor button to
                 anchor the rectangle to the middle right margin of the screen.
 
-            \o  In the \gui Margin field, select 10 for the right anchor and 0
+            \li In the \gui Margin field, select 10 for the right anchor and 0
                 for the vertical center anchor.
 
-            \o  In the code editor,add a pointer to a clicked expression to the
+            \li In the code editor,add a pointer to a clicked expression to the
                 mouse area element. The following expression sets the state to
                 \e State1:
 
@@ -237,19 +237,19 @@
 
         \endlist
 
-        \o  Select topLeftRect2 and edit its properties:
+        \li Select topLeftRect2 and edit its properties:
 
         \list a
 
-            \o  In the \gui Id field, enter \e bottomLeftRect.
+            \li In the \gui Id field, enter \e bottomLeftRect.
 
-            \o  In \gui {Layout}, select the bottom and left anchor buttons to
+            \li In \gui {Layout}, select the bottom and left anchor buttons to
                 anchor the rectangle to the bottom left margin of the screen.
 
-            \o  In the \gui Margin field, select 20 for the bottom anchor and 10
+            \li In the \gui Margin field, select 20 for the bottom anchor and 10
                 for the left anchor.
 
-            \o  In the code editor, add a pointer to a clicked expression to the
+            \li In the code editor, add a pointer to a clicked expression to the
                 mouse area element. The following expression sets the state to
                 \e State2:
 
@@ -263,9 +263,9 @@
 
         \endlist
 
-        \o  Press \key {Ctrl+S} to save the changes.
+        \li Press \key {Ctrl+S} to save the changes.
 
-        \o  Press \key {Ctrl+R} to run the application.
+        \li Press \key {Ctrl+R} to run the application.
 
     \endlist
 
@@ -283,11 +283,11 @@
 
     \list 1
 
-        \o  Click the empty slot in the \gui States pane to create State1.
+        \li Click the empty slot in the \gui States pane to create State1.
 
-        \o  Click the empty slot in the \gui States pane to create State2.
+        \li Click the empty slot in the \gui States pane to create State2.
 
-        \o  In the code editor, bind the position of the Qt logo to the
+        \li In the code editor, bind the position of the Qt logo to the
             rectangle to make sure that the logo is displayed within the
             rectangle when the view is scaled on different sizes of screens. Set
             expressions for the x and y properties, as illustrated by the
@@ -300,7 +300,7 @@
             \note When you set the expressions, drag and drop is disabled for
             the icon in \QMLD.
 
-        \o  Press \key {Ctrl+R} to run the application.
+        \li Press \key {Ctrl+R} to run the application.
 
     \endlist
 
@@ -315,42 +315,42 @@
 
     \list 1
 
-        \o  In the code editor, add the following code to specify that when
+        \li In the code editor, add the following code to specify that when
             moving to State1, the x and y coordinates of the Qt logo change
             linearly over a duration of 1 second:
 
             \snippet qml/list-of-transitions.qml first transition
 
-        \o  You can use the Qt Quick toolbar for animation to change the easing
+        \li You can use the Qt Quick toolbar for animation to change the easing
             curve type from linear to OutBounce:
 
         \list a
 
-            \o  Click \gui NumberAnimation in the code editor to display the
+            \li Click \gui NumberAnimation in the code editor to display the
                 \inlineimage qml-toolbar-indicator.png
                 icon, and then click the icon to open the toolbar:
 
                 \image qmldesigner-tutorial-quick-toolbar.png "Qt Quick toolbar for animation"
 
-            \o  In the \gui Easing field, select \gui Bounce.
+            \li In the \gui Easing field, select \gui Bounce.
 
-            \o  In the \gui Subtype field, select \gui Out.
+            \li In the \gui Subtype field, select \gui Out.
 
         \endlist
 
-        \o  Add the following code to specify that when moving to State2, the x
+        \li Add the following code to specify that when moving to State2, the x
             and y coordinates of the Qt logo change over a duration of 2
             seconds, and an InOutQuad easing function is used:
 
             \snippet qml/list-of-transitions.qml second transition
 
-        \o  Add the following code to specify that for any other state changes,
+        \li Add the following code to specify that for any other state changes,
             the x and y coordinates of the Qt logo change linearly over a
             duration of 200 milliseconds:
 
             \snippet qml/list-of-transitions.qml default transition
 
-        \o  Press \key {Ctrl+R} to run the application.
+        \li Press \key {Ctrl+R} to run the application.
 
     \endlist
 
diff --git a/doc/src/qtquick/qtquick-buttons.qdoc b/doc/src/qtquick/qtquick-buttons.qdoc
index 1b43084c78fe915d05509bc0f7fc6ecf3090e2e6..d184d509c78ff2f7e449d3ca2541d1865002bc2b 100644
--- a/doc/src/qtquick/qtquick-buttons.qdoc
+++ b/doc/src/qtquick/qtquick-buttons.qdoc
@@ -34,57 +34,57 @@
 
     \list 1
 
-        \o  Select \gui {File > New File or Project > Qt > QML File > Choose}
+        \li Select \gui {File > New File or Project > Qt > QML File > Choose}
             to create a QML file called Button.qml (for example).
 
             \note Components are listed in the \gui Library pane only if the
             filename begins with a capital letter.
 
-        \o  Click \gui {Design} to edit the file in the visual editor.
+        \li Click \gui {Design} to edit the file in the visual editor.
 
-        \o  In the \gui Navigator pane, click \gui Rectangle to set properties
+        \li In the \gui Navigator pane, click \gui Rectangle to set properties
             for it.
 
-        \o  In the \gui Properties pane, modify the appearance of the button.
+        \li In the \gui Properties pane, modify the appearance of the button.
 
         \list a
 
-            \o  In the \gui Size field, set the width (\gui W) and height
+            \li In the \gui Size field, set the width (\gui W) and height
                 (\gui H) of the button.
 
-            \o  In the \gui Color field, select the button color.
+            \li In the \gui Color field, select the button color.
 
-            \o  In the \gui Radius field, use the slider to set the radius of
+            \li In the \gui Radius field, use the slider to set the radius of
                 the rectangle and produce rounded corners for the button.
 
         \endlist
 
-        \o  Drag and drop a \gui {Text} item on top of the \gui Rectangle. This
+        \li Drag and drop a \gui {Text} item on top of the \gui Rectangle. This
             creates a nested element where \gui Rectangle is the parent element
             of \gui Text. Elements are positioned relative to their parents.
 
-        \o  In the \gui Properties pane, edit the properties of the \gui Text
+        \li In the \gui Properties pane, edit the properties of the \gui Text
             item.
 
         \list a
 
-            \o  In the \gui Text field, type \bold Button.
+            \li In the \gui Text field, type \b Button.
 
                 You can select the text color in the \gui Color section and the
                 font, size, and style in the
                 \gui Font section.
 
-            \o  In the \gui Alignment field, select the center buttons to align
+            \li In the \gui Alignment field, select the center buttons to align
                 the text to the center of the button.
 
-            \o  Click \gui {Layout}, and then click the
+            \li Click \gui {Layout}, and then click the
                 \inlineimage qmldesigner-anchor-fill-screen.png
                 (\gui {Fill to Parent}) button to anchor the text to the whole
                 button area.
 
         \endlist
 
-        \o  Press \key {Ctrl+S} to save the button.
+        \li Press \key {Ctrl+S} to save the button.
 
             \image qmldesigner-button.png "Button component"
 
@@ -131,12 +131,12 @@
 
     \list 1
 
-        \o  Select \gui {File > New File or Project > Qt > QML File > Choose}
+        \li Select \gui {File > New File or Project > Qt > QML File > Choose}
             to create a QML file called Button.qml (for example).
 
-        \o  Double-click the file to open it in the code editor.
+        \li Double-click the file to open it in the code editor.
 
-        \o  Replace the \gui Rectangle with an \gui Item, as illustrated by the
+        \li Replace the \gui Rectangle with an \gui Item, as illustrated by the
             following code snippet:
 
             \qml
@@ -145,93 +145,93 @@
             }
             \endqml
 
-        \o  Specify properties and set expressions for the \gui Item, as
+        \li Specify properties and set expressions for the \gui Item, as
             illustrated by the following code snippet:
 
             \snippet snippets/qml/quick-scalable-image.qml properties and signal definitions
 
             You will point to the properties and expression later.
 
-        \o  Click \gui {Design} to edit the file in the visual editor.
+        \li Click \gui {Design} to edit the file in the visual editor.
 
-        \o  Drag and drop two \gui {Border Image} items from the \gui Library pane
+        \li Drag and drop two \gui {Border Image} items from the \gui Library pane
             to the scene.
 
-        \o  Drag and drop a \gui Text item to the scene.
+        \li Drag and drop a \gui Text item to the scene.
 
-        \o  Drag and drop a \gui {Mouse Area} to the screen.
+        \li Drag and drop a \gui {Mouse Area} to the screen.
 
-        \o  In the \gui Navigator pane, select \gui border_image1 to specify
+        \li In the \gui Navigator pane, select \gui border_image1 to specify
             settings for it in the \gui Properties pane:
 
         \list a
 
-            \o  Select \gui {Set Expression} in the menu next to the
+            \li Select \gui {Set Expression} in the menu next to the
                 \gui Visibility check box.
 
-            \o  Enter the following expression to specify that the image is
+            \li Enter the following expression to specify that the image is
                 visible when the mouse is not pressed down:
                 \c {!mouse_area1.pressed}.
 
-            \o  In the \gui Source field, select the image file for the button,
+            \li In the \gui Source field, select the image file for the button,
                 for example button_up.png.
 
-            \o   Click \gui {Layout}, and then click the
+            \li  Click \gui {Layout}, and then click the
                 \inlineimage qmldesigner-anchor-fill-screen.png
                 (\gui {Fill to Parent}) button to anchor the border image to the
                 \gui Item.
 
         \endlist
 
-        \o  Select \gui border_image2 to specify similar settings for it:
+        \li Select \gui border_image2 to specify similar settings for it:
 
         \list a
 
-            \o  Set the following epression for \gui Visibility, to specify that
+            \li Set the following epression for \gui Visibility, to specify that
                 the image is visible when the mouse is pressed down:
                 \c {mouse_area1.pressed}.
 
-            \o  In the \gui Source field, select the image file for the button
+            \li In the \gui Source field, select the image file for the button
                 when it is clicked, for example button_down.png.
 
-            \o  Click \gui {Layout}, and then click the
+            \li Click \gui {Layout}, and then click the
                 \gui {Fill to Parent}
                 button to anchor the border image to the \gui Item.
 
         \endlist
 
-        \o  Select \gui text1 to specify font size and color, and text
+        \li Select \gui text1 to specify font size and color, and text
             scaling and rendering:
 
         \list a
 
-            \o  In the \gui Color field, use the color picker to select
+            \li In the \gui Color field, use the color picker to select
                 the font color, or enter a value in the field.
 
-            \o  In the \gui Text field, select \gui {Set Expression} and
+            \li In the \gui Text field, select \gui {Set Expression} and
                 enter a pointer to the \c {text} property that you specified
                 earlier: \c {parent.txt}.
 
-            \o  Select the \gui Smooth check box to enable smooth text
+            \li Select the \gui Smooth check box to enable smooth text
                 rendering.
 
-            \o  In the \gui Size field, select \gui {Pixels} to specify the font
+            \li In the \gui Size field, select \gui {Pixels} to specify the font
                 size in pixels. By default, the size is specified in points.
 
-            \o  In the \gui Size field, select \gui {Set Expression} and enter a
+            \li In the \gui Size field, select \gui {Set Expression} and enter a
                 pointer to the \c {fontSize} property that you specified
                 earlier.
 
-            \o  Click \gui {Layout}, and then click the
+            \li Click \gui {Layout}, and then click the
                 \inlineimage qmldesigner-center-in.png "Anchor buttons"
                 (\gui {Set Vertical Anchor} and \gui {Set Horizontal Anchor})
                 buttons to inherit the vertical and horizontal centering from
                 the parent.
 
-            \o  Click \gui Advanced to specify scaling for the text in the
+            \li Click \gui Advanced to specify scaling for the text in the
                 \gui Scale field.
 
-            \o  Select \gui {Set Expression} and enter the following expression:
+            \li Select \gui {Set Expression} and enter the following expression:
                 \c {if (!mousearea1.pressed) { 1 } else { 0.95 }}.
 
                 \note You can enter long and complicated expressions also in the
@@ -239,7 +239,7 @@
 
         \endlist
 
-        \o  In the code editor, add to the \c MouseArea item a pointer to the
+        \li In the code editor, add to the \c MouseArea item a pointer to the
             \c clicked expression that you added earlier:
             \c {onClicked: parent.clicked()}.
 
diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc
index 93f04f017242ecad4537013bb248973af59a6b5b..34e6eb7a28106639553a2e5a3b0e931b87caaea9 100644
--- a/doc/src/qtquick/qtquick-components.qdoc
+++ b/doc/src/qtquick/qtquick-components.qdoc
@@ -41,34 +41,34 @@
 
     \list
 
-        \o  \l{http://qt-project.org/doc/qt-4.8/qml-borderimage.html}
+        \li \l{http://qt-project.org/doc/qt-4.8/qml-borderimage.html}
             {Border Image}
             uses an image as a border or background.
 
-        \o  \l{http://qt-project.org/doc/qt-4.8/qml-image.html}{Image}
+        \li \l{http://qt-project.org/doc/qt-4.8/qml-image.html}{Image}
             adds a bitmap to the scene. You can stretch and tile images.
 
-        \o  \l{http://qt-project.org/doc/qt-4.8/qml-item.html}{Item}
+        \li \l{http://qt-project.org/doc/qt-4.8/qml-item.html}{Item}
             is the most basic of all visual items in QML. Even though it has no
             visual appearance, it defines all the properties that are common
             across visual items, such as the x and y position, width and height,
             anchoring, and key handling.
 
-        \o  \l{http://qt-project.org/doc/qt-4.8/qml-rectangle.html}{Rectangle}
+        \li \l{http://qt-project.org/doc/qt-4.8/qml-rectangle.html}{Rectangle}
             adds a rectangle that is painted with a solid fill color and an
             optional border. You can also use the radius property to create
             rounded rectangles.
 
-        \o  \l{http://qt-project.org/doc/qt-4.8/qml-text.html}{Text}
+        \li \l{http://qt-project.org/doc/qt-4.8/qml-text.html}{Text}
             adds formatted read-only text.
 
-        \o  \l{http://qt-project.org/doc/qt-4.8/qml-textedit.html}{Text Edit}
+        \li \l{http://qt-project.org/doc/qt-4.8/qml-textedit.html}{Text Edit}
             adds a single line of editable formatted text that can be validated.
 
-        \o  \l{http://qt-project.org/doc/qt-4.8/qml-textinput.html}{Text Input}
+        \li \l{http://qt-project.org/doc/qt-4.8/qml-textinput.html}{Text Input}
             adds a single line of editable plain text that can be validated.
 
-        \o  \l{http://qt-project.org/doc/qt-4.8/qml-webview.html}{Web View}
+        \li \l{http://qt-project.org/doc/qt-4.8/qml-webview.html}{Web View}
             adds web content to a canvas.
 
     \endlist
@@ -88,18 +88,18 @@
 
     \list 1
 
-        \o  Select \gui {File > New File or Project > Files and Classes > QML
+        \li Select \gui {File > New File or Project > Files and Classes > QML
             > Choose} to create a new .qml file.
 
             \note Components are listed in the \gui {QML Components} section of
             the \gui Library pane only if the filename begins with a capital
             letter.
 
-        \o  Click \gui Design to open the .qml file in \QMLD.
+        \li Click \gui Design to open the .qml file in \QMLD.
 
-        \o  Drag and drop an item from the \gui Library pane to the editor.
+        \li Drag and drop an item from the \gui Library pane to the editor.
 
-        \o  Edit item properties in the \gui Properties pane.
+        \li Edit item properties in the \gui Properties pane.
 
             The available properties depend on the item.
 
@@ -111,9 +111,9 @@
 
     \list
 
-        \o  \l{Creating Buttons}
+        \li \l{Creating Buttons}
 
-        \o  \l{Creating Scalable Buttons and Borders}
+        \li \l{Creating Scalable Buttons and Borders}
 
     \endlist
 
diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc
index a2dd925780b5e2a5b1e7d112a884f52938138231..b75d392028f3e8da11aa5265faa98db4dd129e71 100644
--- a/doc/src/qtquick/qtquick-creating.qdoc
+++ b/doc/src/qtquick/qtquick-creating.qdoc
@@ -38,7 +38,7 @@
 
     \list
 
-        \o  \gui {Qt Quick Application} creates a Qt Quick application project
+        \li \gui {Qt Quick Application} creates a Qt Quick application project
             that can contain both QML and C++ code. The project includes a
             QDeclarativeView. You can build the application and deploy it on
             desktop and mobile target platforms.
@@ -57,19 +57,19 @@
 
             The Qt Quick 2 Application wizard imports Qt Quick 2.0. Use it to
             develop for platforms that run Qt 5.
-        \o  \gui {Qt Quick UI} creates a Qt Quick UI project with a single QML
+        \li \gui {Qt Quick UI} creates a Qt Quick UI project with a single QML
             file that contains the main view. You can review Qt Quick UI
             projects in a \l{Previewing QML Files}{preview tool} and you need
             not build them. You do not
             need to have the development environment installed on your
             computer to create and run this type of project.
 
-        \o  \gui {Qt Quick 1 Application (from Existing QML File)} converts
+        \li \gui {Qt Quick 1 Application (from Existing QML File)} converts
             existing Qt Quick 1 applications to Qt Quick application projects.
             This enables you to run them from \QC and to deploy them to mobile
             devices.
 
-        \o  \gui {Qt Quick Extension Plugins} (in the \gui Libraries category)
+        \li \gui {Qt Quick Extension Plugins} (in the \gui Libraries category)
             create C++ plugins that make it possible to offer extensions that
             can be loaded dynamically into Qt Quick applications. Select
             \gui {Qt Quick 1 Extension Plugin} to create extensions for
@@ -87,11 +87,11 @@
 
     \list
 
-        \o  .qmlproject project file defines that all QML, JavaScript, and image
+        \li .qmlproject project file defines that all QML, JavaScript, and image
             files in the project folder belong to the project. Therefore, you do
             not need to individually list all the files in the project.
 
-        \o  .qml file defines an element, such as a component, screen, or the
+        \li .qml file defines an element, such as a component, screen, or the
             whole application UI.
 
     \endlist
diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc
index 848dc8eeabd19cb65c7efea94b7cc77c0a448e8b..8873f09dc1a236302c11effe06f8fe6bd5668aa8 100644
--- a/doc/src/qtquick/qtquick-designer.qdoc
+++ b/doc/src/qtquick/qtquick-designer.qdoc
@@ -43,22 +43,22 @@
 
     \list
 
-        \o  \gui {Navigator} pane (1) displays the QML elements in the current QML
+        \li \gui {Navigator} pane (1) displays the QML elements in the current QML
             file as tree structure.
 
-        \o  \gui {Library} pane (2) displays the building blocks that you can use to
+        \li \gui {Library} pane (2) displays the building blocks that you can use to
             design applications: predefined QML elements, your own QML
             components, Qt Quick components that you import to the project, and
             other resources.
 
-        \o  \gui Canvas (3) is the working area where you create QML components and
+        \li \gui Canvas (3) is the working area where you create QML components and
             design applications.
 
-        \o  \gui {Properties} pane (4) organizes the properties of the selected QML
+        \li \gui {Properties} pane (4) organizes the properties of the selected QML
             element or QML component. You can change the properties also in the
             code editor.
 
-        \o  \gui {State} pane (5) displays the different states of the component.
+        \li \gui {State} pane (5) displays the different states of the component.
             QML states typically describe user interface configurations, such as
             the UI  elements, their properties and behavior and the available
             actions.
@@ -152,7 +152,7 @@
 
     \list
 
-        \o  \c {import com.nokia.meego 1.0} for MeeGo
+        \li \c {import com.nokia.meego 1.0} for MeeGo
 
     \endlist
 
@@ -216,23 +216,23 @@
 
     \table
         \row
-            \o  \image qmldesigner-boolean-true.png
-            \o  TRUE
-            \o  The element is visible by default. The visibility might be
+            \li \image qmldesigner-boolean-true.png
+            \li TRUE
+            \li The element is visible by default. The visibility might be
                 overridden by the visibility set in the base state.
         \row
-            \o  \image qmldesigner-boolean-true-blue.png
-            \o  TRUE (highlighted)
-            \o  The element is explicitly set to visible.
+            \li \image qmldesigner-boolean-true-blue.png
+            \li TRUE (highlighted)
+            \li The element is explicitly set to visible.
         \row
-            \o  \image qmldesigner-boolean-false.png
-            \o  FALSE
-            \o  The element is hidden by default. The visibility might be
+            \li \image qmldesigner-boolean-false.png
+            \li FALSE
+            \li The element is hidden by default. The visibility might be
                 overridden by the visibility set in the base state.
         \row
-            \o  \image qmldesigner-boolean-false-blue.png
-            \o  FALSE (hightlighted)
-            \o  The item is explicitly set to hidden.
+            \li \image qmldesigner-boolean-false-blue.png
+            \li FALSE (hightlighted)
+            \li The item is explicitly set to hidden.
     \endtable
 
     \section2 Setting Expressions
@@ -409,17 +409,17 @@
 
     \list
 
-        \o  Show some UI elements and hide others.
+        \li Show some UI elements and hide others.
 
-        \o  Present different available actions to the user.
+        \li Present different available actions to the user.
 
-        \o  Start, stop or pause animations.
+        \li Start, stop or pause animations.
 
-        \o  Execute some script required in the new state.
+        \li Execute some script required in the new state.
 
-        \o  Change a property value for a particular item.
+        \li Change a property value for a particular item.
 
-        \o  Show a different view or screen.
+        \li Show a different view or screen.
 
     \endlist
 
diff --git a/doc/src/qtquick/qtquick-exporting-qml.qdoc b/doc/src/qtquick/qtquick-exporting-qml.qdoc
index 39bb65abf72fef7ab6112bfbfa5aed0eae3bfd22..2fc4a8def5e515530d93c3fb01733c73a05df33b 100644
--- a/doc/src/qtquick/qtquick-exporting-qml.qdoc
+++ b/doc/src/qtquick/qtquick-exporting-qml.qdoc
@@ -54,21 +54,21 @@
 
     \list
 
-        \o  Layer names are used as element names. Spaces and hash marks (#) are
+        \li Layer names are used as element names. Spaces and hash marks (#) are
             replaced with underscore characters to create valid ids for the
             elements.
 
-        \o  Layer styles, such as drop shadows, are converted to images.
+        \li Layer styles, such as drop shadows, are converted to images.
 
-        \o  Offset, size, ordering and opacity are preserved.
+        \li Offset, size, ordering and opacity are preserved.
 
-        \o  Text layers are converted to Text elements, unless you specify that
+        \li Text layers are converted to Text elements, unless you specify that
             they be converted to Image elements.
 
-        \o  Hidden layers can be exported, and their visibility is set to
+        \li Hidden layers can be exported, and their visibility is set to
             hidden.
 
-        \o  PNG images are copied to the images subirectory.
+        \li PNG images are copied to the images subirectory.
 
     \endlist
 
@@ -79,28 +79,28 @@
 
     \list
 
-        \o  To minimize the number of elements, minimize the number of layers or
+        \li To minimize the number of elements, minimize the number of layers or
             use top-level layer groups, because each layer or layer group is
             exported as a Text or Image element.
 
-        \o  To make sure that all related elements are exported to the same
+        \li To make sure that all related elements are exported to the same
             element, use top-level layer groups.
 
-        \o  To determine that some layers are not exported, hide them, and
+        \li To determine that some layers are not exported, hide them, and
             deselect the \gui {Export hidden} check box during exporting.
 
-        \o  To make it easier to find the layers and layer groups after
+        \li To make it easier to find the layers and layer groups after
             exporting them, use descriptive names for them.
 
-        \o  To make sure that image dimensions are preserved during export,
+        \li To make sure that image dimensions are preserved during export,
             create at least one fully filled layer (which can be hidden), such
             as a background layer. If the export script does not find a fully
             filled layer, it resizes all images to the size of the canvas.
 
-        \o  To prevent errors during export, make sure that the layers are not
+        \li To prevent errors during export, make sure that the layers are not
             locked. Locked layers cannot be exported.
 
-        \o  To avoid unexpected results, do not use Blending Mode effects. They
+        \li To avoid unexpected results, do not use Blending Mode effects. They
             are not exported.
 
     \endlist
@@ -114,37 +114,37 @@
 
     \list 1
 
-        \o  Download the export script, \e{Export QML.jx}, from
+        \li Download the export script, \e{Export QML.jx}, from
             \l{http://qt.gitorious.org/qt-labs/photoshop-qmlexporter/trees/master}
             {Gitorious}.
 
             \note Read the README.txt file in the repository for latest
             information about the script.
 
-        \o  Double-click the export script to add the export command to the
+        \li Double-click the export script to add the export command to the
             \gui Scripts menu. You can also copy the script file to the Adobe
             Photoshop scripts directory (typically, \c{\Presets\Scripts} in the
             Photoshop installation directory).
 
-        \o  In Adobe Photoshop, choose \gui {File > Scripts > Export to QML} to
+        \li In Adobe Photoshop, choose \gui {File > Scripts > Export to QML} to
             export the scene to a QML file.
 
-        \o  In the \gui {Export Document to QML} dialog, enter a name and
+        \li In the \gui {Export Document to QML} dialog, enter a name and
             location for the QML file.
 
-        \o  Select the \gui {Rasterize text} check box to export text layers as
+        \li Select the \gui {Rasterize text} check box to export text layers as
             images, not as Text elements.
 
-        \o  Select the \gui {Group layers} check box to export each top-level
+        \li Select the \gui {Group layers} check box to export each top-level
             group as a merged QML Image element.
 
-        \o  Select the \gui {Export hidden} check box to export hidden layers
+        \li Select the \gui {Export hidden} check box to export hidden layers
             and to set their visibility property to hidden.
 
-        \o  Deselect the \gui {Export QML} check box if you have modified the
+        \li Deselect the \gui {Export QML} check box if you have modified the
             QML document in \QC, but still want to re-export graphical assets.
 
-        \o  Click \gui Export.
+        \li Click \gui Export.
 
     \endlist
 
@@ -167,31 +167,31 @@
 
     \list 1
 
-        \o  On Microsoft Windows, you must first add Python support to your GIMP
+        \li On Microsoft Windows, you must first add Python support to your GIMP
             installation, as instructed in
             \l {http://www.gimpusers.com/tutorials/install-python-for-gimp-2-6-windows}
             {Tutorial: Installing Python for GIMP 2.6 (Windows)}.
 
-        \o  Download the export script, \e qmlexporter.py, from
+        \li Download the export script, \e qmlexporter.py, from
             \l{http://qt.gitorious.org/qt-labs/gimp-qmlexporter/trees/master}
             {Gitorious}.
 
             \note Read the INSTALL.txt in the repository for latest information
             about the script.
 
-        \o  Copy the export script to the plug-ins directory in the GIMP
+        \li Copy the export script to the plug-ins directory in the GIMP
             installation directory.
 
-        \o  Check the properties of the file to make sure that it is executable.
+        \li Check the properties of the file to make sure that it is executable.
 
             On Linux, run the following command: \c {chmod u+rx}
 
-        \o  Restart GIMP to have the export command added to the \gui File menu.
+        \li Restart GIMP to have the export command added to the \gui File menu.
 
-        \o  Choose \gui {File > Export to QML} to export the design to a QML
+        \li Choose \gui {File > Export to QML} to export the design to a QML
             file.
 
-        \o  In the \gui {Export Layers to a QML Document} dialog, enter a name
+        \li In the \gui {Export Layers to a QML Document} dialog, enter a name
             and location for the QML file, and click \gui Export.
 
     \endlist
diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc
index 24a381465b9b6f82f2a5b7a567867fc7eb2bc2ac..20af4e9da9cdff1359299ea01dfd0a91512a43ba 100644
--- a/doc/src/qtquick/qtquick-screens.qdoc
+++ b/doc/src/qtquick/qtquick-screens.qdoc
@@ -49,9 +49,9 @@
 
     \list 1
 
-        \o  Drag and drop components from the \gui Library pane to the editor.
+        \li Drag and drop components from the \gui Library pane to the editor.
 
-        \o  Select components in the \gui Navigator pane to edit their
+        \li Select components in the \gui Navigator pane to edit their
             properties in the \gui Properties pane.
 
             For example, you can anchor components to a position on the screen.
@@ -67,13 +67,13 @@
 
     \list
 
-        \o  \l{http://qt-project.org/doc/qt-4.8/qml-gridview.html}{Grid View}
+        \li \l{http://qt-project.org/doc/qt-4.8/qml-gridview.html}{Grid View}
             provides a grid vizualization of a model.
 
-        \o  \l{http://qt-project.org/doc/qt-4.8/qml-listview.html}{List View}
+        \li \l{http://qt-project.org/doc/qt-4.8/qml-listview.html}{List View}
             provides a list vizualization of a model.
 
-        \o  \l{http://qt-project.org/doc/qt-4.8/qml-pathview.html}{Path View}
+        \li \l{http://qt-project.org/doc/qt-4.8/qml-pathview.html}{Path View}
             visualizes the contents of a model along a path.
 
     \endlist
@@ -94,17 +94,17 @@
 
     \list
 
-        \o  \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-column.html}{Column}
+        \li \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-column.html}{Column}
             arranges its child items vertically.
 
-        \o  \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-row.html}{Row}
+        \li \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-row.html}{Row}
             arranges its child items horizontally.
 
-        \o  \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-grid.html}{Grid}
+        \li \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-grid.html}{Grid}
             arranges its child items so that they are aligned in a grid and
             are not overlapping.
 
-        \o  \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-flow.html}{Flow}
+        \li \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-flow.html}{Flow}
             arranges its child items side by side, wrapping as necessary.
 
     \endlist
@@ -143,16 +143,16 @@
 
     \list
 
-        \o  Align items on different screens with each other.
+        \li Align items on different screens with each other.
 
-        \o  Avoid excessive property changes. If an item is invisible in the
+        \li Avoid excessive property changes. If an item is invisible in the
             base state, you must define all changes to its child elements as
             property changes, which leads to complicated QML code.
 
-        \o  Minimize the differences between the base state and the other states
+        \li Minimize the differences between the base state and the other states
             to keep the QML code short and readable and to improve performance.
 
-        \o  Avoid problems when using transitions and animation when changing
+        \li Avoid problems when using transitions and animation when changing
             states.
 
     \endlist
@@ -162,26 +162,26 @@
 
     \list 1
 
-        \o  In the base state, add all elements you will need in the
+        \li In the base state, add all elements you will need in the
             application (1).
             While you work on one screen, you can click the
             \inlineimage qmldesigner-show-hide-icon.png
             icon to hide elements on the canvas that are not part of a screen.
 
-        \o  In the \gui States pane, click the empty slot to create a new state
+        \li In the \gui States pane, click the empty slot to create a new state
             and give it a name. For example, \c Normal.
 
-        \o  In the \gui Properties pane (2), deselect the \gui Visibility check box
+        \li In the \gui Properties pane (2), deselect the \gui Visibility check box
             or set \gui Opacity to 0 for each element that is not needed in this
             view. If you specify the setting for the parent element, all child
             elements inherit it and are also hidden.
 
             \image qmldesigner-screen-design.png "Designing screens"
 
-        \o  Create additional states for each screen and set the visibility
+        \li Create additional states for each screen and set the visibility
             or opacity of the elements in the screen.
 
-        \o  To determine which view opens when the application starts, use the
+        \li To determine which view opens when the application starts, use the
             code editor to set the state of the root item of the .qml file, as
             specified by the following code snippet:
 
@@ -237,18 +237,18 @@
 
     \list
 
-        \o  \l{http://qt-project.org/doc/qt-4.8/qml-flickable.html}{Flickable}
+        \li \l{http://qt-project.org/doc/qt-4.8/qml-flickable.html}{Flickable}
             items can be flicked horizontally or vertically.
 
-        \o  \l{http://qt-project.org/doc/qt-4.8/qml-flipable.html}{Flipable}
+        \li \l{http://qt-project.org/doc/qt-4.8/qml-flipable.html}{Flipable}
             items can be flipped between their front and back sides by using
             rotation, state, and transition.
 
-        \o  \l{http://qt-project.org/doc/qt-4.8/qml-focusscope.html}{Focus Scope}
+        \li \l{http://qt-project.org/doc/qt-4.8/qml-focusscope.html}{Focus Scope}
             assists in keyboard focus handling when building reusable QML
             components.
 
-        \o  \l{http://qt-project.org/doc/qt-4.8/qml-mousearea.html}{Mouse Area}
+        \li \l{http://qt-project.org/doc/qt-4.8/qml-mousearea.html}{Mouse Area}
             enables simple mouse handling.
 
     \endlist
diff --git a/doc/src/widgets/creator-faq-qtdesigner.qdocinc b/doc/src/widgets/creator-faq-qtdesigner.qdocinc
index a3b9ad5df6c931e8b0e7ba162483ec3257e41b00..b5d0378f4d8cd1def4818f323dc541bf919c74fa 100644
--- a/doc/src/widgets/creator-faq-qtdesigner.qdocinc
+++ b/doc/src/widgets/creator-faq-qtdesigner.qdocinc
@@ -1,6 +1,6 @@
     \section1 Qt Designer Integration Questions
 
-    \bold {Why are custom widgets not loaded in Design mode even though it
+    \b {Why are custom widgets not loaded in Design mode even though it
     works in standalone Qt Designer?}
 
     Qt Designer fetches plugins from standard locations and loads the plugins
diff --git a/doc/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
index 9fef4525de3e57277944e209b62b601246b4f707..7d622bee9d4a68463cb02a226efb882ab22d3a44 100644
--- a/doc/src/widgets/qtdesigner-app-tutorial.qdoc
+++ b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
@@ -42,7 +42,7 @@
 
     \list 1
 
-        \o  Select \gui{File > New File or Project > Applications > Qt Gui
+        \li Select \gui{File > New File or Project > Applications > Qt Gui
             Application > Choose}.
 
             \image qtcreator-new-qt-gui-application.png "New File or Project dialog"
@@ -51,9 +51,9 @@
 
             \image qtcreator-intro-and-location-qt-gui.png "Introduction and Project Location dialog"
 
-        \o  In the \gui{Name} field, type \bold {TextFinder}.
+        \li In the \gui{Name} field, type \b {TextFinder}.
 
-        \o  In the \gui {Create in} field, enter the path for the project files.
+        \li In the \gui {Create in} field, enter the path for the project files.
             For example, \c {C:\Qt\examples}, and then click \gui{Next} (on
             Windows and Linux) or \gui Continue (on Mac OS).
 
@@ -61,7 +61,7 @@
 
             \image qtcreator-new-project-qt-versions-qt-gui.png "Kit Selection dialog"
 
-        \o  Select build and run \l{glossary-buildandrun-kit}{kits} for your project,
+        \li Select build and run \l{glossary-buildandrun-kit}{kits} for your project,
             and click \gui Next or \gui Continue.
 
             \note If only one kit is specified in \gui Tools > \gui Options >
@@ -72,22 +72,22 @@
 
             \image qtcreator-class-info-qt-gui.png "Class Information dialog"
 
-        \o  In the \gui{Class name} field, type \bold {TextFinder} as the class
+        \li In the \gui{Class name} field, type \b {TextFinder} as the class
             name.
 
-        \o  In the \gui{Base class} list, select \bold {QWidget} as the base
+        \li In the \gui{Base class} list, select \b {QWidget} as the base
             class type.
 
            \note The \gui{Header file}, \gui{Source file} and \gui{Form file}
             fields are automatically updated to match the name of the class.
 
-        \o  Click \gui Next or \gui Continue.
+        \li Click \gui Next or \gui Continue.
 
             The \gui{Project Management} dialog opens.
 
             \image qtcreator-new-project-summary-qt-gui.png "Project Management dialog"
 
-        \o  Review the project settings, and click \gui{Finish} (on Windows and
+        \li Review the project settings, and click \gui{Finish} (on Windows and
             Linux) or \gui Done (on Mac OS) to create the project.
 
     \endlist
@@ -99,11 +99,11 @@
 
     \list
 
-        \o  textfinder.h
-        \o  textfinder.cpp
-        \o  main.cpp
-        \o  textfinder.ui
-        \o  textfinder.pro
+        \li textfinder.h
+        \li textfinder.cpp
+        \li main.cpp
+        \li textfinder.ui
+        \li textfinder.pro
 
     \endlist
 
@@ -123,16 +123,16 @@
 
     \list 1
 
-        \o  In the \gui{Editor} mode, double-click the textfinder.ui file in the
+        \li In the \gui{Editor} mode, double-click the textfinder.ui file in the
             \gui{Projects} view to launch the integrated \QD.
 
-        \o  Drag and drop the following widgets to the form:
+        \li Drag and drop the following widgets to the form:
 
         \list
 
-            \o  \gui{Label} (QLabel)
-            \o  \gui{Line Edit} (QLineEdit)
-            \o  \gui{Push Button} (QPushButton)
+            \li \gui{Label} (QLabel)
+            \li \gui{Line Edit} (QLineEdit)
+            \li \gui{Push Button} (QPushButton)
 
         \endlist
 
@@ -140,31 +140,31 @@
 
         \note To easily locate the widgets, use the search box at the top of the
         \gui Sidebar. For example, to find the \gui Label widget, start typing
-        the word \bold label.
+        the word \b label.
 
         \image qtcreator-texfinder-filter.png "Filter field"
 
-        \o  Double-click the \gui{Label} widget and enter the text
-            \bold{Keyword}.
+        \li Double-click the \gui{Label} widget and enter the text
+            \b{Keyword}.
 
-        \o  Double-click the \gui{Push Button} widget and enter the text
-            \bold{Find}.
+        \li Double-click the \gui{Push Button} widget and enter the text
+            \b{Find}.
 
-        \o  In the \gui Properties pane, change the \gui objectName to
-            \bold findButton.
+        \li In the \gui Properties pane, change the \gui objectName to
+            \b findButton.
 
             \image qtcreator-textfinder-objectname.png "Changing object names"
 
-        \o  Press \key {Ctrl+A} (or \key {Cmd+A}) to select the widgets and
+        \li Press \key {Ctrl+A} (or \key {Cmd+A}) to select the widgets and
             click \gui{Lay out Horizontally} (or press \gui{Ctrl+H} on Linux or
             Windows or \key {Ctrl+Shift+H} on Mac OS) to apply a horizontal
             layout (QHBoxLayout).
 
             \image qtcreator-texfinder-ui-horizontal-layout.png "Applying horizontal layout"
 
-        \o  Drag and drop a \gui{Text Edit} widget (QTextEdit) to the form.
+        \li Drag and drop a \gui{Text Edit} widget (QTextEdit) to the form.
 
-        \o  Select the screen area and click \gui{Lay out Vertically} (or press
+        \li Select the screen area and click \gui{Lay out Vertically} (or press
             \gui{Ctrl+L}) to apply a vertical layout (QVBoxLayout).
 
             \image qtcreator-textfinder-ui.png "Text Finder UI"
@@ -172,7 +172,7 @@
             Applying the horizontal and vertical layouts ensures that the
             application UI scales to different screen sizes.
 
-        \o  To call a find function when users press the \gui Find button, you
+        \li To call a find function when users press the \gui Find button, you
             use the Qt signals and slots mechanism. A signal is emitted when a
             particular event occurs and a slot is a function that is called in
             response to a particular signal. Qt widgets have predefined signals
@@ -181,9 +181,9 @@
 
             \list
 
-                \o  Right-click the \gui Find button to open a context-menu.
+                \li Right-click the \gui Find button to open a context-menu.
 
-                \o  Select \gui {Go to Slot > clicked()}, and then select
+                \li Select \gui {Go to Slot > clicked()}, and then select
                     \gui OK.
 
                     A private slot, \c{on_findButton_clicked()}, is added to the
@@ -193,7 +193,7 @@
 
             \endlist
 
-        \o  Press \gui{Ctrl+S} (or \key {Cmd+S}) to save your changes.
+        \li Press \gui{Ctrl+S} (or \key {Cmd+S}) to save your changes.
 
     \endlist
 
@@ -209,10 +209,10 @@
 
     \list 1
 
-        \o  In the \gui{Projects} pane in the \gui {Edit view}, double-click the
+        \li In the \gui{Projects} pane in the \gui {Edit view}, double-click the
             \c{textfinder.h} file to open it for editing.
 
-        \o  Add a private function to the \c{private} section, after the
+        \li Add a private function to the \c{private} section, after the
             \c{Ui::TextFinder} pointer, as illustrated by the following code
             snippet:
 
@@ -227,10 +227,10 @@
 
     \list 1
 
-        \o  In the \gui{Projects} pane in the \gui Edit view, double-click the
+        \li In the \gui{Projects} pane in the \gui Edit view, double-click the
             textfinder.cpp file to open it for editing.
 
-        \o  Add code to load a text file using QFile, read it with QTextStream,
+        \li Add code to load a text file using QFile, read it with QTextStream,
             and then display it on \c{textEdit} with
             \l{http://qt-project.org/doc/qt-4.8/qtextedit.html#plainText-prop}
             {setPlainText()}.
@@ -238,12 +238,12 @@
 
             \snippet textfinder/textfinder.cpp 0
 
-        \o  To use QFile and QTextStream, add the following #includes to
+        \li To use QFile and QTextStream, add the following #includes to
             textfinder.cpp:
 
             \snippet textfinder/textfinder.cpp 1
 
-        \o  For the \c{on_findButton_clicked()} slot, add code to extract the
+        \li For the \c{on_findButton_clicked()} slot, add code to extract the
             search string and use the
             \l{http://qt-project.org/doc/qt-4.8/qtextedit.html#find}{find()}
             function
@@ -252,7 +252,7 @@
 
             \snippet textfinder/textfinder.cpp 2
 
-        \o  Once both of these functions are complete, add a line to call
+        \li Once both of these functions are complete, add a line to call
             \c{loadTextFile()} in the constructor, as illustrated by the
             following code snippet:
 
@@ -278,7 +278,7 @@
 
     \list 1
 
-        \o  Select \gui{File > New File or Project > Qt > Qt Resource File >
+        \li Select \gui{File > New File or Project > Qt > Qt Resource File >
             Choose}.
 
             \image qtcreator-add-resource-wizard.png "New File or Project dialog"
@@ -287,9 +287,9 @@
 
             \image qtcreator-add-resource-wizard2.png "Choose the Location dialog"
 
-        \o  In the \gui{Name} field, enter \bold{textfinder}.
+        \li In the \gui{Name} field, enter \b{textfinder}.
 
-        \o  In the \gui{Path} field, enter \c{C:\Qt\examples\TextFinder},
+        \li In the \gui{Path} field, enter \c{C:\Qt\examples\TextFinder},
             and click \gui Next or \gui Continue.
 
             The \gui{Project Management} dialog opens.
@@ -297,16 +297,16 @@
             \image qtcreator-add-resource-wizard3.png "Project Management dialog"
 
 
-        \o  In the \gui{Add to project} field, select \bold{TextFinder.pro}
+        \li In the \gui{Add to project} field, select \b{TextFinder.pro}
             and click \gui{Finish} or \gui Done to open the file in the code
             editor.
 
-        \o  Select \gui{Add > Add Prefix}.
+        \li Select \gui{Add > Add Prefix}.
 
-        \o  In the \gui{Prefix} field, replace the default prefix with a slash
+        \li In the \gui{Prefix} field, replace the default prefix with a slash
             (/).
 
-        \o  Select \gui{Add > Add Files}, to locate and add input.txt.
+        \li Select \gui{Add > Add Files}, to locate and add input.txt.
 
             \image qtcreator-add-resource.png "Editing resource files"
 
diff --git a/doc/src/widgets/qtdesigner-overview.qdoc b/doc/src/widgets/qtdesigner-overview.qdoc
index 9e05ee80042a98479f4e9acb1f765fa2a403d8a2..183dd049a726beeb884f0e59bb33dc86f1f5d00c 100644
--- a/doc/src/widgets/qtdesigner-overview.qdoc
+++ b/doc/src/widgets/qtdesigner-overview.qdoc
@@ -66,11 +66,11 @@
 
     \list 1
 
-        \o  Select \gui Tools > \gui{Form Editor} > \gui Views > \gui Locked.
+        \li Select \gui Tools > \gui{Form Editor} > \gui Views > \gui Locked.
 
             When this option is not checked, you can change the layout.
 
-        \o  Click the header of an element and drag the element to a new
+        \li Click the header of an element and drag the element to a new
             position.
 
     \endlist
@@ -79,17 +79,17 @@
 
     \list
 
-        \o  Select \gui Tools > \gui Options > \gui Designer.
+        \li Select \gui Tools > \gui Options > \gui Designer.
 
-        \o  Specify settins for generating classes and code in \gui {Class
+        \li Specify settins for generating classes and code in \gui {Class
             Generation}.
 
-        \o  Specify embedded device profiles, that determine style, font, and
+        \li Specify embedded device profiles, that determine style, font, and
             screen resolution, for example, in \gui{Embedded Design}.
 
-        \o  Specify settings for the grid and previewing forms in \gui Forms.
+        \li Specify settings for the grid and previewing forms in \gui Forms.
 
-        \o  Specify an additional folder for saving templates in \gui{Template
+        \li Specify an additional folder for saving templates in \gui{Template
             Paths}.
 
     \endlist
@@ -107,15 +107,15 @@
 
     \list 1
 
-        \o  Select \gui Tools > \gui Options > \gui Designer.
+        \li Select \gui Tools > \gui Options > \gui Designer.
 
-        \o  Select the \gui{Print/Preview Configuration} check box.
+        \li Select the \gui{Print/Preview Configuration} check box.
 
-        \o  In the \gui {Device skin} field, select a device skin.
+        \li In the \gui {Device skin} field, select a device skin.
 
-        \o  When the form is open in \gui Design mode, press \key Alt+Shift+R.
+        \li When the form is open in \gui Design mode, press \key Alt+Shift+R.
 
-        \o  To end the preview, right-click the skin and select \gui Close in
+        \li To end the preview, right-click the skin and select \gui Close in
             the context menu.
 
     \endlist
diff --git a/doc/src/widgets/qtdesigner-plugins.qdoc b/doc/src/widgets/qtdesigner-plugins.qdoc
index 4a77664a9e1c7608f71749b3d5c89d0f130aa163..1bd549fdd4167f06f6133f6be5ae60715f402b9f 100644
--- a/doc/src/widgets/qtdesigner-plugins.qdoc
+++ b/doc/src/widgets/qtdesigner-plugins.qdoc
@@ -84,7 +84,7 @@
 
     \list 1
 
-        \o  To check the paths used in the Qwt library, enter the following
+        \li To check the paths used in the Qwt library, enter the following
             \c otool command:
 
             \snippet doc_src_plugins.qdoc 0
@@ -96,15 +96,15 @@
             \snippet doc_src_plugins.qdoc 1
 
 
-        \o  You must copy the \QD plugin and the Qwt library files to the
+        \li You must copy the \QD plugin and the Qwt library files to the
             following locations:
 
             \list
 
-                \o  \c {libqwt_designer_plugin.dylib} to
+                \li \c {libqwt_designer_plugin.dylib} to
                     \c {QtCreator.app/Contents/MacOS/designer}
 
-                \o \c {libqwt.*.dylib} to \c {QtCreator.app/Contents/Frameworks}
+                \li  \c {libqwt.*.dylib} to \c {QtCreator.app/Contents/Frameworks}
 
             \endlist
 
@@ -112,7 +112,7 @@
 
             \snippet doc_src_plugins.qdoc 4
 
-        \o  Enter the following \c otool command to check the libraries that are
+        \li Enter the following \c otool command to check the libraries that are
             used by the Qwt library:
 
             \snippet doc_src_plugins.qdoc 2
@@ -121,7 +121,7 @@
 
             \snippet doc_src_plugins.qdoc 3
 
-        \o  Enter the following \c install_name_tool command to fix the
+        \li Enter the following \c install_name_tool command to fix the
             references of the libraries:
 
             \snippet doc_src_plugins.qdoc 5
diff --git a/src/libs/aggregation/aggregate.cpp b/src/libs/aggregation/aggregate.cpp
index 37b8e8d748da0d922dc50749c54eb7dbc8c38c5d..e6979b0a13dac97fda4939287a8b4e347e21473d 100644
--- a/src/libs/aggregation/aggregate.cpp
+++ b/src/libs/aggregation/aggregate.cpp
@@ -55,8 +55,8 @@
     other components in the Aggregate to the outside.
     Specifically that means:
     \list
-    \o They can be "cast" to each other (using query and query_all methods).
-    \o Their life cycle is coupled, i.e. whenever one is deleted all of them are.
+    \li They can be "cast" to each other (using query and query_all methods).
+    \li Their life cycle is coupled, i.e. whenever one is deleted all of them are.
     \endlist
     Components can be of any QObject derived type.
 
diff --git a/src/libs/extensionsystem/iplugin.cpp b/src/libs/extensionsystem/iplugin.cpp
index bb2964d39077fe57ed469349768b5cc08d7529ac..062e9efdee9b3883c09f6a8a005c279d26574109 100644
--- a/src/libs/extensionsystem/iplugin.cpp
+++ b/src/libs/extensionsystem/iplugin.cpp
@@ -62,12 +62,12 @@
     After the plugins' XML files have been read, and dependencies have been
     found, the plugin loading is done in three phases:
     \list 1
-    \o All plugin libraries are loaded in \e{root-to-leaf} order of the
+    \li All plugin libraries are loaded in \e{root-to-leaf} order of the
        dependency tree.
-    \o All plugins' initialize methods are called in \e{root-to-leaf} order
+    \li All plugins' initialize methods are called in \e{root-to-leaf} order
        of the dependency tree. This is a good place to put
        objects in the plugin manager's object pool.
-    \o All plugins' extensionsInitialized methods are called in \e{leaf-to-root}
+    \li All plugins' extensionsInitialized methods are called in \e{leaf-to-root}
        order of the dependency tree. At this point, plugins can
        be sure that all plugins that depend on this plugin have
        been initialized completely (implying that they have put
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index caa9078e211d75ea613f9c9adbf35232a19b1130..3657ff7d1bd351d163a028b36dff3fd3a39691d8 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -80,8 +80,8 @@ enum { debugLeaks = 0 };
 
     The plugin manager is used for the following tasks:
     \list
-    \o Manage plugins and their state
-    \o Manipulate a 'common object pool'
+    \li Manage plugins and their state
+    \li Manipulate a 'common object pool'
     \endlist
 
     \section1 Plugins
@@ -186,13 +186,13 @@ enum { debugLeaks = 0 };
         };
     \endcode
 
-    \bold Note: The type of the parameters passed to the \c{invoke()} calls
+    \note The type of the parameters passed to the \c{invoke()} calls
     is deduced from the parameters themselves and must match the type of
     the arguments of the called functions \e{exactly}. No conversion or even
     integer promotions are applicable, so to invoke a function with a \c{long}
     parameter explicitly use \c{long(43)} or such.
 
-    \bold Note: The object pool manipulating functions are thread-safe.
+    \note The object pool manipulating functions are thread-safe.
 */
 
 /*!
diff --git a/src/libs/qmljs/qmljsevaluate.cpp b/src/libs/qmljs/qmljsevaluate.cpp
index 79f6f35e2884d088e992264a232d5bbeee47893a..78fc410fa247209acd22678d3593b77e83620aa8 100644
--- a/src/libs/qmljs/qmljsevaluate.cpp
+++ b/src/libs/qmljs/qmljsevaluate.cpp
@@ -56,8 +56,8 @@ using namespace QmlJS;
 
     Example: In a scope where "var a = 1"
     \list
-    \o value(Identifier-a) will return NumberValue
-    \o reference(Identifier-a) will return the ASTVariableReference for the declaration of "a"
+    \li value(Identifier-a) will return NumberValue
+    \li reference(Identifier-a) will return the ASTVariableReference for the declaration of "a"
     \endlist
 */
 
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index ce4b8101dc9f3ea2d9a4e117deede20ad624cc14..6627242aceffa070acc0f00bfe41c91e94d48de2 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -80,10 +80,10 @@ using namespace QmlJS::AST;
 
     Values are the result of many operations in the QmlJS code model:
     \list
-    \o \l{Evaluate}
-    \o Context::lookupType() and Context::lookupReference()
-    \o ScopeChain::lookup()
-    \o ObjectValue::lookupMember()
+    \li \l{Evaluate}
+    \li Context::lookupType() and Context::lookupReference()
+    \li ScopeChain::lookup()
+    \li ObjectValue::lookupMember()
     \endlist
 */
 
diff --git a/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp
index a09f484b1ff4ba406279ac53aa86d37743c780c4..e9c39e9d51b8d9cc3b3f5946319265ca4bdd7b1a 100644
--- a/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp
+++ b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp
@@ -92,15 +92,15 @@ public:
     \e{Elements in the Qt.labs module are not guaranteed to remain compatible
     in future versions.}
 
-    \bold{import Qt.labs.folderlistmodel 1.0}
+    \b {import Qt.labs.folderlistmodel 1.0}
 
     The \l folder property specifies the folder to access. Information about the
     files and directories in the folder is supplied via the model's interface.
     Components access names and paths via the following roles:
 
     \list
-    \o fileName
-    \o filePath
+    \li fileName
+    \li filePath
     \endlist
 
     Additionally a file entry can be differentiated from a folder entry via the
@@ -289,11 +289,11 @@ void QDeclarativeFolderListModel::componentComplete()
     The \a sortField property contains field to use for sorting.  sortField
     may be one of:
     \list
-    \o Unsorted - no sorting is applied.  The order is system default.
-    \o Name - sort by filename
-    \o Time - sort by time modified
-    \o Size - sort by file size
-    \o Type - sort by file type (extension)
+    \li Unsorted - no sorting is applied.  The order is system default.
+    \li Name - sort by filename
+    \li Time - sort by time modified
+    \li Size - sort by file size
+    \li Type - sort by file type (extension)
     \endlist
 
     \sa sortReversed
diff --git a/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp b/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp
index ac6db960d1fd5fc99771859b82a450842ded23e7..5369fd2f9554829d53d6d8a8393dccec41dcefeb 100644
--- a/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp
+++ b/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp
@@ -50,15 +50,15 @@
     It provides
 
     \list
-    \o Notification about the state of the debugging session:
+    \li Notification about the state of the debugging session:
     \list
-        \o idle: (hooked with .idle_cmd) debuggee stopped
-        \o accessible: Debuggee stopped, cdb.exe accepts commands
-        \o inaccessible: Debuggee runs, no way to post commands
-        \o session active/inactive: Lost debuggee, terminating.
+        \li idle: (hooked with .idle_cmd) debuggee stopped
+        \li accessible: Debuggee stopped, cdb.exe accepts commands
+        \li inaccessible: Debuggee runs, no way to post commands
+        \li session active/inactive: Lost debuggee, terminating.
     \endlist
-    \o Hook up with output/event callbacks and produce formatted output
-    \o Provide some extension commands that produce output in a standardized (GDBMI)
+    \li Hook up with output/event callbacks and produce formatted output
+    \li Provide some extension commands that produce output in a standardized (GDBMI)
        format that ends up in handleExtensionMessage().
     \endlist
 */
diff --git a/src/libs/qtcreatorcdbext/symbolgroupnode.cpp b/src/libs/qtcreatorcdbext/symbolgroupnode.cpp
index f2c8ffbe86af8bbace3748a2fea39ff37ab360e4..009c46174be365408f4e97a519067065a73675b3 100644
--- a/src/libs/qtcreatorcdbext/symbolgroupnode.cpp
+++ b/src/libs/qtcreatorcdbext/symbolgroupnode.cpp
@@ -582,12 +582,12 @@ void ErrorSymbolGroupNode::debug(std::ostream &os, const std::string &visitingFu
  Provides accessors for fixed-up symbol group value and a dumping facility
  consisting of:
  \list
- \o 'Simple' dumping done when running the DumpVisitor. This produces one
+ \li 'Simple' dumping done when running the DumpVisitor. This produces one
     line of formatted output shown for the class. These values
     values are always displayed, while still allowing for expansion of the structure
     in the debugger.
     It also pre-determines some information for complex dumping (type, container).
- \o 'Complex' dumping: Obscures the symbol group children by fake children, for
+ \li 'Complex' dumping: Obscures the symbol group children by fake children, for
     example container children, to be run when calling SymbolGroup::dump with an iname.
     The fake children are appended to the child list (other children are just marked as
     obscured for GDBMI dumping so that SymbolGroupValue expressions still work as before).
diff --git a/src/libs/utils/fileinprojectfinder.cpp b/src/libs/utils/fileinprojectfinder.cpp
index 0c70c4f1c905850a223ab8bcaf1ff04e7c4ec71e..d4fe24e6e88532486115cdc053512facd198634c 100644
--- a/src/libs/utils/fileinprojectfinder.cpp
+++ b/src/libs/utils/fileinprojectfinder.cpp
@@ -48,8 +48,8 @@ namespace Utils {
 
   E.g. following file paths:
   \list
-  \i C:/app-build-desktop/qml/app/main.qml (shadow build directory)
-  \i /Users/x/app-build-desktop/App.app/Contents/Resources/qml/App/main.qml (folder on Mac OS X)
+  \li C:/app-build-desktop/qml/app/main.qml (shadow build directory)
+  \li /Users/x/app-build-desktop/App.app/Contents/Resources/qml/App/main.qml (folder on Mac OS X)
   \endlist
 
  should all be mapped to $PROJECTDIR/qml/app/main.qml
diff --git a/src/libs/utils/parameteraction.cpp b/src/libs/utils/parameteraction.cpp
index 340c5ee264cd1ade2961a41af7f2078ed136e02e..1d44a2fc390d495e918ac0f37b3546c89696fa13 100644
--- a/src/libs/utils/parameteraction.cpp
+++ b/src/libs/utils/parameteraction.cpp
@@ -37,8 +37,8 @@
 
     The action has 2 states:
     \list
-    \o <no current parameter> displaying "Do XX" (empty text)
-    \o <parameter present> displaying "Do XX with %1".
+    \li <no current parameter> displaying "Do XX" (empty text)
+    \li <parameter present> displaying "Do XX with %1".
     \endlist
 
     Provides a slot to set the parameter, changing display
diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp
index 29d1510e1201cc0504f917f86a998e456d22fada..f6e57eef67fe2768a0741f13c6949ad55f0a4b4c 100644
--- a/src/libs/utils/persistentsettings.cpp
+++ b/src/libs/utils/persistentsettings.cpp
@@ -67,9 +67,9 @@
     When parsing the structure, a parse stack of ParseValueStackEntry is used for each
     <data> element. ParseValueStackEntry is a variant/union of:
     \list
-    \o simple value
-    \o map
-    \o list
+    \li simple value
+    \li map
+    \li list
     \endlist
 
     When entering a value element ( \c <value> / \c <valuelist> , \c <valuemap> ), entry is pushed
diff --git a/src/libs/utils/projectintropage.cpp b/src/libs/utils/projectintropage.cpp
index 1f54f68e19f4b8f4d35295f97804ca42c19aed0a..dc1ae6b806b8903b31915b680e9a2f3723aadfc0 100644
--- a/src/libs/utils/projectintropage.cpp
+++ b/src/libs/utils/projectintropage.cpp
@@ -45,8 +45,8 @@
     Looks similar to FileWizardPage, but provides additional
     functionality:
     \list
-    \o Description label at the top for displaying introductory text
-    \o It does on the fly validation (connected to changed()) and displays
+    \li Description label at the top for displaying introductory text
+    \li It does on the fly validation (connected to changed()) and displays
        warnings/errors in a status label at the bottom (the page is complete
        when fully validated, validatePage() is thus not implemented).
     \endlist
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 0d2c7e01a30543738dbe53161946460adbb745dd..e2c9f5f824ae964b1f06ea753964bdcc6ad6cf88 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -203,11 +203,11 @@ static QStringList doSplitArgs(const QString &args, QtcProcess::SplitError *err)
 
     The behavior is based on the POSIX shell and bash:
     \list
-    \i Whitespace splits tokens
-    \i The backslash quotes the following character
-    \i A string enclosed in single quotes is not split. No shell meta
+    \li Whitespace splits tokens
+    \li The backslash quotes the following character
+    \li A string enclosed in single quotes is not split. No shell meta
         characters are interpreted.
-    \i A string enclosed in double quotes is not split. Within the string,
+    \li A string enclosed in double quotes is not split. Within the string,
         the backslash quotes shell meta characters - if it is followed
         by a "meaningless" character, the backslash is output verbatim.
     \endlist
@@ -220,16 +220,16 @@ static QStringList doSplitArgs(const QString &args, QtcProcess::SplitError *err)
 
     The behavior is defined by the Microsoft C runtime:
     \list
-    \i Whitespace splits tokens
-    \i A string enclosed in double quotes is not split
+    \li Whitespace splits tokens
+    \li A string enclosed in double quotes is not split
     \list
-        \i 3N double quotes within a quoted string yield N literal quotes.
+        \li 3N double quotes within a quoted string yield N literal quotes.
            This is not documented on MSDN.
     \endlist
-    \i Backslashes have special semantics iff they are followed by a double quote:
+    \li Backslashes have special semantics iff they are followed by a double quote:
     \list
-        \i 2N backslashes + double quote => N backslashes and begin/end quoting
-        \i 2N+1 backslashes + double quote => N backslashes + literal quote
+        \li 2N backslashes + double quote => N backslashes and begin/end quoting
+        \li 2N+1 backslashes + double quote => N backslashes + literal quote
     \endlist
     \endlist
     Qt and many other implementations comply with this standard, but many do not.
@@ -237,10 +237,10 @@ static QStringList doSplitArgs(const QString &args, QtcProcess::SplitError *err)
     If \a abortOnMeta is \c true, cmd shell semantics are applied before
     proceeding with word splitting:
     \list
-    \i Cmd ignores \e all special chars between double quotes.
+    \li Cmd ignores \e all special chars between double quotes.
         Note that the quotes are \e not removed at this stage - the
         tokenization rules described above still apply.
-    \i The \c circumflex is the escape char for everything including itself.
+    \li The \c circumflex is the escape char for everything including itself.
     \endlist
     As the quoting levels are independent from each other and have different
     semantics, you need a command line like \c{"foo "\^"" bar"} to get
diff --git a/src/libs/utils/textfileformat.cpp b/src/libs/utils/textfileformat.cpp
index 28a579f824050ea2441fead848e8fbd43e88d85b..cbb58f9adca59c3a5cc706ff5417ca68c271770d 100644
--- a/src/libs/utils/textfileformat.cpp
+++ b/src/libs/utils/textfileformat.cpp
@@ -65,9 +65,9 @@ QDebug operator<<(QDebug d, const TextFileFormat &format)
 
     The format comprises
     \list
-    \o Encoding represented by a pointer to a QTextCodec
-    \o Presence of an UTF8 Byte Order Marker (BOM)
-    \o Line feed storage convention
+    \li Encoding represented by a pointer to a QTextCodec
+    \li Presence of an UTF8 Byte Order Marker (BOM)
+    \li Line feed storage convention
     \endlist
 
     The class also provides convenience functions to read text files and return them
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index 574b97cf94c21c21745ef6e60c1667492d45c443..9fc242dd6dcf8827cda7fec4de2eb3f86230841a 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -127,14 +127,14 @@ using namespace Core::Internal;
 
     \section1 Important Guidelines:
     \list
-    \o Always register your actions and shortcuts!
-    \o Register your actions and shortcuts during your plugin's \l{ExtensionSystem::IPlugin::initialize()}
+    \li Always register your actions and shortcuts!
+    \li Register your actions and shortcuts during your plugin's \l{ExtensionSystem::IPlugin::initialize()}
        or \l{ExtensionSystem::IPlugin::extensionsInitialized()} methods, otherwise the shortcuts won't appear
        in the keyboard settings dialog from the beginning.
-    \o When registering an action with \c{cmd=registerAction(action, id, contexts)} be sure to connect
+    \li When registering an action with \c{cmd=registerAction(action, id, contexts)} be sure to connect
        your own action \c{connect(action, SIGNAL...)} but make \c{cmd->action()} visible to the user, i.e.
        \c{widget->addAction(cmd->action())}.
-    \o Use this class to add actions to the applications menus
+    \li Use this class to add actions to the applications menus
     \endlist
 
     \sa Core::ICore
diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp
index bac79c0f7803b105478ae9a2cc27f96b85c55820..cfb292e7f613a0a7cdfb1f1104acd860c629b4fa 100644
--- a/src/plugins/coreplugin/basefilewizard.cpp
+++ b/src/plugins/coreplugin/basefilewizard.cpp
@@ -351,8 +351,8 @@ void WizardEventLoop::rejected()
 
     The abstract methods:
     \list
-    \o createWizardDialog(): Called to create the QWizard dialog to be shown
-    \o generateFiles(): Generate file content
+    \li createWizardDialog(): Called to create the QWizard dialog to be shown
+    \li generateFiles(): Generate file content
     \endlist
 
     must be implemented.
diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.cpp b/src/plugins/coreplugin/dialogs/ioptionspage.cpp
index 11de40b3b7200dedf41b15f8ee14cfeb9fb5cfb1..db3b8006ca663402553068ddf3a1fc378f57dc0e 100644
--- a/src/plugins/coreplugin/dialogs/ioptionspage.cpp
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.cpp
@@ -38,15 +38,15 @@
   into the plugin manager object pool (e.g. ExtensionSystem::PluginManager::addObject).
   Guidelines for implementing:
   \list
-  \o id() is a unique identifier for referencing this page
-  \o displayName() is the (translated) name for display
-  \o category() is the unique id for the category that the page should be displayed in
-  \o displayCategory() is the translated name of the category
-  \o createPage() is called to retrieve the widget to show in the preferences dialog
+  \li id() is a unique identifier for referencing this page
+  \li displayName() is the (translated) name for display
+  \li category() is the unique id for the category that the page should be displayed in
+  \li displayCategory() is the translated name of the category
+  \li createPage() is called to retrieve the widget to show in the preferences dialog
      The widget will be destroyed by the widget hierarchy when the dialog closes
-  \o apply() is called to store the settings. It should detect if any changes have been
+  \li apply() is called to store the settings. It should detect if any changes have been
          made and store those
-  \o finish() is called directly before the preferences dialog closes
-  \o matches() is used for the options dialog search filter
+  \li finish() is called directly before the preferences dialog closes
+  \li matches() is used for the options dialog search filter
   \endlist
 */
diff --git a/src/plugins/coreplugin/editormanager/ieditor.cpp b/src/plugins/coreplugin/editormanager/ieditor.cpp
index af67b517a7ddd8afcc923c2a7f9665231849456a..d9ad75fe8e7602239dc6e000308671f171c138ef 100644
--- a/src/plugins/coreplugin/editormanager/ieditor.cpp
+++ b/src/plugins/coreplugin/editormanager/ieditor.cpp
@@ -42,13 +42,13 @@
 
   Guidelines for implementing:
   \list
-  \o displayName() is used as a user visible description of the document (usually filename w/o path).
-  \o kind() must be the same value as the kind() of the corresponding EditorFactory.
-  \o The changed() signal should be emitted when the modified state of the document changes
+  \li displayName() is used as a user visible description of the document (usually filename w/o path).
+  \li kind() must be the same value as the kind() of the corresponding EditorFactory.
+  \li The changed() signal should be emitted when the modified state of the document changes
      (so /bold{not} every time the document changes, but /bold{only once}).
-  \o If duplication is supported, you need to ensure that all duplicates
+  \li If duplication is supported, you need to ensure that all duplicates
         return the same file().
-  \o QString preferredMode() const is the mode the editor manager should activate.
+  \li QString preferredMode() const is the mode the editor manager should activate.
      Some editors use a special mode (such as Design mode).
   \endlist
 
diff --git a/src/plugins/coreplugin/icorelistener.h b/src/plugins/coreplugin/icorelistener.h
index 9f83287456b389900a6456cd236f96e7547fa966..fa918c7a2e979117ebcc3d3648cd73ced2f79695 100644
--- a/src/plugins/coreplugin/icorelistener.h
+++ b/src/plugins/coreplugin/icorelistener.h
@@ -53,10 +53,10 @@ the core plugin.
 
   Guidelines for implementing:
   \list
-  \o Return false from the implemented method if you want to prevent the event.
-  \o You need to add your implementing object to the plugin managers objects:
+  \li Return false from the implemented method if you want to prevent the event.
+  \li You need to add your implementing object to the plugin managers objects:
      ExtensionSystem::PluginManager::instance()->addObject(yourImplementingObject);
-  \o Don't forget to remove the object again at deconstruction (e.g. in the destructor of
+  \li Don't forget to remove the object again at deconstruction (e.g. in the destructor of
      your plugin).
 */
 class CORE_EXPORT ICoreListener : public QObject
diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp
index 3066cb2e035d9989a4d60424d6190446c756b157..ccbe55a95de7054c9806d8f87c2f5b010689b60d 100644
--- a/src/plugins/coreplugin/mimedatabase.cpp
+++ b/src/plugins/coreplugin/mimedatabase.cpp
@@ -1191,21 +1191,21 @@ MimeMapEntry::MimeMapEntry(const MimeType &t, int aLevel) :
 
     Storage requirements:
     \list
-    \o Must be robust in case of incomplete hierarchies, dangling entries
-    \o Plugins will not load and register their mime types in order of inheritance.
-    \o Multiple inheritance (several subClassesOf) can occur
-    \o Provide quick lookup by name
-    \o Provide quick lookup by file type.
+    \li Must be robust in case of incomplete hierarchies, dangling entries
+    \li Plugins will not load and register their mime types in order of inheritance.
+    \li Multiple inheritance (several subClassesOf) can occur
+    \li Provide quick lookup by name
+    \li Provide quick lookup by file type.
     \endlist
 
     This basically rules out some pointer-based tree, so the structure chosen is:
     \list
-    \o An alias map QString->QString for mapping aliases to types
-    \o A Map QString->MimeMapEntry for the types (MimeMapEntry being a pair of
+    \li An alias map QString->QString for mapping aliases to types
+    \li A Map QString->MimeMapEntry for the types (MimeMapEntry being a pair of
        MimeType and (hierarchy) level.
-    \o A map  QString->QString representing parent->child relations (enabling
+    \li A map  QString->QString representing parent->child relations (enabling
        recursing over children)
-    \o Using strings avoids dangling pointers.
+    \li Using strings avoids dangling pointers.
     \endlist
 
     The hierarchy level is used for mapping by file types. When findByFile()
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
index 5afa119c827d7150363958225bfb21e17509c7da..4f170f41e182de8281bf2e665e3a80769b16a3ba 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
@@ -57,32 +57,32 @@ using namespace Core::Internal;
 
     \table
     \header
-        \o Property
-        \o Type
-        \o Description
+        \li Property
+        \li Type
+        \li Description
     \row
-        \o Task abstraction
-        \o \c QFuture<void>
-        \o A \c QFuture object that represents the task which is
+        \li Task abstraction
+        \li \c QFuture<void>
+        \li A \c QFuture object that represents the task which is
            responsible for reporting the state of the task. See below
            for coding patterns how to create this object for your
            specific task.
     \row
-        \o Title
-        \o \c QString
-        \o A very short title describing your task. This is shown
+        \li Title
+        \li \c QString
+        \li A very short title describing your task. This is shown
            as a title over the progress bar.
     \row
-        \o Type
-        \o \c QString
-        \o A string identifier that is used to group different tasks that
+        \li Type
+        \li \c QString
+        \li A string identifier that is used to group different tasks that
            belong together.
            For example, all the search operations use the same type
            identifier.
     \row
-        \o Flags
-        \o \l ProgressManager::ProgressFlags
-        \o Additional flags that specify how the progress bar should
+        \li Flags
+        \li \l ProgressManager::ProgressFlags
+        \li Additional flags that specify how the progress bar should
            be presented to the user.
     \endtable
 
diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter.h b/src/plugins/cpptools/cpppointerdeclarationformatter.h
index 214e72396c32e512e40a9e6354f14789cc1bf107..e43a58bc49970e17d403a2e7f13481bcdadbaafd 100644
--- a/src/plugins/cpptools/cpppointerdeclarationformatter.h
+++ b/src/plugins/cpptools/cpppointerdeclarationformatter.h
@@ -55,9 +55,9 @@ typedef Utils::ChangeSet::Range Range;
 
     The following constructs are supported:
     \list
-     \o Simple declarations
-     \o Parameters and return types of function declarations and definitions
-     \o Control flow statements like if, while, for, foreach
+     \li Simple declarations
+     \li Parameters and return types of function declarations and definitions
+     \li Control flow statements like if, while, for, foreach
     \endlist
 */
 
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 1fa38bdda1faf2cdd7914958f5f8bc3adf874bbb..9461b63051c95c3db05c9dbad7edc5206a50f4fe 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -119,22 +119,22 @@ enum HandleLocalsFlags
     library (32/64bit), which is loaded into cdb.exe. It serves to:
 
     \list
-    \o Notify the engine about the state of the debugging session:
+    \li Notify the engine about the state of the debugging session:
         \list
-        \o idle: (hooked up with .idle_cmd) debuggee stopped
-        \o accessible: Debuggee stopped, cdb.exe accepts commands
-        \o inaccessible: Debuggee runs, no way to post commands
-        \o session active/inactive: Lost debuggee, terminating.
+        \li idle: (hooked up with .idle_cmd) debuggee stopped
+        \li accessible: Debuggee stopped, cdb.exe accepts commands
+        \li inaccessible: Debuggee runs, no way to post commands
+        \li session active/inactive: Lost debuggee, terminating.
         \endlist
-    \o Hook up with output/event callbacks and produce formatted output to be able
+    \li Hook up with output/event callbacks and produce formatted output to be able
        to catch application output and exceptions.
-    \o Provide some extension commands that produce output in a standardized (GDBMI)
+    \li Provide some extension commands that produce output in a standardized (GDBMI)
       format that ends up in handleExtensionMessage(), for example:
       \list
-      \o pid     Return debuggee pid for interrupting.
-      \o locals  Print locals from SymbolGroup
-      \o expandLocals Expand locals in symbol group
-      \o registers, modules, threads
+      \li pid     Return debuggee pid for interrupting.
+      \li locals  Print locals from SymbolGroup
+      \li expandLocals Expand locals in symbol group
+      \li registers, modules, threads
       \endlist
    \endlist
 
@@ -142,11 +142,11 @@ enum HandleLocalsFlags
 
    \list
 
-    \o postCommand(): Does not expect a reply
-    \o postBuiltinCommand(): Run a builtin-command producing free-format, multiline output
+    \li postCommand(): Does not expect a reply
+    \li postBuiltinCommand(): Run a builtin-command producing free-format, multiline output
        that is captured by enclosing it in special tokens using the 'echo' command and
        then invokes a callback with a CdbBuiltinCommand structure.
-    \o postExtensionCommand(): Run a command provided by the extension producing
+    \li postExtensionCommand(): Run a command provided by the extension producing
        one-line output and invoke a callback with a CdbExtensionCommand structure
        (output is potentially split up in chunks).
     \endlist
diff --git a/src/plugins/debugger/memoryagent.cpp b/src/plugins/debugger/memoryagent.cpp
index 43da6fdaf9a751afe2e87521ec08277913504746..c6e635f988afe2556e37edbc950db637b8abdb32 100644
--- a/src/plugins/debugger/memoryagent.cpp
+++ b/src/plugins/debugger/memoryagent.cpp
@@ -70,9 +70,9 @@ namespace Internal {
 
     Memory can be shown as
     \list
-    \o Editor: Create an IEditor using the normal editor factory
+    \li Editor: Create an IEditor using the normal editor factory
        interface (m_editors)
-    \o View: Separate top-level view consisting of a Bin Editor widget
+    \li View: Separate top-level view consisting of a Bin Editor widget
        (m_view).
     \endlist
 
diff --git a/src/plugins/find/ifindfilter.cpp b/src/plugins/find/ifindfilter.cpp
index 4fd3e2e62a38bccb5870a59a50538998c396fb76..f126b12afc99855e5fcca4d168e070a3821ae110 100644
--- a/src/plugins/find/ifindfilter.cpp
+++ b/src/plugins/find/ifindfilter.cpp
@@ -59,10 +59,10 @@
     If you want to implement a more specialized find filter, you'll need
     to
     \list
-        \o Start your search in a separate thread
-        \o Make this known to the Core::ProgressManager, for a progress bar
+        \li Start your search in a separate thread
+        \li Make this known to the Core::ProgressManager, for a progress bar
            and the ability to cancel the search
-        \o Interface with the shared \gui{Search Results} panel, to show
+        \li Interface with the shared \gui{Search Results} panel, to show
            the search results, handle the event that the user click on one
            of the search result items, and possible handle a global replace
            of all or some of the search result items.
diff --git a/src/plugins/macros/macroevent.cpp b/src/plugins/macros/macroevent.cpp
index 59f9a7ac532f842184845122b76e1de15059eb77..fc88ee409c2f73447deeb3df9dfa2fc18f979359 100644
--- a/src/plugins/macros/macroevent.cpp
+++ b/src/plugins/macros/macroevent.cpp
@@ -41,10 +41,10 @@ using namespace Macros;
 
     An event stores information so it can be replayed. An event can be:
     \list
-    \o menu action
-    \o key event on an editor
-    \o find/replace usage
-    \o ...
+    \li menu action
+    \li key event on an editor
+    \li find/replace usage
+    \li ...
     \endlist
 
     The information are stored in a map of QVariants (using quint8 for keys).
diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp
index 63a623038b4ca1b33b9405189f55a53b9f1d2436..12372f855ec66b3eb033469249a10fa60f84a135 100644
--- a/src/plugins/macros/macromanager.cpp
+++ b/src/plugins/macros/macromanager.cpp
@@ -80,8 +80,8 @@ using namespace Macros::Internal;
 
     There are two important methods in this class that can be used outside the Macros plugin:
     \list
-    \o registerEventHandler: add a new event handler
-    \o registerAction: add a macro event when this action is triggered
+    \li registerEventHandler: add a new event handler
+    \li registerAction: add a macro event when this action is triggered
     \endlist
 
     This class is a singleton and can be accessed using the instance method.
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index ad6ee8c24c1620de54f80fc89c253c515a023924..a5b64289644216ce66bd213d27c37a6012d18a5e 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -53,12 +53,12 @@ using namespace ProjectExplorer;
 
     Usage:
     \list
-    \o Use processParameters() to configure the process you want to run
+    \li Use processParameters() to configure the process you want to run
     (you need to do that before calling AbstractProcessStep::init()).
-    \o Inside YourBuildStep::init() call AbstractProcessStep::init().
-    \o Inside YourBuildStep::run() call AbstractProcessStep::run(), which automatically starts the proces
+    \li Inside YourBuildStep::init() call AbstractProcessStep::init().
+    \li Inside YourBuildStep::run() call AbstractProcessStep::run(), which automatically starts the process
     and by default adds the output on stdOut and stdErr to the OutputWindow.
-    \o If you need to process the process output override stdOut() and/or stdErr.
+    \li If you need to process the process output override stdOut() and/or stdErr.
     \endlist
 
     The two functions processStarted() and processFinished() are called after starting/finishing the process.
diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
index 37e8a25c07cba8774bef4eee95810f2cf03e32a5..87d84c721fc361295a9186449f7a6bcb86dc67f7 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
@@ -908,12 +908,12 @@ bool replaceFieldHelper(ValueStringTransformation transform,
 
     Replace field values delimited by '%' with special modifiers:
     \list
-    \o %Field% -> simple replacement
-    \o %Field:l% -> replace with everything changed to lower case
-    \o %Field:u% -> replace with everything changed to upper case
-    \o %Field:c% -> replace with first character capitalized
-    \o  %Field:h% -> replace with something usable as header guard
-    \o %Field:s% -> replace with something usable as structure or class name
+    \li %Field% -> simple replacement
+    \li %Field:l% -> replace with everything changed to lower case
+    \li %Field:u% -> replace with everything changed to upper case
+    \li %Field:c% -> replace with first character capitalized
+    \li  %Field:h% -> replace with something usable as header guard
+    \li %Field:s% -> replace with something usable as structure or class name
     \endlist
 
     The return value indicates whether non-empty replacements were encountered.
diff --git a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp
index db638aecaa37620ac9c89d4c8ad789668d7fe138..438a20d20454d1ea8017f18b9ecb9b0e85305ec9 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp
@@ -226,12 +226,12 @@ Core::GeneratedFiles
     As Qt Creator needs to know the file names before actually creates them to
     do overwrite checking etc., this is  2-step process:
     \list
-    \o Determine file names and attributes: The script is called with the
+    \li Determine file names and attributes: The script is called with the
       \c --dry-run option and the field values. It then prints the relative path
       names it intends to create followed by comma-separated attributes
      matching those of the \c <file> element, for example:
      \c myclass.cpp,openeditor
-    \o The script is called with the parameters only in the working directory
+    \li The script is called with the parameters only in the working directory
     and then actually creates the files. If that involves directories, the script
     should create those, too.
     \endlist
diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
index ae3e896658704521c43570ccc6d54c9ca4fea918..6025395d08ca5e3cb6f7566da11a22ff9e57501f 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
+++ b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
@@ -299,9 +299,9 @@ DeviceProcess DeviceProcessesDialogPrivate::selectedProcess() const
 
      The dialog can be used as a
      \list
-     \o Non-modal dialog showing a list of processes: Call addCloseButton()
+     \li Non-modal dialog showing a list of processes: Call addCloseButton()
         to add a 'Close' button.
-     \o Modal dialog with an 'Accept' button to select a process: Call
+     \li Modal dialog with an 'Accept' button to select a process: Call
         addAcceptButton() passing the label text. This will create a
         'Cancel' button as well.
      \endlist
diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp
index 28b9de349a90dfda9ca2c8de266bbaa14262583e..c4fca9ea4e56c755d0e0ff9f2051cd8a133ecd16 100644
--- a/src/plugins/projectexplorer/projectfilewizardextension.cpp
+++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp
@@ -69,8 +69,8 @@
 
     Offers:
     \list
-    \o Add to a project file (*.pri/ *.pro)
-    \o Initialize a version control repository (unless the path is already
+    \li Add to a project file (*.pri/ *.pro)
+    \li Initialize a version control repository (unless the path is already
         managed) and do 'add' if the VCS supports it.
     \endlist
 
diff --git a/src/plugins/qmljstools/qmljsplugindumper.cpp b/src/plugins/qmljstools/qmljsplugindumper.cpp
index 24bcc8fc3facea65fa5402fe980758c4593596f2..41e29f19fd60dd86e72bd4cded651fc668d3caf0 100644
--- a/src/plugins/qmljstools/qmljsplugindumper.cpp
+++ b/src/plugins/qmljstools/qmljsplugindumper.cpp
@@ -489,12 +489,12 @@ QString PluginDumper::resolvePlugin(const QDir &qmldirPath, const QString &qmldi
   Adapted from QDeclarativeImportDatabase::resolvePlugin.
 
   \table
-  \header \i Platform \i Valid suffixes
-  \row \i Windows     \i \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
+  \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
 
   Version number on unix are ignored.
diff --git a/src/plugins/texteditor/snippets/isnippetprovider.cpp b/src/plugins/texteditor/snippets/isnippetprovider.cpp
index 29722fd84f7e97850c7abe4cd2ea6e93c65c3c0c..6f398cd43c3c9c01d0aebf2e79a33ee5fa2f1369 100644
--- a/src/plugins/texteditor/snippets/isnippetprovider.cpp
+++ b/src/plugins/texteditor/snippets/isnippetprovider.cpp
@@ -42,21 +42,21 @@ using namespace TextEditor;
 
     In order to create a new group of snippets two steps are necessary:
     \list
-        \o Implement the TextEditor::ISnippetProvider interface and register it in
+        \li Implement the TextEditor::ISnippetProvider interface and register it in
         the extension system.
-        \o Create an XML configuration file and place it in the
+        \li Create an XML configuration file and place it in the
         /share/qtcreator/snippets directory. As an example of the file format
         please take a look at the already available ones. The meaning and consistency rules
         of the fields are described below:
         \list
-            \o group - This is the group in which the snippet belongs in the user interface.
+            \li group - This is the group in which the snippet belongs in the user interface.
             It must match TextEditor::ISnippetProvider::groupId().
-            \o id - A unique string that identifies this snippet among all others available.
+            \li id - A unique string that identifies this snippet among all others available.
             The recommended practice is to prefix it with the group so it is easier to have
             such control on a file level.
-            \o trigger - The sequence of characters to be compared by the completion engine
+            \li trigger - The sequence of characters to be compared by the completion engine
             in order to display this snippet as a code assist proposal.
-            \o complement - Additional information that is displayed in the code assist
+            \li complement - Additional information that is displayed in the code assist
             proposal so it is possible to disambiguate similar snippets that have the
             same trigger.
         \endlist
diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp
index ac4846548c87b9f851170067dc4fad4a9c44999c..66789ea3c845c40cddc2417e2cb8ff53e7fcda1a 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.cpp
+++ b/src/plugins/vcsbase/vcsbaseplugin.cpp
@@ -313,8 +313,8 @@ public:
     Qt Creator's state relevant to VCS plugins is a tuple of
 
     \list
-    \o Current file and it's version system control/top level
-    \o Current project and it's version system control/top level
+    \li Current file and it's version system control/top level
+    \li Current project and it's version system control/top level
     \endlist
 
     \sa VcsBase::VcsBasePlugin