manual:1.2.0:ui: Lots of small fixes

- Worded some things for better clarity
- Use kbd tag instead of inline code block.

Signed-off-by: Aesara <[email protected]>

pages/docs/manuals/v1.2.0/ui/footer-bar/index.md

@@ -19,11 +19,10 @@ The status bar at the bottom of the main window shows the current tool, and also
 The colour controls are clustered on the left side of the footer bar.
 
 **Eyedropper** button
-> <kbd>R</kbd>, and <kbd>ALT</kbd>+<kbd>LMB</kbd>
+> Press <kbd>r</kbd>, or <kbd>alt</kbd>+<kbd>lmb</kbd>
 - Pick a colour from the canvas. [Read more]({{< relref "../tools/colour-picker" >}})
-
 **Current and Previous Colour** indicator and menu
-> *Colour → Change Colour…*, or <kbd>C</kbd>.
+> *Colour → Change Colour…*, or <kbd>C</kbd>
 - A rectangle consisting of two sides (swatches). The left swatch shows the current brush colour, the right swatch shows
 the previous colour. 
 - Clicking the left swatch (current colour) opens the colour selector popup. [Read more]({{< relref "../popups/colour-selector" >}})

pages/docs/manuals/v1.2.0/ui/main-toolbar/index.md

@@ -10,25 +10,26 @@ weight = 10
 {{< /id >}}
 
 The **Main Toolbar** contains MyPaint's painting tools, and other commands. It is located at the top of the
-[main window]({{< relref "../#user-interface" >}}), next to the menu. It continues into the [UI toolbar]({{< relref
+[main window]({{< relref "../#user-interface" >}}), underneath the menubar. It continues into the [UI toolbar]({{< relref
 "ui-toolbar" >}}).
-Clicking on a blank area of the main toolbar with the right mouse button shows a popup menu which you can use to tailor
-what appears on it.
+
+Clicking on a blank area of the main toolbar with the right mouse button reveals a context menu used to show/hide
+buttons
 
 # File Handling
 {{< img src="main-toolbar-file.jpg" float="right" >}}
 The File Handling toolbar buttons let you load and save the working canvas. They are visible by default.
 
 **New File**
-> *File → New*, or `Ctrl+N`
+> *File → New*, or <kbd>Ctrl</kbd>+<kbd>N</kbd>
 - Starts a new, blank canvas.
 
 **Open File**
-> *File → Open…*, or `Ctrl+O`
+> *File → Open…*, or <kbd>Ctrl</kbd>+<kbd>O</kbd>
 - Open a file on disk, so it can be edited in the canvas area.
 
 **Save File**
-> *File → Save…*, or `Ctrl+S`
+> *File → Save…*, or <kbd>Ctrl</kbd>+<kbd>S</kbd>
 - Saves the current canvas to a file on disk. If it hasn't got a file name yet, you'll be asked for one.
 
 # Core Tools
@@ -37,21 +38,21 @@ The File Handling toolbar buttons let you load and save the working canvas. They
 The core set of tools cannot be hidden using the popup menu.
 
 **Eraser**
-> *Brush → Paint Mode → Paint Mode: Eraser*, or `E`
+> *Brush → Paint Mode → Paint Mode: Eraser*, or <kbd>E</kbd>
 
 - Toggles the Eraser paint/blend mode, which affects how the painting tools operate. [Read more]({{< relref
 "../paint-modes#eraser" >}})
 - Other optional paint modes can be toggled on the toolbar, see [blend modes]({{< relref "#blend-modes" >}}).
 
 
 **Freehand** (paintbrush)
-> *Edit → Freehand*, or `P`
+> *Edit → Freehand*, or <kbd>P</kbd>
 
 - The default painting tool; paint using the current brush and colour, without constraints. [Read more]({{< relref
 "../tools/freehand" >}})
 
 **Pick Colour** (eyedropper)
-> *Colour → Pick Colour*, or `R`
+> *Colour → Pick Colour*, or <kbd>R</kbd>
 
 - Pick a new painting colour from the canvas. [Read more]({{< relref "../tools/colour-picker" >}})
 
@@ -84,18 +85,18 @@ Scrap file revisions are stored with numbered filenames in a single folder. The
 in the [Preferences window]({{< relref "../preferences" >}})
 
 **Save As Scrap**
-> *File → Save As Scrap*, or `F2`.
+> *File → Save As Scrap*, or <kbd>F2</kbd>
 - Saves the working canvas to a scrap file. This changes the filename, so _File → Save_ will write over the new scrap.
 - If the file is _already_ a scrap file, a new _revision_ is saved.
 
 **Open Previous Scrap**
-> *File → Open Previous Scrap*, or `F6`.
+> *File → Open Previous Scrap*, or <kbd>F6</kbd>
 - Loads the scrap file before the current one.
 - If your working file isn't a scrap file, you'll get the last scrap file in your scrap folder.
 - If the scrap file has revisions, this will load only the latest revision.
 
 **Open Next Scrap**
-> *File → Open Next Scrap*, or `F7`
+> *File → Open Next Scrap*, or <kbd>F7</kbd>
  - This works just like Open Previous Scrap, but in the opposite direction.
 
 # Undo and Redo
@@ -107,10 +108,10 @@ that MyPaint's freehand mode uses shortish fragments of continuous painting as i
 The toolbar items are only sensitive when you can undo or redo a step.
 
 **Undo**
-> *Edit → Undo \<action\>*, or `Ctrl+Z`, or `Z`
+> *Edit → Undo \<action\>*, or <kbd>Ctrl</kbd>+<kbd>Z</kbd>, or <kbd>Z</kbd>
 
 **Redo**
-> *Edit → Redo \<action\>*, or `Ctrl+Y`, or `Y`
+> *Edit → Redo \<action\>*, or <kbd>Ctrl</kbd>+<kbd>Y</kbd>, or <kbd>Y</kbd>
 
 
 # Blend Modes
@@ -121,14 +122,14 @@ to use the [main toolbar's context menu]({{< relref "#main-toolbar-image" >}}) t
 paint modes]({{< relref "../paint-modes" >}})
 
 **Lock Alpha** (padlock)
-> *Brush → Paint Mode → Paint Mode: Lock Alpha*, or press `Shift+L`
+> *Brush → Paint Mode → Paint Mode: Lock Alpha*, or <kbd>Shift</kbd>+<kbd>L</kbd>
 - Applying the brush doesn't change the transparency of the pixels you paint over (in the target layer). Use this for
 further highlighting or shading objects that are painted on their own layer. [Read more]({{< relref
 "../paint-modes#lock-alpha" >}})
 - It's analogous to painting on layer groups which contain a mask, but a lot less fiddly.
 
 **Colourize** (rainbow)
-> *Brush → Paint Mode → Paint Mode: Colourize*, or press `Shift+K`
+> *Brush → Paint Mode → Paint Mode: Colourize*, or <kbd>Shift</kbd>+<kbd>K</kbd>
 - Painting applies the _hue_ (kind of colour) and _saturation_ (degree of colour) of your brush to whatever you paint on.
 The _value_ (brightness or darkness) of what you paint on isn't affected. [Read more]({{< relref
 "../paint-modes#colourize" >}})
