Doc: Edits to workaround note for EFI command line option string issue.

Signed-off-by: Deb Taylor <deb.taylor@intel.com>

doc/getting-started/rt_industry.rst

@@ -154,11 +154,16 @@ Use the pre-installed industry ACRN hypervisor
       Boot000D* INTEL SSDPEKKW256G8 : PART 0 : Boot Drive	BBS(HD,,0x0)..BO
       Boot000E* UEFI : INTEL SSDPEKKW256G8 : PART 0 : OS Bootloader	PciRoot(0x0)/Pci(0x1d,0x0)/Pci(0x0,0x0)/NVMe(0x1,00-00-00-00-00-00-00-00)/HD(1,GPT,8aa992f8-8149-4f6b-8b64-503998c776c1,0x800,0x47000)..BO
 
-   .. note:: Ensure that ACRN is first in the boot order, or you may use ``efibootmgr -o 1`` command to move it
+   .. note:: Ensure that ACRN is first in the boot order, or you may use the
-      to the first position. If you need to enable the serial port, run the following command before rebooting:
+      ``efibootmgr -o 1`` command to move it to the first position. If you need to enable the serial port, run the following command before rebooting:
 
       ``efibootmgr -c -l '\EFI\acrn\acrn.efi' -d /dev/sda -p 1 -L ACRN -u "uart=port@0x3f8 "``
 
+      Note the extra space at the end of the EFI command-line options
+      string. This is a workaround for a current `efi-stub bootloader name
+      issue <https://github.com/projectacrn/acrn-hypervisor/issues/4520>`_.
+      It ensures that the end of the string is properly detected.
+
 #. Reboot KBL NUC.
 
 #. Use the ``dmesg`` command to ensure that the Service VM boots:
@@ -206,9 +211,10 @@ Use the ACRN industry out-of-the-box image
 
       # efibootmgr -c -l "\EFI\acrn\acrn.efi" -d /dev/sda -p 1 -L "ACRN" -u "uart=port@0x3f8 "
 
-   .. note:: This is a workaround for the issue in efi-stub;
+   .. note:: Note the extra space at the end of the EFI command-line options
-      Add an extra space to the EFI option to make sure space could be used to detect the end of bootloader name string.
+      strings above. This is a workaround for a current `efi-stub bootloader
-      The extra space can be removed after the issue in efi-stub is fixed later.
+      name issue <https://github.com/projectacrn/acrn-hypervisor/issues/4520>`_.
+      It ensures that the end of the string is properly detected.
 
 #. Reboot the test machine. After the Clear Linux OS boots,
    log in as “root” for the first time.

doc/tutorials/running_deb_as_serv_vm.rst

@@ -14,7 +14,7 @@ Use the following instructions to install Debian.
 
 -  Navigate to `Debian 10 iso <https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/>`_. Select and download **debian-10.1.0-amd64-netinst.iso** (scroll down to the bottom of the page).
 -  Follow the `Debian installation guide <https://www.debian.org/releases/stable/amd64/index.en.html>`_ to install it on your NUC; we are using an Intel Kaby Lake NUC (NUC7i7DNHE) in this tutorial.
--  :ref:`install-build-tools-dependencies` for ACRN.
+-  Install the necessary development tools. Refer to :ref:`install-build-tools-dependencies` for ACRN.
 -  Update to the latest iASL (required by the ACRN Device Model):
 
    .. code-block:: bash
@@ -63,7 +63,7 @@ Install ACRN on the Debian VM
 
          $ sudo mkdir /boot/efi/EFI/acrn/
          $ sudo cp ~/acrn-hypervisor/build/hypervisor/acrn.efi /boot/efi/EFI/acrn/
-         $ sudo efibootmgr -c -l "\EFI\acrn\acrn.efi" -d /dev/sda -p 1 -L "ACRN Hypervisor" -u "bootloader=\EFI\debian\grubx64.efi"
+         $ sudo efibootmgr -c -l "\EFI\acrn\acrn.efi" -d /dev/sda -p 1 -L "ACRN Hypervisor" -u "bootloader=\EFI\debian\grubx64.efi "
          $ sudo efibootmgr -v     # shows output as below
          Timeout: 1 seconds
          BootOrder: 0009,0003,0004,0007,0005,0006,0001,0008,0002,0000
@@ -78,7 +78,14 @@ Install ACRN on the Debian VM
          Boot0008* Linux bootloader VenHw(99e275e7-75a0-4b37-a2e6-c5385e6c00cb)
          Boot0009* ACRN Hypervisor HD(1,GPT,94597852-7166-4216-b0f1-cef5fd1f2349,0x800,0x100000)/File(\EFI\acrn\acrn.efi)b.o.o.t.l.o.a.d.e.r.=.\.E.F.I.\.d.e.b.i.a.n.\.g.r.u.b.x.6.4...e.f.i.
 
-   #. Install the Service VM kernel and reboot:
+
+     .. note::
+        Note the extra space at the end of the EFI command-line options
+        string above. This is a workaround for a current `efi-stub
+        bootloader name issue <https://github.com/projectacrn/acrn-hypervisor/issues/4520>`_.
+        It ensures that the end of the string is properly detected.
+
+   b. Install the Service VM kernel and reboot:
 
       .. code-block:: bash
 

doc/tutorials/using_ubuntu_as_sos.rst

@@ -118,10 +118,11 @@ the source code, build it, and install it on your device.
          sudo efibootmgr -c -l "\EFI\acrn\acrn.efi" -d /dev/nvme0n1 -p 1 \
                 -L "ACRN Hypervisor" -u "bootloader=\EFI\ubuntu\grubx64.efi "
 
-      .. Note::
+     .. note::
-         This is a workaround for the issue in efi-stub;
+        Note the extra space at the end of the EFI command-line options
-         Add an extra space to the EFI option to make sure space could be used to detect the end of bootloader name string.
+        strings above. This is a workaround for a current `efi-stub
-         This extra space can be removed after issue in efi-stub fixed later.
+        bootloader name issue <https://github.com/projectacrn/acrn-hypervisor/issues/4520>`_.
+        It ensures that the end of the string is properly detected.
 
    #. Verify that "ACRN Hypervisor" is added and that it will boot first: