Merge branch 'MadsRC-patch-1'

It's fairly easy to miss the fact that some of the text is for R3 and some of it is for R4. In the source it's pretty straightforward (Since it contains a linebreak) but when rendered, said linebreak is removed. Adding a few third-level headers clears this up, at least in opinion.

configuration/change-time-zone.md

@@ -0,0 +1,36 @@
+---
+layout: doc
+title: Changing your Time Zone
+permalink: /doc/change-time-zone/
+---
+
+# Changing your Time Zone #
+
+## Qubes 4.0 ##
+
+### Command line ###
+
+If you use the i3 window manager or would prefer to change the system's time
+zone in terminal you can issue the `timedatectl` command with the option
+`set-timezone`.
+
+For example, to set the system's time zone to Berlin, Germany type in a dom0
+terminal:
+
+    $ sudo timedatectl set-timezone 'Europe/Berlin'
+
+You can list the available time zones with the option `list-timezones` and show
+the current settings of the system clock and time zone with option `status`.
+
+Example output status of `timedatectl` on a system with time zone set to
+Europe/Berlin:
+
+    [user@dom0 ~]$ timedatectl status
+          Local time: Sun 2018-10-14 06:20:00 CEST
+      Universal time: Sun 2018-10-14 04:20:00 UTC
+            RTC time: Sun 2018-10-14 04:20:00
+           Time zone: Europe/Berlin (CEST, +0200)
+     Network time on: no
+    NTP synchronized: no
+     RTC in local TZ: no
+

doc.md

@@ -127,6 +127,7 @@ Configuration Guides
  * [Multibooting](/doc/multiboot/)
  * [Resize Disk Image](/doc/resize-disk-image/)
  * [RPC Policies](/doc/rpc-policy/)
+ * [Changing your Time Zone](/doc/change-time-zone)
  * [Installing ZFS in Qubes](/doc/zfs/)
  * [Mutt Guide](/doc/mutt/)
  * [Postfix Guide](/doc/postfix/)

managing-os/hvm.md

@@ -22,7 +22,8 @@ Interested readers might want to check [this article](https://blog.invisiblethin
 Creating an HVM domain
 ----------------------
 
-R3.2:
+### R3.2 ###
+
 With a GUI: in Qubes Manager VM creation dialog box choose the "Standalone qube not based on a template" type.
 If "install system from device" is selected (which is by default), then `virt_mode` will be set to `hvm` automatically.
 Otherwise, open the newly created VM's Qube Settings GUI and in the "Advanced" tab select "HVM" in the virtualization mode drop-down list.
@@ -32,7 +33,8 @@ Command line (the VM's name and label color are for illustration purposes):
 qvm-create my-new-vm --hvm --label green
 ~~~
 
-R4.0:
+### R4.0 ###
+
 With a GUI: in Qubes Manager VM creation dialog box choose the "Standalone qube not based on a template" type.
 If "install system from device" is selected (which is by default), then `virt_mode` will be set to `hvm` automatically.
 Otherwise, open the newly created VM's Qube Settings GUI and in the "Advanced" tab select `HVM` in the virtualization mode drop-down list.

security-info/canaries.md

@@ -41,4 +41,5 @@ Qubes Canaries are published through the [Qubes Security Pack](/security/pack/).
 
 -   [Qubes Canary \#15](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-015-2018.txt)
 -   [Qubes Canary \#16](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-016-2018.txt)
+-   [Qubes Canary \#17](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-017-2018.txt)