undo breakages

1 files changed, 234 insertions, 291 deletions

diff --git a/docs/gnulinux/encrypted_parabola.md b/docs/gnulinux/encrypted_parabola.md
index 20b7e02e..99be254a 100644
--- a/docs/gnulinux/encrypted_parabola.md
+++ b/docs/gnulinux/encrypted_parabola.md
@@ -1,4 +1,6 @@
-% Installing Parabola or Arch GNU+Linux with full disk encryption (including /boot)
+
+Installing Parabola or Arch GNU+Linux with full disk encryption (including /boot)
+=================================================================================
 
 Libreboot on x86 uses the GRUB
 [payload](http://www.coreboot.org/Payloads#GRUB_2) by default, which
@@ -15,7 +17,7 @@ volume. Not so with libreboot! Since GRUB is already included directly
 as a payload, even /boot can be encrypted. This protects /boot from
 tampering by someone with physical access to the system.
 
-**This guide is *only* for the GRUB payload. If you use the
+**This guide is \*only\* for the GRUB payload. If you use the
 depthcharge payload, ignore this section entirely.**
 
 This guide is intended for the Parabola distribution, but it should also
@@ -32,6 +34,8 @@ drive.
 
 [Back to previous index](./)
 
+
+
 Boot Parabola's install environment. [How to boot a GNU+Linux
 installer](grub_boot_installer.html).
 
@@ -47,6 +51,8 @@ to the Parabola wiki at a later date. For up to date Parabola install
 guide, go to the Parabola wiki. This guide essentially cherry picks the
 useful information (valid at the time of writing: 2015-08-25).
 
+
+
 This section deals with wiping the storage device on which you plan to
 install Parabola GNU+Linux. Follow these steps, but if you use an SSD,
 also:
@@ -64,15 +70,13 @@ article](https://wiki.archlinux.org/index.php/Solid_State_Drives). Edit
 /etc/fstab later on when chrooted into your install. Also, read the
 whole article and keep all points in mind, adapting them for this guide.
 
-Securely wipe the drive:
-
-    # dd if=/dev/urandom of=/dev/sda; sync
+Securely wipe the drive:\
+\# **dd if=/dev/urandom of=/dev/sda; sync**\
 NOTE: If you have an SSD, only do this the first time. If it was already
 LUKS-encrypted before, use the info below to wipe the LUKS header. Also,
 check online for your SSD what the recommended erase block size is. For
-example if it was 2MiB:
-
-# **dd if=/dev/urandom of=/dev/sda bs=2M; sync**
+example if it was 2MiB:\
+\# **dd if=/dev/urandom of=/dev/sda bs=2M; sync**
 
 If your drive was already LUKS encrypted (maybe you are re-installing
 your distro) then it is already 'wiped'. You should just wipe the LUKS
@@ -80,22 +84,24 @@ header.
 <https://www.lisenet.com/2013/luks-add-keys-backup-and-restore-volume-header/>
 showed me how to do this. It recommends doing the first 3MiB. Now, that
 guide is recommending putting zero there. I'm going to use urandom. Do
-this:
-
-    # head -c 3145728 /dev/urandom > /dev/sda; sync
+this:\
+\# **head -c 3145728 /dev/urandom > /dev/sda; sync**\
 (Wiping the LUKS header is important, since it has hashed passphrases
 and so on. It's 'secure', but 'potentially' a risk).
 
+
+
 Change keyboard layout
 ----------------------
 
 Parabola live shell assumes US Qwerty. If you have something different,
-list the available keymaps and use yours:
-
-    # localectl list-keymaps
-    # loadkeys LAYOUT
+list the available keymaps and use yours:\
+\# **localectl list-keymaps**\
+\# **loadkeys LAYOUT**\
 For me, LAYOUT would have been dvorak-uk.
 
+
+
 Establish an internet connection
 --------------------------------
 
@@ -103,6 +109,8 @@ Refer to [this
 guide](https://wiki.parabola.nu/Beginners%27_guide#Establish_an_internet_connection).
 Wired is recommended, but wireless is also explained there.
 
+
+
 Getting started
 ---------------
 
@@ -110,13 +118,14 @@ The beginning is based on
 <https://wiki.parabolagnulinux.org/Installation_Guide>. Then I referred
 to <https://wiki.archlinux.org/index.php/Partitioning> at first.
 
+
+
 dm-mod
 ------
 
 device-mapper will be used - a lot. Make sure that the kernel module is
-loaded:
-
-# **modprobe dm-mod**
+loaded:\
+\# **modprobe dm-mod**
 
 Create LUKS partition
 ---------------------
@@ -129,35 +138,29 @@ prepared cryptsetup command below. Note that the iteration time is for
 security purposes (mitigates brute force attacks), so anything lower
 than 5 seconds is probably not ok.
 
-I am using MBR partitioning, so I use cfdisk:
-
-# **cfdisk /dev/sda**
+I am using MBR partitioning, so I use cfdisk:\
+\# **cfdisk /dev/sda**
 
 I create a single large sda1 filling the whole drive, leaving it as the
 default type 'Linux' (83).
 
 Now I refer to
-<https://wiki.archlinux.org/index.php/Dm-crypt/Drive_preparation#Partitioning>:
-
+<https://wiki.archlinux.org/index.php/Dm-crypt/Drive_preparation#Partitioning>:\
 I am then directed to
 <https://wiki.archlinux.org/index.php/Dm-crypt/Device_encryption>.
 
 Parabola forces you to RTFM. Do that.
 
-It tells me to run:
-
-# **cryptsetup benchmark** (for making sure the list below is
-populated)
-
-Then:
-
-    # cat /proc/crypto
+It tells me to run:\
+\# **cryptsetup benchmark** (for making sure the list below is
+populated)\
+Then:\
+\# **cat /proc/crypto**\
 This gives me crypto options that I can use. It also provides a
 representation of the best way to set up LUKS (in this case, security is
 a priority; speed, a distant second). To gain a better understanding, I
-am also reading:
-
-# **man cryptsetup**
+am also reading:\
+\# **man cryptsetup**
 
 Following that page, based on my requirements, I do the following based
 on
@@ -165,9 +168,8 @@ on
 Reading through, it seems like Serpent (encryption) and Whirlpool (hash)
 is the best option.
 
-I am initializing LUKS with the following:
-
-# **cryptsetup -v \--cipher serpent-xts-plain64 \--key-size 512 \--hash
+I am initializing LUKS with the following:\
+\# **cryptsetup -v \--cipher serpent-xts-plain64 \--key-size 512 \--hash
 whirlpool \--iter-time 500 \--use-random \--verify-passphrase luksFormat
 /dev/sda1** Choose a **secure** passphrase here. Ideally lots of
 lowercase/uppercase numbers, letters, symbols etc all in a random
@@ -177,45 +179,38 @@ without writing it down or storing it anywhere.
 Use of the *diceware method* is recommended, for generating secure
 passphrases (instead of passwords).
 
+
+
 Create LVM
 ----------
 
 Now I refer to <https://wiki.archlinux.org/index.php/LVM>.
 
-Open the LUKS partition:
-
-    # cryptsetup luksOpen /dev/sda1 lvm
+Open the LUKS partition:\
+\# **cryptsetup luksOpen /dev/sda1 lvm**\
 (it will be available at /dev/mapper/lvm)
 
-Create LVM partition:
-
-    # pvcreate /dev/mapper/lvm
-Show that you just created it:
-
-# **pvdisplay**
+Create LVM partition:\
+\# **pvcreate /dev/mapper/lvm**\
+Show that you just created it:\
+\# **pvdisplay**
 
 Now I create the volume group, inside of which the logical volumes will
-be created:
-
-    # vgcreate matrix /dev/mapper/lvm
+be created:\
+\# **vgcreate matrix /dev/mapper/lvm**\
 (volume group name is 'matrix' - choose your own name, if you like)
-Show that you created it:
-
-# **vgdisplay**
-
-Now create the logical volumes:
-
-# **lvcreate -L 2G matrix -n swapvol** (2G swap partition, named
-swapvol)
+Show that you created it:\
+\# **vgdisplay**
 
