Doc: Add more links to topics covering views

Also some miscellaneous fixes.

Task-number: QDS-3407
Change-Id: If47cdb0b7bc16f3fc624b96c2e0dabfde2d2f2db
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>

15 files changed, 46 insertions, 46 deletions

diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc
index 281725f55d..f1d39786b7 100644
--- a/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc
@@ -104,9 +104,8 @@
     \uicontrol {Signal Handler} column, you can add it:
 
     \list 1
-        \li Right-click a component in the \uicontrol Navigator or
-            \uicontrol {Form Editor} view and select
-            \uicontrol {Add New Signal Handler} in the context menu.
+        \li Right-click a component in the \l Navigator or \l {Form Editor} view
+            and select \uicontrol {Add New Signal Handler} in the context menu.
         \li In the \uicontrol Signal field, select the signal to handle.
             \image qmldesigner-implement-signal-handler.png "Implement Signal Handler dialog"
         \li Select the radio buttons to filter the list to only display
diff --git a/doc/qtcreator/src/qtquick/qtquick-library.qdoc b/doc/qtcreator/src/qtquick/qtquick-library.qdoc
index 300f32aac4..c76fe8c189 100644
--- a/doc/qtcreator/src/qtquick/qtquick-library.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-library.qdoc
@@ -101,16 +101,16 @@
 
     \section1 Assets
 
-    \uicontrol {Assets} displays the images and other files that you add to
-    the project folder by selecting \inlineimage plus.png
+    \uicontrol Library > \uicontrol {Assets} displays the images and other files
+    that you add to the project folder by selecting \inlineimage plus.png
     .
 
     \image qtquick-assets-tab.png "Library view Assets tab"
 
-    When you drag and drop assets from the tab to \uicontrol Navigator
-    or \uicontrol {Form Editor}, components with a suitable type are
-    automatically created for you. For example, components of the
-    \l{Images}{Image} type will be created for graphics files.
+    When you drag-and-drop assets from \uicontrol Assets to \l Navigator
+    or \l {Form Editor}, component instances with a suitable type are
+    automatically created for you. For example, instances of the
+    \l{Images}{Image} component will be created for graphics files.
 
     \section1 Context Menu Commands
 
diff --git a/doc/qtcreator/src/qtquick/qtquick-positioning.qdoc b/doc/qtcreator/src/qtquick/qtquick-positioning.qdoc
index e013bda7d6..ae6ac6ec54 100644
--- a/doc/qtcreator/src/qtquick/qtquick-positioning.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-positioning.qdoc
@@ -392,8 +392,8 @@
     (\uicontrol Next) buttons.
 
     To add a tab bar to a stack layout, right-click on the
-    \uicontrol {Stack Layout} in \uicontrol Navigator to access the context menu,
-    and select \uicontrol {Stacked Container} > \uicontrol {Add Tab Bar}.
+    \uicontrol {Stack Layout} in \l Navigator to access the context menu, and
+    select \uicontrol {Stacked Container} > \uicontrol {Add Tab Bar}.
 
     To raise or lower the stacking order of a component, select
     \uicontrol {Stacked Container} > \uicontrol {Increase Index} or
diff --git a/doc/qtdesignstudio/examples/doc/coffeemachine.qdoc b/doc/qtdesignstudio/examples/doc/coffeemachine.qdoc
index 8d45fe1b6d..463cf53ac6 100644
--- a/doc/qtdesignstudio/examples/doc/coffeemachine.qdoc
+++ b/doc/qtdesignstudio/examples/doc/coffeemachine.qdoc
@@ -127,14 +127,14 @@
     We use the default values for all other fields.
 
     To start recording the transition from the startup screen to the coffee
-    selection screen on the timeline, we select \e choosingCoffee in the
-    \uicontrol Navigator. We check that the playhead is at frame 0, and then
+    selection screen on the timeline, we select \e choosingCoffee in
+    \l Navigator. We check that the playhead is at frame 0, and then
     select the \inlineimage recordfill.png
     (\uicontrol {Auto Key (K)}) button (or press \key k).
 
