Update slide palette documentation

Fixed formatting and minor errors. Added more clear description of
actions on master slide.

Task-number: QT3DS-844
Change-Id: I4afcd52ced2d0e5ffbaae8a542cb1cf6336447a9
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

2 files changed, 35 insertions, 38 deletions

diff --git a/doc/src/03-studio/6-slide-palette.qdoc b/doc/src/03-studio/6-slide-palette.qdoc
index 9f7d6d1b..ea8d6179 100644
--- a/doc/src/03-studio/6-slide-palette.qdoc
+++ b/doc/src/03-studio/6-slide-palette.qdoc
@@ -36,61 +36,61 @@
 
 \image slidePalette.png
 
- Each scene and
-component in a presentation has a set of "slides" associated with it.
-These slides can be used to effect drastic, PowerPoint-like changes
-(\e{each slide has completely different content}) or subtle
-variations on the same content (\e{make the button background pulse
-with a slight orange color on the 'Focused' slide}).
+Each scene and component in a presentation has a set of \e slides associated with it.
+These slides can be used to effect drastic, PowerPoint-like changes (each slide has completely
+different content) or subtle variations on the same content (i.e. make the button background pulse
+with a slight orange color on the active slide).
 
 Each slide has its own animation timeline and playback characteristics.
-Your 'Intro' slide may last for 1 second and automatically play through
+Your intro slide may last for 1 second and automatically play through
 to another slide that has no animation at all. A third slide may have 10
 seconds of different animation that play in a looping fashion.
 
 Each scene and component come to life with one slide already created. To
-add additional slides, right-click in the Slide palette and choose \"New
-Slide\" (or duplicate an existing slide).
+add additional slides, right-click in the slide palette and choose \uicontrol{New Slide}
+(or duplicate an existing slide).
 
 Click on a slide to select it. This will cause the
-\l{studio-timeline-palette.html}{Timeline palette} to show the
+\l{studio-timeline-palette.html}{timeline palette} to show the
 elements and animations for the selected slide, and the
 \l{studio-scene-view-and-matte.html}{scene view} to update
 accordingly. Adding new elements to your scene (via the
-\l{studio-basic-objects-palette.html}{Basic Objects} or
-\l{studio-project-palette.html}{Project} palettes) will add the
+\l{studio-basic-objects-palette.html}{basic objects palette} or
+\l{studio-project-palette.html}{project palette}) will add the
 elements only to this slide. Adding new actions (via the
-\l{studio-action-palette.html}{Actions palette} will create actions
+\l{studio-action-palette.html}{actions palette} will create actions
 that only can be triggered on this slide.
 
-You may re-order slides within the palette by dragging them.
+You may re-order slides within the slide palette by dragging them.
 
 \section1 The Master Slide
 
 \image Studio-Slide-Master.png
 
- To create content
-that subtly changes across multiple slides you need elements that exist
-across all of those slides. Each scene and component have one \"master
-slide\". Elements placed on this slide exist on all slides of that
-scene/component.
+To create content that subtly changes across multiple slides you need elements that exist
+across all of those slides. Each scene and component have one \e{master
+slide}. Elements placed on this slide exist on all slides of that
+scene or \l{component}.
 
-Click the \b {Edit Master} button at the top of the Slide palette to
-enter the master slide. As with other slides, the Timeline palette and
+Click the \uicontrol {Edit Master} slide at the top of the slide palette to
+enter the master slide. As with other slides, the timeline palette and
 scene view will update accordingly. Now adding new elements and actions
 will create these items on the master slide.
 
-Click the \b {Leave Master} button when you have finished adjusting the
+Click the \b {Leave Master} slide when you have finished adjusting the
 master slide. Note that you do not need to be on the master slide to
 adjust properties of elements on the master slide. Changes made to a
 property of a master element apply across all slides equally.
 
+To add an action to a master slide object you need to be on the master slide. If you add an action
+to a master slide object on any other slide, the action will only exist on that slide.
+
 To cause certain properties for an element to vary per slide, you must
 \l{studio-inspector-palette.html#unlinking-from-the-master-slide}
 {unlink each property} that you wish to change.
 
 To cause a property to smoothly transition when changing from one slide
-to another, animated the property using
+to another, animate the property using
 \l{best-practices-dynamic-keyframes.html}{dynamic keyframes}.
 
 */
diff --git a/doc/src/03-studio/7-inspector-palette.qdoc b/doc/src/03-studio/7-inspector-palette.qdoc
index 2747a1ce..560b0be2 100644
--- a/doc/src/03-studio/7-inspector-palette.qdoc
+++ b/doc/src/03-studio/7-inspector-palette.qdoc
@@ -56,26 +56,23 @@ the presentation will start with a blank slate.
 
 \section1 Unlinking from the Master Slide
 
- By default, elements on the
-\l{studio-slide-palette.html#the-master-slide}{master slide} of their
-owning time context have the same property values on all slides. If you
-change the Scale of an that change is applied on all slides. However, it
-is also possible to \"unlink\" any property of a master element. An
-unlinked attriute can have custom values and animations for each slide.
-
-To unlink an property, right-click on the property name in the Inspector
-palette and choose \"Unlink Property from Master Slide\". The name of
+By default, elements on the
+\l{studio-slide-palette.html#the-master-slide}{master slide} have the same property values on all
+slides. If you change the scale of an object that change is applied on all slides. However, it
+is also possible to unlink any property of a master element. An
+unlinked property can have custom values and animations for each slide.
+
+To unlink a property, right-click on the property name in the inspector
+palette and choose \uicontrol {Unlink Property from Master Slide}. The name of
 the property will change from green to light grey. This is the same
 color used for the name of elements that are present only on a single
 slide, and the properties of such elements.
 
-Tip: when you first unlink a property the current value for that
-property, including any animation keyframes, is used as the value for
-every slide. If you want a similar-but-slightly-different animation on
+Tip: When you first unlink a property, the current value for that
+property (including any animation keyframes) is used as the value for
+every slide. If you want a similar but slightly different animation on
 all or most slides, first create the animation on the master slide and
-\b{then} unlink the property and tweak the animation on other
-slides. A little thinking ahead can save you from needing to perform
-redudant work.
+then unlink the property and tweak the animation on other slides.
 
 \section1 Editing Numeric Values