+Now create the logical volumes:\
+\# **lvcreate -L 2G matrix -n swapvol** (2G swap partition, named
+swapvol)\
 Again, choose your own name if you like. Also, make sure to choose a
 swap size of your own needs. It basically depends on how much RAM you
 have installed. I refer to
-<http://www.linux.com/news/software/applications/8208-all-about-linux-swap-space>.
-
-# **lvcreate -l +100%FREE matrix -n root** (single large partition in
-the rest of the space, named root)
-
+<http://www.linux.com/news/software/applications/8208-all-about-linux-swap-space>.\
+\# **lvcreate -l +100%FREE matrix -n root** (single large partition in
+the rest of the space, named root)\
 You can also be flexible here, for example you can specify a /boot, a /,
 a /home, a /var, a /usr, etc. For example, if you will be running a
 web/mail server then you want /var in its own partition (so that if it
@@ -223,27 +218,26 @@ fills up with logs, it won't crash your system). For a home/laptop
 system (typical use case), a root and a swap will do (really).
 
 Verify that the logical volumes were created, using the following
-command:
+command:\
+\# **lvdisplay**
+
 
-# **lvdisplay**
 
 Create / and swap partitions, and mount
 ---------------------------------------
 
-For the swapvol LV I use:
+For the swapvol LV I use:\
+\# **mkswap /dev/mapper/matrix-swapvol**\
+Activate swap:\
+\# **swapon /dev/matrix/swapvol**
 
-    # mkswap /dev/mapper/matrix-swapvol
-Activate swap:
+For the root LV I use:\
+\# **mkfs.btrfs /dev/mapper/matrix-root**
 
-# **swapon /dev/matrix/swapvol**
+Mount the root (/) partition:\
+\# **mount /dev/matrix/root /mnt**
 
-For the root LV I use:
 
-# **mkfs.btrfs /dev/mapper/matrix-root**
-
-Mount the root (/) partition:
-
-# **mount /dev/matrix/root /mnt**
 
 Continue with Parabola installation
 -----------------------------------
@@ -255,150 +249,121 @@ Now I am following the rest of
 <https://wiki.parabolagnulinux.org/Installation_Guide>. I also cross
 referenced <https://wiki.archlinux.org/index.php/Installation_guide>.
 
-Create /home and /boot on root mountpoint:
-
-    # mkdir -p /mnt/home
-# **mkdir -p /mnt/boot**
+Create /home and /boot on root mountpoint:\
+\# **mkdir -p /mnt/home**\
+\# **mkdir -p /mnt/boot**
 
 Once all the remaining partitions, if any, have been mounted, the
 devices are ready to install Parabola.
 
 In **/etc/pacman.d/mirrorlist**, comment out all lines except the Server
 line closest to where you are (I chose the UK Parabola server (main
-server)) and then did:
-
-    # pacman -Syy
-    # pacman -Syu
-# **pacman -Sy pacman** (and then I did the other 2 steps above,
-again)
-
+server)) and then did:\
+\# **pacman -Syy**\
+\# **pacman -Syu**\
+\# **pacman -Sy pacman** (and then I did the other 2 steps above,
+again)\
 In my case I did the steps in the next paragraph, and followed the steps
 in this paragraph again.
 
-<troubleshooting>
-
+<troubleshooting>\
    The following is based on 'Verification of package signatures' in
-the Parabola install guide.
-
-   Check there first to see if steps differ by now.
-
+the Parabola install guide.\
+   Check there first to see if steps differ by now.\
    Now you have to update the default Parabola keyring. This is used for
-signing and verifying packages:
-
-       # pacman -Sy parabola-keyring
+signing and verifying packages:\
+   \# **pacman -Sy parabola-keyring**\
    It says that if you get GPG errors, then it's probably an expired
-key and, therefore, you should do:
-
-       # pacman-key \--populate parabola
-       # pacman-key \--refresh-keys
-       # pacman -Sy parabola-keyring
+key and, therefore, you should do:\
+   \# **pacman-key \--populate parabola**\
+   \# **pacman-key \--refresh-keys**\
+   \# **pacman -Sy parabola-keyring**\
    To be honest, you should do the above anyway. Parabola has a lot of
