14 files changed, 250 insertions, 250 deletions

diff --git a/doc/src/qtquick2/anchor-layout.qdoc b/doc/src/qtquick2/anchor-layout.qdoc
index 6e56768f8a..fb2d8b7d83 100644
--- a/doc/src/qtquick2/anchor-layout.qdoc
+++ b/doc/src/qtquick2/anchor-layout.qdoc
@@ -33,7 +33,7 @@
 
 \target anchor-layout
 In addition to the more traditional \l Grid, \l Row, and \l Column,
-QML also provides a way to layout items using the concept of \i anchors.
+QML also provides a way to layout items using the concept of \e anchors.
 Each item can be thought of as having a set of 7 invisible "anchor lines":
 \l {Item::anchors.left}{left}, \l {Item::anchors.horizontalCenter}{horizontalCenter},
 \l {Item::anchors.right}{right}, \l {Item::anchors.top}{top},
@@ -43,7 +43,7 @@ and \l {Item::anchors.bottom}{bottom}.
 \image edges_qml.png
 
 The baseline (not pictured above) corresponds to the imaginary line on which
-text would sit. For items with no text it is the same as \i top.
+text would sit. For items with no text it is the same as \e top.
 
 The QML anchoring system allows you to define relationships between the anchor lines of different items. For example, you can write:
 
@@ -52,7 +52,7 @@ Rectangle { id: rect1; ... }
 Rectangle { id: rect2; anchors.left: rect1.right; ... }
 \endcode
 
-In this case, the left edge of \i rect2 is bound to the right edge of \i rect1, producing the following:
+In this case, the left edge of \e rect2 is bound to the right edge of \e rect1, producing the following:
 
 \image edge1.png
 