-    At frame 0, we set the X coordinate to 0 in \uicontrol Properties >
-    \uicontrol Geometry > \uicontrol Position. We then move the playhead
-    to 400 frames and set the X coordinate to a negative value.
+    At frame 0, we set the X coordinate to 0 in \l Properties > \uicontrol
+    Geometry > \uicontrol Position. We then move the playhead to 400 frames and
+    set the X coordinate to a negative value.
 
     \image coffee-machine-properties.png
 
diff --git a/doc/qtdesignstudio/examples/doc/ebikedesign.qdoc b/doc/qtdesignstudio/examples/doc/ebikedesign.qdoc
index f91dfca37d..5f15994e70 100644
--- a/doc/qtdesignstudio/examples/doc/ebikedesign.qdoc
+++ b/doc/qtdesignstudio/examples/doc/ebikedesign.qdoc
@@ -60,13 +60,13 @@
 
     To start recording the transitions between the Standard screen and the
     Trip and Navigator screens on the timeline, we select \e screenCanvas in
-    the Design mode \uicontrol Navigator view. We check that the playhead is at
-    frame 0, and then select the \inlineimage recordfill.png
+    the \l Navigator view. We check that the playhead is at frame 0, and then
+    select the \inlineimage recordfill.png
     (\uicontrol {Auto Key (K)}) button (or press \key k).
 
     \image ebikedesign-timeline.png "Timeline view"
 
-    At frame 0, we set the X coordinate to 0 in \uicontrol Properties >
+    At frame 0, we set the X coordinate to 0 in \l Properties >
     \uicontrol Geometry > \uicontrol Position to display the Trip screen.
     We then move the playhead to frame 1000 and set the X coordinate to
     -1286 to display the Standard screen. We continue by moving the playhead
diff --git a/doc/qtdesignstudio/examples/doc/sidemenu.qdoc b/doc/qtdesignstudio/examples/doc/sidemenu.qdoc
index 15cc4ddf56..2f7e39ec4b 100644
--- a/doc/qtdesignstudio/examples/doc/sidemenu.qdoc
+++ b/doc/qtdesignstudio/examples/doc/sidemenu.qdoc
@@ -101,8 +101,9 @@
     We construct the menu bar in the \e {MainFile.ui.qml} file using the
     \l {Form Editor}. The CustomButton component is listed in
     \l Library > \uicontrol Components > \uicontrol {My Components}.
-    We drag and drop several instances of the component to the \l {Form Editor}
-    and enclose them in a RowLayout component to lay them out as a menu bar.
+    We drag-and-drop several instances of the component to the
+    \uicontrol {Form Editor} and enclose them in a RowLayout component instance
+    to lay them out as a menu bar.
 
     \image sidemenu-menubar.png
 
diff --git a/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc b/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc
index daaccf5586..f90c83ee30 100644
--- a/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc
+++ b/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc
@@ -140,7 +140,7 @@
     \image washingmachineui-timeline-settings.png "Timeline settings"
 
     First, we select the initial arc segment, \e arcSegment1, in
-    \uicontrol Navigator to display its properties in \uicontrol Properties.
+    \l Navigator to display its properties in \uicontrol Properties.
     In the \uicontrol Layout tab, \uicontrol Rotation field, we select
     \inlineimage icons/action-icon.png
     , and then select \uicontrol {Insert Keyframe} to insert a keyframe
@@ -167,7 +167,7 @@
     and 1000 (\e arcSegment4).
 
     When we move the playhead in \uicontrol Timeline, we can see the rotation
-    animation in \uicontrol {Form Editor}.
+    animation in \l {Form Editor}.
 
     \image washingmachineui-multsegmentarc.gif "Rotation animation in Form Editor"
 
@@ -212,8 +212,8 @@
     \printuntil startClicked
 
     Then, we select the mouse area for the start button, \e startMA,