-maintainers, and a lot of keys. Really!
-
-   If you get an error mentioning dirmngr, do:
-
-       # dirmngr </dev/null
+maintainers, and a lot of keys. Really!\
+   If you get an error mentioning dirmngr, do:\
+   \# **dirmngr </dev/null**\
    Also, it says that if the clock is set incorrectly then you have to
-manually set the correct time
-
-   (if keys are listed as expired because of it):
-
-       # date MMDDhhmm\[\[CC\]YY\]\[.ss\]
-   I also had to install:
-
-       # pacman -S archlinux-keyring
-       # pacman-key \--populate archlinux
+manually set the correct time\
+   (if keys are listed as expired because of it):\
+   \# **date MMDDhhmm\[\[CC\]YY\]\[.ss\]**\
+   I also had to install:\
+   \# **pacman -S archlinux-keyring**\
+   \# **pacman-key \--populate archlinux**\
    In my case I saw some conflicting files reported in pacman, stopping
-me from using it.
-
+me from using it.\
    I deleted the files that it mentioned and then it worked.
-Specifically, I had this error:
-
-   *licenses: /usr/share/licenses/common/MPS exists in filesystem*
-
+Specifically, I had this error:\
+   *licenses: /usr/share/licenses/common/MPS exists in filesystem*\
    I rm -Rf'd the file and then pacman worked. I'm told that the
-following would have also made it work:
-
-       # pacman -Sf licenses
-</troubleshooting>
+following would have also made it work:\
+   \# **pacman -Sf licenses**\
+</troubleshooting>\
 
 I also like to install other packages (base-devel, compilers and so on)
 and wpa\_supplicant/dialog/iw/wpa\_actiond are needed for wireless after
-the install:
-
-# **pacstrap /mnt base base-devel wpa\_supplicant dialog iw
+the install:\
+\# **pacstrap /mnt base base-devel wpa\_supplicant dialog iw
 wpa\_actiond**
 
+
+
 Configure the system
 --------------------
 
 Generate an fstab - UUIDs are used because they have certain advantages
 (see <https://wiki.parabola.nu/Fstab#Identifying_filesystems>. If you
-prefer labels instead, replace the -U option with -L):
-
-    # genfstab -U -p /mnt >> /mnt/etc/fstab
-Check the created file:
-
-    # cat /mnt/etc/fstab
+prefer labels instead, replace the -U option with -L):\
+\# **genfstab -U -p /mnt >> /mnt/etc/fstab**\
+Check the created file:\
+\# **cat /mnt/etc/fstab**\
 (If there are any errors, edit the file. Do **NOT** run the genfstab
 command again!)
 
-Chroot into new system:
+Chroot into new system:\
+\# **arch-chroot /mnt /bin/bash**
 
-# **arch-chroot /mnt /bin/bash**
-
-It's a good idea to have this installed:
-
-# **pacman -S linux-libre-lts**
+It's a good idea to have this installed:\
+\# **pacman -S linux-libre-lts**
 
 It was also suggested that you should install this kernel (read up on
-what GRSEC is):
-
-# **pacman -S linux-libre-grsec**
+what GRSEC is):\
+\# **pacman -S linux-libre-grsec**
 
 This is another kernel that sits inside /boot, which you can use. LTS
 means 'long-term support'. These are so-called 'stable' kernels that
 can be used as a fallback during updates, if a bad kernel causes issues
 for you.
 
-Parabola does not have wget. This is sinister. Install it:
-
-# **pacman -S wget**
+Parabola does not have wget. This is sinister. Install it:\
+\# **pacman -S wget**
 
-Locale:
-
-    # vi /etc/locale.gen
+Locale:\
+\# **vi /etc/locale.gen**\
 Uncomment your needed localisations. For example en\_GB.UTF-8 (UTF-8 is
-highly recommended over other options).
-
-    # locale-gen
-    # echo LANG=en\_GB.UTF-8 > /etc/locale.conf
-# **export LANG=en\_GB.UTF-8**
+highly recommended over other options).\
+\# **locale-gen**\
+\# **echo LANG=en\_GB.UTF-8 > /etc/locale.conf**\
+\# **export LANG=en\_GB.UTF-8**
 
