From ce0fa3be5ff0281a7587cce9709b6fbfb548f24c Mon Sep 17 00:00:00 2001
From: Katrina Prosise <katrina.prosise@foundries.io>
Date: Thu, 17 Aug 2023 09:18:28 -0400
Subject: [PATCH] Cleanup user-guide pages mu-t

The last pages of the User Guide requiring cleanup have been addressed.
Simplified language and rst, style fixes.

QA Steps: Did not step through all instructions. Rendered HTML was
inspected visually. Ran linter and linkcheck.

This commit applies to FFTK 988

Signed-off-by: Katrina Prosise <katrina.prosise@foundries.io>
---
 .../_static/userguide/submodule/newrepo.png   | Bin 15452 -> 0 bytes
 .../multi-stage-container.rst                 | 139 ++++++------------
 .../offline-update/offline-update.rst         |  19 ++-
 source/user-guide/submodule/submodule.rst     | 137 +++++++----------
 .../troubleshooting/troubleshooting.rst       |  15 +-
 5 files changed, 118 insertions(+), 192 deletions(-)
 delete mode 100644 source/_static/userguide/submodule/newrepo.png

diff --git a/source/_static/userguide/submodule/newrepo.png b/source/_static/userguide/submodule/newrepo.png
deleted file mode 100644
index 5f9b9a63742ec386ae864cbdadcb79f7aea952f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15452
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

diff --git a/source/user-guide/multi-stage-container/multi-stage-container.rst b/source/user-guide/multi-stage-container/multi-stage-container.rst
index b10cbfd2c..78cd55e49 100644
--- a/source/user-guide/multi-stage-container/multi-stage-container.rst
+++ b/source/user-guide/multi-stage-container/multi-stage-container.rst
@@ -3,36 +3,29 @@
 Multi-Stage Container Builds
 ============================
 
-When developing for embedded devices, optimization is one of the most 
-important things to consider.
+Optimization is always a consideration when developing for embedded devices.
+Using Multi-stage builds optimize your Dockerfiles, and keep them easier to read and maintain.
 
-Multi-stage builds are useful to optimize your Dockerfiles and keep them 
-easy to read and maintain.
-
-You can find more information about it on: `Use multi-stage builds`_.
+.. seealso::
+   Docker's documentation on `multi-stage builds`_.
 
 This guide assumes you have Docker installed on your computer.
 
-To summarize, multi-stage container builds allow you to develop in one stage and 
-copy just the necessary artifacts to the next stage. That being said, in the first 
-stage you can install dependencies for development, like a toolchain, and compile 
-your application. In the final stage, you can keep the image nice and clean with 
-just what is necessary for your application while making use of the final artifacts from 
-the first stage.
+To summarize, multi-stage container builds allow you to develop in one stage, then copy only the necessary artifacts to the next stage.
+In the first stage you can install dependencies for development, like a toolchain, and compile your application.
+In the final stage, the image is kept clean with just the necessities for your application.
+This is done by making use of the final artifacts from the first stage.
+
+This guide presenst a Dockerfile implementing a ``helloworld`` application written in C. 
 
-This section will present a Dockerfile implementing a ``helloworld`` application 
-written in C. 
+In the first example, the Dockerfile is implementing everything in a single stage, leaving all objects and spare software in the image.
 
-In the first example, the Dockerfile is implementing everything 
-in a single stage, leaving all the objects and spare software in the image. The 
-second example shows how to convert it into a multi-stage container, where the 
-build happens in the first stage, and all the objects and spare software 
-stay in the first stage. Finally, the second stage copies the binary from the 
-first stage and ends up with a smaller and optimized image.
+The second example shows how to convert this into a multi-stage container.
+This time, the build happens in the first stage, and the second stage copies the binary—ending with a smaller and optimized image.
 
-Both examples, single and multi-stage, will use the same file structure:
+Both examples use the same file structure:
 
-.. prompt:: text
+::
 
      ├── single
      │   └── Dockerfile
@@ -51,13 +44,7 @@ Create the file structure:
 
 Create the ``helloworld.c`` file:
 
