diff --git a/doc/src/demos-qmlchart.qdoc b/doc/src/demos-qmlchart.qdoc
index 98372ce..3279936 100644
--- a/doc/src/demos-qmlchart.qdoc
+++ b/doc/src/demos-qmlchart.qdoc
@@ -4,36 +4,115 @@
     \subtitle
 
     This is a basic demonstration how to use the different chart types by using qml. Creating each chart type begins
-    with creation of a ChartView. For example to create a pie, we use the PieSeries API together with a few PieSlices:
-    \snippet ../demos/qmlchart/qml/qmlchart/View1.qml 1
-    \image demos_qmlchart1.png
+    with creation of a ChartView.
 
-    To create a chart with line series:
-    \snippet ../demos/qmlchart/qml/qmlchart/View2.qml 1
-    \image demos_qmlchart2.png
+    \table
+        \row
+            \o  \br
+                To create a pie, we use the PieSeries API together with a few PieSlices:
+                \br
+                \br
+                \snippet ../demos/qmlchart/qml/qmlchart/View1.qml 1
+            \o \inlineimage demos_qmlchart1.png
+    \endtable
 
-    And spline series:
-    \snippet ../demos/qmlchart/qml/qmlchart/View3.qml 1
-    \image demos_qmlchart3.png
+    \table
+        \row
+            \o  \br
+                To create a chart with line series:
+                \br
+                \br
+                \snippet ../demos/qmlchart/qml/qmlchart/View2.qml 1
+            \o \inlineimage demos_qmlchart2.png
+    \endtable
 
-    Then we create a chart that illustrates the success of Russian, Swedish and Finnish ice-hockey players in the
-    NHL All-Star player selections by using three area series:
-    \snippet ../demos/qmlchart/qml/qmlchart/View4.qml 1
-    \image demos_qmlchart4.png
+    \table
+        \row
+            \o  \br
+                And spline series:
+                \br
+                \br
+                \snippet ../demos/qmlchart/qml/qmlchart/View3.qml 1
+            \o \inlineimage demos_qmlchart3.png
+    \endtable
 
-    Then couple of scatter series:
-    \snippet ../demos/qmlchart/qml/qmlchart/View5.qml 1
-    \image demos_qmlchart5.png
+    \table
+        \row
+            \o  \br
+                Then we create a chart that illustrates the NHL All-Star player selections by using three area series:
+                \br
+                \br
+                \snippet ../demos/qmlchart/qml/qmlchart/View4.qml 1
+            \o \inlineimage demos_qmlchart4.png
+    \endtable
+
+    \table
+        \row
+            \o  \br
+                Then couple of scatter series:
+                \br
+                \br
+                \snippet ../demos/qmlchart/qml/qmlchart/View5.qml 1
+            \o \inlineimage demos_qmlchart5.png
+    \endtable
 
     And a few different bar series:
-    \snippet ../demos/qmlchart/qml/qmlchart/View6.qml 1
-    \image demos_qmlchart6.png
-    \snippet ../demos/qmlchart/qml/qmlchart/View7.qml 1
-    \image demos_qmlchart7.png
-    \snippet ../demos/qmlchart/qml/qmlchart/View8.qml 1
-    \image demos_qmlchart8.png
-
-    And finally an example how to create a donut chart with two pie series:
-    \snippet ../demos/qmlchart/qml/qmlchart/View12.qml 1
-    \image demos_qmlchart12.png
+    \table
+        \row
+            \o  \br
+                \br
+                \br
+                \snippet ../demos/qmlchart/qml/qmlchart/View6.qml 1
+            \o \inlineimage demos_qmlchart6.png
+    \endtable
+    \table
+        \row
+            \o  \br
+                \br
+                \br
+                \snippet ../demos/qmlchart/qml/qmlchart/View7.qml 1
+            \o \inlineimage demos_qmlchart7.png
+    \endtable
+    \table
+        \row
+            \o  \br
+                \br
+                \br
+                \snippet ../demos/qmlchart/qml/qmlchart/View8.qml 1
+            \o \inlineimage demos_qmlchart8.png
+    \endtable
+    \table
+        \row
+            \o  \br
+                \br
+                \br
+                \snippet ../demos/qmlchart/qml/qmlchart/View9.qml 1
+            \o \inlineimage demos_qmlchart9.png
+    \endtable
+    \table
+        \row
+            \o  \br
+                \br
+                \br
+                \snippet ../demos/qmlchart/qml/qmlchart/View10.qml 1
+            \o \inlineimage demos_qmlchart10.png
+    \endtable
+    \table
+        \row
+            \o  \br
+                \br
+                \br
+                \snippet ../demos/qmlchart/qml/qmlchart/View11.qml 1
+            \o \inlineimage demos_qmlchart11.png
+    \endtable
+
+    \table
+        \row
+            \o  \br
+                And finally an example how to create a donut chart with two pie series:
+                \br
+                \br
+                \snippet ../demos/qmlchart/qml/qmlchart/View12.qml 1
+            \o \inlineimage demos_qmlchart12.png
+    \endtable
 */
diff --git a/src/axis/categoryaxis/qcategoryaxis.cpp b/src/axis/categoryaxis/qcategoryaxis.cpp
index 624d708..de382be 100644
--- a/src/axis/categoryaxis/qcategoryaxis.cpp
+++ b/src/axis/categoryaxis/qcategoryaxis.cpp
@@ -55,14 +55,14 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
     \brief CategoryAxis allows putting a named ranges on the axis.
 
     For example:
-    \code
-        CategoryAxis {
-            startValue: 0.0
-            CategoryRange { endValue: 1.0; label: "min (0-1)" }
-            CategoryRange { endValue: 3.0; label: "standard (1-3)" }
-            CategoryRange { endValue: 4.0; label: "high (3-4)" }
-        }
-    \endcode
+    \table
+        \row
+            \o  \br
+                \br
+                \br
+                \snippet ../demos/qmlaxes/qml/qmlaxes/View3.qml 1
+            \o \inlineimage demos_qmlaxes3.png
+    \endtable
 */
 
 /*!