Remove the usage of deprecated qdoc macros.

QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.

Task-number: QTBUG-24578
Change-Id: I62d203f21df63a95ee236e578b10418fd9680707
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>

5 files changed, 119 insertions, 119 deletions

diff --git a/doc/src/examples/advtutorial.qdoc b/doc/src/examples/advtutorial.qdoc
index d682a73430..bbb145cd40 100644
--- a/doc/src/examples/advtutorial.qdoc
+++ b/doc/src/examples/advtutorial.qdoc
@@ -36,7 +36,7 @@ This tutorial walks step-by-step through the creation of a full application usin
 It assumes that you already know the basics of QML (for example, from reading the
 \l{QML Tutorial}{simple tutorial}). 
 
-In this tutorial we write a game, \i {Same Game}, based on the Same Game application
+In this tutorial we write a game, \e {Same Game}, based on the Same Game application
 included in the declarative \c examples directory, which looks like this:
 
 \image declarative-samegame.png
@@ -53,10 +53,10 @@ control QML elements.
 Tutorial chapters:
 
 \list 1
-\o \l {declarative/tutorials/samegame/samegame1}{Creating the Game Canvas and Blocks}
-\o \l {declarative/tutorials/samegame/samegame2}{Populating the Game Canvas}
-\o \l {declarative/tutorials/samegame/samegame3}{Implementing the Game Logic}
-\o \l {declarative/tutorials/samegame/samegame4}{Finishing Touches}
+\li \l {declarative/tutorials/samegame/samegame1}{Creating the Game Canvas and Blocks}
+\li \l {declarative/tutorials/samegame/samegame2}{Populating the Game Canvas}
+\li \l {declarative/tutorials/samegame/samegame3}{Implementing the Game Logic}
+\li \l {declarative/tutorials/samegame/samegame4}{Finishing Touches}
 \endlist
 
 All the code in this tutorial can be found in Qt's \c examples/declarative/tutorials/samegame
@@ -168,18 +168,18 @@ and moves the new block to its position on the game canvas. This involves severa
 
 \list
 
-\o \l {QML:Qt::createComponent()}{Qt.createComponent()} is called to
+\li \l {QML:Qt::createComponent()}{Qt.createComponent()} is called to
    generate an element from \c Block.qml.  If the component is ready,
    we can call \c createObject() to create an instance of the \c Block
    item.
 