-Console font and keymap:
-
-    # vi /etc/vconsole.conf
+Console font and keymap:\
+\# **vi /etc/vconsole.conf**\
 In my case:
 
     KEYMAP=dvorak-uk
     FONT=lat9w-16
 
-Time zone:
-
-    # ln -s /usr/share/zoneinfo/Europe/London /etc/localtime
+Time zone:\
+\# **ln -s /usr/share/zoneinfo/Europe/London /etc/localtime**\
 (Replace Zone and Subzone to your liking. See /usr/share/zoneinfo)
 
-Hardware clock:
-
-# **hwclock \--systohc \--utc**
+Hardware clock:\
+\# **hwclock \--systohc \--utc**
 
 Hostname: Write your hostname to /etc/hostname. For example, if your
-hostname is parabola:
-
-    # echo parabola > /etc/hostname
-Add the same hostname to /etc/hosts:
-
-    # vi /etc/hosts
+hostname is parabola:\
+\# **echo parabola > /etc/hostname**\
+Add the same hostname to /etc/hosts:\
+\# **vi /etc/hosts**\
 
     #<ip-address> <hostname.domain.org> <hostname>
     127.0.0.1   localhost.localdomain   localhost   parabola
@@ -410,10 +375,9 @@ Configure the network: Refer to
 Mkinitcpio: Configure /etc/mkinitcpio.conf as needed (see
 <https://wiki.parabola.nu/Mkinitcpio>). Runtime modules can be found in
 /usr/lib/initcpio/hooks, and build hooks can be found in
-/usr/lib/initcpio/install. (# **mkinitcpio -H hookname** gives
-information about each hook.) Specifically, for this use case:
-
-    # vi /etc/mkinitcpio.conf
+/usr/lib/initcpio/install. (\# **mkinitcpio -H hookname** gives
+information about each hook.) Specifically, for this use case:\
+\# **vi /etc/mkinitcpio.conf**\
 Then modify the file like so:
 
 -   MODULES="i915"
@@ -437,54 +401,44 @@ Then modify the file like so:
 
 Now using mkinitcpio, you can create the kernel and ramdisk for booting
 with (this is different from Arch, specifying linux-libre instead of
-linux):
-
-    # mkinitcpio -p linux-libre
-Also do it for linux-libre-lts:
-
-    # mkinitcpio -p linux-libre-lts
-Also do it for linux-libre-grsec:
-
-# **mkinitcpio -p linux-libre-grsec**
+linux):\
+\# **mkinitcpio -p linux-libre**\
+Also do it for linux-libre-lts:\
+\# **mkinitcpio -p linux-libre-lts**\
+Also do it for linux-libre-grsec:\
+\# **mkinitcpio -p linux-libre-grsec**
 
 Set the root password: At the time of writing, Parabola used SHA512 by
 default for its password hashing. I referred to
-<https://wiki.archlinux.org/index.php/SHA_password_hashes>.
-
-    # vi /etc/pam.d/passwd
-Add rounds=65536 at the end of the uncommented 'password' line.
-
-    # passwd root
+<https://wiki.archlinux.org/index.php/SHA_password_hashes>.\
+\# **vi /etc/pam.d/passwd**\
+Add rounds=65536 at the end of the uncommented 'password' line.\
+\# **passwd root**\
 Make sure to set a secure password! Also, it must never be the same as
 your LUKS password.
 
 Use of the *diceware method* is recommended, for generating secure
 passphrases (instead of passwords).
 
+
+
 Extra security tweaks
 ---------------------
 
 Based on <https://wiki.archlinux.org/index.php/Security>.
 
-Restrict access to important directories:
-
-# **chmod 700 /boot /etc/{iptables,arptables}**
-
-Lockout user after three failed login attempts:
-
-Edit the file /etc/pam.d/system-login and comment out that line:
-
-*# auth required pam\_tally.so onerr=succeed file=/var/log/faillog*
-
-Or just delete it. Above it, put:
+Restrict access to important directories:\
+\# **chmod 700 /boot /etc/{iptables,arptables}**
 