@@ -67,8 +67,8 @@ Rectangle { id: rect2; anchors.left: rect1.right; anchors.top: rect1.bottom; ...
 \image edge3.png
 
 By specifying multiple horizontal or vertical anchors you can control the size of an item. Below,
-\i rect2 is anchored to the right of \i rect1 and the left of \i rect3. If either of the blue
-rectangles are moved, \i rect2 will stretch and shrink as necessary:
+\e rect2 is anchored to the right of \e rect1 and the left of \e rect3. If either of the blue
+rectangles are moved, \e rect2 will stretch and shrink as necessary:
 
 \code
 Rectangle { id: rect1; x: 0; ... }
@@ -84,7 +84,7 @@ and horizontalCenter anchors to the verticalCenter and horizontalCenter of the t
 
 \section1 Anchor Margins and Offsets
 
-The anchoring system also allows \i margins and \i offsets to be specified for an item's anchors.
+The anchoring system also allows \e margins and \e offsets to be specified for an item's anchors.
 Margins specify the amount of empty space to leave to the outside of an item's anchor, while
 offsets allow positioning to be manipulated using the center anchor lines.  An item can
 specify its anchor margins individually through \l {Item::anchors.leftMargin}{leftMargin},
@@ -104,11 +104,11 @@ Rectangle { id: rect1; ... }
 Rectangle { id: rect2; anchors.left: rect1.right; anchors.leftMargin: 5; ... }
 \endcode
 
-In this case, a margin of 5 pixels is reserved to the left of \i rect2, producing the following:
+In this case, a margin of 5 pixels is reserved to the left of \e rect2, producing the following:
 
 \image edge2.png
 
-\note Anchor margins only apply to anchors; they are \i not a generic means of applying margins to an \l Item.
+\note Anchor margins only apply to anchors; they are \e not a generic means of applying margins to an \l Item.
 If an anchor margin is specified for an edge but the item is not anchored to any item on that
 edge, the margin is not applied.
 
diff --git a/doc/src/qtquick2/animation.qdoc b/doc/src/qtquick2/animation.qdoc
index cf656fb209..7e74f06abf 100644
--- a/doc/src/qtquick2/animation.qdoc
+++ b/doc/src/qtquick2/animation.qdoc
@@ -34,27 +34,27 @@
 \keyword qml-animation-elements
 \section1 Animation and Transitions Elements
 \list
-\o \l {Transition} - Animates transitions during state changes
-\o \l {SequentialAnimation} - Runs animations sequentially
-\o \l {ParallelAnimation} - Runs animations in parallel
-\o \l {Behavior} - Specifies a default animation for property changes
-\o \l {PropertyAction} - Sets immediate property changes during animation
-\o \l {PauseAnimation} - Introduces a pause in an animation
-\o \l {SmoothedAnimation} - Allows a property to smoothly track a value
-\o \l {SpringAnimation} - Allows a property to track a value in a spring-like motion
-\o \l {ScriptAction} - Runs scripts during an animation
+\li \l {Transition} - Animates transitions during state changes
+\li \l {SequentialAnimation} - Runs animations sequentially
+\li \l {ParallelAnimation} - Runs animations in parallel
+\li \l {Behavior} - Specifies a default animation for property changes
+\li \l {PropertyAction} - Sets immediate property changes during animation
+\li \l {PauseAnimation} - Introduces a pause in an animation
+\li \l {SmoothedAnimation} - Allows a property to smoothly track a value
+\li \l {SpringAnimation} - Allows a property to track a value in a spring-like motion
+\li \l {ScriptAction} - Runs scripts during an animation
 \endlist
 
 \keyword qml-property-animation-elements
 Elements that animate properties based on data types
 \list
-\o \l {PropertyAnimation} - Animates property changes
-\o \l {NumberAnimation} - Animates properties of type qreal
-\o \l {Vector3dAnimation} - Animates properties of type QVector3d
-\o \l {ColorAnimation} - Animates color changes
-\o \l {RotationAnimation} - Animates rotations
-\o \l {ParentAnimation} - Animates parent changes
-\o \l {AnchorAnimation} - Animates anchor changes
+\li \l {PropertyAnimation} - Animates property changes
+\li \l {NumberAnimation} - Animates properties of type qreal
+\li \l {Vector3dAnimation} - Animates properties of type QVector3d
+\li \l {ColorAnimation} - Animates color changes
+\li \l {RotationAnimation} - Animates rotations
+\li \l {ParentAnimation} - Animates parent changes
+\li \l {AnchorAnimation} - Animates anchor changes
 \endlist
 
 In QML, animations are created by applying animation elements to property
@@ -78,7 +78,7 @@ directly. This may be done in signal handlers or attached properties.
 
 \snippet doc/src/snippets/qml/animation.qml direct property change
 
-However, to create more control, \i {property animations} apply smooth movements
+However, to create more control, \e {property animations} apply smooth movements
 by interpolating values between property value changes. Property animations
 provide timing controls and allows different interpolations through
 \l{qml-easing-animation}{easing curves}.
@@ -123,7 +123,7 @@ that the transition applies to any state change.
 
 \section2 Default Animation as Behaviors
 
-Default property animations are set using \i {behavior animations}. Animations
+Default property animations are set using \e {behavior animations}. Animations
 declared in \l {Behavior} elements apply to the property and animates any
 property value changes. However, Behavior elements have an
 \c enabled property to purposely enable or disable the behavior animations.
@@ -144,7 +144,7 @@ demonstration of behavioral animations.
 
 \section1 Playing Animations in Parallel or in Sequence
 
-Animations can run \i {in parallel} or \i {in sequence}. Parallel animations
+Animations can run \e {in parallel} or \e {in sequence}. Parallel animations
 will play a group of animations at the same time while sequential animations
 play a group of animations in order: one after the other. Grouping animations in
 \l{SequentialAnimation} and \l{ParallelAnimation} will play the animations in
@@ -202,22 +202,22 @@ of the different easing types.
 In addition, QML provides several other elements useful for animation:
 
 \list
-\o PauseAnimation: enables pauses during animations
-\o ScriptAction: allows JavaScript to be executed during an animation, and can
+\li PauseAnimation: enables pauses during animations
+\li ScriptAction: allows JavaScript to be executed during an animation, and can
 be used together with StateChangeScript to reused existing scripts
-\o PropertyAction: changes a property \i immediately during an animation,
+\li PropertyAction: changes a property \e immediately during an animation,
 without animating the property change
 \endlist
 
 These are specialized animation elements that animate different property types
 \list
-\o SmoothedAnimation: a specialized NumberAnimation that provides smooth
+\li SmoothedAnimation: a specialized NumberAnimation that provides smooth
 changes in animation when the target value changes
-\o SpringAnimation: provides a spring-like animation with specialized
+\li SpringAnimation: provides a spring-like animation with specialized
 attributes such as \l {SpringAnimation::}{mass},
 \l{SpringAnimation::}{damping} and \l{SpringAnimation::}{epsilon}
-\o ParentAnimation: used for animating a parent change (see ParentChange)
-\o AnchorAnimation: used for animating an anchor change (see AnchorChanges)
+\li ParentAnimation: used for animating a parent change (see ParentChange)
+\li AnchorAnimation: used for animating an anchor change (see AnchorChanges)
 \endlist
 
 \section1 Sharing Animation Instances
diff --git a/doc/src/qtquick2/basicelements.qdoc b/doc/src/qtquick2/basicelements.qdoc
index ae212f1964..99eb83bca2 100644
--- a/doc/src/qtquick2/basicelements.qdoc
+++ b/doc/src/qtquick2/basicelements.qdoc
@@ -31,7 +31,7 @@
 \title Qt Quick Basic Elements
 \brief introduction to the Qt Quick Elements
 
-Qt Quick includes \i elements for placing components. These can be combined
+Qt Quick includes \e elements for placing components. These can be combined
 to form other components.
 
 \code
@@ -40,15 +40,15 @@ import QtQuick 2.0
 \section1 Basic Elements
 This is a list of some of the elements readily available for users.
 \list
-\o \l {Item}
-\o \l {Rectangle}
-\o \l {Image}
-\o \l {Text}
-\o \l {TextInput}
-\o \l {TextEdit}
-\o \l {FocusScope}
-\o \l {Component}
-\o \l {MouseArea}
+\li \l {Item}
+\li \l {Rectangle}
+\li \l {Image}
+\li \l {Text}
+\li \l {TextInput}
+\li \l {TextEdit}
+\li \l {FocusScope}
+\li \l {Component}
+\li \l {MouseArea}
 \endlist
 
 For a complete list of QML elements, please visit the \l {QML Elements} page.
diff --git a/doc/src/qtquick2/behaviors-and-states.qdoc b/doc/src/qtquick2/behaviors-and-states.qdoc
index 626b6e61e3..16ee0f9ba5 100644
--- a/doc/src/qtquick2/behaviors-and-states.qdoc
+++ b/doc/src/qtquick2/behaviors-and-states.qdoc
@@ -78,8 +78,8 @@ problem occurs because we have used a Behavior to animate the change in color, a
 
 To state the problem more formally, using States and Behaviors together can cause unexpected behavior when:
 \list
-\o a Behavior is used to animate a property change, specifically when moving from an explicitly defined state back to the implicit base state; and
-\o this Behavior can be interrupted to (re-)enter an explicitly defined state.
+\li a Behavior is used to animate a property change, specifically when moving from an explicitly defined state back to the implicit base state; and
+\li this Behavior can be interrupted to (re-)enter an explicitly defined state.
 \endlist
 
 The problem occurs because of the way the base state is defined for QML: as the "snapshot" state of the application just prior to entering an explicitly defined state. In this case, if we are in the process of animating from green back
diff --git a/doc/src/qtquick2/canvaspainting.qdoc b/doc/src/qtquick2/canvaspainting.qdoc
index 8590c74913..3b1f742b8f 100644
--- a/doc/src/qtquick2/canvaspainting.qdoc
+++ b/doc/src/qtquick2/canvaspainting.qdoc
@@ -34,8 +34,8 @@
 \section1 Canvas Element
 
 \list
-    \o \l{Canvas}
-    \o \l{Context2D}
+    \li \l{Canvas}
+    \li \l{Context2D}
 \endlist
 
 The Canvas and Context2D elements implement the \l{HTML Canvas API 2D Context}
diff --git a/doc/src/qtquick2/elements.qdoc b/doc/src/qtquick2/elements.qdoc
index 4dde7216e5..90d38d7ecb 100644
--- a/doc/src/qtquick2/elements.qdoc
+++ b/doc/src/qtquick2/elements.qdoc
@@ -45,154 +45,154 @@ To see the QML elements listed by functional area, see the
 
 \section1 Basic QML Elements
 \list
-\o \l {Item} - Basic item element inherited by QML elements
-\o \l {Component} - Encapsulates QML elements during importing
-\o \l {QtObject} {QtObject} - Basic element containing only the \c {objectName} property
+\li \l {Item} - Basic item element inherited by QML elements
+\li \l {Component} - Encapsulates QML elements during importing
+\li \l {QtObject} {QtObject} - Basic element containing only the \c {objectName} property
 \endlist
 
 \section1 Graphics
 \list
-\o \l {Rectangle} - A rectangle element
-\o \l {Image} - For incorporating bitmaps into a scene
-\o \l {BorderImage} - Allows the use of images as borders
-\o \l {AnimatedImage} - For playing animations stored in a series of frames
-\o \l {Gradient} - For defining a color gradient
-\o \l {GradientStop} - Used to define a color within a \l {Gradient}
-\o \l {SystemPalette} - Provides access to the Qt palettes
-\o \l {Canvas} - Provides a 2D canvas element
+\li \l {Rectangle} - A rectangle element
+\li \l {Image} - For incorporating bitmaps into a scene
+\li \l {BorderImage} - Allows the use of images as borders
+\li \l {AnimatedImage} - For playing animations stored in a series of frames
+\li \l {Gradient} - For defining a color gradient
+\li \l {GradientStop} - Used to define a color within a \l {Gradient}
+\li \l {SystemPalette} - Provides access to the Qt palettes
+\li \l {Canvas} - Provides a 2D canvas element
 \endlist
 
 \section1 Text Handling
 \list
-\o \l {Text} - For inserting formatted text into a scene
-\o \l {TextInput} - Captures user key input
-\o \l {TextEdit} - Displays multiple lines of editable formatted text
-\o \l {IntValidator} - Validates values as integers
-\o \l {DoubleValidator} - Validates real values
-\o \l {RegExpValidator} - Validator for string regular expressions
-\o \l {FontLoader} - Loads fonts by name or URL
+\li \l {Text} - For inserting formatted text into a scene
+\li \l {TextInput} - Captures user key input
+\li \l {TextEdit} - Displays multiple lines of editable formatted text
+\li \l {IntValidator} - Validates values as integers
+\li \l {DoubleValidator} - Validates real values
+\li \l {RegExpValidator} - Validator for string regular expressions
+\li \l {FontLoader} - Loads fonts by name or URL
 \endlist
 
 \section1 Mouse and Interaction Area
 \list
-\o \l {MouseArea} - Sets up an area for mouse interaction
-\o \l {Keys} - Provides components with attached properties to handle key input.
-\o \l {FocusScope} - Element that mediate keyboard focus changes
-\o \l {Flickable} - Provides a surface that can be "flicked"
-\o \l {Flipable} - Provides a surface that produces "flipping" effects
-\o \l {PinchArea} - Enables simple pinch gesture handling
-\o \l {MultiPointTouchArea} - Enables handling of multiple touch points
+\li \l {MouseArea} - Sets up an area for mouse interaction
+\li \l {Keys} - Provides components with attached properties to handle key input.
+\li \l {FocusScope} - Element that mediate keyboard focus changes
+\li \l {Flickable} - Provides a surface that can be "flicked"
+\li \l {Flipable} - Provides a surface that produces "flipping" effects
+\li \l {PinchArea} - Enables simple pinch gesture handling
+\li \l {MultiPointTouchArea} - Enables handling of multiple touch points
 \endlist
 
 \section1 Positioners and Repeater
 \list
-\o \l {Column} - Arranges its children vertically
-\o \l {Row} - Arranges its children horizontally
-\o \l {Grid} - Positions its children in a grid
-\o \l {Flow} - Positions its children with wrapping support
-\o \l {Repeater} - Uses a model to create multiple components
+\li \l {Column} - Arranges its children vertically
+\li \l {Row} - Arranges its children horizontally
+\li \l {Grid} - Positions its children in a grid
+\li \l {Flow} - Positions its children with wrapping support
+\li \l {Repeater} - Uses a model to create multiple components
 \endlist
 
 \section1 Transformations
 \list
-\o \l {Scale} - Assigns item scaling behaviors
-\o \l {Rotation} - Assigns item rotation behaviors
-\o \l {Translate} - Assigns item translation behaviors
+\li \l {Scale} - Assigns item scaling behaviors
+\li \l {Rotation} - Assigns item rotation behaviors
+\li \l {Translate} - Assigns item translation behaviors
 \endlist
 
 \section1 States
 \list
-\o \l {State} - Defines sets of configurations of objects and properties
-\o \l {PropertyChanges} - Describes property changes within a state
-\o \l {StateGroup} - Contains a set of states and state transitions
-\o \l {StateChangeScript} - Allows script binding in a state
-\o \l {ParentChange} - Re-parent an Item in a state change
-\o \l {AnchorChanges} - Change the anchors of an item in a state
+\li \l {State} - Defines sets of configurations of objects and properties
+\li \l {PropertyChanges} - Describes property changes within a state
+\li \l {StateGroup} - Contains a set of states and state transitions
+\li \l {StateChangeScript} - Allows script binding in a state
+\li \l {ParentChange} - Re-parent an Item in a state change
+\li \l {AnchorChanges} - Change the anchors of an item in a state
 \endlist
 
 \section1 Animation and Transitions
 \list
-\o \l {Transition} - Animates transitions during state changes
-\o \l {SequentialAnimation} - Runs animations sequentially
-\o \l {ParallelAnimation} - Runs animations in parallel
-\o \l {Behavior} - Specifies a default animation for property changes
-\o \l {PropertyAction} - Sets immediate property changes during animation
-\o \l {PauseAnimation} - Introduces a pause in an animation
-\o \l {SmoothedAnimation} - Allows a property to smoothly track a value
-\o \l {SpringAnimation} - Allows a property to track a value in a spring-like motion
-\o \l {ScriptAction} - Runs scripts during an animation
+\li \l {Transition} - Animates transitions during state changes
+\li \l {SequentialAnimation} - Runs animations sequentially
+\li \l {ParallelAnimation} - Runs animations in parallel
+\li \l {Behavior} - Specifies a default animation for property changes
+\li \l {PropertyAction} - Sets immediate property changes during animation
+\li \l {PauseAnimation} - Introduces a pause in an animation
+\li \l {SmoothedAnimation} - Allows a property to smoothly track a value
+\li \l {SpringAnimation} - Allows a property to track a value in a spring-like motion
+\li \l {ScriptAction} - Runs scripts during an animation
 \endlist
 
 Elements that animate properties based on data types
 \list
-\o \l {PropertyAnimation} - Animates property changes
-\o \l {NumberAnimation} - Animates properties of type qreal
-\o \l {Vector3dAnimation} - Animates properties of type QVector3d
-\o \l {ColorAnimation} - Animates color changes
-\o \l {RotationAnimation} - Animates rotations
-\o \l {ParentAnimation} - Animates parent changes
-\o \l {AnchorAnimation} - Animates anchor changes
-\o \l {PathAnimation} - Animates position along a path
+\li \l {PropertyAnimation} - Animates property changes
+\li \l {NumberAnimation} - Animates properties of type qreal
+\li \l {Vector3dAnimation} - Animates properties of type QVector3d
+\li \l {ColorAnimation} - Animates color changes
+\li \l {RotationAnimation} - Animates rotations
+\li \l {ParentAnimation} - Animates parent changes
+\li \l {AnchorAnimation} - Animates anchor changes
+\li \l {PathAnimation} - Animates position along a path
 \endlist
 
 Elements that provide lower-level animation control
 \list
-\o \l {PathInterpolator} - Allows manual animation along a path
-\o \l {AnimationController} - Allows manual control of animation progress
+\li \l {PathInterpolator} - Allows manual animation along a path
+\li \l {AnimationController} - Allows manual control of animation progress
 \endlist
 
 \section1 Models and Data Handling
 \list
-\o \l {QtQuick2::ListModel}{ListModel} - Defines a list of data
-\o \l {QtQuick2::ListElement}{ListElement} - Defines a data item in a \l {QtQuick2::ListModel}{ListModel}
-\o \l {VisualItemModel} - Contains items that already defines its own visual delegate
-\o \l {VisualDataModel} - Encapsulates a model and a delegate
-\o \l {XmlListModel} - Specifies a model using XPath expressions
-\o \l {XmlRole} - Specifies a role for an \l {XmlListModel}
-\o \l {Binding} - Binds any value to any property
-\o \l {Package} - Collection that enables sharing of items within different views
+\li \l {QtQuick2::ListModel}{ListModel} - Defines a list of data
+\li \l {QtQuick2::ListElement}{ListElement} - Defines a data item in a \l {QtQuick2::ListModel}{ListModel}
+\li \l {VisualItemModel} - Contains items that already defines its own visual delegate
+\li \l {VisualDataModel} - Encapsulates a model and a delegate
+\li \l {XmlListModel} - Specifies a model using XPath expressions
+\li \l {XmlRole} - Specifies a role for an \l {XmlListModel}
+\li \l {Binding} - Binds any value to any property
+\li \l {Package} - Collection that enables sharing of items within different views
 \endlist
 
 \section1 Views
 \list
-\o \l {ListView} - Provides a list visualization of a model
-\o \l {GridView} - Provides a grid visualization of a model
-\o \l {PathView} - Visualizes a model's contents along a path. See \l {Path Definition}{Path Elements} for more information.
+\li \l {ListView} - Provides a list visualization of a model
+\li \l {GridView} - Provides a grid visualization of a model
+\li \l {PathView} - Visualizes a model's contents along a path. See \l {Path Definition}{Path Elements} for more information.
 \endlist
 
 \section1 Path Definition
 \list
-\o \l {Path} - Defines a path used by \l {PathView}
-\o \l {PathLine} - Defines a line in \l {Path}
-\o \l {PathQuad} - Defines a quadratic Bezier curve in a \l {Path}
-\o \l {PathCubic} - Defines a cubic Bezier curve in a \l {Path}
-\o \l {PathArc} - Defines an arc in a \l {Path}
-\o \l {PathCurve} - Defines a point on a Catmull-Rom curve in a \l {Path}
-\o \l {PathSvg} - Defines a sub-path specified as a SVG path data string in a \l {Path}
-\o \l {PathAttribute} - Allows the setting of attributes along a \l {Path}
-\o \l {PathPercent} - Modifies the item distribution along a \l {Path}
+\li \l {Path} - Defines a path used by \l {PathView}
+\li \l {PathLine} - Defines a line in \l {Path}
+\li \l {PathQuad} - Defines a quadratic Bezier curve in a \l {Path}
+\li \l {PathCubic} - Defines a cubic Bezier curve in a \l {Path}
+\li \l {PathArc} - Defines an arc in a \l {Path}
+\li \l {PathCurve} - Defines a point on a Catmull-Rom curve in a \l {Path}
+\li \l {PathSvg} - Defines a sub-path specified as a SVG path data string in a \l {Path}
+\li \l {PathAttribute} - Allows the setting of attributes along a \l {Path}
+\li \l {PathPercent} - Modifies the item distribution along a \l {Path}
 \endlist
 
 \section1 Utility
 \list
-\o \l {Connections} - Explicitly connects signals and signal handlers
-\o \l {Timer} - Provides timed triggers
-\o \l {QmlGlobalQtObject}{Qt} - The QML global Qt object provides useful enums and functions from Qt.
-\o \l {WorkerScript} - Enables the use of threads in QML
-\o \l {Loader} - Controls the loading of items or components
+\li \l {Connections} - Explicitly connects signals and signal handlers
+\li \l {Timer} - Provides timed triggers
+\li \l {QmlGlobalQtObject}{Qt} - The QML global Qt object provides useful enums and functions from Qt.
+\li \l {WorkerScript} - Enables the use of threads in QML
+\li \l {Loader} - Controls the loading of items or components
 \endlist
 
 \section1 Graphical Effects
 \list
-\o \l {ShaderEffect} - Allows GLSL shaders to be used as graphical effects
-\o \l {ShaderEffectSource} - Usable as a texture in ShaderEffect
-\o \l {GridMesh} - Generates a gird mesh of vertices for use by ShaderEffect
-\o The \l{QtQuick.Particles 2} module provides a set of Particle System elements for QtQuick 2
+\li \l {ShaderEffect} - Allows GLSL shaders to be used as graphical effects
+\li \l {ShaderEffectSource} - Usable as a texture in ShaderEffect
+\li \l {GridMesh} - Generates a gird mesh of vertices for use by ShaderEffect
+\li The \l{QtQuick.Particles 2} module provides a set of Particle System elements for QtQuick 2
 \endlist
 
 \section1 Accessibility
 \list
-\o \l {Accessible} - Attached property to make components accessible
+\li \l {Accessible} - Attached property to make components accessible
 \endlist
 
 */
diff --git a/doc/src/qtquick2/focus.qdoc b/doc/src/qtquick2/focus.qdoc
index e2c4c79d3c..3528169995 100644
--- a/doc/src/qtquick2/focus.qdoc
+++ b/doc/src/qtquick2/focus.qdoc
@@ -34,7 +34,7 @@
 When a key is pressed or released, a key event is generated and delivered to the
 focused QML \l Item. To facilitate the construction of reusable components
 and to address some of the cases unique to fluid user interfaces, the QML items add aged
-\i scope based extension to Qt's traditional keyboard focus model.
+\e scope based extension to Qt's traditional keyboard focus model.
 
 \tableofcontents
 
@@ -42,13 +42,13 @@ and to address some of the cases unique to fluid user interfaces, the QML items
 
 When the user presses or releases a key, the following occurs:
 \list 1
-\o Qt receives the key action and generates a key event.
-\o If the Qt widget containing the \l QQuickView has focus, the key event
+\li Qt receives the key action and generates a key event.
+\li If the Qt widget containing the \l QQuickView has focus, the key event
 is delivered to it. Otherwise, regular Qt key handling continues.
-\o The key event is delivered by the scene to the QML \l Item with
-\i {active focus}. If no Item has active focus, the key event is
+\li The key event is delivered by the scene to the QML \l Item with
+\e {active focus}. If no Item has active focus, the key event is
 \l {QEvent::ignore()}{ignored} and regular Qt key handling continues.
-\o If the QML Item with active focus accepts the key event, propagation
+\li If the QML Item with active focus accepts the key event, propagation
 stops. Otherwise the event is "bubbled up", by recursively passing it to each
 Item's parent until either the event is accepted, or the root Item is reached.
 
@@ -59,7 +59,7 @@ item and thus subsequently be ignored.
 \snippet doc/src/snippets/qml/focus/rectangle.qml simple key event
 \snippet doc/src/snippets/qml/focus/rectangle.qml simple key event end
 
-\o If the root \l Item is reached, the key event is \l {QEvent::ignore()}{ignored} and regular Qt key handling continues.
+\li If the root \l Item is reached, the key event is \l {QEvent::ignore()}{ignored} and regular Qt key handling continues.
 
 \endlist
 
@@ -119,7 +119,7 @@ the focus, but it cannot control the focus when it is imported or reused.
 Likewise, the \c window component does not have the ability to know if its
 imported components are requesting the focus.
 
-To solve this problem, the QML introduces a concept known as a \i {focus scope}.
+To solve this problem, the QML introduces a concept known as a \e {focus scope}.
 For existing Qt users, a focus scope is like an automatic focus proxy.
 A focus scope is created by declaring the \l FocusScope element.
 
@@ -131,13 +131,13 @@ visual result shown.
 \image declarative-qmlfocus3.png
 
 
-Conceptually \i {focus scopes} are quite simple.
+Conceptually \e {focus scopes} are quite simple.
 \list
-\o Within each focus scope one element may have \c {Item::focus} set to
+\li Within each focus scope one element may have \c {Item::focus} set to
 \c true. If more than one \l Item has the \c focus property set, the
 last element to set the \c focus will have the focus and the others are unset,
 similar to when there are no focus scopes.
-\o When a focus scope receives active focus, the contained element with
+\li When a focus scope receives active focus, the contained element with
 \c focus set (if any) also gets the active focus. If this element is
 also a \l FocusScope, the proxying behavior continues. Both the
 focus scope and the sub-focused item will have \c activeFocus property set.
diff --git a/doc/src/qtquick2/modelview.qdoc b/doc/src/qtquick2/modelview.qdoc
index 5d799027ad..0c66a7810b 100644
--- a/doc/src/qtquick2/modelview.qdoc
+++ b/doc/src/qtquick2/modelview.qdoc
@@ -30,7 +30,7 @@
 \brief how to display and form data in QML
 
 Simply put, applications need to form data and display the data. QML has the
-notion of \i models, \i views, and \i delegates to display data. They modularize
+notion of \e models, \e views, and \e delegates to display data. They modularize
 the visualization of data in order to give the developer or designer control
 over the different aspects of the data. A developer can swap a list view with a
 grid view with little changes to the data. Similarly, encapsulating an instance
@@ -39,11 +39,11 @@ handle the data.
 
 \image modelview-overview.png
 \list
-\o \bold Model - contains the data and its structure. There are several QML
+\li \b Model - contains the data and its structure. There are several QML
 elements for creating models.
-\o \bold View - a container that displays the data. The view might
+\li \b View - a container that displays the data. The view might
 display the data in a list or a grid.
-\o \bold Delegate - dictates how the data should appear in the view.
+\li \b Delegate - dictates how the data should appear in the view.
 The delegate takes each data in the model and encapsulates it. The data is
 accessible through the delegate.
 \endlist
@@ -61,9 +61,9 @@ To visualize data, bind the view's \c model property to a model and the
     graphical elements:
 
     \list
-    \o \l{ListView} - arranges items in a horizontal or vertical list
-    \o \l{GridView} - arranges items in a grid within the available space
-    \o \l{PathView} - arranges items on a path
+    \li \l{ListView} - arranges items in a horizontal or vertical list
+    \li \l{GridView} - arranges items in a grid within the available space
+    \li \l{PathView} - arranges items on a path
     \endlist
 
     These elements have properties and behaviors exclusive to each element.
@@ -71,7 +71,7 @@ To visualize data, bind the view's \c model property to a model and the
 
     \section2 Decorating Views
 
-    Views allow visual customization through \i decoration properties such as
+    Views allow visual customization through \e decoration properties such as
     the \c header, \c footer, and \c section properties. By binding an object,
     usually another visual object, to these properties, the views are
     decoratable. A footer may include a \l Rectangle element showcasing borders
@@ -104,7 +104,7 @@ To visualize data, bind the view's \c model property to a model and the
 
     \section2 ListView Sections
 
-    \l {ListView} contents may be grouped into \i sections, where related list
+    \l {ListView} contents may be grouped into \e sections, where related list
     items are labeled according to their sections. Further, the sections may be
     decorated with \l{qml-view-delegate}{delegates}.
 
@@ -125,7 +125,7 @@ To visualize data, bind the view's \c model property to a model and the
 \keyword qml-view-delegate
 \section1 View Delegates
 
-    Views need a \i delegate to visually represent an item in a list. A view will
+    Views need a \e delegate to visually represent an item in a list. A view will
     visualize each item list according to the template defined by the delegate.
     Items in a model are accessible through the \c index property as well as the
     item's properties.
@@ -146,9 +146,9 @@ To visualize data, bind the view's \c model property to a model and the
     properties of each of the views. Similarly, it might be of interest to
     access or show some properties of the model.
 
-    In the following example, the delegate shows the property \i{language} of
+    In the following example, the delegate shows the property \e{language} of
     the model, and the color of one of the fields depends on the property
-    \i{fruit_color} of the view.
+    \e{fruit_color} of the view.
 
     \snippet doc/src/snippets/qml/models/views-models-delegates.qml rectangle
 
@@ -156,21 +156,21 @@ To visualize data, bind the view's \c model property to a model and the
 \section1 Models
 
     Data is provided to the delegate via named data roles which the delegate may
-    bind to. Here is a ListModel with two roles, \i type and \i age, and a
+    bind to. Here is a ListModel with two roles, \e type and \e age, and a
     ListView with a delegate that binds to these roles to display their values:
 
     \snippet doc/src/snippets/qml/qml-data-models/listmodel-listview.qml document
 
     If there is a naming clash between the model's properties and the delegate's
-    properties, the roles can be accessed with the qualified \i model name
-    instead. For example, if a \l Text element had \i type or \i age properties,
+    properties, the roles can be accessed with the qualified \e model name
+    instead. For example, if a \l Text element had \e type or \e age properties,
     the text in the above example would display those property values instead of
-    the \i type and \i age values from the model item. In this case, the
+    the \e type and \e age values from the model item. In this case, the
     properties could have been referenced as \c model.type and \c model.age
     instead to ensure the delegate displays the property values from the model
     item.
 
-    A special \i index role containing the index of the item in the model is
+    A special \e index role containing the index of the item in the model is
     also available to the delegate. Note this index is set to -1 if the item is
     removed from the model. If you bind to the index role, be sure that the
     logic accounts for the possibility of index being -1, i.e. that the item is
@@ -179,9 +179,9 @@ To visualize data, bind the view's \c model property to a model and the
     attached property.)
 
     Models that do not have named roles (such as the ListModel shown
-    below) will have the data provided via the \i modelData role. The \i
+    below) will have the data provided via the \e modelData role. The \e
     modelData role is also provided for models that have only one role. In this