-\o If \c createObject() returned null (i.e. if there was an error
+\li If \c createObject() returned null (i.e. if there was an error
    while loading the object), print the error information.
 
-\o Place the block in its position on the board and set its width and
+\li Place the block in its position on the board and set its width and
    height.  Also, store it in the blocks array for future reference.
 
-\o Finally, print error information to the console if the component
+\li Finally, print error information to the console if the component
    could not be loaded for some reason (for example, if the file is
    missing).
 
@@ -228,11 +228,11 @@ until it is won or lost.
 To do this, we have added the following functions to \c samegame.js:
 
 \list
-\o \c{handleClick(x,y)}
-\o \c{floodFill(xIdx,yIdx,type)}
-\o \c{shuffleDown()}
-\o \c{victoryCheck()}
-\o \c{floodMoveCheck(xIdx, yIdx, type)}
+\li \c{handleClick(x,y)}
+\li \c{floodFill(xIdx,yIdx,type)}
+\li \c{shuffleDown()}
+\li \c{victoryCheck()}
+\li \c{floodMoveCheck(xIdx, yIdx, type)}
 \endlist
 
 As this is a tutorial about QML, not game design, we will only discuss \c handleClick() and \c victoryCheck() below since they interface directly with the QML elements. Note that although the game logic here is written in JavaScript, it could have been written in C++ and then exposed to QML. 
@@ -459,10 +459,10 @@ makes it very easy to fetch and display XML based data such as RSS in a QML appl
 By following this tutorial you've seen how you can write a fully functional application in QML:
 
 \list
-\o Build your application with \l {{QML Elements}}{QML elements}
-\o Add application logic \l{JavaScript Expressions in QML}{with JavaScript code}
-\o Add animations with \l {Behavior}{Behaviors} and \l{QML States}{states}
-\o Store persistent application data using, for example, the \l{Offline Storage API} or \l XMLHttpRequest
+\li Build your application with \l {{QML Elements}}{QML elements}
+\li Add application logic \l{JavaScript Expressions in QML}{with JavaScript code}
+\li Add animations with \l {Behavior}{Behaviors} and \l{QML States}{states}
+\li Store persistent application data using, for example, the \l{Offline Storage API} or \l XMLHttpRequest
 \endlist
 
 There is so much more to learn about QML that we haven't been able to cover in this tutorial. Check out all the
diff --git a/doc/src/examples/dynamicview-tutorial.qdoc b/doc/src/examples/dynamicview-tutorial.qdoc
index 517dacc2f1..d1f69c28bb 100644
--- a/doc/src/examples/dynamicview-tutorial.qdoc
+++ b/doc/src/examples/dynamicview-tutorial.qdoc
@@ -39,10 +39,10 @@ data to dynamically sort all items in a view.
 Tutorial chapters:
 
 \list 1
-\o \l {declarative/tutorials/dynamicview/dynamicview1}{A Simple ListView and Delegate}
-\o \l {declarative/tutorials/dynamicview/dynamicview2}{Dragging View Items}
-\o \l {declarative/tutorials/dynamicview/dynamicview3}{Moving Dragged Items}
-\o \l {declarative/tutorials/dynamicview/dynamicview4}{Sorting Items}
+\li \l {declarative/tutorials/dynamicview/dynamicview1}{A Simple ListView and Delegate}
+\li \l {declarative/tutorials/dynamicview/dynamicview2}{Dragging View Items}
+\li \l {declarative/tutorials/dynamicview/dynamicview3}{Moving Dragged Items}
+\li \l {declarative/tutorials/dynamicview/dynamicview4}{Sorting Items}
 \endlist
 
 All the code in this tutorial can be found in Qt's \c examples/declarative/tutorials/dynamicview
diff --git a/doc/src/examples/example-slideswitch.qdoc b/doc/src/examples/example-slideswitch.qdoc
index 689841a78b..25e81861b7 100644
--- a/doc/src/examples/example-slideswitch.qdoc
+++ b/doc/src/examples/example-slideswitch.qdoc
@@ -37,12 +37,12 @@ The code for this example can be found in the \c examples/declarative/ui-compone
 The elements that compose the switch are:
 
 \list
-\o a \c on property (the interface to interact with the switch),
-\o two images (the background image and the knob),
-\o two mouse regions for user interation (on the background image and on the knob),
-\o two states (a \i on state and a \i off state),
-\o two functions or slots to react to the user interation (\c toggle() and \c dorelease()),
-\o and a transition that describe how to go from one state to the other.
+\li a \c on property (the interface to interact with the switch),
+\li two images (the background image and the knob),
+\li two mouse regions for user interation (on the background image and on the knob),
+\li two states (an \e on state and an \e off state),
+\li two functions or slots to react to the user interation (\c toggle() and \c dorelease()),
+\li and a transition that describe how to go from one state to the other.
 \endlist
 
 \section1 Switch.qml
@@ -93,8 +93,8 @@ in the \c dorelease() function that is called in the \c onReleased property.
 
 We define the two states of the switch:
 \list
-\o In the \i on state the knob is on the right (\c x position is 78) and the \c on property is \c true.
-\o In the \i off state the knob is on the left (\c x position is 1) and the \c on property is \c false.
+\li In the \e on state the knob is on the right (\c x position is 78) and the \c on property is \c true.
+\li In the \e off state the knob is on the left (\c x position is 1) and the \c on property is \c false.
 \endlist
 
 For more information on states see \l{qmlstates}{QML States}.
@@ -106,13 +106,13 @@ We add two JavaScript functions to our switch:
 \snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 2
 
 This first function is called when the background image or the knob are clicked. We simply want the switch to toggle between the two
-states (\i on and \i off).
+states (\e on and \e off).
 
 
 \snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 3
 
 This second function is called when the knob is released and we want to make sure that the knob does not end up between states
-(neither \i on nor \i off). If it is the case call the \c toggle() function otherwise we do nothing.
+(neither \e on nor \e off). If it is the case call the \c toggle() function otherwise we do nothing.
 
 For more information on scripts see \l{JavaScript Expressions in QML}.
 
diff --git a/doc/src/examples/examples.qdoc b/doc/src/examples/examples.qdoc
index f9c89d87f4..a99dc8c263 100644
--- a/doc/src/examples/examples.qdoc
+++ b/doc/src/examples/examples.qdoc
@@ -103,10 +103,10 @@ This set of code samples are part of the collection of \l{Qt Examples}.
         Mouse and Keyboard Input
         \enddiv
         \list
-        \o \l{declarative/text/fonts}{Fonts}
-        \o \l{declarative/text/textselection}{Text Selection}
-        \o \l{declarative/keyinteraction/focus}{Keyboard Focus}
-        \o \l{declarative/touchinteraction/mousearea}{MouseArea}
+        \li \l{declarative/text/fonts}{Fonts}
+        \li \l{declarative/text/textselection}{Text Selection}
+        \li \l{declarative/keyinteraction/focus}{Keyboard Focus}
+        \li \l{declarative/touchinteraction/mousearea}{MouseArea}
         \endlist
     \enddiv
     \div {class="threecolumn_piece"}
@@ -114,10 +114,10 @@ This set of code samples are part of the collection of \l{Qt Examples}.
         States and Transitions
         \enddiv
         \list
-        \o \l{declarative/animation/states}{States}
-        \o \l{declarative/animation/basics}{Animation Essentials}
-        \o \l{declarative/animation/behaviors}{Behaviors}
-        \o \l{declarative/animation/easing}{Easing}
+        \li \l{declarative/animation/states}{States}
+        \li \l{declarative/animation/basics}{Animation Essentials}
+        \li \l{declarative/animation/behaviors}{Behaviors}
+        \li \l{declarative/animation/easing}{Easing}
         \endlist
     \enddiv
     \div {class="threecolumn_piece"}
@@ -125,14 +125,14 @@ This set of code samples are part of the collection of \l{Qt Examples}.
         UI Components
         \enddiv
         \list
-        \o \l{declarative/ui-components/dialcontrol}{Dial Control}
-        \o \l{declarative/ui-components/flipable}{Flipable}
-        \o \l{declarative/ui-components/progressbar}{Progress Bar}
-        \o \l{declarative/ui-components/scrollbar}{Scroll Bar}
-        \o \l{declarative/ui-components/searchbox}{Search Box}
-        \o \l{declarative/ui-components/slideswitch}{Slide Switch}
-        \o \l{declarative/ui-components/spinner}{Spinner}
-        \o \l{declarative/ui-components/tabwidget}{Tab Widget}
+        \li \l{declarative/ui-components/dialcontrol}{Dial Control}
+        \li \l{declarative/ui-components/flipable}{Flipable}
+        \li \l{declarative/ui-components/progressbar}{Progress Bar}
+        \li \l{declarative/ui-components/scrollbar}{Scroll Bar}
+        \li \l{declarative/ui-components/searchbox}{Search Box}
+        \li \l{declarative/ui-components/slideswitch}{Slide Switch}
+        \li \l{declarative/ui-components/spinner}{Spinner}
+        \li \l{declarative/ui-components/tabwidget}{Tab Widget}
         \endlist
     \enddiv
     \div {class="threecolumn_piece"}
@@ -140,11 +140,11 @@ This set of code samples are part of the collection of \l{Qt Examples}.
         Positioners and Layout
         \enddiv
         \list
-        \o \l{declarative/positioners}{Row and Column}
-        \o \l{declarative/righttoleft/layoutmirroring}{Layout Mirroring}
-        \o \l{declarative/righttoleft/layoutdirection}{Layout Direction}
-        \o \l{declarative/righttoleft/textalignment}{Text Alignment}
-        \o \l{declarative/screenorientation}{Screen Orientation}
+        \li \l{declarative/positioners}{Row and Column}
+        \li \l{declarative/righttoleft/layoutmirroring}{Layout Mirroring}
+        \li \l{declarative/righttoleft/layoutdirection}{Layout Direction}
+        \li \l{declarative/righttoleft/textalignment}{Text Alignment}
+        \li \l{declarative/screenorientation}{Screen Orientation}
         \endlist
     \enddiv
     \div {class="threecolumn_piece"}
@@ -152,15 +152,15 @@ This set of code samples are part of the collection of \l{Qt Examples}.
         Data with Models and Views
         \enddiv
         \list
-        \o \l{declarative/modelviews/gridview}{GridView}
-        \o \l{declarative/modelviews/listview}{ListView}
-        \o \l{declarative/modelviews/pathview}{PathView}
-        \o \l{declarative/modelviews/package}{Package}
-        \o \l{declarative/modelviews/visualitemmodel}{VisualItemModel}
-        \o \l{declarative/modelviews/stringlistmodel}{String ListModel}
-        \o \l{declarative/modelviews/objectlistmodel}{Object ListModel}
-        \o \l{declarative/modelviews/abstractitemmodel}{AbstractItemModel}
-        \o \l{declarative/modelviews/webview}{WebView}
+        \li \l{declarative/modelviews/gridview}{GridView}
+        \li \l{declarative/modelviews/listview}{ListView}
+        \li \l{declarative/modelviews/pathview}{PathView}
+        \li \l{declarative/modelviews/package}{Package}
+        \li \l{declarative/modelviews/visualitemmodel}{VisualItemModel}
+        \li \l{declarative/modelviews/stringlistmodel}{String ListModel}
+        \li \l{declarative/modelviews/objectlistmodel}{Object ListModel}
+        \li \l{declarative/modelviews/abstractitemmodel}{AbstractItemModel}
+        \li \l{declarative/modelviews/webview}{WebView}
         \endlist
     \enddiv
     \div {class="threecolumn_piece"}
@@ -168,12 +168,12 @@ This set of code samples are part of the collection of \l{Qt Examples}.
         Advance UI Components
         \enddiv
         \list
-        \o \l{declarative/modelviews/parallax}{Parallax}
-        \o \l{declarative/toys/clocks}{Clocks}
-        \o \l{declarative/toys/corkboards}{Corkboards}
-        \o \l{declarative/toys/dynamicscene}{Dynamic Scene}
-        \o \l{declarative/toys/tic-tac-toe}{Tic Tac Toe}
-        \o \l{declarative/toys/tvtennis}{TV Tennis}
+        \li \l{declarative/modelviews/parallax}{Parallax}
+        \li \l{declarative/toys/clocks}{Clocks}
+        \li \l{declarative/toys/corkboards}{Corkboards}
+        \li \l{declarative/toys/dynamicscene}{Dynamic Scene}
+        \li \l{declarative/toys/tic-tac-toe}{Tic Tac Toe}
+        \li \l{declarative/toys/tvtennis}{TV Tennis}
         \endlist
     \enddiv
     \div {class="threecolumn_piece"}
@@ -181,8 +181,8 @@ This set of code samples are part of the collection of \l{Qt Examples}.
         Image Elements
         \enddiv
         \list
-        \o \l{declarative/imageelements/borderimage}{BorderImage}
-        \o \l{declarative/imageelements/image}{Image}
+        \li \l{declarative/imageelements/borderimage}{BorderImage}
+        \li \l{declarative/imageelements/image}{Image}
         \endlist
     \enddiv
     \div {class="threecolumn_piece"}
@@ -190,8 +190,8 @@ This set of code samples are part of the collection of \l{Qt Examples}.
         Loading Resources
         \enddiv
         \list
-        \o \l{declarative/sqllocalstorage}{SQL Local Storage}
-        \o \l{declarative/xml/xmlhttprequest}{XmlHttpRequest}
+        \li \l{declarative/sqllocalstorage}{SQL Local Storage}
+        \li \l{declarative/xml/xmlhttprequest}{XmlHttpRequest}
         \endlist
     \enddiv
     \div {class="threecolumn_piece"}
@@ -199,7 +199,7 @@ This set of code samples are part of the collection of \l{Qt Examples}.
         Localization
         \enddiv
         \list
-        \o \l{declarative/i18n}{Translation}
+        \li \l{declarative/i18n}{Translation}
         \endlist
     \enddiv
     \div {class="threecolumn_piece"}
@@ -207,8 +207,8 @@ This set of code samples are part of the collection of \l{Qt Examples}.
         Threading
         \enddiv
         \list
-        \o \l{declarative/threading/threadedlistmodel}{Threaded ListModel}
-        \o \l{declarative/threading/workerscript}{WorkerScript Element}
+        \li \l{declarative/threading/threadedlistmodel}{Threaded ListModel}
+        \li \l{declarative/threading/workerscript}{WorkerScript Element}
         \endlist
     \enddiv
     \div {class="threecolumn_piece"}
@@ -216,7 +216,7 @@ This set of code samples are part of the collection of \l{Qt Examples}.
         Graphical Effects
         \enddiv
         \list
-        \o \l{declarative/shadereffects}{Shader Effects}
+        \li \l{declarative/shadereffects}{Shader Effects}
         \endlist
     \enddiv
 \enddiv
@@ -231,16 +231,16 @@ This set of code samples are part of the collection of \l{Qt Examples}.
         From Qt C++ to QML
         \enddiv
         \list
-        \o \l {declarative/cppextensions/referenceexamples/adding}{Exporting C++ Classes}
-        \o \l {declarative/cppextensions/referenceexamples/properties}{Exporting Qt C++ Properties}
-        \o \l {declarative/cppextensions/referenceexamples/coercion}{C++ Inheritance and Coercion}
-        \o \l {declarative/cppextensions/referenceexamples/default}{Default Property}
-        \o \l {declarative/cppextensions/referenceexamples/grouped}{Grouped Properties}
-        \o \l {declarative/cppextensions/referenceexamples/attached}{Attached Properties}
-        \o \l {declarative/cppextensions/referenceexamples/signal}{Signal Support}
-        \o \l {declarative/cppextensions/referenceexamples/methods}{Methods Support}
-        \o \l {declarative/cppextensions/referenceexamples/valuesource}{Property Value Source}
-        \o \l {declarative/cppextensions/referenceexamples/binding}{Binding}
+        \li \l {declarative/cppextensions/referenceexamples/adding}{Exporting C++ Classes}
+        \li \l {declarative/cppextensions/referenceexamples/properties}{Exporting Qt C++ Properties}
+        \li \l {declarative/cppextensions/referenceexamples/coercion}{C++ Inheritance and Coercion}
+        \li \l {declarative/cppextensions/referenceexamples/default}{Default Property}
+        \li \l {declarative/cppextensions/referenceexamples/grouped}{Grouped Properties}
+        \li \l {declarative/cppextensions/referenceexamples/attached}{Attached Properties}
+        \li \l {declarative/cppextensions/referenceexamples/signal}{Signal Support}
+        \li \l {declarative/cppextensions/referenceexamples/methods}{Methods Support}
+        \li \l {declarative/cppextensions/referenceexamples/valuesource}{Property Value Source}
+        \li \l {declarative/cppextensions/referenceexamples/binding}{Binding}
         \endlist
     \enddiv
     \div {class="threecolumn_piece"}
@@ -248,10 +248,10 @@ This set of code samples are part of the collection of \l{Qt Examples}.
         Plugins and Resources
         \enddiv
         \list
-        \o \l{declarative/cppextensions/plugins}{Plugins}
-        \o \l{declarative/cppextensions/imageprovider}{Image Provider}
-        \o \l{declarative/cppextensions/networkaccessmanagerfactory}{Network Access Manager}
-        \o \l{src/imports/folderlistmodel}{Folder List Model} - a C++ model plugin
+        \li \l{declarative/cppextensions/plugins}{Plugins}
+        \li \l{declarative/cppextensions/imageprovider}{Image Provider}
+        \li \l{declarative/cppextensions/networkaccessmanagerfactory}{Network Access Manager}
+        \li \l{src/imports/folderlistmodel}{Folder List Model} - a C++ model plugin
         \endlist
     \enddiv
     \div {class="threecolumn_piece"}
@@ -259,8 +259,8 @@ This set of code samples are part of the collection of \l{Qt Examples}.
         Qt UI and QML Integration
         \enddiv
         \list
-        \o \l{declarative-cppextensions-qgraphicslayouts.html}{QGraphicsLayouts}
-        \o \l{declarative/cppextensions/qwidgets}{QWidgets}
+        \li \l{declarative-cppextensions-qgraphicslayouts.html}{QGraphicsLayouts}
+        \li \l{declarative/cppextensions/qwidgets}{QWidgets}
         \endlist
     \enddiv
 \enddiv
@@ -276,11 +276,11 @@ This set of code samples are part of the collection of \l{Qt Examples}.
             Elements and Components
         \enddiv
         \list
-        \o \l{QML Elements}
-        \o \l{external: Qt Mobility QML Plugins}{QML Plugins}
-        \o \l{external: Qt Quick Components for Symbian}{Symbian Components}
-        \o MeeGo Components
-        \o \l{QtWebKit QML Module}
+        \li \l{QML Elements}
+        \li \l{external: Qt Mobility QML Plugins}{QML Plugins}
+        \li \l{external: Qt Quick Components for Symbian}{Symbian Components}
+        \li MeeGo Components
+        \li \l{QtWebKit QML Module}
         \endlist
     \enddiv
     \div {class="threecolumn_piece"}
@@ -288,9 +288,9 @@ This set of code samples are part of the collection of \l{Qt Examples}.
             Qt Developer Network
         \enddiv
         \list
-        \o \l{Qt eLearning}{Training Materials}
-        \o \l{Forums on Qt Developer Network}{Forums}
-        \o \l{Wiki on Qt Developer Network}{Wiki}
+        \li \l{Qt eLearning}{Training Materials}
+        \li \l{Forums on Qt Developer Network}{Forums}
+        \li \l{Wiki on Qt Developer Network}{Wiki}
         \endlist
     \enddiv
     \div {class="threecolumn_piece"}
@@ -298,9 +298,9 @@ This set of code samples are part of the collection of \l{Qt Examples}.
             Reference
         \enddiv
         \list
-        \o \l{All Classes}{Qt API}
-        \o \l{external: Qt Creator Manual}{Qt Creator Manual}
-        \o \l{Develop with Qt}
+        \li \l{All Classes}{Qt API}
+        \li \l{external: Qt Creator Manual}{Qt Creator Manual}
+        \li \l{Develop with Qt}
         \endlist
     \enddiv
 \enddiv
diff --git a/doc/src/examples/tutorial.qdoc b/doc/src/examples/tutorial.qdoc
index 9042b5e3d8..d8d6e14f09 100644
--- a/doc/src/examples/tutorial.qdoc
+++ b/doc/src/examples/tutorial.qdoc
@@ -46,9 +46,9 @@ The tutorial's source code is located in the $QTDIR/examples/declarative/tutoria
 Tutorial chapters:
 
 \list 1
-\o \l {QML Tutorial 1 - Basic Types}{Basic Types}
-\o \l {QML Tutorial 2 - QML Components}{QML Components}
-\o \l {QML Tutorial 3 - States and Transitions}{States and Transitions}
+\li \l {QML Tutorial 1 - Basic Types}{Basic Types}
+\li \l {QML Tutorial 2 - QML Components}{QML Components}
+\li \l {QML Tutorial 3 - States and Transitions}{States and Transitions}
 \endlist
 
 */
@@ -97,7 +97,7 @@ We add a \l Text element as a child of the root Rectangle element that displays
 The \c y property is used to position the text vertically at 30 pixels from the top of its parent.
 
 The \c anchors.horizontalCenter property refers to the horizontal center of an element.
-In this case, we specify that our text element should be horizontally centered in the \i page element (see \l{anchor-layout}{Anchor-Based Layout}).
+In this case, we specify that our text element should be horizontally centered in the \e page element (see \l{anchor-layout}{Anchor-Based Layout}).
 
 The \c font.pointSize and \c font.bold properties are related to fonts and use the \l{dot properties}{dot notation}.
 
@@ -141,24 +141,24 @@ Here is the QML code for \c Cell.qml:
 
 \snippet examples/declarative/tutorials/helloworld/Cell.qml 1
 
-The root element of our component is an \l Item with the \c id \i container.
+The root element of our component is an \l Item with the \c id \e container.
 An \l Item is the most basic visual element in QML and is often used as a container for other elements.
 
 \snippet examples/declarative/tutorials/helloworld/Cell.qml 4
 
-We declare a \c cellColor property. This property is accessible from  \i outside our component, this allows us
+We declare a \c cellColor property. This property is accessible from  \e outside our component, this allows us
 to instantiate the cells with different colors.
 This property is just an alias to an existing property - the color of the rectangle that compose the cell
 (see \l{Property Binding in QML}).
 
 \snippet examples/declarative/tutorials/helloworld/Cell.qml 5
 
-We want our component to also have a signal that we call \i clicked with a \i cellColor parameter of type \i color.
+We want our component to also have a signal that we call \e clicked with a \e cellColor parameter of type \e color.
 We will use this signal to change the color of the text in the main QML file later.
 
 \snippet examples/declarative/tutorials/helloworld/Cell.qml 2
 
-Our cell component is basically a colored rectangle with the \c id \i rectangle.
+Our cell component is basically a colored rectangle with the \c id \e rectangle.
 
 The \c anchors.fill property is a convenient way to set the size of an element.
 In this case the rectangle will have the same size as its parent (see \l{anchor-layout}{Anchor-Based Layout}).
@@ -168,8 +168,8 @@ In this case the rectangle will have the same size as its parent (see \l{anchor-
 In order to change the color of the text when clicking on a cell, we create a \l MouseArea element with
 the same size as its parent.
 
-A \l MouseArea defines a signal called \i clicked.
-When this signal is triggered we want to emit our own \i clicked signal with the color as parameter.
+A \l MouseArea defines a signal called \e clicked.
+When this signal is triggered we want to emit our own \e clicked signal with the color as parameter.
 
 \section2 The main QML file
 
@@ -181,8 +181,8 @@ We create the color picker by putting 6 cells with different colors in a grid.
 
 \snippet examples/declarative/tutorials/helloworld/tutorial2.qml 1
 
-When the \i clicked signal of our cell is triggered, we want to set the color of the text to the \i cellColor passed as a parameter.
-We can react to any signal of our component through a property of the name \i 'onSignalName' (see \l{Signal Handlers}).
+When the \e clicked signal of our cell is triggered, we want to set the color of the text to the \e cellColor passed as a parameter.
+We can react to any signal of our component through a property of the name \e 'onSignalName' (see \l{Signal Handlers}).
 */
 
 /*!
@@ -206,10 +206,10 @@ Here is the QML code:
 
 \snippet examples/declarative/tutorials/helloworld/tutorial3.qml 2
 
-First, we create a new \i down state for our text element.
+First, we create a new \e down state for our text element.
 This state will be activated when the \l MouseArea is pressed, and deactivated when it is released.
 
-The \i down state includes a set of property changes from our implicit \i {default state}
+The \e down state includes a set of property changes from our implicit \e {default state}
 (the items as they were initially defined in the QML).
 Specifically, we set the \c y property of the text to \c 160, the rotation to \c 180 and the \c color to red.
 
@@ -219,9 +219,9 @@ Because we don't want the text to appear at the bottom instantly but rather move
 we add a transition between our two states.
 
 \c from and \c to define the states between which the transition will run.
-In this case, we want a transition from the default state to our \i down state.
+In this case, we want a transition from the default state to our \li down state.
 
-Because we want the same transition to be run in reverse when changing back from the \i down state to the default state,
+Because we want the same transition to be run in reverse when changing back from the \e down state to the default state,
 we set \c reversible to \c true.
 This is equivalent to writing the two transitions separately.