-    in \uicontrol Navigator. In the \l {Connection View} >
-    \uicontrol Connections tab, we select the \inlineimage plus.png
+    in \uicontrol Navigator. In \l {Connection View} > \uicontrol Connections,
+    we select the \inlineimage plus.png
     (\uicontrol Add) button to connect the \c onClicked() signal handler
     of the button to the \c startClicked() signal.
 
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc
index 963151b2aa..3e7e65f753 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc
@@ -91,7 +91,7 @@
     displayed in \uicontrol Library > \uicontrol Components >
     \uicontrol {My Components} as well as in the \uicontrol Projects view as
     separate QML files. To start using them, drag-and-drop them from
-    \uicontrol Library to \uicontrol {Form Editor} or \uicontrol Navigator.
+    \uicontrol Library to \uicontrol {Form Editor} or \l Navigator.
 
     \note The layer that was the bottom layer in the design tool becames the top
     layer in \uicontrol Navigator to reflect the QML code model. You
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-simulink.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-simulink.qdoc
index 719237827f..8592271055 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-simulink.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-simulink.qdoc
@@ -154,7 +154,7 @@
 
     If you need to change the IP address and/or port, you need to select the
     \uicontrol SimulinkConnector item in \l Navigator and set the IP address
-    and/or port in the \uicontrol Properties view. If you cannot see
+    and/or port in the \l Properties view. If you cannot see
     \uicontrol SimulinkConnector in \uicontrol Navigator, you need to click
     \inlineimage filtericon.png
     (\uicontrol {Filter Tree}) and unselect \uicontrol {Show only visible items}.
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-effects-materials.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-effects-materials.qdoc
index 598700e793..3d44cf363c 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-effects-materials.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-effects-materials.qdoc
@@ -81,25 +81,25 @@
     To create a custom effect:
 
     \list 1
-        \li Drag and drop an \uicontrol {Effect} component from the
+        \li Drag-and-drop an \uicontrol {Effect} component from the
             \uicontrol {Qt Quick 3D Custom Shader Utils} tab of
-            \uicontrol Library to a Model component in \uicontrol Navigator.
+            \uicontrol Library to a Model component in \l Navigator.
         \li Select the custom effect component in \uicontrol Navigator to edit
-            the values of its properties in the \uicontrol Properties view.
+            the values of its properties in the \l Properties view.
             \image studio-qtquick-3d-custom-effect.png "Custom effect properties"
         \li In the \uicontrol Passes field, select the pass components for
             the effect.
         \li Select the pass component in \uicontrol Navigator to specify values
             for its properties in \uicontrol Properties.
             \image studio-qtquick-3d-pass.png "Pass properties"
-        \li To execute commands during the pass, drag and drop the following
+        \li To execute commands during the pass, drag-and-drop the following
             command components from \uicontrol Library to the custom material in
             \uicontrol Navigator: \uicontrol Blending, \uicontrol {Buffer Blit},
             \uicontrol {Buffer Input}, \uicontrol {Cull Mode},
             \uicontrol {Depth Input}, \uicontrol {Render State}, and
             \uicontrol {Set Uniform Value}. Then select the commands in the
             \uicontrol Commands field.
-        \li To allocate a buffer for the pass, drag and drop a \uicontrol Buffer
+        \li To allocate a buffer for the pass, drag-and-drop a \uicontrol Buffer
             component to the custom material. Then select the buffer in the
             \uicontrol Buffer field.
         \li Select the shader component in \uicontrol Navigator to set the path
@@ -133,7 +133,7 @@
     To create a custom material:
 
     \list 1
-        \li Drag and drop a \uicontrol {Custom Material} component from the
+        \li Drag-and-drop a \uicontrol {Custom Material} component from the
             \uicontrol {Qt Quick 3D Custom Shader Utils} tab of
             \uicontrol Library to a Model component in \uicontrol Navigator.
         \li Select the custom material component in \uicontrol Navigator to
@@ -159,7 +159,7 @@
         \li Select the pass component in \uicontrol Navigator to specify values
             for its properties in \uicontrol Properties.
             \image studio-qtquick-3d-pass.png "Pass properties"
-        \li To execute commands during the pass, drag and drop the following
+        \li To execute commands during the pass, drag-and-drop the following
             command components from \uicontrol Library to the pass component in
             \uicontrol Navigator: \uicontrol Blending, \uicontrol {Buffer Blit},
             \uicontrol {Buffer Input}, \uicontrol {Cull Mode},