-.. prompt:: bash host:~$, auto
-
-    host:~$ gedit helloworld.c
-
-**helloworld.c**:
-
-.. prompt:: text
+.. code-block:: c
 
     #include <stdio.h>
     int main()
@@ -65,17 +52,11 @@ Create the ``helloworld.c`` file:
       printf("hello, world!\n");
     }
  
-    /* helloworld.c */
+    /* helloworld.c \*/
 
 Create the ``start.sh`` file:
 
-.. prompt:: bash host:~$, auto
-
-    host:~$ gedit start.sh
-
-**start.sh**:
-
-.. prompt:: text
+.. code-block:: bash
 
     #!/bin/sh
     
@@ -96,13 +77,9 @@ Single Stage Container
 
 Create the ``Dockerfile`` that implements the single stage container:
 
-.. prompt:: bash host:~$, auto
-
-    host:~$ gedit single/Dockerfile
+``single/Dockerfile``:
 
-**single/Dockerfile**:
-
-.. prompt:: text
+.. code-block:: dockerfile
 
     FROM debian:bullseye-slim
     RUN  echo "-------Single-Stage--------------"
@@ -123,20 +100,18 @@ Create the ``Dockerfile`` that implements the single stage container:
     
     ENTRYPOINT ["/app/start.sh"]
 
-The ``Dockerfile`` is very simple. It installs ``build-essential``, 
-copies the files ``helloworld.c`` and ``start.sh`` to the container image, 
-compiles ``helloworld.c`` and sets the entrypoint to start the ``start.sh`` script.
+The ``Dockerfile`` is straightforward..
+It installs ``build-essential``, copies the files ``helloworld.c`` and ``start.sh`` to the container image,
+then compiles ``helloworld.c`` and sets the entrypoint to start the ``start.sh`` script.
 
-Build the docker example and check the image size:
+Build the Docker example and check the image size:
 
 .. prompt:: bash host:~$, auto
 
     host:~$ docker build --tag single:1.0 -f single/Dockerfile .
     host:~$ docker image ls
 
-**Example Output**:
-
-.. prompt:: text
+::
 
      docker image ls
      REPOSITORY                         TAG             IMAGE ID       CREATED          SIZE
@@ -148,9 +123,7 @@ Run the image and open a second terminal:
 
     host:~$ docker run -it --rm --name single single:1.0
 
-**Example Output**:
-
-.. prompt:: text
+::
 
      hello, world!
      hello, world!
@@ -162,36 +135,28 @@ In the second terminal, inspect the image and note that the spare files are pres
 
     host:~$ docker exec -it single ls /app
 
-**Example Output**:
-
-.. prompt:: text
+::
 
      helloworld  helloworld.c  start.sh
 
-Note that the gcc software is present in the image:
+Note that the GCC compiler is present in the image:
 
 .. prompt:: bash host:~$, auto
 
     host:~$ docker exec -it single sh -c 'type gcc'
 
-**Example Output**:
-
-.. prompt:: text
+::
 
      gcc is /usr/bin/gcc
 
 Multi-Stage Container
 ---------------------
 
-Create the ``Dockerfile`` that implements the multi-stage container:
-
-.. prompt:: bash host:~$, auto
-
-    host:~$ gedit multi/Dockerfile
+Create the ``Dockerfile`` to implement the multi-stage container:
 
-**multi/Dockerfile**:
+``multi/Dockerfile``:
 
-.. prompt:: text
+.. code-block:: dockerfile
 
     FROM debian:bullseye-slim AS builder
     RUN  echo "-------Multi-Stage--------------"
@@ -226,32 +191,28 @@ Create the ``Dockerfile`` that implements the multi-stage container:
     
     ENTRYPOINT ["/app/start.sh"]
 
-In this case, the ``Dockerfile`` is divided into two stages: ``builder`` and ``final-stage``. 
-The first stage starts with ``AS builder`` after specifying the starting image (first line of the Dockerfile). Next, 
-it installs ``build-essential`` and compiles ``helloworld.c``.
+This ``Dockerfile`` is divided into two stages: ``builder`` and ``final-stage``. 
+The first stage starts with ``AS builder`` after specifying the starting image (first line of the Dockerfile).
+Next, it installs ``build-essential`` and compiles ``helloworld.c``.
 