+Lockout user after three failed login attempts:\
+Edit the file /etc/pam.d/system-login and comment out that line:\
+*\# auth required pam\_tally.so onerr=succeed file=/var/log/faillog*\
+Or just delete it. Above it, put:\
 *auth required pam\_tally.so deny=2 unlock\_time=600 onerr=succeed
-file=/var/log/faillog*
-
+file=/var/log/faillog*\
 To unlock a user manually (if a password attempt is failed 3 times),
-do:
-
-# **pam\_tally \--user *theusername* \--reset** What the above
+do:\
+\# **pam\_tally \--user *theusername* \--reset** What the above
 configuration does is lock the user out for 10 minutes, if they make 3
 failed login attempts.
 
@@ -492,29 +446,29 @@ Configure sudo - not covered here. Will be covered post-installation in
 another tutorial, at a later date. If this is a single-user system, you
 don't really need sudo.
 
-Unmount, reboot!
-----------------
 
-Exit from chroot:
 
-# **exit**
+Unmount, reboot!
+----------------
 
-unmount:
+Exit from chroot:\
+\# **exit**
 
-    # umount -R /mnt
-# **swapoff -a**
+unmount:\
+\# **umount -R /mnt**\
+\# **swapoff -a**
 
-deactivate the lvm lv's:
+deactivate the lvm lv's:\
+\# **lvchange -an /dev/matrix/root**\
+\# **lvchange -an /dev/matrix/swapvol**\
 
-    # lvchange -an /dev/matrix/root
-    # lvchange -an /dev/matrix/swapvol
+Lock the encrypted partition (close it):\
+\# **cryptsetup luksClose lvm**
 
-Lock the encrypted partition (close it):
+\# **shutdown -h now**\
+Remove the installation media, then boot up again.
 
-# **cryptsetup luksClose lvm**
 
-    # shutdown -h now
-Remove the installation media, then boot up again.
 
 Booting from GRUB
 -----------------
@@ -523,17 +477,18 @@ Initially you will have to boot manually. Press C to get to the GRUB
 command line. The underlined parts are optional (using those 2
 underlines will boot lts kernel instead of normal).
 
-grub>     cryptomount -a
-grub>     set root='lvm/matrix-root'
+grub> **cryptomount -a**\
+grub> **set root='lvm/matrix-root'**\
 grub> **linux /boot/vmlinuz-linux-libre-lts root=/dev/matrix/root
-cryptdevice=/dev/sda1:root**
-
-grub>     initrd /boot/initramfs-linux-libre-lts.img
-grub>     boot
+cryptdevice=/dev/sda1:root**\
+grub> **initrd /boot/initramfs-linux-libre-lts.img**\
+grub> **boot**\
 
 You could also make it load /boot/vmlinuz-linux-libre-grsec and
 /boot/initramfs-linux-libre-grsec.img
 
+
+
 Follow-up tutorial: configuring Parabola
 ----------------------------------------
 
@@ -549,6 +504,8 @@ means that you are in control. For more information, read [The Arch
 Way](https://wiki.archlinux.org/index.php/The_Arch_Way) (Parabola also
 follows it).
 
+
+
 Modify grub.cfg inside the ROM
 ------------------------------
 
@@ -563,21 +520,16 @@ possibility of bricking your device!
 I will go for the re-flash option here. Firstly, cd to the
 libreboot\_util/cbfstool/{armv7l i686 x86\_64} directory. Dump the
 current firmware - where *libreboot.rom* is an example: make sure to
-adapt:
-
-    # flashrom -p internal -r libreboot.rom
+adapt:\
+\# **flashrom -p internal -r libreboot.rom**\
 If flashrom complains about multiple flash chips detected, add a *-c*