-    case the \i modelData role contains the same data as the named role.
+    case the \e modelData role contains the same data as the named role.
 
     QML provides several types of data models among the built-in set of QML
     elements. In addition, models can be created with Qt C++ and then made
@@ -199,7 +199,7 @@ To visualize data, bind the view's \c model property to a model and the
 
     \snippet doc/src/snippets/qml/qml-data-models/listelements.qml model
 
-    The above model has two roles, \i name and \i cost.  These can be bound
+    The above model has two roles, \e name and \e cost.  These can be bound
     to by a ListView delegate, for example:
 
     \snippet doc/src/snippets/qml/qml-data-models/listelements.qml view
@@ -214,7 +214,7 @@ To visualize data, bind the view's \c model property to a model and the
     \dots
     \snippet doc/src/snippets/qml/qml-data-models/dynamic-listmodel.qml mouse area
 
-    When the MouseArea is clicked, \c fruitModel will have two roles, \i cost and \i name.
+    When the MouseArea is clicked, \c fruitModel will have two roles, \e cost and \e name.
     Even if subsequent roles are added, only the first two will be handled by views
     using the model. To reset the roles available in the model, call ListModel::clear().
 
@@ -229,7 +229,7 @@ To visualize data, bind the view's \c model property to a model and the
     \endcode
 
 
