nixos/doc: re-format

10 files changed, 152 insertions, 490 deletions

diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml
index 48193d986ab7..65b384dd5962 100644
--- a/nixos/doc/manual/installation/changing-config.xml
+++ b/nixos/doc/manual/installation/changing-config.xml
@@ -4,28 +4,20 @@
          xml:id="sec-changing-config">
  <title>Changing the Configuration</title>
  <para>
-  The file <filename>/etc/nixos/configuration.nix</filename> contains the
-  current configuration of your machine. Whenever you’ve
-  <link linkend="ch-configuration">changed something</link> in that file, you
-  should do
+  The file <filename>/etc/nixos/configuration.nix</filename> contains the current configuration of your machine. Whenever you’ve <link linkend="ch-configuration">changed something</link> in that file, you should do
 <screen>
 <prompt># </prompt>nixos-rebuild switch
 </screen>
-  to build the new configuration, make it the default configuration for
-  booting, and try to realise the configuration in the running system (e.g., by
-  restarting system services).
+  to build the new configuration, make it the default configuration for booting, and try to realise the configuration in the running system (e.g., by restarting system services).
   <warning>
    <para>
-    This command doesn't start/stop <link linkend="opt-systemd.user.services">user
-    services</link> automatically. <command>nixos-rebuild</command> only runs a
-    <literal>daemon-reload</literal> for each user with running user services.
+    This command doesn't start/stop <link linkend="opt-systemd.user.services">user services</link> automatically. <command>nixos-rebuild</command> only runs a <literal>daemon-reload</literal> for each user with running user services.
    </para>
   </warning>
  </para>
  <warning>
   <para>
-   These commands must be executed as root, so you should either run them from
-   a root shell or by prefixing them with <literal>sudo -i</literal>.
+   These commands must be executed as root, so you should either run them from a root shell or by prefixing them with <literal>sudo -i</literal>.
   </para>
  </warning>
  <para>
@@ -33,63 +25,44 @@
 <screen>
 <prompt># </prompt>nixos-rebuild test
 </screen>
-  to build the configuration and switch the running system to it, but without
-  making it the boot default. So if (say) the configuration locks up your
-  machine, you can just reboot to get back to a working configuration.
+  to build the configuration and switch the running system to it, but without making it the boot default. So if (say) the configuration locks up your machine, you can just reboot to get back to a working configuration.
  </para>
  <para>
   There is also
 <screen>
 <prompt># </prompt>nixos-rebuild boot
 </screen>
-  to build the configuration and make it the boot default, but not switch to it
-  now (so it will only take effect after the next reboot).
+  to build the configuration and make it the boot default, but not switch to it now (so it will only take effect after the next reboot).
  </para>
  <para>
-  You can make your configuration show up in a different submenu of the GRUB 2
-  boot screen by giving it a different <emphasis>profile name</emphasis>, e.g.
+  You can make your configuration show up in a different submenu of the GRUB 2 boot screen by giving it a different <emphasis>profile name</emphasis>, e.g.
 <screen>
 <prompt># </prompt>nixos-rebuild switch -p test
 </screen>
-  which causes the new configuration (and previous ones created using
-  <literal>-p test</literal>) to show up in the GRUB submenu “NixOS - Profile
-  'test'”. This can be useful to separate test configurations from
-  “stable” configurations.
+  which causes the new configuration (and previous ones created using <literal>-p test</literal>) to show up in the GRUB submenu “NixOS - Profile 'test'”. This can be useful to separate test configurations from “stable” configurations.
  </para>
  <para>
   Finally, you can do
 <screen>
 <prompt>$ </prompt>nixos-rebuild build
 </screen>
-  to build the configuration but nothing more. This is useful to see whether
-  everything compiles cleanly.
+  to build the configuration but nothing more. This is useful to see whether everything compiles cleanly.
  </para>
  <para>
-  If you have a machine that supports hardware virtualisation, you can also
-  test the new configuration in a sandbox by building and running a QEMU
-  <emphasis>virtual machine</emphasis> that contains the desired configuration.
-  Just do
+  If you have a machine that supports hardware virtualisation, you can also test the new configuration in a sandbox by building and running a QEMU <emphasis>virtual machine</emphasis> that contains the desired configuration. Just do
 <screen>
 <prompt>$ </prompt>nixos-rebuild build-vm
 <prompt>$ </prompt>./result/bin/run-*-vm
 </screen>
-  The VM does not have any data from your host system, so your existing user
-  accounts and home directories will not be available unless you have set
-  <literal>mutableUsers = false</literal>. Another way is to temporarily add
-  the following to your configuration:
+  The VM does not have any data from your host system, so your existing user accounts and home directories will not be available unless you have set <literal>mutableUsers = false</literal>. Another way is to temporarily add the following to your configuration:
 <screen>
 <link linkend="opt-users.users._name__.initialHashedPassword">users.users.your-user.initialHashedPassword</link> = "test";
 </screen>
-  <emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you have
-  started the virtual machine at least once without the right users, otherwise
-  the changes will not get picked up. You can forward ports on the host to the
-  guest. For instance, the following will forward host port 2222 to guest port
-  22 (SSH):
+  <emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you have started the virtual machine at least once without the right users, otherwise the changes will not get picked up. You can forward ports on the host to the guest. For instance, the following will forward host port 2222 to guest port 22 (SSH):
 <screen>
 <prompt>$ </prompt>QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm
 </screen>
-  allowing you to log in via SSH (assuming you have set the appropriate
-  passwords or SSH authorized keys):
+  allowing you to log in via SSH (assuming you have set the appropriate passwords or SSH authorized keys):
 <screen>
 <prompt>$ </prompt>ssh -p 2222 localhost
 </screen>
diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml
index 2901f462dee0..a9d2c74d1158 100644
--- a/nixos/doc/manual/installation/installation.xml
+++ b/nixos/doc/manual/installation/installation.xml
@@ -6,8 +6,7 @@
  <title>Installation</title>
  <partintro xml:id="ch-installation-intro">
   <para>
-   This section describes how to obtain, install, and configure NixOS for
-   first-time use.
+   This section describes how to obtain, install, and configure NixOS for first-time use.
   </para>
  </partintro>
  <xi:include href="obtaining.xml" />
diff --git a/nixos/doc/manual/installation/installing-behind-a-proxy.xml b/nixos/doc/manual/installation/installing-behind-a-proxy.xml
index 8f9baff44b51..4f74f0b30290 100644
--- a/nixos/doc/manual/installation/installing-behind-a-proxy.xml
+++ b/nixos/doc/manual/installation/installing-behind-a-proxy.xml
@@ -6,16 +6,13 @@
  <title>Installing behind a proxy</title>
 
  <para>
-  To install NixOS behind a proxy, do the following before running
-  <literal>nixos-install</literal>.
+  To install NixOS behind a proxy, do the following before running <literal>nixos-install</literal>.
  </para>
 
  <orderedlist numeration="arabic">
   <listitem>
    <para>
-    Update proxy configuration in
-    <literal>/mnt/etc/nixos/configuration.nix</literal> to keep the internet
-    accessible after reboot.
+    Update proxy configuration in <literal>/mnt/etc/nixos/configuration.nix</literal> to keep the internet accessible after reboot.
    </para>
 <programlisting>
 networking.proxy.default = &quot;http://user:password@proxy:port/&quot;;
@@ -24,8 +21,7 @@ networking.proxy.noProxy = &quot;127.0.0.1,localhost,internal.domain&quot;;
   </listitem>
   <listitem>
    <para>
-    Setup the proxy environment variables in the shell where you are running
-    <literal>nixos-install</literal>.
+    Setup the proxy environment variables in the shell where you are running <literal>nixos-install</literal>.
    </para>
 <programlisting>
 # proxy_url=&quot;http://user:password@proxy:port/&quot;
@@ -39,10 +35,7 @@ networking.proxy.noProxy = &quot;127.0.0.1,localhost,internal.domain&quot;;
 
  <note>
   <para>
-   If you are switching networks with different proxy configurations, use the
-   <literal>nesting.clone</literal> option in
-   <literal>configuration.nix</literal> to switch proxies at runtime. Refer to
-   <xref linkend="ch-options" /> for more information.
+   If you are switching networks with different proxy configurations, use the <literal>nesting.clone</literal> option in <literal>configuration.nix</literal> to switch proxies at runtime. Refer to <xref linkend="ch-options" /> for more information.
   </para>
  </note>
 </section>
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml
index 8ed45899fd7f..468757ed60b9 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.xml
+++ b/nixos/doc/manual/installation/installing-from-other-distro.xml
@@ -8,28 +8,23 @@
  <title>Installing from another Linux distribution</title>
 
  <para>
-  Because Nix (the package manager) &amp; Nixpkgs (the Nix packages collection)
-  can both be installed on any (most?) Linux distributions, they can be used to
-  install NixOS in various creative ways. You can, for instance:
+  Because Nix (the package manager) &amp; Nixpkgs (the Nix packages collection) can both be installed on any (most?) Linux distributions, they can be used to install NixOS in various creative ways. You can, for instance:
  </para>
 
  <orderedlist>
   <listitem>
    <para>
-    Install NixOS on another partition, from your existing Linux distribution
-    (without the use of a USB or optical device!)
+    Install NixOS on another partition, from your existing Linux distribution (without the use of a USB or optical device!)
    </para>
   </listitem>
   <listitem>
    <para>
-    Install NixOS on the same partition (in place!), from your existing
-    non-NixOS Linux distribution using <literal>NIXOS_LUSTRATE</literal>.
+    Install NixOS on the same partition (in place!), from your existing non-NixOS Linux distribution using <literal>NIXOS_LUSTRATE</literal>.
    </para>
   </listitem>
   <listitem>
    <para>
-    Install NixOS on your hard drive from the Live CD of any Linux
-    distribution.
+    Install NixOS on your hard drive from the Live CD of any Linux distribution.
    </para>
   </listitem>
  </orderedlist>
@@ -50,10 +45,8 @@
 <prompt>$ </prompt>curl https://nixos.org/nix/install | sh
 <prompt>$ </prompt>. $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell</screen>
    <para>
-    More details in the
-    <link
-                    xlink:href="https://nixos.org/nix/manual/#chap-quick-start">
-    Nix manual</link>
+    More details in the <link
+                    xlink:href="https://nixos.org/nix/manual/#chap-quick-start"> Nix manual</link>
    </para>
   </listitem>
   <listitem>
@@ -61,21 +54,18 @@
     Switch to the NixOS channel:
    </para>
    <para>
-    If you've just installed Nix on a non-NixOS distribution, you will be on
-    the <literal>nixpkgs</literal> channel by default.
+    If you've just installed Nix on a non-NixOS distribution, you will be on the <literal>nixpkgs</literal> channel by default.
    </para>
 <screen>
 <prompt>$ </prompt>nix-channel --list
 nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
    <para>
-    As that channel gets released without running the NixOS tests, it will be
-    safer to use the <literal>nixos-*</literal> channels instead:
+    As that channel gets released without running the NixOS tests, it will be safer to use the <literal>nixos-*</literal> channels instead:
    </para>
 <screen>
 <prompt>$ </prompt>nix-channel --add https://nixos.org/channels/nixos-<replaceable>version</replaceable> nixpkgs</screen>
    <para>
-    You may want to throw in a <literal>nix-channel --update</literal> for good
-    measure.
+    You may want to throw in a <literal>nix-channel --update</literal> for good measure.
    </para>
   </listitem>
   <listitem>
@@ -83,33 +73,24 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
     Install the NixOS installation tools:
    </para>
    <para>
-    You'll need <literal>nixos-generate-config</literal> and
-    <literal>nixos-install</literal> and we'll throw in some man pages and
-    <literal>nixos-enter</literal> just in case you want to chroot into your
-    NixOS partition. They are installed by default on NixOS, but you don't have
-    NixOS yet..
+    You'll need <literal>nixos-generate-config</literal> and <literal>nixos-install</literal> and we'll throw in some man pages and <literal>nixos-enter</literal> just in case you want to chroot into your NixOS partition. They are installed by default on NixOS, but you don't have NixOS yet..
    </para>
 <screen><prompt>$ </prompt>nix-env -iE "_: with import &lt;nixpkgs/nixos&gt; { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]"</screen>
   </listitem>
   <listitem>
    <note>
     <para>
-     The following 5 steps are only for installing NixOS to another partition.
-     For installing NixOS in place using <literal>NIXOS_LUSTRATE</literal>,
-     skip ahead.
+     The following 5 steps are only for installing NixOS to another partition. For installing NixOS in place using <literal>NIXOS_LUSTRATE</literal>, skip ahead.
     </para>
    </note>
    <para>
     Prepare your target partition:
    </para>
    <para>
-    At this point it is time to prepare your target partition. Please refer to
-    the partitioning, file-system creation, and mounting steps of
-    <xref linkend="sec-installation" />
+    At this point it is time to prepare your target partition. Please refer to the partitioning, file-system creation, and mounting steps of <xref linkend="sec-installation" />
    </para>
    <para>
-    If you're about to install NixOS in place using
-    <literal>NIXOS_LUSTRATE</literal> there is nothing to do for this step.
+    If you're about to install NixOS in place using <literal>NIXOS_LUSTRATE</literal> there is nothing to do for this step.
    </para>
   </listitem>
   <listitem>
@@ -118,17 +99,11 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
    </para>
 <screen><prompt>$ </prompt>sudo `which nixos-generate-config` --root /mnt</screen>
    <para>
-    You'll probably want to edit the configuration files. Refer to the
-    <literal>nixos-generate-config</literal> step in
-    <xref
-                    linkend="sec-installation" /> for more
-    information.
+    You'll probably want to edit the configuration files. Refer to the <literal>nixos-generate-config</literal> step in <xref
+                    linkend="sec-installation" /> for more information.
    </para>
    <para>
-    Consider setting up the NixOS bootloader to give you the ability to boot on
-    your existing Linux partition. For instance, if you're using GRUB and your
-    existing distribution is running Ubuntu, you may want to add something like
-    this to your <literal>configuration.nix</literal>:
+    Consider setting up the NixOS bootloader to give you the ability to boot on your existing Linux partition. For instance, if you're using GRUB and your existing distribution is running Ubuntu, you may want to add something like this to your <literal>configuration.nix</literal>:
    </para>
 <programlisting>
 <xref linkend="opt-boot.loader.grub.extraEntries"/> = ''
@@ -138,14 +113,12 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
   }
 '';</programlisting>
    <para>
-    (You can find the appropriate UUID for your partition in
-    <literal>/dev/disk/by-uuid</literal>)
+    (You can find the appropriate UUID for your partition in <literal>/dev/disk/by-uuid</literal>)
    </para>
   </listitem>
   <listitem>
    <para>
-    Create the <literal>nixbld</literal> group and user on your original
-    distribution:
+    Create the <literal>nixbld</literal> group and user on your original distribution:
    </para>
 <screen>
 <prompt>$ </prompt>sudo groupadd -g 30000 nixbld
@@ -157,14 +130,12 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
    </para>
    <warning>
     <para>
-     Once you complete this step, you might no longer be able to boot on
-     existing systems without the help of a rescue USB drive or similar.
+     Once you complete this step, you might no longer be able to boot on existing systems without the help of a rescue USB drive or similar.
     </para>
    </warning>
 <screen><prompt>$ </prompt>sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt</screen>
    <para>
-    Again, please refer to the <literal>nixos-install</literal> step in
-    <xref linkend="sec-installation" /> for more information.
+    Again, please refer to the <literal>nixos-install</literal> step in <xref linkend="sec-installation" /> for more information.
    </para>
    <para>
     That should be it for installation to another partition!
@@ -178,16 +149,13 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
 <prompt>$ </prompt>sudo userdel nixbld
 <prompt>$ </prompt>sudo groupdel nixbld</screen>
    <para>
-    If you do not wish to keep the Nix package manager installed either, run
-    something like <literal>sudo rm -rv ~/.nix-* /nix</literal> and remove the
-    line that the Nix installer added to your <literal>~/.profile</literal>.
+    If you do not wish to keep the Nix package manager installed either, run something like <literal>sudo rm -rv ~/.nix-* /nix</literal> and remove the line that the Nix installer added to your <literal>~/.profile</literal>.
    </para>
   </listitem>
   <listitem>
    <note>
     <para>
-     The following steps are only for installing NixOS in place using
-     <literal>NIXOS_LUSTRATE</literal>:
+     The following steps are only for installing NixOS in place using <literal>NIXOS_LUSTRATE</literal>:
     </para>
    </note>
    <para>
@@ -195,20 +163,11 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
    </para>
 <screen><prompt>$ </prompt>sudo `which nixos-generate-config` --root /</screen>
    <para>
-    Note that this will place the generated configuration files in
-    <literal>/etc/nixos</literal>. You'll probably want to edit the
-    configuration files. Refer to the <literal>nixos-generate-config</literal>
-    step in <xref
-                    linkend="sec-installation" /> for more
-    information.
+    Note that this will place the generated configuration files in <literal>/etc/nixos</literal>. You'll probably want to edit the configuration files. Refer to the <literal>nixos-generate-config</literal> step in <xref
+                    linkend="sec-installation" /> for more information.
    </para>
    <para>
-    You'll likely want to set a root password for your first boot using the
-    configuration files because you won't have a chance to enter a password
-    until after you reboot. You can initalize the root password to an empty one
-    with this line: (and of course don't forget to set one once you've rebooted
-    or to lock the account with <literal>sudo passwd -l root</literal> if you
-    use <literal>sudo</literal>)
+    You'll likely want to set a root password for your first boot using the configuration files because you won't have a chance to enter a password until after you reboot. You can initalize the root password to an empty one with this line: (and of course don't forget to set one once you've rebooted or to lock the account with <literal>sudo passwd -l root</literal> if you use <literal>sudo</literal>)
    </para>
 <programlisting>
 <link linkend="opt-users.users._name__.initialHashedPassword">users.users.root.initialHashedPassword</link> = "";
@@ -216,34 +175,25 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
   </listitem>
   <listitem>
    <para>
-    Build the NixOS closure and install it in the <literal>system</literal>
-    profile:
+    Build the NixOS closure and install it in the <literal>system</literal> profile:
    </para>
 <screen><prompt>$ </prompt>nix-env -p /nix/var/nix/profiles/system -f '&lt;nixpkgs/nixos&gt;' -I nixos-config=/etc/nixos/configuration.nix -iA system</screen>
   </listitem>
   <listitem>
    <para>
-    Change ownership of the <literal>/nix</literal> tree to root (since your
-    Nix install was probably single user):
+    Change ownership of the <literal>/nix</literal> tree to root (since your Nix install was probably single user):
    </para>
 <screen><prompt>$ </prompt>sudo chown -R 0.0 /nix</screen>
   </listitem>
   <listitem>
    <para>
-    Set up the <literal>/etc/NIXOS</literal> and
-    <literal>/etc/NIXOS_LUSTRATE</literal> files:
+    Set up the <literal>/etc/NIXOS</literal> and <literal>/etc/NIXOS_LUSTRATE</literal> files:
    </para>
    <para>
-    <literal>/etc/NIXOS</literal> officializes that this is now a NixOS
-    partition (the bootup scripts require its presence).
+    <literal>/etc/NIXOS</literal> officializes that this is now a NixOS partition (the bootup scripts require its presence).
    </para>
    <para>
-    <literal>/etc/NIXOS_LUSTRATE</literal> tells the NixOS bootup scripts to
-    move <emphasis>everything</emphasis> that's in the root partition to
-    <literal>/old-root</literal>. This will move your existing distribution out
-    of the way in the very early stages of the NixOS bootup. There are
-    exceptions (we do need to keep NixOS there after all), so the NixOS
-    lustrate process will not touch:
+    <literal>/etc/NIXOS_LUSTRATE</literal> tells the NixOS bootup scripts to move <emphasis>everything</emphasis> that's in the root partition to <literal>/old-root</literal>. This will move your existing distribution out of the way in the very early stages of the NixOS bootup. There are exceptions (we do need to keep NixOS there after all), so the NixOS lustrate process will not touch:
    </para>
    <itemizedlist>
     <listitem>
@@ -258,26 +208,19 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
     </listitem>
     <listitem>
      <para>
-      Any file or directory listed in <literal>/etc/NIXOS_LUSTRATE</literal>
-      (one per line)
+      Any file or directory listed in <literal>/etc/NIXOS_LUSTRATE</literal> (one per line)
      </para>
     </listitem>
    </itemizedlist>
    <note>
     <para>
