Marek Marczykowski-Górecki 919f2ed17e Merge branch 'master' into spelling-grammar-fixes ... Resolved conflicts in: basics_user/doc-guidelines.md basics_user/reporting-bugs.md common-tasks/backup-restore.md common-tasks/software-update-dom0.md common-tasks/software-update-vm.md common-tasks/usb.md configuration/disk-trim.md configuration/external-audio.md configuration/network-printer.md configuration/resize-disk-image.md configuration/resize-root-disk-image.md customization/fedora-minimal-template-customization.md managing-os/hvm.md managing-os/templates/archlinux.md privacy/whonix-install.md security/yubi-key.md troubleshooting/install-nvidia-driver.md troubleshooting/macbook-troubleshooting.md		2018-02-10 16:46:43 +01:00
..
canaries.md	Add Qubes Canary 14	2017-12-11 09:35:21 -06:00
canary-template.md	Reorganize security info pages	2017-03-18 19:31:12 -07:00
security-bulletins-checklist.md	Reorganize security info pages	2017-03-18 19:31:12 -07:00
security-bulletins-template.md	Add QSB 32; minor update to QSB template	2017-08-15 08:27:34 -05:00
security-bulletins.md	Move QSB 37 to 2018	2018-01-11 08:58:19 -06:00
security-goals.md	Insignificantly edit security-goals.md	2017-04-16 14:11:04 -07:00
security-pack.md	reinstate 'somehow'	2017-05-25 17:10:17 +10:00
security.md	Clarify language, improve links, and clean up source	2018-01-31 22:40:01 -06:00
verifying-signatures.md	Add point about checking against different keyservers	2017-05-14 14:14:30 -05:00
xsa.md	Add notes regarding embargoed XSAs and unused XSA numbers	2017-03-21 18:02:03 -07:00