-The second stage starts with ``AS final-stage`` right after specifying the image used 
-for the second stage (line 18 of the Dockerfile).
-Finally, it ``COPY`` the ``helloworld`` binary from the first stage using the parameter ``--from=builder``.
+The second stage starts with ``AS final-stage`` after specifying the image to be used. (line 18 of the Dockerfile).
+Finally, ``COPY`` get the ``helloworld`` binary from the first stage using the parameter ``--from=builder``.
 
-Build the docker example and check the image size:
+Build the Docker example and check the image size:
 
 .. prompt:: bash host:~$, auto
 
     host:~$ docker build --tag multi:1.0 -f multi/Dockerfile .
     host:~$ docker image ls
 
-**Example Output**:
-
-.. prompt:: text
+::
 
      docker image ls
      REPOSITORY                         TAG             IMAGE ID       CREATED          SIZE
      single                             1.0             ba94763b6fe4   25 seconds ago   351MB
      multi                              1.0             bdeac19070ea   50 minutes ago   80.4MB
 
-Note the difference between the `single` and `multi` images. A simple ``helloworld`` 
-with just the ``build-essential`` software shows how useful a multi-stage container could be.
+Note the difference between the `single` and `multi` images.
 
 Run the image and open a second terminal:
 
@@ -259,37 +220,31 @@ Run the image and open a second terminal:
 
     host:~$ docker run -it --rm --name multi multi:1.0
 
-**Example Output**:
-
-.. prompt:: text
+::
 
      hello, world!
      hello, world!
      hello, world!
 
-In the second terminal, inspect the image and note that only the needed files are 
-present in the image (``helloworld.c`` is not installed in the final stage):
+In the second terminal, inspect the image.
+Note that only the needed files are present in the image (``helloworld.c`` is not installed in the final stage):
 
 .. prompt:: bash host:~$, auto
 
     host:~$ docker exec -it multi ls /app
 
-**Example Output**:
-
-.. prompt:: text
+::
 
      helloworld  start.sh
 
-Note that the ``gcc`` software is not installed in the final stage:
+Notice how ``gcc`` is not installed in the final stage:
 
 .. prompt:: bash host:~$, auto
 
     host:~$ docker exec -it multi sh -c 'type gcc'
 
-**Example Output**:
-
-.. prompt:: text
+::
 
      gcc: not found
 
-.. _Use multi-stage builds: https://docs.docker.com/build/building/multi-stage/
+.. _multi-stage builds: https://docs.docker.com/build/building/multi-stage/
diff --git a/source/user-guide/offline-update/offline-update.rst b/source/user-guide/offline-update/offline-update.rst
index 9bde4185c..f701d799f 100644
--- a/source/user-guide/offline-update/offline-update.rst
+++ b/source/user-guide/offline-update/offline-update.rst
@@ -13,20 +13,20 @@ Prerequisites
 
 1. Enable Offline Update support, i.e. add ``aklite-offline`` to ``PACKAGECONFIG`` of ``aktualizr``. For example:
 
-    .. prompt:: text
+    .. prompt:: bash
 
         cat meta-subscriber-overrides.git/recipes-sota/aktualizr/aktualizr_%.bbappend
         PACKAGECONFIG:append = " aklite-offline"
 2. Enable :ref:`ug-container-preloading` if you would like to update ``Compose Apps`` along with rootfs (aka ostree).
 
-3. Ensure that :ref:`TUF keys are taken offline <ref-offline-keys>`. If they are not, then do it.
+3. Ensure that :ref:`TUF keys are taken offline <ref-offline-keys>`.
 
 4. Build an LmP image and flash it onto a target device or update the device with the image via OTA.
 
-
 Obtaining Offline Update Content
 --------------------------------
-Once the prerequisites are met, download the offline update content from the FoundriesFactory to some medium, e.g., a USB drive, which can be attached to a target device.
+
+First download the offline update content from your Factory to an install medium which can be attached to the target device.
 The offline update content consists of:
 
 1. `TUF metadata`_;
@@ -51,6 +51,7 @@ Use the command ``fioctl targets offline-update <target-name> <dst> --tag <tag>
 
 Performing the Offline Update
 -----------------------------
