misc. appearance, grammar

user/advanced-configuration/uefi-troubleshooting.md

@@ -35,6 +35,7 @@ If you have an Nvidia card, see also [Nvidia Troubleshooting](/doc/nvidia-troubl
 1. Follow the [steps here](/doc/uefi-troubleshooting/#change-installer-kernel-parameters-in-uefi) to edit the `[qubes-verbose]` section of your installer's `BOOTX64.cfg`.
    You want to comment out the `mapbs` and `noexitboot` lines.
    The end result should look like this:
+   
    ~~~
    [qubes-verbose]
    options=console=vga efi=attr=uc
@@ -43,15 +44,18 @@ If you have an Nvidia card, see also [Nvidia Troubleshooting](/doc/nvidia-troubl
    kernel=vmlinuz inst.stage2=hd:LABEL=Qubes-R4.0-x86_64 i915.alpha_support=1
    ramdisk=initrd.img
    ~~~
+   
 2. Boot the installer and continue to install as normal, but don't reboot the system at the end when prompted.
 3. Go to `tty2` (Ctrl-Alt-F2).
 4. Use your preferred text editor (`nano` works) to edit `/mnt/sysimage/boot/efi/EFI/qubes/xen.cfg`, verifying the `noexitboot` and `mapbs` lines are not present.
 This is also a good time to make permanent any other changes needed to get the installer to work, such as `nouveau.modeset=0`.
    For example:
+   
    ~~~
    [4.14.18-1.pvops.qubes.x86_64]
    options=loglvl=all dom0_mem=min:1024M dom0_mem=max:4096M iommu=no-igfx ucode=scan efi=attr=uc
    ~~~
+   
 5. Go back to `tty6` (Ctrl-Alt-F6) and click `Reboot`.
 6. Continue with setting up default templates and logging in to Qubes.
 
@@ -67,6 +71,7 @@ Consider this approach as a last resort, because it will make every Xen update a
 1. Follow the [steps here](/doc/uefi-troubleshooting/#change-installer-kernel-parameters-in-uefi) to edit the `[qubes-verbose]` section of your installer's `xen.cfg`.
    You want to modify the `efi=attr=uc` setting and comment out the `mapbs` and `noexitboot` lines.
    The end result should look like this:
+   
    ~~~
    [qubes-verbose]
    options=console=vga efi=no-rs
@@ -75,21 +80,26 @@ Consider this approach as a last resort, because it will make every Xen update a
    kernel=vmlinuz inst.stage2=hd:LABEL=Qubes-R4.0-x86_64 i915.alpha_support=1
    ramdisk=initrd.img
    ~~~
+   
 2. Boot the installer and continue to install as normal, until towards the end when you will receive a warning about being unable to create the EFI boot entry.
    Click continue, but don't reboot the system at the end when prompted.
 3. Go to `tty2` (Ctrl-Alt-F2).
 4. Use your preferred text editor (`nano` works) to edit `/mnt/sysimage/boot/efi/EFI/qubes/xen.cfg`, adding the `efi=no-rs` option to the end of the `options=` line.
    For example:
+   
    ~~~
    [4.14.18-1.pvops.qubes.x86_64]
    options=loglvl=all dom0_mem=min:1024M dom0_mem=max:4096M iommu=no-igfx ucode=scan efi=no-rs
    ~~~
+   
 5. Execute the following commands:
+
    ~~~
    cp -R /mnt/sysimage/boot/efi/EFI/qubes /mnt/sysimage/boot/efi/EFI/BOOT
    mv /mnt/sysimage/boot/efi/EFI/BOOT/xen.efi /mnt/sysimage/boot/efi/EFI/BOOT/BOOTX64.efi
    mv /mnt/sysimage/boot/efi/EFI/BOOT/xen.cfg /mnt/sysimage/boot/efi/EFI/BOOT/BOOTX64.cfg
    ~~~
+   
 6. Go back to `tty6` (Ctrl-Alt-F6) and click `Reboot`.
 7. Continue with setting up default templates and logging in to Qubes.
 
@@ -106,7 +116,7 @@ You can re-enable them either as part of the install process:
 
 1. Perform installation normally, but don't reboot the system at the end yet.
 2. Go to `tty2` (Ctrl-Alt-F2).
-3. Enable `/mapbs /noexitboot` on just installed system.
+3. Enable `mapbs` and/or `noexitboot` on the just installed system.
    Edit `/mnt/sysimage/boot/efi/EFI/qubes/xen.cfg` (you can use `vi` or `nano` editor) and add to every kernel section:
             
         mapbs=1
@@ -123,7 +133,7 @@ You can re-enable them either as part of the install process:
 Or if you have already rebooted after the first stage install and have encountered this issue, by:
 
 1. Boot into [rescue mode](/doc/uefi-troubleshooting/#accessing-installer-rescue-mode-on-uefi).
-2. Enable `/mapbs /noexitboot` on just installed system.
+2. Enable `mapbs` and/or `noexitboot` on the just installed system.
    Edit `/mnt/sysimage/boot/efi/EFI/qubes/xen.cfg` (you can use `vi` or `nano` editor) and add to every kernel section:
             
         mapbs=1
@@ -171,13 +181,11 @@ Or if you have already rebooted after the first stage install and have encounter
 Boot device not recognized after installing
 ------------------------------------------
 
-Some firmware will not recognize the default Qubes EFI configuration. As such,
+Some firmware will not recognize the default Qubes EFI configuration.
-it will have to be manually edited to be bootable. This will need to be done after
+As such, it will have to be manually edited to be bootable.
-every kernel and Xen update to ensure you use the most recently installed versions.
+This will need to be done after every kernel and Xen update to ensure you use the most recently installed versions.
 
-1. Copy the `/boot/efi/EFI/qubes/` directory to `/boot/efi/EFI/BOOT/`
+1. Copy the `/boot/efi/EFI/qubes/` directory to `/boot/efi/EFI/BOOT/` (the contents of `/boot/efi/EFI/BOOT` should be identical to `/boot/efi/EFI/qubes` besides what is described in steps 2 and 3):
-(the contents of `/boot/efi/EFI/BOOT` should be identical to `/boot/efi/EFI/qubes`
-besides what is described in steps 2 and 3):
 
        cp -r /boot/efi/EFI/qubes/. /boot/efi/EFI/BOOT
 
@@ -185,9 +193,8 @@ besides what is described in steps 2 and 3):
 
        mv /boot/efi/EFI/BOOT/xen.cfg /boot/efi/EFI/BOOT/BOOTX64.cfg
 
-3. Copy `/boot/efi/EFI/qubes/xen-*.efi` to `/boot/efi/EFI/qubes/xen.efi`
+3. Copy `/boot/efi/EFI/qubes/xen-*.efi` to `/boot/efi/EFI/qubes/xen.efi` and `/boot/efi/EFI/BOOT/BOOTX64.efi`.
-and `/boot/efi/EFI/BOOT/BOOTX64.efi`. For example with Xen 4.8.3
+   For example, with Xen 4.8.3 (you may need to confirm file overwrite):
-(you may need to confirm file overwrite):
 
        cp /boot/efi/EFI/qubes/xen-4.8.3.efi /boot/efi/EFI/qubes/xen.efi
        cp /boot/efi/EFI/qubes/xen-4.8.3.efi /boot/efi/EFI/BOOT/BOOTX64.efi
@@ -196,10 +203,9 @@ and `/boot/efi/EFI/BOOT/BOOTX64.efi`. For example with Xen 4.8.3
 Installation finished but "Qubes" boot option is missing and xen.cfg is empty
 --------------------------------------------------------------------------------------
 
-In some cases installer fails to finish EFI setup and leave the system without
+In some cases installer fails to finish EFI setup and leave the system without a Qubes-specific EFI configuration.
-Qubes-specific EFI configuration. In such a case you need to finish those parts
+In such a case you need to finish those parts manually.
-manually. You can do that just after installation (switch to `tty2` with
+You can do that just after installation (switch to `tty2` with Ctrl-Alt-F2), or by booting from installation media in [rescue mode](/doc/uefi-troubleshooting/#accessing-installer-rescue-mode-on-uefi).
-Ctrl-Alt-F2), or booting from installation media in "Rescue a Qubes system" mode.
 
 1. Examine `/boot/efi/EFI/qubes` (if using Qubes installation media, it's in `/mnt/sysimage/boot/efi/EFI/qubes`). You should see 4 files there:
 
@@ -216,7 +222,6 @@ Ctrl-Alt-F2), or booting from installation media in "Rescue a Qubes system" mode
 3. Create xen.cfg with this content (adjust kernel version, and filesystem
    locations, below values are based on default installation of Qubes 3.2):
 
-
        [global]
        default=4.4.14-11.pvops.qubes.x86_64
 
@@ -233,7 +238,8 @@ Ctrl-Alt-F2), or booting from installation media in "Rescue a Qubes system" mode
 Accessing installer Rescue mode on UEFI
 ---------------------------------------
 
-In UEFI mode installer do not have boot menu, but starts directly the installation wizard. To get into Rescue mode, you need to switch to tty2 (Ctrl+Alt+F2) and then execute:
+In UEFI mode, the installer does not have a boot menu, but boots directly into the installation wizard.
+To get into Rescue mode, you need to switch to tty2 (Ctrl+Alt+F2) and then execute:
 
 ~~~
 pkill -9 anaconda