diff --git a/doc/src/qtquick/qtquick-pathview-editor.qdoc b/doc/src/qtquick/qtquick-pathview-editor.qdoc
index bec3642bbf7..59fe8c51ca4 100644
--- a/doc/src/qtquick/qtquick-pathview-editor.qdoc
+++ b/doc/src/qtquick/qtquick-pathview-editor.qdoc
@@ -31,14 +31,15 @@
 
     \title Editing PathView Properties
 
-    A \l{PathView} lays out data provided by data models on a \l{Path}.
+    A \l{PathView}{Path View} lays out data provided by data models on a
+    \l{Path}.
 
-    A graphical spline editor enables you to specify PathView paths, which
+    A graphical spline editor enables you to specify path view paths, which
     is a non-trivial task to do in the code editor.
 
     \image qmldesigner-pathview-editor.png "PathView editor"
 
-    To start editing the Path, double-click the PathView on the canvas. The
+    To start editing the path, double-click the path view on the canvas. The
     editor composes the path of PathCubic path objects. They are cubic Bezier
     curves to a given position with two control points. Drag and drop the
     control points to construct the curve.
@@ -47,7 +48,7 @@
     To make a curve segment linear, select \uicontrol {Make Curve Segment Straight} in
     the context menu.
 
-    By default, the Path is closed, which means that its start and end points
+    By default, the path is closed, which means that its start and end points
     are identical. To create separate start and end points for it, right-click
     an edit point to open a context menu, and deselect \uicontrol {Closed Path}.
 
@@ -55,7 +56,7 @@
     in the context menu.
 
     In the \uicontrol Properties pane, you can specify other properties for
-    the PathView. For example, what is the maximum distance from the path that
+    the path view. For example, what is the maximum distance from the path that
     initiates mouse dragging and what is the rate at which a flick will
     decelerate.
 
diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc
index 219cce6afd6..5aa994c3a13 100644
--- a/doc/src/qtquick/qtquick-screens.qdoc
+++ b/doc/src/qtquick/qtquick-screens.qdoc
@@ -79,18 +79,19 @@
 
     \list
 
-        \li GridView provides a grid vizualization of a model.
+        \li \l{GridView}{Grid View} provides a grid vizualization of a model.
 
-        \li ListView provides a list vizualization of a model.
+        \li \l{ListView}{List View} provides a list vizualization of a model.
 
-        \li PathView visualizes the contents of a model along a path.
+        \li \l{PathView}{Path View} visualizes the contents of a model along a
+            path.
 
     \endlist
 
-    When you add a GridView, ListView, or PathView, the ListModel and the
-    delegate component that creates an instance for each item in the model are
-    added automatically. You can edit item properties
-    in the \uicontrol Properties pane or
+    When you add a \l{GridView}{Grid View}, \l{ListView}{List View}, or
+    \l{PathView}{Path View}, the ListModel and the delegate component that
+    creates an instance for each item in the model are added automatically.
+    You can edit item properties in the \uicontrol Properties pane or
     in the code editor. You can also replace the default model and
     delegate with other, more complex models and delegates in the code editor.
 
@@ -231,9 +232,9 @@
 
     \endlist
 
-    To lay out several items in a Column, Row, Grid, or Flow, select
-    the items on the canvas, and then select \uicontrol Layout in the context
-    menu.
+    To lay out several items in a \uicontrol Column, \uicontrol Row,
+    \uicontrol Grid, or \uicontrol Flow, select the items on the canvas, and
+    then select \uicontrol Layout in the context menu.
 
     \section2 Using Layouts
 
@@ -249,12 +250,13 @@
         \li \l{Layout} provides attached properties for items pushed onto a
             \uicontrol {Column Layout}, \uicontrol {Row Layout}, or \uicontrol {Grid Layout}.
 
-        \li ColumnLayout provides a grid layout with only one column.
+        \li \l{ColumnLayout}{Column Layout} provides a grid layout with only one
+            column.
 
-        \li RowLayout provides a grid layout with only one row.
+        \li \l{RowLayout}{Row Layout} provides a grid layout with only one row.
 
-        \li GridLayout provides a way of dynamically arranging items in a
-            grid.
+        \li \l{GridLayout}{Grid Layout} provides a way of dynamically arranging
+            items in a grid.
 
     \endlist
 
@@ -372,7 +374,7 @@
         \li \l{Flickable}
             items can be flicked horizontally or vertically.
 
-        \li FocusScope
+        \li \l{FocusScope}{Focus Scope}
             assists in keyboard focus handling when building reusable QML
             components.