@@ -143,22 +144,22 @@ These tools let you draw geometric shapes. The lines that are created will be ma
 paint blend mode.
 
 **Lines and Curves**
-> *Edit → Lines and Curves*, or press `K`
-- Draw straight lines, hold down `Ctrl` to constrain the angle. [Read more]({{< relref "../tools/lines-and-curves" >}})
-- When this tool is active, you can add curves to the last straight line you drew by pressing `Shift` and dragging.
+> *Edit → Lines and Curves*, or <kbd>K</kbd>
+- Draw straight lines, hold down <kbd>Ctrl</kbd> to constrain the angle. [Read more]({{< relref "../tools/lines-and-curves" >}})
+- When this tool is active, you can add curves to the last straight line you drew by pressing <kbd>Shift</kbd> and dragging.
 - You can add up to two bends in each straight line.
 
 **Connected Lines**
-> *Edit → Connected Lines*, or press `J`
+> *Edit → Connected Lines*, or <kbd>J</kbd>
 - Draw a line from where you last painted. Constraints and curving work just like the Lines and Curves tool. [Read
 more]({{< relref "../tools/connected-lines" >}})
 
 **Ellipses and Circles**
-> *Edit → Ellipses and Circles*, or press `O`
+> *Edit → Ellipses and Circles*, or <kbd>O</kbd>
 - Draw circles and ellipses (stretched-out circles). [Read more]({{< relref "../tools/ellipses-and-circles" >}})
-- Holding down `Shift` allows you to change the angle of an ellipse.
-- Holding down `Ctrl` constrains the aspect ratio (how stretched-out it looks).
-- When you hold down `Ctrl+Shift` together, the angle is constrained instead.
+- Holding down <kbd>Shift</kbd> allows you to change the angle of an ellipse.
+- Holding down <kbd>Ctrl</kbd> constrains the aspect ratio (how stretched-out it looks).
+- When you hold down <kbd>Ctrl</kbd>+<kbd>Shift</kbd> together, the angle is constrained instead.
 
 **Inking**
 > *Edit → Inking*
@@ -184,7 +185,7 @@ tools, so they are visible by default.
 - Tilt/turn the canvas within the viewport.
 
 - **Mirror Horizontal**
-> *View → Adjust View → Mirror Horizontal*, or press `I`
+> *View → Adjust View → Mirror Horizontal*, or <kbd>I</kbd>
 - Flip the current view from left to right.
 - This allows you to ensure your sketches look right from both directions.
 
@@ -197,11 +198,11 @@ context menu]({{< relref "#main-toolbar-image" >}}) to make them visible.
 There's no equivalent of these buttons for the canvas position, but the cursor keys will pan around the canvas.
 
 **Zoom In** and **Zoom Out**
-> *View → Adjust View*, or press `-` or `,` to zoom out, or `+` or `.` to zoom in
+> *View → Adjust View*, or <kbd>-</kbd> or <kbd>,</kbd> to zoom out, or <kbd>+</kbd> or <kbd>.</kbd> to zoom in
 - Change the canvas magnification by one step.
 
 **Rotate Counterclockwise** and **Rotate Clockwise**
-> *View → Adjust View*, or press `Ctrl+Left` or `Ctrl+Right`
+> *View → Adjust View*, or <kbd>Ctrl</kbd>+<kbd>Left</kbd> or <kbd>Ctrl</kbd>+<kbd>Right</kbd>
 - Change the canvas rotation by one angular step.
 
 ## View (Resetting)
@@ -211,11 +212,11 @@ These are for resetting the view. These items are optional, you need to use the
 "#main-toolbar-image" >}}) to make them visible.
 
 **Reset and Centre View**
-> *View → Reset and Centre View*, or press `F12`
+> *View → Reset and Centre View*, or <kbd>F12</kbd>
 - Resets the view fully, discarding any rotation, mirroring, or position.
 
 **Fit to View**
-> *View → Fit to View*, `F10`
+> *View → Fit to View*, or <kbd>F10</kbd>
 - The view is toggled between a fitted view, and an overview of your whole canvas.
 - The fitted view retains your mirroring and rotation settings.
 - Adjusting the view while it's fitted to your work discards your old saved zoom and position.

pages/docs/manuals/v1.2.0/ui/ui-toolbar/index.md

@@ -24,16 +24,16 @@ paint with. [Read more]({{< relref "../popups/brush-groups" >}})
 - This panel shows options for the current tool. [Read more]({{< relref "../panels/tool-options" >}})
 
 **Layers Panel** (stack of paper)
-> *Layer → Show Layers Panel*, or press `L`
+> *Layer → Show Layers Panel*, or <kbd>L</kbd>
 - This panel shows the layers tree (layer stack) for your working document. [Read more]({{< relref "../panels/layers" >}})
 
 **Scratchpad Panel** (clipboard)
-> *Scratchpad → Show Scratchpad Panel*, or press `Shift+S`
+> *Scratchpad → Show Scratchpad Panel*, or <kbd>Shift</kbd>+<kbd>S</kbd>
 - This panel is a little area where you can work on thumbnail sketches, stash references, or make palettes. Scratchpads
 can be saved and loaded independently of the main working doc. [Read more]({{< relref "../panels/scratchpad" >}})
 
 **Preview Panel** (camera viewfinder)
-> *View → Preview*, or press `Shift+P`
+> *View → Preview*, or <kbd>Shift</kbd>+<kbd>P</kbd>
 - The preview panel shows an overview of the entire document, and a viewfinder showing where you're zoomed to. [Read
 more]({{< relref "../panels/preview" >}})
 
@@ -42,6 +42,6 @@ more]({{< relref "../panels/preview" >}})
 - The history panel shows a short timeline of recent brushes and colours. [Read more]({{< relref "../panels/history" >}})
 
 {{< id "fullscreen-toggle" >}}**Fullscreen Mode Toggle**{{< /id >}}
-> *View → Fullscreen*, or press `F11`
+> *View → Fullscreen*, or <kbd>F11</kbd>
 - This button makes MyPaint take up the whole screen, or gets you out of fullscreen mode when it's active. [Read more](
 {{< relref "fullscreen" >}})