Merge branch 'master' into spelling-grammar-fixes

Resolved conflicts in:
      basics_user/doc-guidelines.md
      basics_user/reporting-bugs.md
      common-tasks/backup-restore.md
      common-tasks/software-update-dom0.md
      common-tasks/software-update-vm.md
      common-tasks/usb.md
      configuration/disk-trim.md
      configuration/external-audio.md
      configuration/network-printer.md
      configuration/resize-disk-image.md
      configuration/resize-root-disk-image.md
      customization/fedora-minimal-template-customization.md
      managing-os/hvm.md
      managing-os/templates/archlinux.md
      privacy/whonix-install.md
      security/yubi-key.md
      troubleshooting/install-nvidia-driver.md
      troubleshooting/macbook-troubleshooting.md

troubleshooting/install-nvidia-driver.md

@@ -20,8 +20,8 @@ Support for newer cards is limited until AMDGPU support in the 4.5+ kernel, whic
 
 Built in Intel graphics, Radeon graphics (between that 4000-9000 range), and perhaps some prebaked NVIDIA card support that I don't know about. Those are your best bet for great Qubes support.
 
-If you do happen to get proprietary drivers working on your Qubes system (via installing them), please take the time to go to the
-[Hardware Compatibility List (HCL)](https://www.qubes-os.org/doc/hcl/#generating-and-submitting-new-reports )
+If you do happen to get proprietary drivers working on your Qubes system (via installing them), please take the time to go to the 
+[Hardware Compatibility List (HCL)](/doc/hcl/#generating-and-submitting-new-reports )
 Add your computer, graphics card, and installation steps you did to get everything working.
 
 ## RpmFusion packages

troubleshooting/macbook-troubleshooting.md

@@ -135,7 +135,7 @@ Please see [this thread o the qubes-devel mailing list][macbook-air-2012-5-1].
 
 [1]: https://github.com/QubesOS/qubes-issues/issues/794
 [2]: https://github.com/QubesOS/qubes-issues/issues/1261
-[3]: https://www.qubes-os.org/doc/assigning-devices/
+[3]: /doc/assigning-devices/
 [bluetooth-replacement]: https://www.ifixit.com/Guide/MacBook+Air+13-Inch+Mid+2011+AirPort-Bluetooth+Card+Replacement/6360
 [macbook-air-2012-5-1]: https://groups.google.com/d/topic/qubes-devel/uLDYGdKk_Dk/discussion
 
@@ -187,11 +187,11 @@ You can install Qubes using BIOS or UEFI:
    * unzip it and run installer, which installs rEFIind on the internal SSD
    * if installation fails due to SIP, reboot in recovery mode, open a terminal and issue command
    ~~~
-   crsutil disable
+   csrutil disable
    ~~~
    * reboot and you will see some icons
    * choose Boot EFI\BOOT\xen.efi from ANACONDA
-   * after a while the graphical installer is up and running, with keyboard and touchpad working
+   * after a while the graphical installer is up (keyboard and touchpad working)
 
 ### 3. Installation
 

troubleshooting/thinkpad-troubleshooting.md

@@ -15,6 +15,33 @@ redirect_from:
 
 # Lenovo ThinkPad Troubleshooting #
 
+## Instructions to create USB installation medium for newer (UEFI-only) ThinkPads ##
+Newer ThinkPads (e.g. T470, T470p, ThinkPad 25) are likely to fail installation attempts made from a USB stick that was created with dd or Rufus, and even from a DVD burned using official ISO images - if the ThinkPad is configured for UEFI boot. If you don't want to use Legacy Mode as a workaround, the following instructions should help you create a Qubes Installation USB stick that works in UEFI-only mode.
+
+In a nutshell, you need to use the Fedora livecd-tools to make a Qubes Installation USB Stick from the Qubes ISO image, then update the label on the partition of that USB stick to "BOOT", and then update the BOOT/EFI/xen.cfg file on the USB stick so that all labels point to BOOT. In more detail:
+
+1. On your ThinkPad, enter the UEFI setup (press F1 at startup) and make sure to set at least the following options:
+   - *USB UEFI BIOS Support: Enabled*
+   - *UEFI/Legacy Boot: UEFI Only*
+   - *Secure Boot: Disabled*
+2. On a different computer, create a "Fedora Live USB Stick": Download a current Fedora Live CD image, and put it onto a USB stick (e.g. using dd or Rufus). Start your ThinkPad from the Fedora Live USB Stick on your ThinkPad (Press F12 at startup to select boot device). Of course, you can alternatively start a different machine from the Fedora Live USB Stick, or use an existing Fedora installation. The next steps all occur within Fedora:
+3. Install livecd-tools: `# dnf install livecd-tools`
+4. Download the desired Qubes ISO image (or attach a storage device containing it), and verify the signatures as described in the Qubes installation guide. For these instructions, I assume the ISO image is at */run/media/liveuser/qsrc/Qubes-R4.0-rc3-x86_64.iso* (so whenever you see that path going forward in these instructions, replace it with whatever your own path is)
+5. Within Fedora, attach the USB stick that you would like to turn into your Qubes Installation USB Stick. Use `dmesg` to figure out what the device name of that stick is. For these instructions, I assume it's */dev/sdd* (so whenever you see */dev/sdd* going forward in these instructions, replace it with whatever your actual device name is)
+6. Make sure your target USB stick (presumed to be /dev/sdd) has no mounted partitions: ``# umount /dev/sdd*`` (the asterisk at the end makes sure to unmount all partitions if more than one exists). If none are mounted you'll get an error that you can ignore.
+7. Use livecd-tools to copy the image: ``# livecd-iso-to-disk --format --efi /run/media/liveuser/qsrc/Qubes-R4.0-rc3-x86_64.iso /dev/sdd``. **This will erase everything on the drive. Make sure you specify the correct destination.** Then press ENTER when prompted to proceed. This process will take quite a while, be patient.
+8. When imaging is complete, change the partition label to BOOT: ``# dosfslabel /dev/sdd1 BOOT``
+9. Now create a mount point and mount the partition:
+
+   ``# mkdir /mnt/qinst``
+
+   ``# mount /dev/sdd1 /mnt/qinst/``
+
+10. Use your favorite editor to edit the file */mnt/qinst/EFI/BOOT/xen.cfg*: Replace all instances of ``LABEL=Qubes-R4.0-rc3-x86_64`` with ``LABEL=BOOT``. There is typically no space in front of ``LABEL``, but there is a space at the end of the portion you replace.
+11. Unmount the Qubes Installation USB stick: ``# umount /dev/sdd*`` and disconnect it.
+
+That's it! You can now reboot the machine with the Qubes USB Installation stick attached, and press F12 to select it as the boot device at startup. Proceed to install Qubes OS normally. Enjoy!
+
 ## ThinkPads with Intel HD 3000 graphics ##
 
 Several ThinkPad models have Intel HD 3000 graphics, including the T420s and the

troubleshooting/uefi-troubleshooting.md

@@ -7,6 +7,23 @@ permalink: /doc/uefi-troubleshooting/
 Troubleshooting UEFI related problems
 ========================================
 
+Change installer kernel parameters in UEFI
+---------------------
+
+If you've installed successfully in legacy mode but had to change some kernel parameters for it to work, you should try installing in UEFI mode with the same parameters.
+
+**Change the xen configuration on a USB media**
+01. Attach the usb disk, mount the EFI partition (second partition available on the disk) 
+02. Edit your xen config (`xen.cfg/BOOTX64.cfg`) changing the `kernel` key to add your kernel parameters on the boot entry of your choice
+03. Install using your modified boot entry
+
+**Change xen configuration directly in an iso image**
+01. Get EFI partition boundaries `parted Qubes-R4.0-rc4-x86_64.iso unit B print`
+02. Using the start address and the size of the EFI partition, setup a loop device for it `sudo losetup -o 524288 --sizelimit 30562304 /dev/loop0 Qubes-R4.0-rc4-x86_64.iso`
+03. Mount the loop device `sudo mount /dev/loop0 /mnt`
+04. Edit `EFI/BOOT/BOOTX64.cfg` to add your params to the `kernel` configuration key
+05. Save your changes, unmount and dd to usb device
+
 
 Cannot start installation, installation completes successfully but then BIOS loops at boot device selection, hangs at four penguins after choosing "Test media and install Qubes OS" in GRUB menu
 ---------------------