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
..
upgrade-to-r2.md	Fix internal links	2016-09-25 01:25:34 +02:00
upgrade-to-r2b1.md	Clean up and organize doc files	2016-03-15 11:15:31 +00:00
upgrade-to-r2b2.md	Update upgrade-to-r2b2.md	2017-05-03 14:59:18 +00:00
upgrade-to-r2b3.md	Clean up and organize doc files	2016-03-15 11:15:31 +00:00
upgrade-to-r3.0.md	More typo/grammar/re-wording from @jpouellet's review	2017-05-25 16:43:11 +10:00
upgrade-to-r3.1.md	Update links to new FAQ (QubesOS/qubes-issues#2704)	2017-11-15 22:38:48 -06:00
upgrade-to-r3.2.md	Clarify Fedora template upgrade process	2016-11-19 04:40:30 -08:00
upgrade-to-r4.0.md	Improve 4.0 upgrade instructions regarding TemplateVMs	2018-02-01 23:35:35 -06:00
upgrade.md	Revise 4.0 upgrade guide and add to main list	2018-01-25 23:11:00 -06:00