-option at the end, with the name of your chosen chip is quotes.
-
+option at the end, with the name of your chosen chip is quotes.\
 You can check if everything is in there (*grub.cfg* and *grubtest.cfg*
-would be really nice):
-
-    $ ./cbfstool libreboot.rom print
-Extract grubtest.cfg:
-
-    $ ./cbfstool libreboot.rom extract -n grubtest.cfg -f grubtest.cfg
-And modify:
-
+would be really nice):\
+\$ **./cbfstool libreboot.rom print**\
+Extract grubtest.cfg:\
+\$ **./cbfstool libreboot.rom extract -n grubtest.cfg -f grubtest.cfg**\
+And modify:\
 \$ **vi grubtest.cfg**
 
 In grubtest.cfg, inside the 'Load Operating System' menu entry, change
@@ -606,24 +558,20 @@ detected LUKS volumes. You can also specify -u UUID or -a (device).
 hardening your GRUB configuration, for security purposes.
 
 Save your changes in grubtest.cfg, then delete the unmodified config
-from the ROM image:
-
-    $ ./cbfstool libreboot.rom remove -n grubtest.cfg
-and insert the modified grubtest.cfg:
-
+from the ROM image:\
+\$ **./cbfstool libreboot.rom remove -n grubtest.cfg**\
+and insert the modified grubtest.cfg:\
 \$ **./cbfstool libreboot.rom add -n grubtest.cfg -f grubtest.cfg -t
-raw**
+raw**\
 
 Now refer to <http://libreboot.org/docs/install/#flashrom>. Cd (up) to
-the libreboot\_util directory and update the flash chip contents:
-
-    # ./flash update libreboot.rom
+the libreboot\_util directory and update the flash chip contents:\
+\# **./flash update libreboot.rom**\
 Ocassionally, coreboot changes the name of a given board. If flashrom
 complains about a board mismatch, but you are sure that you chose the
-correct ROM image, then run this alternative command:
-
-    # ./flash forceupdate libreboot.rom
-You should see "Verifying flash... VERIFIED." written at the end of
+correct ROM image, then run this alternative command:\
+\# **./flash forceupdate libreboot.rom**\
+You should see "Verifying flash\... VERIFIED." written at the end of
 the flashrom output.
 
 With this new configuration, Parabola can boot automatically and you
@@ -636,7 +584,7 @@ LUKS passphrase and login as root/your user. All went well? Great!
 If it does not work like you want it to, if you are unsure or sceptical
 in any way, don't despair: you have been wise and did not brick your
 device! Reboot and login the default way, and then modify your
-grubtest.cfg until you get it right! **Do *not* proceed past this
+grubtest.cfg until you get it right! **Do \*not\* proceed past this
 point unless you are 100% sure that your new configuration is safe (or
 desirable) to use.**
 
@@ -648,37 +596,35 @@ the main config still links (in the menu) to grubtest.cfg, so that you
 don't have to manually switch to it, in case you ever want to follow
 this guide again in the future (modifying the already modified config).
 Inside libreboot\_util/cbfstool/{armv7l i686 x86\_64}, we can do this
-with the following command:
-
+with the following command:\
 \$ **sed -e 's:(cbfsdisk)/grub.cfg:(cbfsdisk)/grubtest.cfg:g' -e
 's:Switch to grub.cfg:Switch to grubtest.cfg:g' < grubtest.cfg >
-grub.cfg**
-
-Delete the grub.cfg that remained inside the ROM:
-
-    $ ./cbfstool libreboot.rom remove -n grub.cfg
-Add the modified version that you just made:
-
-    $ ./cbfstool libreboot.rom add -n grub.cfg -f grub.cfg -t raw
+grub.cfg**\
+Delete the grub.cfg that remained inside the ROM:\
+\$ **./cbfstool libreboot.rom remove -n grub.cfg**\
+Add the modified version that you just made:\
+\$ **./cbfstool libreboot.rom add -n grub.cfg -f grub.cfg -t raw**\
 
 Now you have a modified ROM. Once more, refer to
 <http://libreboot.org/docs/install/#flashrom>. Cd to the libreboot\_util