+
 Before doing the offline update, make the offline update content accessible on a device, e.g., attach and mount the USB drive.
 
 Use the ``aklite-offline`` CLI utility to perform an offline update.
@@ -152,19 +153,21 @@ Offline Update Considerations
 
 * **Offline Update is not a packaged delivery**
 
-The content provided by ``fioctl targets offline-update`` command should be packaged by the customer and verified by the client service.
+  The content provided by ``fioctl targets offline-update`` command should be packaged by you, and verified by the client service.
 
 * **Offline Update does not provide a secure delivery**
 
-Related to the bullet above, Foundries.io™ cannot provide secure delivery of offline update content since the customer should do the packaging and delivery.
+  Related to the bullet above, Foundries.io™ cannot provide secure delivery of offline update content since you should do the packaging and delivery.
 
 * **Offline Update allows installing Targets from different Tags**
 
-A custom client application should handle this case if it is not the intended behavior.
+  A custom client application should handle this case if it is not the intended behavior.
 
 * **Online/Offline Mixed Updates**
 
-Toggling between online and offline modes is not tested or validated by Foundries.io. It should be handled by a custom client application. Both cases can work together, but the offline update feature was initially designed to be offline only until the device was registered.
+  Toggling between online and offline modes is not tested or validated by Foundries.io.
+  It should be handled by a custom client application.
+  Both cases can work together, but the offline update feature is designed to be offline only, until the device is registered.
 
 There are a few points to take into account by the custom client application:
 
diff --git a/source/user-guide/submodule/submodule.rst b/source/user-guide/submodule/submodule.rst
index efbbd452e..2a1dc6527 100644
--- a/source/user-guide/submodule/submodule.rst
+++ b/source/user-guide/submodule/submodule.rst
@@ -1,37 +1,27 @@
 .. _ug-submodule:
 
-Working with Git Submodules
+Working With Git Submodules
 ===========================
 
-This section shows how to add a git submodule to your FoundriesFactory repository.
+This section shows how to add a git submodule to your FoundriesFactory® repository.
 
-This is very helpful when you want to use an external private or public git repository, 
-such as GitHub_, connected to the FoundriesFactory repository as a submodule.
+This is for when you want an external git repository, such as GitHub, connected to a Factory repository as a submodule.
 
-Submodules can be used to isolate two different application teams to work 
-on separated repositories. In this case, each team works in their own repository 
-and each repository is added as a submodule in the FoundriesFactory repository.
+Submodules can be used to isolate two different application teams, allowing work to take place in separate repositories.
+Each team works in their own repository and each repository is added as a submodule in the Factory repository.
 
 This section can be adapted for other git repository hosting services.
 
-Create Github Repository
-------------------------
-
-Go to GitHub_ and click on the button :guilabel:`New` in the upper left corner.
-
-.. figure:: /_static/userguide/submodule/newrepo.png
-   :width: 300
-   :align: center
+Create a GithHub Repository
+---------------------------
 
-   GitHub New Repo
+Go to GitHub_ and create a new repo.
 
-You can choose to use a private or a public repository.
+You can choose to use a private or a public repository, each involves separate steps:
 
 .. tabs::
 
    .. group-tab:: Private
-      
-      Complete the :guilabel:`Repository name` with the name that works best for your repository.
 
       Select :guilabel:`Private` and :guilabel:`Create repository`.
 
@@ -41,10 +31,9 @@ You can choose to use a private or a public repository.
       
          New Private GitHub repository
       
-      The FoundriesFactory CI needs GitHub_ personal access token to download 
-      the submodule content during the build.
+      The FoundriesFactory CI needs GitHub personal access token to download the submodule content during the build.
 
-      Go to GitHub_ and in the upper right corner, click on your avatar and :guilabel:`Settings`.
+      Go to GitHub and in the upper right corner, click on your avatar and :guilabel:`Settings`.
 
       .. figure:: /_static/userguide/submodule/settings.png
          :width: 300
@@ -54,8 +43,7 @@ You can choose to use a private or a public repository.
       
       In the left menu, click on the :guilabel:`Developer settings`.
       
-      Next, click on the :guilabel:`Personal access tokens` and click on the 
-      button :guilabel:`Generate new token`.
+      Next, click on the :guilabel:`Personal access tokens` and click on the  button :guilabel:`Generate new token`.
 
       .. figure:: /_static/userguide/submodule/newtoken.png
          :width: 800
@@ -80,7 +68,7 @@ You can choose to use a private or a public repository.
       
          Personal Token Scope      
       
-      Configure your FoundriesFactory with the personal access token.
+      Configure your Factory with the personal access token.
 
       Use ``fioctl`` to configure the ``githubtok`` variable.
 
@@ -90,8 +78,6 @@ You can choose to use a private or a public repository.
    
    .. group-tab:: Public
 
-      Complete the :guilabel:`Repository name` with the name work best for your repository.
-
       Select :guilabel:`Public` and :guilabel:`Create repository`.
 
       .. figure:: /_static/userguide/submodule/public.png
@@ -100,18 +86,16 @@ You can choose to use a private or a public repository.
       
          New Public GitHub repository
 
-Preparing GitHub Repository
----------------------------
+Preparing the GitHub Repository
+--------------------------------
 
-The GitHub_ repository created will be used to specify a Docker Compose Application.
+For this guide, the GitHub repo  will be used to specify a Docker Compose Application.
 
-The requirements to the FoundriesFactory CI to build a Docker Image and create a 
-Docker Compose App with this image is to have a folder with a ``Dockerfile`` and a ``docker-compose.yml``
+The requirements for the FoundriesFactory CI to build this is to have a folder with a ``Dockerfile`` and a ``docker-compose.yml``
 
-If you are not familiar with the ``containers.git`` file structure, read the 
-section :ref:`tutorial-compose-app-file-structure`.
+If you are not familiar with the ``containers.git`` file structure, see the section on :ref:`tutorial-compose-app-file-structure`.
 
-That being said, create a folder to initialize the GitHub_ repository.
+Create a folder to initialize the repo.
 
 .. prompt:: bash host:~$, auto
 
@@ -136,31 +120,25 @@ Move it from the ``shellhttpd`` folder to the repo root directory:
     host:~$ git mv shellhttpd/Dockerfile shellhttpd/docker-compose.yml shellhttpd/httpd.sh .
     host:~$ git rm -r shellhttpd/
 
-Now you have the files required for a Docker Compose Application:
+You have the files required for a Docker Compose Application:
 
 .. prompt:: bash host:~$, auto
 
     host:~$ tree ../myapp/
 
-Example output:
-
-.. prompt:: text
+.. code-block:: console
     
      ../myapp/
      ├── docker-compose.yml
      ├── Dockerfile
      └── httpd.sh
 
-Update the image url in the ``docker-compose.yml`` file with your repository name.
+Update the image url in ``docker-compose.yml`` with your repo's name.
 This example uses ``myapp``:
 
-.. prompt:: bash host:~$, auto
+``docker-compose.yml``:
 
-    host:~$ vim docker-compose.yml
-     
-**docker-compose.yml**:
-
-.. prompt:: text
+.. code-block:: yaml
 
      version: '3.2'
      
@@ -180,33 +158,29 @@ Add all new files, changes and commit and push:
 
     host:~$ git add docker-compose.yml Dockerfile httpd.sh
     host:~$ git commit -m "Adding App Structure"
-    host:~$ git branch -M devel
-    host:~$ git push --set-upstream origin devel
+    host:~$ git push
 
-Adding Submodule
-----------------
+Adding the Submodule
+--------------------
 
 Clone your ``containers.git`` repo and enter its directory:
 
 .. prompt:: bash host:~$
 
-    git clone -b devel https://source.foundries.io/factories/<factory>/containers.git
+    git clone https://source.foundries.io/factories/<factory>/containers.git
     cd containers
 
 .. tip::
 
-   If you followed the Tutorials, your ``containers.git`` might have the ``shellhttpd`` 
-   app already. If that is the case, to avoid conflict with the submodule example remove 
-   or move it to ``shellhttpd.disabled``
+   If you followed the tutorials, your ``containers.git`` might have the ``shellhttpd`` app already.
+   If that is the case, to avoid conflict with the submodule example remove or move it to ``shellhttpd.disabled``
 
-Inside the ``containers`` adapt the command below to your GitHub_ repository:
+Inside the ``containers`` directory, adapt the command below using your GitHub repo:
 
 .. prompt:: bash host:~$
 
     git submodule add git@github.com:<user>/<repository>.git
 
-**Example**:
-
 .. prompt:: bash host:~$, auto
 
     host:~$ git submodule add -b devel git@github.com:munoz0raul/myapp.git
@@ -217,9 +191,9 @@ Inside the ``containers`` adapt the command below to your GitHub_ repository:
 
 Go to the `web app <https://app.foundries.io>`_, select your Factory and click on :guilabel:`Targets`:
 
-The latest **Target** named :guilabel:`containers-devel` should be the CI job you just created.
+The latest Target should be the CI job you just created.
 
-Click anywhere on the Target’s line in the list to see more details.
+Click anywhere on the Target’s line to see more details.
 
 After the CI Job finishes, refresh the page and find your application in Apps:
 
@@ -239,15 +213,12 @@ In your Factory, click on :guilabel:`Source` and select the ``container.git`` re
 
 Note the application submodule is available but it is not possible to inspect the application files.
 
-Updating Submodule Manually
----------------------------
+Updating the Submodule Manually
+-------------------------------
 
-The submodule inside the ``containers.git`` is pinned to the latest GitHub_ repository commit.
-
-As new commits are added to the GitHub_ repository, the ``containers.git`` must 
-be updated with the latest submodule changes.
-
-It is possible to do it manually or using GitHub_ Actions.
+The submodule inside ``containers.git`` is pinned to the latest GitHub repo commit.
+As new commits are added, ``containers.git`` must be updated with the latest submodule changes.
+It is possible to do it manually or using GitHub Actions.
 
 To update it manually, go to your ``containers`` folder, inside the submodule and run:
 
@@ -259,19 +230,18 @@ To update it manually, go to your ``containers`` folder, inside the submodule an
     host:~$ git commit -m "Updating submodule hash"
     host:~$ git push
 
-Updating Submodule Automatically
---------------------------------
+Updating the Submodule Automatically
+------------------------------------
 
-To automate the previous steps, you have to allow GitHub_ to access your 
-FoundriesFactory repository. For that, you need to create a token.
+To automate the previous steps, you have to allow GitHub to access your Factory repo.
+For that, you need to create a token.
 
 Go to `Tokens <https://app.foundries.io/settings/tokens>`_ and create a new **Api Token** by clicking on 
 :guilabel:`+ New Token`.
 
 Complete with a **Description** and the **Expiration date** and select :guilabel:`next`.
 
-For GitHub_, check the :guilabel:`Use for source code access` box and 
-select your **Factory**.
+For GitHub, check the :guilabel:`Use for source code access` box and select your **Factory**.
 
 .. figure:: /_static/userguide/mirror-action/mirror-action.png
    :width: 500
@@ -279,7 +249,7 @@ select your **Factory**.
 
    Token for source code access
 
-Copy the token, go to the Github_ repository and find the repository :guilabel:`Settings`.
+Copy the token, go to the GitHub repo and find :guilabel:`Settings`.
 
 .. figure:: /_static/userguide/submodule/reposetting.png
    :width: 800
@@ -297,10 +267,8 @@ Name it with ``FOUNDRIES_API_TOKEN``, paste your ``<Token>`` on Value and click
      
    Action Token
 
-Create the file ``.github/workflows/source-fio-update.yml`` inside your GitHub_ 
-application repository. Follow the example below and make sure you update the 
-``<FACTORY_NAME>`` to your Factory Name and ``<SUBMODULE_FOLDER>`` with your 
-submodule folder name.
+Create the ``.github/workflows/source-fio-update.yml`` inside your GitHub application repo.
+Follow the example below and make sure you update ``<FACTORY_NAME>`` with your Factory, and ``<SUBMODULE_FOLDER>`` with your submodule folder.
 
 .. prompt:: bash host:~$, auto
 
@@ -308,9 +276,7 @@ submodule folder name.
     host:~$ mkdir -p .github/workflows/ 
     host:~$ gedit .github/workflows/source-fio-update.yml
 
