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-18-to-20.md	Prefer 2nd level headings where appropriate	2016-12-21 22:33:42 -05:00
upgrade-20-to-21.md	Various minor spelling and grammar fixes	2017-05-11 18:48:59 +10:00
upgrade-21-to-23.md	Various minor spelling and grammar fixes	2017-05-11 18:48:59 +10:00
upgrade-23-to-24.md	Various minor spelling and grammar fixes	2017-05-11 18:48:59 +10:00
upgrade-24-to-25.md	Add fedora-24 to fedora-25 upgrade instruction	2017-07-13 22:43:11 +02:00
upgrade-25-to-26.md	Clarify in-place upgrade vs. new template installation	2018-01-07 20:25:17 -06:00