Merge branch 'MadsRC-patch-1'

Merge branch 'patch-1' of https://github.com/MadsRC/qubes-doc into MadsRC-patch-1
Add Canary 17
2018-10-15 19:44:46 -05:00 · 2018-10-15 19:44:05 -05:00 · 2018-10-15 19:19:05 -05:00 · 2018-10-15 10:16:01 +02:00
2 changed files with 5 additions and 2 deletions
--- a/managing-os/hvm.md
+++ b/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.
--- a/security-info/canaries.md
+++ b/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)
Author	SHA1	Message	Date
Andrew David Wong	8f77ebcf07	Merge branch 'MadsRC-patch-1'	2018-10-15 19:44:46 -05:00
Andrew David Wong	da21c5953b	Merge branch 'patch-1' of https://github.com/MadsRC/qubes-doc into MadsRC-patch-1	2018-10-15 19:44:05 -05:00
Andrew David Wong	3456ca3408	Add Canary 17	2018-10-15 19:19:05 -05:00
MadsRC	0d80b96bc6	Update hvm.md 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.	2018-10-15 10:16:01 +02:00