-**docker-compose.yml**:
-
-.. prompt:: text
+.. code-block:: yaml
 
      # .github/workflows/source-fio-update.yml
      
@@ -333,7 +299,7 @@ submodule folder name.
              submodule-path: "./<SUBMODULE_FOLDER>"
              remote-branch: ${{ github.ref }}
 
-Add and commit your GitHub_ Action:
+Add and commit your GitHub Action:
 
 .. prompt:: bash host:~$, auto
 
@@ -341,8 +307,7 @@ Add and commit your GitHub_ Action:
     host:~$ git commit -m "Adding Action"
     host:~$ git push
 
-After this commit, the submodule should be automatically updated inside the 
-``containers.git`` repository. As a result, it will automatically trigger a new 
-FoundriesFactory CI Job to build your application.
+After this commit, the submodule should be automatically updated inside the ``containers.git`` repo.
+As a result, it will automatically trigger a new CI Job to build your application.
 
-.. _GitHub: https://github.com/
+.. _GitHub: https://github.com/new
diff --git a/source/user-guide/troubleshooting/troubleshooting.rst b/source/user-guide/troubleshooting/troubleshooting.rst
index 2895b5b55..335b34552 100644
--- a/source/user-guide/troubleshooting/troubleshooting.rst
+++ b/source/user-guide/troubleshooting/troubleshooting.rst
@@ -173,14 +173,14 @@ It manifests as a failed boot attempt and error in the u-boot log:
 This suggests that the SPL key is missing from the factory.
 The key is defined in the OE recipe and it defaults to ``spldev``.
 
-.. prompt::
+::
 
     UBOOT_SPL_SIGN_KEYNAME="spldev"
 
 This can be confirmed by checking whether files ``spldev.key`` or ``spldev.crt`` are missing from the ``lmp-manifest/factory-keys`` directory.
 If so, the easiest fix is to generate the keys and add them to the repository.
 
-.. prompt::
+.. code-block:: console
 
     cd factory-keys
     openssl genpkey -algorithm RSA -out spldev.key \
@@ -190,7 +190,7 @@ If so, the easiest fix is to generate the keys and add them to the repository.
 
 Once the ``spldev.key`` and ``spldev.crt`` are created, add them to the repository.
 
-.. prompt::
+.. code-block:: console
 
     git add factory-keys/spldev.key
     git add factory-keys/spldev.crt
@@ -341,7 +341,7 @@ First, configure the **aktualizr-lite** polling interval:
        cd meta-subscriber-overrides
        mkdir -p recipes-sota/sota-fragment/sota-fragment
 
-5. Create the ``90-sota-fragment.toml`` file under this new directory:
+5. Create ``90-sota-fragment.toml`` under this new directory:
 
    .. code-block::
 
@@ -354,7 +354,7 @@ First, configure the **aktualizr-lite** polling interval:
 6. In the ``recipes-samples/images/lmp-factory-image.bb`` file, include this new package under ``CORE_IMAGE_BASE_INSTALL``.
    For example:
 
-   .. code-block::
+   .. code-block:: diff
 
        --- a/recipes-samples/images/lmp-factory-image.bb
        +++ b/recipes-samples/images/lmp-factory-image.bb
@@ -518,6 +518,9 @@ Targets list for that tag.
 
 There are some cases where this can happen:
 
-* When using :ref:`Production Targets <ref-production-targets>`: A user creates a wave for Target 42 and some devices are updated. The user then cancels the wave, removing Target 42 from the Targets list. A new wave is created for Target 43. Running ``fioctl wave status`` in this case shows that some devices are running Target 42, which is not present in the Targets list, so it shows as an orphan Target.
+* When using :ref:`Production Targets <ref-production-targets>`: A user creates a wave for Target 42 and some devices are updated.
+  The user then cancels the wave, removing Target 42 from the Targets list.
+  A new wave is created for Target 43.
+  Running ``fioctl wave status`` in this case shows that some devices are running Target 42, which is not present in the Targets list, so it shows as an orphan Target.
 * A device runs an old Target that has been pruned from the Targets list.
 * A device switches from one tag to another and it is still running a Target version which is not present in the new tag.