-directory and update the flash chip contents:
-
-    # ./flash update libreboot.rom
-And wait for the "Verifying flash... VERIFIED." Once you have done
+directory and update the flash chip contents:\
+\# **./flash update libreboot.rom**\
+And wait for the "Verifying flash\... VERIFIED." Once you have done
 that, shut down and then boot up with your new configuration.
 
 When done, delete GRUB (remember, we only needed it for the
 *grub-mkpasswd-pbkdf2* utility; GRUB is already part of libreboot,
-flashed alongside it as a *payload*):
+flashed alongside it as a *payload*):\
+\# **pacman -R grub**
+
 
-# **pacman -R grub**
 
 If you followed all that correctly, you should now have a fully
 encrypted Parabola installation. Refer to the wiki for how to do the
 rest.
 
+
+
 Bonus: Using a key file to unlock /boot/
 ----------------------------------------
 
@@ -689,40 +635,36 @@ fact that it is being loaded from an encrypted volume. Therefore, you
 will be asked to enter your passphrase a second time. A workaround is to
 put a keyfile inside initramfs, with instructions for the kernel to use
 it when booting. This is safe, because /boot/ is encrypted (otherwise,
-putting a keyfile inside initramfs would be a bad idea).
-
-Boot up and login as root or your user. Then generate the key file:
-
-# **dd bs=512 count=4 if=/dev/urandom of=/etc/mykeyfile
-iflag=fullblock**
-
-Insert it into the luks volume:
-
-    # cryptsetup luksAddKey /dev/sdX /etc/mykeyfile
+putting a keyfile inside initramfs would be a bad idea).\
+Boot up and login as root or your user. Then generate the key file:\
+\# **dd bs=512 count=4 if=/dev/urandom of=/etc/mykeyfile
+iflag=fullblock**\
+Insert it into the luks volume:\
+\# **cryptsetup luksAddKey /dev/sdX /etc/mykeyfile**\
 and enter your LUKS passphrase when prompted. Add the keyfile to the
-initramfs by adding it to FILES in /etc/mkinitcpio.conf. For example:
-
-    # FILES="/etc/mykeyfile"
-Create the initramfs image from scratch:
-
-    # mkinitcpio -p linux-libre
-    # mkinitcpio -p linux-libre-lts
-    # mkinitcpio -p linux-libre-grsec
+initramfs by adding it to FILES in /etc/mkinitcpio.conf. For example:\
+\# **FILES="/etc/mykeyfile"**\
+Create the initramfs image from scratch:\
+\# **mkinitcpio -p linux-libre**\
+\# **mkinitcpio -p linux-libre-lts**\
+\# **mkinitcpio -p linux-libre-grsec**\
 Add the following to your grub.cfg - you are now able to do that, see
-above! -, or add it in the kernel command line for GRUB:
-
-    # cryptkey=rootfs:/etc/mykeyfile
-
+above! -, or add it in the kernel command line for GRUB:\
+\# **cryptkey=rootfs:/etc/mykeyfile**\
+\
 You can also place this inside the grub.cfg that exists in CBFS:
 [grub\_cbfs.html](grub_cbfs.html).
 
+
+
 Further security tips
 ---------------------
 
-<https://wiki.archlinux.org/index.php/Security>.
-
+<https://wiki.archlinux.org/index.php/Security>.\
 <https://wiki.parabolagnulinux.org/User:GNUtoo/laptop>
 
+
+
 Troubleshooting
 ===============
 
@@ -734,6 +676,7 @@ station.
 Further investigation revealed that it was the DVD drive causing
 problems. Removing that worked around the issue.
 
+
     "sudo wodim -prcap" shows information about the drive:
     Device was not specified. Trying to find an appropriate drive...
     Detected CD-R drive: /dev/sr0
@@ -810,10 +753,10 @@ problems. Removing that worked around the issue.
       Does write ultra high speed  CD-RW media
       Does not write ultra high speed+ CD-RW media
 
-Copyright © 2014, 2015, 2016 Leah Rowe <info@minifree.org>
 
-Copyright © 2015 Jeroen Quint <jezza@diplomail.ch>
 
+Copyright © 2014, 2015, 2016 Leah Rowe <info@minifree.org>\
+Copyright © 2015 Jeroen Quint <jezza@diplomail.ch>\
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the Creative Commons Attribution-ShareAlike 4.0
 International license or any later version published by Creative