@@ -167,10 +167,10 @@
             \uicontrol {Set Uniform Value}. The command components are created
             at the same level as the pass component and automatically added to
             the \uicontrol Commands field.
-        \li To allocate a buffer for the pass, drag and drop a \uicontrol Buffer
+        \li To allocate a buffer for the pass, drag-and-drop a \uicontrol Buffer
             component to the custom material. Then select the buffer in the
             \uicontrol Buffer field.
-        \li To add a shader to the pass, drag and drop the \uicontrol Shader
+        \li To add a shader to the pass, drag-and-drop the \uicontrol Shader
             component from the \uicontrol Library to the pass component in
             \uicontrol Navigator. The shader components are created at the same
             level as the pass component and automatically added to the
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc
index 7b8e3e3bb5..7cb80f0081 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc
@@ -42,7 +42,7 @@
     described in \l {Adding and Removing Modules}.
 
     Select the \uicontrol Group component in \uicontrol Navigator to modify its
-    properties in the \l Properties view.
+    properties in the \uicontrol Properties view.
 
     \section1 Setting Node Opacity and Visibility
 
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc
index b3950ff219..8b86d68dca 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc
@@ -133,8 +133,8 @@
     \image studio-qtquick-3d-material-texture.png "Material properties"
 
     To change the source file for the texture, select the \uicontrol Texture
-    component in \uicontrol Navigator, go to the \uicontrol Properties view, and
-    specify a new image to use in the \uicontrol Source field.
+    component in \uicontrol Navigator, go to the \l Properties view, and specify
+    a new image to use in the \uicontrol Source field.
 
     \image studio-qtquick-3d-texture-properties.png "Texture properties"
 */
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
index eadb688541..7d0c23b0a8 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
@@ -55,8 +55,8 @@
     scene created by using the wizard template mentioned above. To use other
     light and camera types, select the component in \uicontrol {3D Editor} or
     \uicontrol Navigator and change the type of the component in the \uicontrol
-    Type field in \uicontrol Properties. For example, to use a point light,
-    enter \e {PointLight}.
+    Type field in \l Properties. For example, to use a point light, enter
+    \e {PointLight}.
 
     \image studio-3d-properties-type.png "Type field in Properties view"
 
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc
index 3163eabbda..0862955c73 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc
@@ -35,7 +35,7 @@
 
     \title Editing 3D Scenes
 
-    You can use \l{3D Editor} in the Design mode to edit files you
+    You can use \l{3D Editor} in the \uicontrol Design mode to edit files you
     created using 3D graphics applications and stored in one of the supported
     formats. You cannot create 3D models or other assets in the editor, but you
     can \l{Importing 3D Assets}{import} the assets you need and work with them
@@ -64,9 +64,9 @@
         \endif
         \li \l{Adding 3D Views}
 
-            You can drag and drop 3D components from \uicontrol Library
-            to the scene or to \uicontrol Navigator. You must add all 3D
-            components into a 3D view.
+            You can drag-and-drop 3D components from \l Library >
+            \uicontrol Components to \uicontrol {3D Editor} or to \l Navigator.
+            You must add all 3D components into a 3D view.
         \li \l {Using 3D Components}
 
             You can speficy properties for 3D components, such as cameras,
diff --git a/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-logic-helpers.qdoc b/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-logic-helpers.qdoc
index 22c92ba786..81908d7239 100644
--- a/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-logic-helpers.qdoc
+++ b/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-logic-helpers.qdoc
@@ -67,7 +67,7 @@
     the checked state of a third one. First we drag-and-drop three
     \uicontrol {Check Box} component and an \uicontrol {And Operator} to
     \uicontrol Navigator (1). Then we select the \uicontrol {And Operator}
-    component (2) and set its properties in \uicontrol Properties (3).
+    component (2) and set its properties in \l Properties (3).
 
     We select \inlineimage icons/action-icon.png
     next to the \uicontrol {Input 01} field to display the \uicontrol Actions