-     Support for <literal>NIXOS_LUSTRATE</literal> was added in NixOS 16.09.
-     The act of "lustrating" refers to the wiping of the existing distribution.
-     Creating <literal>/etc/NIXOS_LUSTRATE</literal> can also be used on NixOS
-     to remove all mutable files from your root partition (anything that's not
-     in <literal>/nix</literal> or <literal>/boot</literal> gets "lustrated" on
-     the next boot.
+     Support for <literal>NIXOS_LUSTRATE</literal> was added in NixOS 16.09. The act of "lustrating" refers to the wiping of the existing distribution. Creating <literal>/etc/NIXOS_LUSTRATE</literal> can also be used on NixOS to remove all mutable files from your root partition (anything that's not in <literal>/nix</literal> or <literal>/boot</literal> gets "lustrated" on the next boot.
     </para>
     <para>
      lustrate /ˈlʌstreɪt/ verb.
     </para>
     <para>
-     purify by expiatory sacrifice, ceremonial washing, or some other ritual
-     action.
+     purify by expiatory sacrifice, ceremonial washing, or some other ritual action.
     </para>
    </note>
    <para>
@@ -288,8 +231,7 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
 <prompt>$ </prompt>sudo touch /etc/NIXOS_LUSTRATE
 </screen>
    <para>
-    Let's also make sure the NixOS configuration files are kept once we reboot
-    on NixOS:
+    Let's also make sure the NixOS configuration files are kept once we reboot on NixOS:
    </para>
 <screen>
 <prompt>$ </prompt>echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE
@@ -297,18 +239,11 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
   </listitem>
   <listitem>
    <para>
-    Finally, move the <literal>/boot</literal> directory of your current
-    distribution out of the way (the lustrate process will take care of the
-    rest once you reboot, but this one must be moved out now because NixOS
-    needs to install its own boot files:
+    Finally, move the <literal>/boot</literal> directory of your current distribution out of the way (the lustrate process will take care of the rest once you reboot, but this one must be moved out now because NixOS needs to install its own boot files:
    </para>
    <warning>
     <para>
-     Once you complete this step, your current distribution will no longer be
-     bootable! If you didn't get all the NixOS configuration right, especially
-     those settings pertaining to boot loading and root partition, NixOS may
-     not be bootable either. Have a USB rescue device ready in case this
-     happens.
+     Once you complete this step, your current distribution will no longer be bootable! If you didn't get all the NixOS configuration right, especially those settings pertaining to boot loading and root partition, NixOS may not be bootable either. Have a USB rescue device ready in case this happens.
     </para>
    </warning>
 <screen>
@@ -321,8 +256,7 @@ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot
   </listitem>
   <listitem>
    <para>
-    If for some reason you want to revert to the old distribution, you'll need
-    to boot on a USB rescue disk and do something along these lines:
+    If for some reason you want to revert to the old distribution, you'll need to boot on a USB rescue disk and do something along these lines:
    </para>
 <screen>
 # mkdir root
@@ -337,20 +271,14 @@ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot
     This may work as is or you might also need to reinstall the boot loader
    </para>
    <para>
-    And of course, if you're happy with NixOS and no longer need the old
-    distribution:
+    And of course, if you're happy with NixOS and no longer need the old distribution:
    </para>
 <screen>sudo rm -rf /old-root</screen>
   </listitem>
   <listitem>
    <para>
-    It's also worth noting that this whole process can be automated. This is
-    especially useful for Cloud VMs, where provider do not provide NixOS. For
-    instance,
-    <link
-                    xlink:href="https://github.com/elitak/nixos-infect">nixos-infect</link>
-    uses the lustrate process to convert Digital Ocean droplets to NixOS from
-    other distributions automatically.
+    It's also worth noting that this whole process can be automated. This is especially useful for Cloud VMs, where provider do not provide NixOS. For instance, <link
+                    xlink:href="https://github.com/elitak/nixos-infect">nixos-infect</link> uses the lustrate process to convert Digital Ocean droplets to NixOS from other distributions automatically.
    </para>
   </listitem>
  </orderedlist>
diff --git a/nixos/doc/manual/installation/installing-pxe.xml b/nixos/doc/manual/installation/installing-pxe.xml
index 94199e5e028d..5ca320b5bb15 100644
--- a/nixos/doc/manual/installation/installing-pxe.xml
+++ b/nixos/doc/manual/installation/installing-pxe.xml
@@ -10,9 +10,7 @@
  </para>
 
  <para>
-  These instructions assume that you have an existing PXE or iPXE
-  infrastructure and simply want to add the NixOS installer as another option.
-  To build the necessary files from a recent version of nixpkgs, you can run:
+  These instructions assume that you have an existing PXE or iPXE infrastructure and simply want to add the NixOS installer as another option. To build the necessary files from a recent version of nixpkgs, you can run:
  </para>
 
 <programlisting>
@@ -20,31 +18,18 @@ nix-build -A netboot nixos/release.nix
 </programlisting>
 
  <para>
-  This will create a <literal>result</literal> directory containing: *
-  <literal>bzImage</literal> – the Linux kernel * <literal>initrd</literal>
-  – the initrd file * <literal>netboot.ipxe</literal> – an example ipxe
-  script demonstrating the appropriate kernel command line arguments for this
-  image
+  This will create a <literal>result</literal> directory containing: * <literal>bzImage</literal> – the Linux kernel * <literal>initrd</literal> – the initrd file * <literal>netboot.ipxe</literal> – an example ipxe script demonstrating the appropriate kernel command line arguments for this image
  </para>
 
  <para>
-  If you’re using plain PXE, configure your boot loader to use the
-  <literal>bzImage</literal> and <literal>initrd</literal> files and have it
-  provide the same kernel command line arguments found in
-  <literal>netboot.ipxe</literal>.
+  If you’re using plain PXE, configure your boot loader to use the <literal>bzImage</literal> and <literal>initrd</literal> files and have it provide the same kernel command line arguments found in <literal>netboot.ipxe</literal>.
  </para>
 
  <para>
-  If you’re using iPXE, depending on how your HTTP/FTP/etc. server is
-  configured you may be able to use <literal>netboot.ipxe</literal> unmodified,
-  or you may need to update the paths to the files to match your server’s
-  directory layout
+  If you’re using iPXE, depending on how your HTTP/FTP/etc. server is configured you may be able to use <literal>netboot.ipxe</literal> unmodified, or you may need to update the paths to the files to match your server’s directory layout
  </para>
 
  <para>
-  In the future we may begin making these files available as build products
-  from hydra at which point we will update this documentation with instructions
-  on how to obtain them either for placing on a dedicated TFTP server or to
-  boot them directly over the internet.
+  In the future we may begin making these files available as build products from hydra at which point we will update this documentation with instructions on how to obtain them either for placing on a dedicated TFTP server or to boot them directly over the internet.
  </para>
 </section>
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index 83598635acca..99c61511a59d 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -6,12 +6,7 @@
  <title>Booting from a USB Drive</title>
 
  <para>
-  For systems without CD drive, the NixOS live CD can be booted from a USB
-  stick. You can use the <command>dd</command> utility to write the image:
-  <command>dd if=<replaceable>path-to-image</replaceable>
-  of=<replaceable>/dev/sdX</replaceable></command>. Be careful about specifying
-  the correct drive; you can use the <command>lsblk</command> command to get a
-  list of block devices.
+  For systems without CD drive, the NixOS live CD can be booted from a USB stick. You can use the <command>dd</command> utility to write the image: <command>dd if=<replaceable>path-to-image</replaceable> of=<replaceable>/dev/sdX</replaceable></command>. Be careful about specifying the correct drive; you can use the <command>lsblk</command> command to get a list of block devices.
   <note>
    <title>On macOS</title>
    <para>
@@ -25,16 +20,12 @@
 Unmount of all volumes on diskN was successful
 <prompt>$ </prompt>sudo dd if=nix.iso of=/dev/rdiskN
 </screen>
-    Using the 'raw' <command>rdiskN</command> device instead of
-    <command>diskN</command> completes in minutes instead of hours. After
-    <command>dd</command> completes, a GUI dialog "The disk you inserted was
-    not readable by this computer" will pop up, which can be ignored.
+    Using the 'raw' <command>rdiskN</command> device instead of <command>diskN</command> completes in minutes instead of hours. After <command>dd</command> completes, a GUI dialog "The disk you inserted was not readable by this computer" will pop up, which can be ignored.
    </para>
   </note>
  </para>
 
  <para>
-  The <command>dd</command> utility will write the image verbatim to the drive,
-  making it the recommended option for both UEFI and non-UEFI installations.
+  The <command>dd</command> utility will write the image verbatim to the drive, making it the recommended option for both UEFI and non-UEFI installations.
  </para>
 </section>
diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
index 5c86eacfbf45..f75a1cf0a9c3 100644
--- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml
+++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
@@ -6,13 +6,8 @@
  <title>Installing in a VirtualBox guest</title>
 
  <para>
-  Installing NixOS into a VirtualBox guest is convenient for users who want to
-  try NixOS without installing it on bare metal. If you want to use a pre-made
-  VirtualBox appliance, it is available at
-  <link
-  xlink:href="https://nixos.org/nixos/download.html">the downloads
-  page</link>. If you want to set up a VirtualBox guest manually, follow these
-  instructions:
+  Installing NixOS into a VirtualBox guest is convenient for users who want to try NixOS without installing it on bare metal. If you want to use a pre-made VirtualBox appliance, it is available at <link
+  xlink:href="https://nixos.org/nixos/download.html">the downloads page</link>. If you want to set up a VirtualBox guest manually, follow these instructions:
  </para>
 
  <orderedlist>
@@ -43,21 +38,18 @@
   </listitem>
   <listitem>
    <para>
-    Click on Settings / System / Acceleration and enable "VT-x/AMD-V"
-    acceleration
+    Click on Settings / System / Acceleration and enable "VT-x/AMD-V" acceleration
    </para>
   </listitem>
   <listitem>
    <para>
-    Save the settings, start the virtual machine, and continue installation
-    like normal
+    Save the settings, start the virtual machine, and continue installation like normal
    </para>
   </listitem>
  </orderedlist>
 
  <para>
-  There are a few modifications you should make in configuration.nix. Enable
-  booting:
+  There are a few modifications you should make in configuration.nix. Enable booting:
  </para>
 
 <programlisting>
@@ -65,8 +57,7 @@
 </programlisting>
 
  <para>
-  Also remove the fsck that runs at startup. It will always fail to run,
-  stopping your boot until you press <literal>*</literal>.
+  Also remove the fsck that runs at startup. It will always fail to run, stopping your boot until you press <literal>*</literal>.
  </para>
 
 <programlisting>
@@ -74,13 +65,7 @@
 </programlisting>
 
  <para>
-  Shared folders can be given a name and a path in the host system in the
-  VirtualBox settings (Machine / Settings / Shared Folders, then click on the
-  "Add" icon). Add the following to the
-  <literal>/etc/nixos/configuration.nix</literal> to auto-mount them. If you do
-  not add <literal>"nofail"</literal>, the system will no boot properly. The
-  same goes for disabling <literal>rngd</literal> which is normally used to get
-  randomness but this does not work in virtual machines.
+  Shared folders can be given a name and a path in the host system in the VirtualBox settings (Machine / Settings / Shared Folders, then click on the "Add" icon). Add the following to the <literal>/etc/nixos/configuration.nix</literal> to auto-mount them. If you do not add <literal>"nofail"</literal>, the system will no boot properly. The same goes for disabling <literal>rngd</literal> which is normally used to get randomness but this does not work in virtual machines.
  </para>
 
 <programlisting>
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index f1e1568c0349..8049450c6842 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -8,67 +8,46 @@
   <title>Booting the system</title>
 
   <para>
-   NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI
-   installation is by and large the same as a BIOS installation. The
-   differences are mentioned in the steps that follow.
+   NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI installation is by and large the same as a BIOS installation. The differences are mentioned in the steps that follow.
   </para>
 
   <para>
-   The installation media can be burned to a CD, or now more commonly, "burned"
-   to a USB drive (see <xref linkend="sec-booting-from-usb"/>).
+   The installation media can be burned to a CD, or now more commonly, "burned" to a USB drive (see <xref linkend="sec-booting-from-usb"/>).
   </para>
 
   <para>
-   The installation media contains a basic NixOS installation. When it’s
-   finished booting, it should have detected most of your hardware.
+   The installation media contains a basic NixOS installation. When it’s finished booting, it should have detected most of your hardware.
   </para>
 
   <para>
-   The NixOS manual is available on virtual console 8 (press Alt+F8 to access)
-   or by running <command>nixos-help</command>.
+   The NixOS manual is available on virtual console 8 (press Alt+F8 to access) or by running <command>nixos-help</command>.
   </para>
 
   <para>
-   You are logged-in automatically as <literal>nixos</literal>.
-   The <literal>nixos</literal> user account has an empty password so you
-   can use <command>sudo</command> without a password.
+   You are logged-in automatically as <literal>nixos</literal>. The <literal>nixos</literal> user account has an empty password so you can use <command>sudo</command> without a password.
   </para>
 
   <para>
-   If you downloaded the graphical ISO image, you can run <command>systemctl
-   start display-manager</command> to start the desktop environment. If you want to continue on the
-   terminal, you can use <command>loadkeys</command> to switch to your
-   preferred keyboard layout. (We even provide neo2 via <command>loadkeys de
-   neo</command>!)
+   If you downloaded the graphical ISO image, you can run <command>systemctl start display-manager</command> to start the desktop environment. If you want to continue on the terminal, you can use <command>loadkeys</command> to switch to your preferred keyboard layout. (We even provide neo2 via <command>loadkeys de neo</command>!)
   </para>
 
   <section xml:id="sec-installation-booting-networking">
    <title>Networking in the installer</title>
 
    <para>
-    The boot process should have brought up networking (check <command>ip
-    a</command>). Networking is necessary for the installer, since it will
-    download lots of stuff (such as source tarballs or Nixpkgs channel
-    binaries). It’s best if you have a DHCP server on your network. Otherwise
-    configure networking manually using <command>ifconfig</command>.
+    The boot process should have brought up networking (check <command>ip a</command>). Networking is necessary for the installer, since it will download lots of stuff (such as source tarballs or Nixpkgs channel binaries). It’s best if you have a DHCP server on your network. Otherwise configure networking manually using <command>ifconfig</command>.
    </para>
 
    <para>
-    To manually configure the network on the graphical installer, first disable
-    network-manager with <command>systemctl stop NetworkManager</command>.
+    To manually configure the network on the graphical installer, first disable network-manager with <command>systemctl stop NetworkManager</command>.
    </para>
 
    <para>
-    To manually configure the wifi on the minimal installer, run
-    <command>wpa_supplicant -B -i interface -c &lt;(wpa_passphrase 'SSID'
-    'key')</command>.
+    To manually configure the wifi on the minimal installer, run <command>wpa_supplicant -B -i interface -c &lt;(wpa_passphrase 'SSID' 'key')</command>.
    </para>
 
    <para>
-    If you would like to continue the installation from a different machine you
-    need to activate the SSH daemon via <command>systemctl start
-    sshd</command>. You then must set a password for either <literal>root</literal> or
-    <literal>nixos</literal> with <command>passwd></command> to be able to login.
+    If you would like to continue the installation from a different machine you need to activate the SSH daemon via <command>systemctl start sshd</command>. You then must set a password for either <literal>root</literal> or <literal>nixos</literal> with <command>passwd></command> to be able to login.
    </para>
   </section>
  </section>
@@ -76,32 +55,25 @@
   <title>Partitioning and formatting</title>
 
   <para>
-   The NixOS installer doesn’t do any partitioning or formatting, so you need
-   to do that yourself.
+   The NixOS installer doesn’t do any partitioning or formatting, so you need to do that yourself.
   </para>
 
   <para>
-   The NixOS installer ships with multiple partitioning tools. The examples
-   below use <command>parted</command>, but also provides
-   <command>fdisk</command>, <command>gdisk</command>,
-   <command>cfdisk</command>, and <command>cgdisk</command>.
+   The NixOS installer ships with multiple partitioning tools. The examples below use <command>parted</command>, but also provides <command>fdisk</command>, <command>gdisk</command>, <command>cfdisk</command>, and <command>cgdisk</command>.
   </para>
 
   <para>
-   The recommended partition scheme differs depending if the computer uses
-   <emphasis>Legacy Boot</emphasis> or <emphasis>UEFI</emphasis>.
+   The recommended partition scheme differs depending if the computer uses <emphasis>Legacy Boot</emphasis> or <emphasis>UEFI</emphasis>.
   </para>
 
   <section xml:id="sec-installation-partitioning-UEFI">
    <title>UEFI (GPT)</title>
 
    <para>
-    Here's an example partition scheme for UEFI, using
-    <filename>/dev/sda</filename> as the device.
+    Here's an example partition scheme for UEFI, using <filename>/dev/sda</filename> as the device.
     <note>
      <para>
-      You can safely ignore <command>parted</command>'s informational message
-      about needing to update /etc/fstab.
+      You can safely ignore <command>parted</command>'s informational message about needing to update /etc/fstab.
      </para>
     </note>
    </para>
@@ -116,31 +88,24 @@
      </listitem>
      <listitem>
       <para>
-       Add the <emphasis>root</emphasis> partition. This will fill the disk
-       except for the end part, where the swap will live, and the space left in
-       front (512MiB) which will be used by the boot partition.
+       Add the <emphasis>root</emphasis> partition. This will fill the disk except for the end part, where the swap will live, and the space left in front (512MiB) which will be used by the boot partition.
 <screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary 512MiB -8GiB</screen>
       </para>
      </listitem>
      <listitem>
       <para>
-       Next, add a <emphasis>swap</emphasis> partition. The size required will
-       vary according to needs, here a 8GiB one is created.
+       Next, add a <emphasis>swap</emphasis> partition. The size required will vary according to needs, here a 8GiB one is created.
 <screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen>
        <note>
         <para>
-         The swap partition size rules are no different than for other Linux
-         distributions.
+         The swap partition size rules are no different than for other Linux distributions.
         </para>
        </note>
       </para>
      </listitem>
      <listitem>
       <para>
-       Finally, the <emphasis>boot</emphasis> partition. NixOS by default uses
-       the ESP (EFI system partition) as its <emphasis>/boot</emphasis>
-       partition. It uses the initially reserved 512MiB at the start of the
-       disk.
+       Finally, the <emphasis>boot</emphasis> partition. NixOS by default uses the ESP (EFI system partition) as its <emphasis>/boot</emphasis> partition. It uses the initially reserved 512MiB at the start of the disk.
 <screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB
 <prompt># </prompt>parted /dev/sda -- set 3 boot on</screen>
       </para>
@@ -149,8 +114,7 @@
    </para>
 
    <para>
-    Once complete, you can follow with
-    <xref linkend="sec-installation-partitioning-formatting"/>.
+    Once complete, you can follow with <xref linkend="sec-installation-partitioning-formatting"/>.
    </para>
   </section>
 
@@ -158,12 +122,10 @@
    <title>Legacy Boot (MBR)</title>
 
    <para>
-    Here's an example partition scheme for Legacy Boot, using
-    <filename>/dev/sda</filename> as the device.
+    Here's an example partition scheme for Legacy Boot, using <filename>/dev/sda</filename> as the device.
     <note>
      <para>
-      You can safely ignore <command>parted</command>'s informational message
-      about needing to update /etc/fstab.
+      You can safely ignore <command>parted</command>'s informational message about needing to update /etc/fstab.
      </para>
     </note>
    </para>
@@ -178,20 +140,17 @@
      </listitem>
      <listitem>
       <para>
-       Add the <emphasis>root</emphasis> partition. This will fill the the disk
-       except for the end part, where the swap will live.
+       Add the <emphasis>root</emphasis> partition. This will fill the the disk except for the end part, where the swap will live.
 <screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary 1MiB -8GiB</screen>
       </para>
      </listitem>
      <listitem>
       <para>
-       Finally, add a <emphasis>swap</emphasis> partition. The size required
-       will vary according to needs, here a 8GiB one is created.
+       Finally, add a <emphasis>swap</emphasis> partition. The size required will vary according to needs, here a 8GiB one is created.
 <screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen>
        <note>
         <para>
-         The swap partition size rules are no different than for other Linux
-         distributions.
+         The swap partition size rules are no different than for other Linux distributions.
         </para>
        </note>
       </para>
@@ -200,8 +159,7 @@
    </para>
 
    <para>
-    Once complete, you can follow with
-    <xref linkend="sec-installation-partitioning-formatting"/>.
+    Once complete, you can follow with <xref linkend="sec-installation-partitioning-formatting"/>.
    </para>
   </section>
 
@@ -213,20 +171,14 @@
     <itemizedlist>
      <listitem>
       <para>
-       For initialising Ext4 partitions: <command>mkfs.ext4</command>. It is
-       recommended that you assign a unique symbolic label to the file system
-       using the option <option>-L <replaceable>label</replaceable></option>,
-       since this makes the file system configuration independent from device
-       changes. For example:
+       For initialising Ext4 partitions: <command>mkfs.ext4</command>. It is recommended that you assign a unique symbolic label to the file system using the option <option>-L <replaceable>label</replaceable></option>, since this makes the file system configuration independent from device changes. For example:
 <screen>
 <prompt># </prompt>mkfs.ext4 -L nixos /dev/sda1</screen>
       </para>
      </listitem>
      <listitem>
       <para>
-       For creating swap partitions: <command>mkswap</command>. Again it’s
-       recommended to assign a label to the swap partition: <option>-L
-       <replaceable>label</replaceable></option>. For example:
+       For creating swap partitions: <command>mkswap</command>. Again it’s recommended to assign a label to the swap partition: <option>-L <replaceable>label</replaceable></option>. For example:
 <screen>
 <prompt># </prompt>mkswap -L swap /dev/sda2</screen>
       </para>
@@ -239,9 +191,7 @@
         </term>
         <listitem>
          <para>
-          For creating boot partitions: <command>mkfs.fat</command>. Again
-          it’s recommended to assign a label to the boot partition:
-          <option>-n <replaceable>label</replaceable></option>. For example:
+          For creating boot partitions: <command>mkfs.fat</command>. Again it’s recommended to assign a label to the boot partition: <option>-n <replaceable>label</replaceable></option>. For example:
 <screen>
 <prompt># </prompt>mkfs.fat -F 32 -n boot /dev/sda3</screen>
          </para>
@@ -251,9 +201,7 @@
      </listitem>
      <listitem>
       <para>
-       For creating LVM volumes, the LVM commands, e.g.,
-       <command>pvcreate</command>, <command>vgcreate</command>, and
-       <command>lvcreate</command>.
+       For creating LVM volumes, the LVM commands, e.g., <command>pvcreate</command>, <command>vgcreate</command>, and <command>lvcreate</command>.
       </para>
      </listitem>
      <listitem>
@@ -271,8 +219,7 @@
   <orderedlist>
    <listitem>
     <para>
-     Mount the target file system on which NixOS should be installed on
-     <filename>/mnt</filename>, e.g.
+     Mount the target file system on which NixOS should be installed on <filename>/mnt</filename>, e.g.
 <screen>
 <prompt># </prompt>mount /dev/disk/by-label/nixos /mnt
 </screen>
@@ -298,44 +245,26 @@
    </listitem>
    <listitem>
     <para>
-     If your machine has a limited amount of memory, you may want to activate
-     swap devices now (<command>swapon
-     <replaceable>device</replaceable></command>). The installer (or rather,
-     the build actions that it may spawn) may need quite a bit of RAM,
-     depending on your configuration.
+     If your machine has a limited amount of memory, you may want to activate swap devices now (<command>swapon <replaceable>device</replaceable></command>). The installer (or rather, the build actions that it may spawn) may need quite a bit of RAM, depending on your configuration.
 <screen>
 <prompt># </prompt>swapon /dev/sda2</screen>
     </para>
    </listitem>
    <listitem>
     <para>
-     You now need to create a file
-     <filename>/mnt/etc/nixos/configuration.nix</filename> that specifies the
-     intended configuration of the system. This is because NixOS has a
-     <emphasis>declarative</emphasis> configuration model: you create or edit a
-     description of the desired configuration of your system, and then NixOS
-     takes care of making it happen. The syntax of the NixOS configuration file
-     is described in <xref linkend="sec-configuration-syntax"/>, while a list
-     of available configuration options appears in
-     <xref
-    linkend="ch-options"/>. A minimal example is shown in
-     <xref
+     You now need to create a file <filename>/mnt/etc/nixos/configuration.nix</filename> that specifies the intended configuration of the system. This is because NixOS has a <emphasis>declarative</emphasis> configuration model: you create or edit a description of the desired configuration of your system, and then NixOS takes care of making it happen. The syntax of the NixOS configuration file is described in <xref linkend="sec-configuration-syntax"/>, while a list of available configuration options appears in <xref
+    linkend="ch-options"/>. A minimal example is shown in <xref
     linkend="ex-config"/>.
     </para>
     <para>
-     The command <command>nixos-generate-config</command> can generate an
-     initial configuration file for you:
+     The command <command>nixos-generate-config</command> can generate an initial configuration file for you:
 <screen>
 <prompt># </prompt>nixos-generate-config --root /mnt</screen>
-     You should then edit <filename>/mnt/etc/nixos/configuration.nix</filename>
-     to suit your needs:
+     You should then edit <filename>/mnt/etc/nixos/configuration.nix</filename> to suit your needs:
 <screen>
 <prompt># </prompt>nano /mnt/etc/nixos/configuration.nix
 </screen>
-     If you’re using the graphical ISO image, other editors may be available
-     (such as <command>vim</command>). If you have network access, you can also
-     install other editors — for instance, you can install Emacs by running
-     <literal>nix-env -f '&lt;nixpkgs&gt;' -iA emacs</literal>.
+     If you’re using the graphical ISO image, other editors may be available (such as <command>vim</command>). If you have network access, you can also install other editors — for instance, you can install Emacs by running <literal>nix-env -f '&lt;nixpkgs&gt;' -iA emacs</literal>.
     </para>
     <variablelist>
      <varlistentry>
@@ -344,9 +273,7 @@
       </term>
       <listitem>
        <para>
-        You <emphasis>must</emphasis> set the option
-        <xref linkend="opt-boot.loader.grub.device"/> to specify on which disk
-        the GRUB boot loader is to be installed. Without it, NixOS cannot boot.
+        You <emphasis>must</emphasis> set the option <xref linkend="opt-boot.loader.grub.device"/> to specify on which disk the GRUB boot loader is to be installed. Without it, NixOS cannot boot.
        </para>
       </listitem>
      </varlistentry>
@@ -356,60 +283,26 @@
       </term>
       <listitem>
        <para>
-        You <emphasis>must</emphasis> set the option
-        <xref linkend="opt-boot.loader.systemd-boot.enable"/> to
-        <literal>true</literal>. <command>nixos-generate-config</command>
-        should do this automatically for new configurations when booted in UEFI
-        mode.
+        You <emphasis>must</emphasis> set the option <xref linkend="opt-boot.loader.systemd-boot.enable"/> to <literal>true</literal>. <command>nixos-generate-config</command> should do this automatically for new configurations when booted in UEFI mode.
        </para>
        <para>
-        You may want to look at the options starting with
-        <option><link linkend="opt-boot.loader.efi.canTouchEfiVariables">boot.loader.efi</link></option>
-        and
-        <option><link linkend="opt-boot.loader.systemd-boot.enable">boot.loader.systemd</link></option>
-        as well.
+        You may want to look at the options starting with <option><link linkend="opt-boot.loader.efi.canTouchEfiVariables">boot.loader.efi</link></option> and <option><link linkend="opt-boot.loader.systemd-boot.enable">boot.loader.systemd</link></option> as well.
        </para>
       </listitem>
      </varlistentry>
     </variablelist>
     <para>
-     If there are other operating systems running on the machine before
-     installing NixOS, the <xref linkend="opt-boot.loader.grub.useOSProber"/>
-     option can be set to <literal>true</literal> to automatically add them to
-     the grub menu.
+     If there are other operating systems running on the machine before installing NixOS, the <xref linkend="opt-boot.loader.grub.useOSProber"/> option can be set to <literal>true</literal> to automatically add them to the grub menu.
     </para>
     <para>
-     If you need to configure networking for your machine the configuration
-     options are described in <xref linkend="sec-networking"/>.
+     If you need to configure networking for your machine the configuration options are described in <xref linkend="sec-networking"/>.
     </para>
     <para>
-     Another critical option is <option>fileSystems</option>, specifying the
-     file systems that need to be mounted by NixOS. However, you typically
-     don’t need to set it yourself, because
-     <command>nixos-generate-config</command> sets it automatically in
-     <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> from your
-     currently mounted file systems. (The configuration file
-     <filename>hardware-configuration.nix</filename> is included from
-     <filename>configuration.nix</filename> and will be overwritten by future
-     invocations of <command>nixos-generate-config</command>; thus, you
-     generally should not modify it.) Additionally, you may want to look at 
-     <link xlink:href="https://github.com/NixOS/nixos-hardware">Hardware
-     configuration for known-hardware</link> at this point or after
-     installation.
-      
+     Another critical option is <option>fileSystems</option>, specifying the file systems that need to be mounted by NixOS. However, you typically don’t need to set it yourself, because <command>nixos-generate-config</command> sets it automatically in <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> from your currently mounted file systems. (The configuration file <filename>hardware-configuration.nix</filename> is included from <filename>configuration.nix</filename> and will be overwritten by future invocations of <command>nixos-generate-config</command>; thus, you generally should not modify it.) Additionally, you may want to look at <link xlink:href="https://github.com/NixOS/nixos-hardware">Hardware configuration for known-hardware</link> at this point or after installation.
     </para>
     <note>
      <para>
-      Depending on your hardware configuration or type of file system, you may
-      need to set the option <option>boot.initrd.kernelModules</option> to
-      include the kernel modules that are necessary for mounting the root file
-      system, otherwise the installed system will not be able to boot. (If this
-      happens, boot from the installation media again, mount the target file
-      system on <filename>/mnt</filename>, fix
-      <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun
-      <filename>nixos-install</filename>.) In most cases,
-      <command>nixos-generate-config</command> will figure out the required
-      modules.
+      Depending on your hardware configuration or type of file system, you may need to set the option <option>boot.initrd.kernelModules</option> to include the kernel modules that are necessary for mounting the root file system, otherwise the installed system will not be able to boot. (If this happens, boot from the installation media again, mount the target file system on <filename>/mnt</filename>, fix <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun <filename>nixos-install</filename>.) In most cases, <command>nixos-generate-config</command> will figure out the required modules.
      </para>
     </note>
    </listitem>
@@ -418,24 +311,17 @@
      Do the installation:
 <screen>
 <prompt># </prompt>nixos-install</screen>
-     Cross fingers. If this fails due to a temporary problem (such as a network
-     issue while downloading binaries from the NixOS binary cache), you can
-     just re-run <command>nixos-install</command>. Otherwise, fix your
-     <filename>configuration.nix</filename> and then re-run
-     <command>nixos-install</command>.
+     Cross fingers. If this fails due to a temporary problem (such as a network issue while downloading binaries from the NixOS binary cache), you can just re-run <command>nixos-install</command>. Otherwise, fix your <filename>configuration.nix</filename> and then re-run <command>nixos-install</command>.
     </para>
     <para>
-     As the last step, <command>nixos-install</command> will ask you to set the
-     password for the <literal>root</literal> user, e.g.
+     As the last step, <command>nixos-install</command> will ask you to set the password for the <literal>root</literal> user, e.g.
 <screen>
 setting root password...
 Enter new UNIX password: ***
 Retype new UNIX password: ***</screen>
      <note>
       <para>
-       For unattended installations, it is possible to use
-       <command>nixos-install --no-root-passwd</command> in order to disable
-       the password prompt entirely.
+       For unattended installations, it is possible to use <command>nixos-install --no-root-passwd</command> in order to disable the password prompt entirely.
       </para>
      </note>
     </para>
@@ -449,21 +335,14 @@ Retype new UNIX password: ***</screen>
    </listitem>
    <listitem>
     <para>
-     You should now be able to boot into the installed NixOS. The GRUB boot
-     menu shows a list of <emphasis>available configurations</emphasis>
-     (initially just one). Every time you change the NixOS configuration (see
-     <link
-        linkend="sec-changing-config">Changing Configuration</link>
-     ), a new item is added to the menu. This allows you to easily roll back to
-     a previous configuration if something goes wrong.
+     You should now be able to boot into the installed NixOS. The GRUB boot menu shows a list of <emphasis>available configurations</emphasis> (initially just one). Every time you change the NixOS configuration (see <link
+        linkend="sec-changing-config">Changing Configuration</link> ), a new item is added to the menu. This allows you to easily roll back to a previous configuration if something goes wrong.
     </para>
     <para>
-     You should log in and change the <literal>root</literal> password with
-     <command>passwd</command>.
+     You should log in and change the <literal>root</literal> password with <command>passwd</command>.
     </para>
     <para>
-     You’ll probably want to create some user accounts as well, which can be
-     done with <command>useradd</command>:
+     You’ll probably want to create some user accounts as well, which can be done with <command>useradd</command>:
 <screen>
 <prompt>$ </prompt>useradd -c 'Eelco Dolstra' -m eelco
 <prompt>$ </prompt>passwd eelco</screen>
@@ -484,11 +363,8 @@ Retype new UNIX password: ***</screen>
   <title>Installation summary</title>
 
   <para>
-   To summarise, <xref linkend="ex-install-sequence" /> shows a typical
-   sequence of commands for installing NixOS on an empty hard drive (here
-   <filename>/dev/sda</filename>). <xref linkend="ex-config"
-/> shows a
-   corresponding configuration Nix expression.
+   To summarise, <xref linkend="ex-install-sequence" /> shows a typical sequence of commands for installing NixOS on an empty hard drive (here <filename>/dev/sda</filename>). <xref linkend="ex-config"
+/> shows a corresponding configuration Nix expression.
   </para>
 
   <example xml:id="ex-partition-scheme-MBR">
diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml
index 56af5c0e25a0..902f99e1e256 100644
--- a/nixos/doc/manual/installation/obtaining.xml
+++ b/nixos/doc/manual/installation/obtaining.xml
@@ -5,48 +5,28 @@
          xml:id="sec-obtaining">
  <title>Obtaining NixOS</title>
  <para>
-  NixOS ISO images can be downloaded from the
-  <link
-xlink:href="http://nixos.org/nixos/download.html">NixOS download
-  page</link>. There are a number of installation options. If you happen to
-  have an optical drive and a spare CD, burning the image to CD and booting
-  from that is probably the easiest option. Most people will need to prepare a
-  USB stick to boot from. <xref linkend="sec-booting-from-usb"/> describes the
-  preferred method to prepare a USB stick. A number of alternative methods are
-  presented in the
-  <link
-xlink:href="https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installation_media">NixOS
-  Wiki</link>.
+  NixOS ISO images can be downloaded from the <link
+xlink:href="http://nixos.org/nixos/download.html">NixOS download page</link>. There are a number of installation options. If you happen to have an optical drive and a spare CD, burning the image to CD and booting from that is probably the easiest option. Most people will need to prepare a USB stick to boot from. <xref linkend="sec-booting-from-usb"/> describes the preferred method to prepare a USB stick. A number of alternative methods are presented in the <link
+xlink:href="https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installation_media">NixOS Wiki</link>.
  </para>
  <para>
-  As an alternative to installing NixOS yourself, you can get a running NixOS
-  system through several other means:
+  As an alternative to installing NixOS yourself, you can get a running NixOS system through several other means:
   <itemizedlist>
    <listitem>
     <para>
-     Using virtual appliances in Open Virtualization Format (OVF) that can be
-     imported into VirtualBox. These are available from the
-     <link xlink:href="http://nixos.org/nixos/download.html">NixOS download
-     page</link>.
+     Using virtual appliances in Open Virtualization Format (OVF) that can be imported into VirtualBox. These are available from the <link xlink:href="http://nixos.org/nixos/download.html">NixOS download page</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Using AMIs for Amazon’s EC2. To find one for your region and instance
-     type, please refer to the
-     <link
-    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix">list
-     of most recent AMIs</link>.
+     Using AMIs for Amazon’s EC2. To find one for your region and instance type, please refer to the <link
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix">list of most recent AMIs</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Using NixOps, the NixOS-based cloud deployment tool, which allows you to
-     provision VirtualBox and EC2 NixOS instances from declarative
-     specifications. Check out the
-     <link
-    xlink:href="https://nixos.org/nixops">NixOps homepage</link> for
-     details.
+     Using NixOps, the NixOS-based cloud deployment tool, which allows you to provision VirtualBox and EC2 NixOS instances from declarative specifications. Check out the <link
+    xlink:href="https://nixos.org/nixops">NixOps homepage</link> for details.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index 35b4d266e12e..d8b6cda2f2d9 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -4,68 +4,33 @@
          xml:id="sec-upgrading">
  <title>Upgrading NixOS</title>
  <para>
-  The best way to keep your NixOS installation up to date is to use one of the
-  NixOS <emphasis>channels</emphasis>. A channel is a Nix mechanism for
-  distributing Nix expressions and associated binaries. The NixOS channels are
-  updated automatically from NixOS’s Git repository after certain tests have
-  passed and all packages have been built. These channels are:
+  The best way to keep your NixOS installation up to date is to use one of the NixOS <emphasis>channels</emphasis>. A channel is a Nix mechanism for distributing Nix expressions and associated binaries. The NixOS channels are updated automatically from NixOS’s Git repository after certain tests have passed and all packages have been built. These channels are:
   <itemizedlist>
    <listitem>
     <para>
-     <emphasis>Stable channels</emphasis>, such as
-     <literal
-    xlink:href="https://nixos.org/channels/nixos-19.03">nixos-19.03</literal>.
-     These only get conservative bug fixes and package upgrades. For instance,
-     a channel update may cause the Linux kernel on your system to be upgraded
-     from 4.19.34 to 4.19.38 (a minor bug fix), but not from
-     4.19.<replaceable>x</replaceable> to 4.20.<replaceable>x</replaceable> (a
-     major change that has the potential to break things). Stable channels are
-     generally maintained until the next stable branch is created.
+     <emphasis>Stable channels</emphasis>, such as <literal
+    xlink:href="https://nixos.org/channels/nixos-19.03">nixos-19.03</literal>. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not from 4.19.<replaceable>x</replaceable> to 4.20.<replaceable>x</replaceable> (a major change that has the potential to break things). Stable channels are generally maintained until the next stable branch is created.
     </para>
     <para></para>
    </listitem>
    <listitem>
     <para>
-     The <emphasis>unstable channel</emphasis>,
-     <literal
-    xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable</literal>.
-     This corresponds to NixOS’s main development branch, and may thus see
-     radical changes between channel updates. It’s not recommended for
-     production systems.
+     The <emphasis>unstable channel</emphasis>, <literal
+    xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable</literal>. This corresponds to NixOS’s main development branch, and may thus see radical changes between channel updates. It’s not recommended for production systems.
     </para>
    </listitem>
    <listitem>
     <para>
-     <emphasis>Small channels</emphasis>, such as
-     <literal
-    xlink:href="https://nixos.org/channels/nixos-19.03-small">nixos-19.03-small</literal>
-     or
-     <literal
-    xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>.
-     These are identical to the stable and unstable channels described above,
-     except that they contain fewer binary packages. This means they get
-     updated faster than the regular channels (for instance, when a critical
-     security patch is committed to NixOS’s source tree), but may require
-     more packages to be built from source than usual. They’re mostly
-     intended for server environments and as such contain few GUI applications.
+     <emphasis>Small channels</emphasis>, such as <literal
+    xlink:href="https://nixos.org/channels/nixos-19.03-small">nixos-19.03-small</literal> or <literal
+    xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>. These are identical to the stable and unstable channels described above, except that they contain fewer binary packages. This means they get updated faster than the regular channels (for instance, when a critical security patch is committed to NixOS’s source tree), but may require more packages to be built from source than usual. They’re mostly intended for server environments and as such contain few GUI applications.
     </para>
    </listitem>
   </itemizedlist>
-  To see what channels are available, go to
-  <link xlink:href="https://nixos.org/channels"/>. (Note that the URIs of the
-  various channels redirect to a directory that contains the channel’s latest
-  version and includes ISO images and VirtualBox appliances.) Please note that
-  during the release process, channels that are not yet released will be
-  present here as well. See the Getting NixOS page
-  <link xlink:href="https://nixos.org/nixos/download.html"/> to find the newest
-  supported stable release.
+  To see what channels are available, go to <link xlink:href="https://nixos.org/channels"/>. (Note that the URIs of the various channels redirect to a directory that contains the channel’s latest version and includes ISO images and VirtualBox appliances.) Please note that during the release process, channels that are not yet released will be present here as well. See the Getting NixOS page <link xlink:href="https://nixos.org/nixos/download.html"/> to find the newest supported stable release.
  </para>
  <para>
-  When you first install NixOS, you’re automatically subscribed to the NixOS
-  channel that corresponds to your installation source. For instance, if you
-  installed from a 19.03 ISO, you will be subscribed to the
-  <literal>nixos-19.03</literal> channel. To see which NixOS channel you’re
-  subscribed to, run the following as root:
+  When you first install NixOS, you’re automatically subscribed to the NixOS channel that corresponds to your installation source. For instance, if you installed from a 19.03 ISO, you will be subscribed to the <literal>nixos-19.03</literal> channel. To see which NixOS channel you’re subscribed to, run the following as root:
 <screen>
 # nix-channel --list | grep nixos
 nixos https://nixos.org/channels/nixos-unstable
@@ -74,8 +39,7 @@ nixos https://nixos.org/channels/nixos-unstable
 <screen>
 # nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos
 </screen>
-  (Be sure to include the <literal>nixos</literal> parameter at the end.) For
-  instance, to use the NixOS 19.03 stable channel:
+  (Be sure to include the <literal>nixos</literal> parameter at the end.) For instance, to use the NixOS 19.03 stable channel:
 <screen>
 # nix-channel --add https://nixos.org/channels/nixos-19.03 nixos
 </screen>
@@ -89,43 +53,31 @@ nixos https://nixos.org/channels/nixos-unstable
 </screen>
  </para>
  <para>
-  You can then upgrade NixOS to the latest version in your chosen channel by
-  running
+  You can then upgrade NixOS to the latest version in your chosen channel by running
 <screen>
 # nixos-rebuild switch --upgrade
 </screen>
-  which is equivalent to the more verbose <literal>nix-channel --update nixos;
-  nixos-rebuild switch</literal>.
+  which is equivalent to the more verbose <literal>nix-channel --update nixos; nixos-rebuild switch</literal>.
  </para>
  <note>
   <para>
-   Channels are set per user. This means that running <literal> nix-channel
-   --add</literal> as a non root user (or without sudo) will not affect
-   configuration in <literal>/etc/nixos/configuration.nix</literal>
+   Channels are set per user. This means that running <literal> nix-channel --add</literal> as a non root user (or without sudo) will not affect configuration in <literal>/etc/nixos/configuration.nix</literal>
   </para>
  </note>
  <warning>
   <para>
-   It is generally safe to switch back and forth between channels. The only
-   exception is that a newer NixOS may also have a newer Nix version, which may
-   involve an upgrade of Nix’s database schema. This cannot be undone easily,
-   so in that case you will not be able to go back to your original channel.
+   It is generally safe to switch back and forth between channels. The only exception is that a newer NixOS may also have a newer Nix version, which may involve an upgrade of Nix’s database schema. This cannot be undone easily, so in that case you will not be able to go back to your original channel.
   </para>
  </warning>
  <section xml:id="sec-upgrading-automatic">
   <title>Automatic Upgrades</title>
 
   <para>
-   You can keep a NixOS system up-to-date automatically by adding the following
-   to <filename>configuration.nix</filename>:
+   You can keep a NixOS system up-to-date automatically by adding the following to <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-system.autoUpgrade.enable"/> = true;
 </programlisting>
-   This enables a periodically executed systemd service named
-   <literal>nixos-upgrade.service</literal>. It runs <command>nixos-rebuild
-   switch --upgrade</command> to upgrade NixOS to the latest version in the
-   current channel. (To see when the service runs, see <command>systemctl
-   list-timers</command>.) You can also specify a channel explicitly, e.g.
+   This enables a periodically executed systemd service named <literal>nixos-upgrade.service</literal>. It runs <command>nixos-rebuild switch --upgrade</command> to upgrade NixOS to the latest version in the current channel. (To see when the service runs, see <command>systemctl list-timers</command>.) You can also specify a channel explicitly, e.g.
 <programlisting>
 <xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-19.03;
 </programlisting>