-    The following model has three roles, \i title, \i link and \i description:
+    The following model has three roles, \e title, \e link and \e description:
     \qml
     XmlListModel {
          id: feedModel
@@ -289,9 +289,9 @@ To visualize data, bind the view's \c model property to a model and the
     An object instance can be used to specify a model with a single object
     element. The properties of the object are provided as roles.
 
-    The example below creates a list with one item, showing the color of the \i
-    myText text. Note the use of the fully qualified \i model.color property to
-    avoid clashing with \i color property of the Text element in the delegate.
+    The example below creates a list with one item, showing the color of the \e
+    myText text. Note the use of the fully qualified \e model.color property to
+    avoid clashing with \e color property of the Text element in the delegate.
 
     \qml
     Rectangle {
diff --git a/doc/src/qtquick2/mouseevents.qdoc b/doc/src/qtquick2/mouseevents.qdoc
index e452611416..1638311d0c 100644
--- a/doc/src/qtquick2/mouseevents.qdoc
+++ b/doc/src/qtquick2/mouseevents.qdoc
@@ -36,8 +36,8 @@
 \section1 Mouse Elements
 
 \list
-\o \l{MouseArea} Element
-\o \l{MouseEvent} Object
+\li \l{MouseArea} Element
+\li \l{MouseEvent} Object
 \endlist
 
 \section1 Mouse Event Handling
@@ -65,15 +65,15 @@ mouse events. The \l MouseArea element documentation describes these
 gestures in greater detail:
 
 \list
-\o canceled
-\o clicked
-\o doubleClicked
-\o entered
-\o exited
-\o positionChanged
-\o pressAndHold
-\o pressed
-\o released
+\li canceled
+\li clicked
+\li doubleClicked
+\li entered
+\li exited
+\li positionChanged
+\li pressAndHold
+\li pressed
+\li released
 \endlist
 
 These signals have signal handlers that are invoked when the signals are emitted.
diff --git a/doc/src/qtquick2/positioners.qdoc b/doc/src/qtquick2/positioners.qdoc
index 55be7087fd..138bb8334f 100644
--- a/doc/src/qtquick2/positioners.qdoc
+++ b/doc/src/qtquick2/positioners.qdoc
@@ -44,10 +44,10 @@ A set of standard positioners are provided in the basic set of Qt Quick
 graphical elements:
 
 \list
-\o \l{#Column}{Column} arranges its children in a column
-\o \l{#Row}{Row} arranges its children in a row
-\o \l{#Grid}{Grid} arranges its children in a grid
-\o \l{#Flow}{Flow} arranges its children like words on a page
+\li \l{#Column}{Column} arranges its children in a column
+\li \l{#Row}{Row} arranges its children in a row
+\li \l{#Grid}{Grid} arranges its children in a grid
+\li \l{#Flow}{Flow} arranges its children like words on a page
 \endlist
 
 \section2 Column
diff --git a/doc/src/qtquick2/qmltexthandling.qdoc b/doc/src/qtquick2/qmltexthandling.qdoc
index 6e6b2a4c6b..077671ef5f 100644
--- a/doc/src/qtquick2/qmltexthandling.qdoc
+++ b/doc/src/qtquick2/qmltexthandling.qdoc
@@ -37,16 +37,16 @@
 \section1 Text Elements
 
 \list
-\o \l{Text}
-\o \l{TextInput}
-\o \l{TextEdit}
+\li \l{Text}
+\li \l{TextInput}
+\li \l{TextEdit}
 \endlist
 
 \section1 Validators
 \list
-\o \l{IntValidator}
-\o \l{DoubleValidator}
-\o \l{RegExpValidator}
+\li \l{IntValidator}
+\li \l{DoubleValidator}
+\li \l{RegExpValidator}
 \endlist
 
 \section1 Displaying Text in QML
diff --git a/doc/src/qtquick2/qtquick-intro.qdoc b/doc/src/qtquick2/qtquick-intro.qdoc
index 9eebb0bddc..0fcf4ef603 100644
--- a/doc/src/qtquick2/qtquick-intro.qdoc
+++ b/doc/src/qtquick2/qtquick-intro.qdoc
@@ -100,23 +100,23 @@ extendibility and openness, while aiming to lower the barrier of entry for
 newcomers to Qt Quick and Qt. The key features of Qt Creator allow UI designers
 and developers to accomplish the following tasks:
 \list
-\o Get started with Qt Quick application development quickly and easily with
+\li Get started with Qt Quick application development quickly and easily with
 examples, tutorials, and project wizards.
-\o Design application user interface with the integrated editor, Qt Quick
+\li Design application user interface with the integrated editor, Qt Quick
 Designer, or use graphics software to design the user interface and use scripts
 to export the design to Qt Quick Designer.
-\o Develop applications with the advanced code editor that provides new powerful
+\li Develop applications with the advanced code editor that provides new powerful
 features for completing code snippets, refactoring code, and viewing the element
 hierarchy of QML files.
-\o Build and deploy Qt Quick applications that target multiple desktop and
+\li Build and deploy Qt Quick applications that target multiple desktop and
 mobile platforms, such as Microsoft Windows, Mac OS X, Linux, and Maemo.
-\o Debug JavaScript functions and execute JavaScript expressions in the current
+\li Debug JavaScript functions and execute JavaScript expressions in the current
 context, and inspect QML at runtime to explore the object structure, debug
 animations, and inspect colors.
-\o Deploy applications to mobile devices and create application installation
+\li Deploy applications to mobile devices and create application installation
 packages for Maemo devices that can be published in the Ovi Store
 and other channels.
-\o Easily access information with the integrated context-sensitive Qt Help
+\li Easily access information with the integrated context-sensitive Qt Help
 system.
 \endlist
 
@@ -138,6 +138,6 @@ The \l {Qt Quick Code Samples} page has a gallery of QML applications.
 
 \section1 License Information
 \list
-\o \l{Qt Quick Licensing Information}
+\li \l{Qt Quick Licensing Information}
 \endlist
 */
diff --git a/doc/src/qtquick2/states.qdoc b/doc/src/qtquick2/states.qdoc
index 622a1619b0..cdc7bcd5da 100644
--- a/doc/src/qtquick2/states.qdoc
+++ b/doc/src/qtquick2/states.qdoc
@@ -34,31 +34,31 @@
 \target qmlstates
 \section1 States Elements
 \list
-\o \l State
-\o \l PropertyChanges
-\o \l StateGroup
-\o \l StateChangeScript
-\o \l ParentChange
-\o \l AnchorChanges
+\li \l State
+\li \l PropertyChanges
+\li \l StateGroup
+\li \l StateChangeScript
+\li \l ParentChange
+\li \l AnchorChanges
 \endlist
 
-Many user interface designs are \i state driven; interfaces have configurations
+Many user interface designs are \e state driven; interfaces have configurations
 that differ depending on the current state. For example, a traffic signal will
 configure its flags or lights depending on its state. While in the signal's
 \c stop state, a red light will turn on while the yellow and the green lights
 will turn off. In the \c caution state, the yellow light is on while the other
 lights are turned off.
 
-In QML, \i states are a set of property configurations defined in a \l State
+In QML, \e states are a set of property configurations defined in a \l State
 element. Different configurations could, for example:
 
 \list
-\o Show some UI elements and hide others
-\o Present different available actions to the user
-\o Start, stop, or pause animations
-\o Execute some script required in the new state
-\o Change a property value for a particular item
-\o Show a different view or screen
+\li Show some UI elements and hide others
+\li Present different available actions to the user
+\li Start, stop, or pause animations
+\li Execute some script required in the new state
+\li Change a property value for a particular item
+\li Show a different view or screen
 \endlist
 
 All \l {Item}-based objects have a \c state property, and can specify additional
@@ -94,15 +94,15 @@ assigning a different state whenever the signal receives a mouse click.
 The State element is not limited to performing modifications on property values.
 It can also:
 \list
-\o Run some script using \l StateChangeScript
-\o Override an existing signal handler for an object using \l PropertyChanges
-\o Re-parent an \l Item using \l ParentChange
-\o Modify anchor values using \l AnchorChanges
+\li Run some script using \l StateChangeScript
+\li Override an existing signal handler for an object using \l PropertyChanges
+\li Re-parent an \l Item using \l ParentChange
+\li Modify anchor values using \l AnchorChanges
 \endlist
 
 \section1 The Default State
 
-Every \l Item based component has a \c state property and a \i{default state}.
+Every \l Item based component has a \c state property and a \e{default state}.
 The default state is the empty string (\c{""}) and contains all of an item's
 initial property values. The default state is useful for managing property
 values before state changes. Setting the \c state property to an empty string
@@ -141,13 +141,13 @@ for the engine to fast forward and rewind a state (that is, internally set and u
 before it is finally applied. The process is as follows:
 
 \list 1
-\o The state is fast forwarded to determine the complete set of end values.
-\o The state is rewound.
-\o The state is fully applied, with transitions.
+\li The state is fast forwarded to determine the complete set of end values.
+\li The state is rewound.
+\li The state is fully applied, with transitions.
 \endlist
 
 In some cases this may cause unintended behavior. For example, a state that changes
-a view's \i model or a Loader's \i sourceComponent will set these properties
+a view's \e model or a Loader's \e sourceComponent will set these properties
 multiple times (to apply, rewind, and then reapply), which can be relatively expensive.
 
 State fast forwarding should be considered an implementation detail,
diff --git a/doc/src/qtquick2/writingcomponents.qdoc b/doc/src/qtquick2/writingcomponents.qdoc
index 31267cf20c..864f2d81ea 100644
--- a/doc/src/qtquick2/writingcomponents.qdoc
+++ b/doc/src/qtquick2/writingcomponents.qdoc
@@ -62,8 +62,8 @@ named \c Button.qml, the component is referred to as \c Button:
 
 \table
 \row
-\o \snippet doc/src/snippets/qml/qml-extending-types/components/application.qml 0
-\o \image qml-extending-types.png
+\li \snippet doc/src/snippets/qml/qml-extending-types/components/application.qml 0
+\li \image qml-extending-types.png
 \endtable
 
 The root object in \c Button.qml defines the attributes that are available to users of the
@@ -83,11 +83,11 @@ To write a useful component, it is generally necessary to provide it with custom
 communicate specific data. This is achieved by adding the following attributes to your components:
 
 \list
-\o \bold Properties that can be accessed externally to modify an object (for example, \l Item has
+\li \b Properties that can be accessed externally to modify an object (for example, \l Item has
    \l {Item::}{width} and \l {Item::}{height} properties) and used in \l {Property Binding}
-\o \bold Methods of JavaScript code can be invoked internally or externally (for example,
+\li \b Methods of JavaScript code can be invoked internally or externally (for example,
    \l Animation has a \l {Animation::}{start()} method)
-\o \bold Signals to notify other objects when an event has occurred (for example, MouseArea has a
+\li \b Signals to notify other objects when an event has occurred (for example, MouseArea has a
    \c clicked signal)
 \endlist
 
@@ -119,8 +119,8 @@ an \c ImageViewer object and read or modify the \c currentImage value:
 
 \table
 \row
-\o \snippet doc/src/snippets/qml/qml-extending-types/properties/ImageViewer.qml 0
-\o \snippet doc/src/snippets/qml/qml-extending-types/properties/application.qml 0
+\li \snippet doc/src/snippets/qml/qml-extending-types/properties/ImageViewer.qml 0
+\li \snippet doc/src/snippets/qml/qml-extending-types/properties/application.qml 0
 \endtable
 
 It is optional for a property to have a default value. The default value is a convenient shortcut, and is
@@ -146,16 +146,16 @@ A number of property types are supported by default. These are listed in the tab
 with their default values and the corresponding C++ type:
 
 \table
-\header \o QML Type Name \o Default value \o C++ Type Name
-\row \o \l int \o 0 \o int
-\row \o \l bool \o \c false \o bool
-\row \o \l double \o 0.0 \o double
-\row \o \l real \o 0.0 \o double
-\row \o \l string \o "" (empty string) \o QString
-\row \o \l url \o "" (empty url) \o QUrl
-\row \o \l color \o #000000 (black) \o QColor
-\row \o \l date \o \c undefined \o QDateTime
-\row \o \l variant \o \c undefined \o QVariant
+\header \li QML Type Name \li Default value \li C++ Type Name
+\row \li \l int \li 0 \li int
+\row \li \l bool \li \c false \li bool
+\row \li \l double \li 0.0 \li double
+\row \li \l real \li 0.0 \li double
+\row \li \l string \li "" (empty string) \li QString
+\row \li \l url \li "" (empty url) \li QUrl
+\row \li \l color \li #000000 (black) \li QColor
+\row \li \l date \li \c undefined \li QDateTime
+\row \li \l variant \li \c undefined \li QVariant
 \endtable
 
 QML object types can also be used as property types. This includes
@@ -290,8 +290,8 @@ been changed to an alias to the child \l Image object:
 
 \table
 \row
-\o \snippet doc/src/snippets/qml/qml-extending-types/properties/alias/ImageViewer.qml 0
-\o \snippet doc/src/snippets/qml/qml-extending-types/properties/alias/application.qml 0
+\li \snippet doc/src/snippets/qml/qml-extending-types/properties/alias/ImageViewer.qml 0
+\li \snippet doc/src/snippets/qml/qml-extending-types/properties/alias/application.qml 0
 \endtable
 
 Instead of being limited to setting the \l Image source, \c application.qml can now directly
@@ -411,9 +411,9 @@ The signal hander is named \c on<SignalName>, with the first letter of the signa
 cased. The above example item would now have the following signal handlers:
 
 \list
-\o onClicked
-\o onHovered
-\o onPerformAction
+\li onClicked
+\li onHovered
+\li onPerformAction
 \endlist
 
 To emit a signal, simply invoke it in the same way as a method. Below left, when the \l MouseArea is
@@ -422,8 +422,8 @@ signal is received by \c application.qml through an \c onButtonClicked signal ha
 
 \table
 \row
-\o \snippet doc/src/snippets/qml/qml-extending-types/signals/basic.qml 0
-\o \snippet doc/src/snippets/qml/qml-extending-types/signals/no-parameters.qml 0
+\li \snippet doc/src/snippets/qml/qml-extending-types/signals/basic.qml 0
+\li \snippet doc/src/snippets/qml/qml-extending-types/signals/no-parameters.qml 0
 \endtable
 
 If the signal has parameters, they are accessible by parameter name in the signal handler.
@@ -431,8 +431,8 @@ In the example below, \c buttonClicked is emitted with \c xPos and \c yPos param
 
 \table
 \row
-\o \snippet doc/src/snippets/qml/qml-extending-types/signals/Button.qml 0
-\o \snippet doc/src/snippets/qml/qml-extending-types/signals/parameters.qml 0
+\li \snippet doc/src/snippets/qml/qml-extending-types/signals/Button.qml 0
+\li \snippet doc/src/snippets/qml/qml-extending-types/signals/parameters.qml 0
 \endtable