diff --git a/doc.md b/doc.md index f6cddb57..606e12ed 100644 --- a/doc.md +++ b/doc.md @@ -81,26 +81,27 @@ Managing Operating Systems within Qubes --------------------------------------- * [TemplateVMs](/doc/templates/) - * [Templates: Fedora - minimal](/doc/templates/fedora-minimal/) + * [Templates: Fedora](/doc/templates/fedora/) + * [Templates: Fedora Minimal](/doc/templates/fedora-minimal/) * [Templates: Debian](/doc/templates/debian/) * [Templates: Archlinux](/doc/templates/archlinux/) * [Templates: Ubuntu](/doc/templates/ubuntu/) * [Templates: Whonix](/doc/whonix/) - * [How to Reinstall a TemplateVM](/doc/reinstall-template) * [Pentesting](/doc/pentesting/) * [Pentesting: BlackArch](/doc/pentesting/blackarch/) * [Pentesting: Kali](/doc/pentesting/kali/) * [Pentesting: PTF](/doc/pentesting/ptf/) - * [Installing and Using Windows-based AppVMs (Qubes R2 Beta 3 and later)](/doc/windows-appvms/) - * [Creating and Using HVM and Windows Domains (Qubes R2+)](/doc/hvm/) - * [Advanced options and troubleshooting of Qubes Tools for Windows (R3)](/doc/windows-tools-3/) - * [Advanced options and troubleshooting of Qubes Tools for Windows (R2)](/doc/windows-tools-2/) - * [Uninstalling Qubes Tools for Windows 2.x](/doc/uninstalling-windows-tools-2/) - * [Upgrading the Fedora 23 Template](/doc/fedora-template-upgrade-23/) - * [Upgrading the Fedora 21 Template](/doc/fedora-template-upgrade-21/) - * [Upgrading the Fedora 20 Template](/doc/fedora-template-upgrade-20/) - * [Upgrading the Fedora 18 Template](/doc/fedora-template-upgrade-18/) - * [Upgrading the Debian 8 Template](/doc/debian-template-upgrade-8/) + * [Windows: Installing and Using Windows-based AppVMs (Qubes R2 Beta 3 and later)](/doc/windows-appvms/) + * [Windows: Creating and Using HVM and Windows Domains (Qubes R2+)](/doc/hvm/) + * [Windows: Advanced options and troubleshooting of Qubes Tools for Windows (R3)](/doc/windows-tools-3/) + * [Windows: Advanced options and troubleshooting of Qubes Tools for Windows (R2)](/doc/windows-tools-2/) + * [Windows: Uninstalling Qubes Tools for Windows 2.x](/doc/uninstalling-windows-tools-2/) + * [Fedora: Upgrading the Fedora 23 Template to Fedora 24](/doc/template/fedora/upgrade-23-to-24/) + * [Fedora: Upgrading the Fedora 21 Template to Fedora 23](/doc/template/fedora/upgrade-21-to-23/) + * [Fedora: Upgrading the Fedora 20 Template to Fedora 21](/doc/template/fedora/upgrade-20-to-21/) + * [Fedora: Upgrading the Fedora 18 Template to Fedora 20](/doc/template/fedora/upgrade-18-to-20/) + * [Debian: Upgrading the Debian 8 Template to Debian 9](/doc/template/debian/upgrade-8-to-9/) + * [How to Reinstall a TemplateVM](/doc/reinstall-template) * [Tips for Using Linux in an HVM](/doc/linux-hvm-tips/) * [Creating a NetBSD VM](/doc/netbsd/) diff --git a/managing-os/debian-template-upgrade-8.md b/managing-os/templates/debian/upgrade-8-to-9.md similarity index 96% rename from managing-os/debian-template-upgrade-8.md rename to managing-os/templates/debian/upgrade-8-to-9.md index fa7209cf..2d90f5ed 100644 --- a/managing-os/debian-template-upgrade-8.md +++ b/managing-os/templates/debian/upgrade-8-to-9.md @@ -1,8 +1,9 @@ --- layout: doc -title: Upgrading the Debian 8 Template -permalink: /doc/debian-template-upgrade-8/ +title: Upgrading the Debian 8 Template to Debian 9 +permalink: /doc/template/debian/upgrade-8-to-9/ redirect_from: +- /doc/debian-template-upgrade-8/ - /en/doc/debian-template-upgrade-8/ - /doc/DebianTemplateUpgrade8/ - /wiki/DebianTemplateUpgrade8/ @@ -124,4 +125,4 @@ Relevant Mailing List Discussions --------------------------------- * [Stretch Template Installation](https://groups.google.com/forum/#!topicsearchin/qubes-devel/debian$20stretch/qubes-devel/4rdayBF_UTc) * [Stretch availability in 3.2](https://groups.google.com/forum/#!topicsearchin/qubes-devel/debian$20stretch/qubes-devel/cekPfBqQMOI) - * [Fixing sound in Debian Stretch](https://groups.google.com/forum/#!topic/qubes-users/JddCE54GFiU) \ No newline at end of file + * [Fixing sound in Debian Stretch](https://groups.google.com/forum/#!topic/qubes-users/JddCE54GFiU) diff --git a/managing-os/templates/fedora.md b/managing-os/templates/fedora.md new file mode 100644 index 00000000..8c78d6d9 --- /dev/null +++ b/managing-os/templates/fedora.md @@ -0,0 +1,11 @@ +--- +layout: doc +title: The Fedora TemplateVM +permalink: /doc/templates/fedora/ +--- + +The Fedora TemplateVM +===================== + +The Fedora TemplateVM is the default TemplateVM in Qubes OS. + diff --git a/managing-os/fedora-template-upgrade-18.md b/managing-os/templates/fedora/upgrade-18-to-20.md similarity index 93% rename from managing-os/fedora-template-upgrade-18.md rename to managing-os/templates/fedora/upgrade-18-to-20.md index d4f92a76..688e8265 100644 --- a/managing-os/fedora-template-upgrade-18.md +++ b/managing-os/templates/fedora/upgrade-18-to-20.md @@ -1,14 +1,15 @@ --- layout: doc -title: Upgrading the Fedora 18 Temlpate -permalink: /doc/fedora-template-upgrade-18/ +title: Upgrading the Fedora 18 Template to Fedora 20 +permalink: /doc/template/fedora/upgrade-18-to-20/ redirect_from: +- /doc/fedora-template-upgrade-18/ - /en/doc/fedora-template-upgrade-18/ - /doc/FedoraTemplateUpgrade18/ - /wiki/FedoraTemplateUpgrade/ --- -Upgrading the Fedora 18 Temlpate +Upgrading the Fedora 18 Template ================================ (**Note:** There is a [newer version of this page for upgrading from Fedora 20 to Fedora 21](/doc/fedora-template-upgrade-20/).) diff --git a/managing-os/fedora-template-upgrade-20.md b/managing-os/templates/fedora/upgrade-20-to-21.md similarity index 98% rename from managing-os/fedora-template-upgrade-20.md rename to managing-os/templates/fedora/upgrade-20-to-21.md index c85185db..2d219c78 100644 --- a/managing-os/fedora-template-upgrade-20.md +++ b/managing-os/templates/fedora/upgrade-20-to-21.md @@ -1,8 +1,9 @@ --- layout: doc -title: Upgrading the Fedora 20 Template -permalink: /doc/fedora-template-upgrade-20/ +title: Upgrading the Fedora 20 Template to Fedora 21 +permalink: /doc/template/fedora/upgrade-20-to-21/ redirect_from: +- /doc/fedora-template-upgrade-20/ - /en/doc/fedora-template-upgrade-20/ - /doc/FedoraTemplateUpgrade20/ - /wiki/FedoraTemplateUpgrade20/ diff --git a/managing-os/fedora-template-upgrade-21.md b/managing-os/templates/fedora/upgrade-21-to-23.md similarity index 98% rename from managing-os/fedora-template-upgrade-21.md rename to managing-os/templates/fedora/upgrade-21-to-23.md index c908ea43..fd7b2d8a 100644 --- a/managing-os/fedora-template-upgrade-21.md +++ b/managing-os/templates/fedora/upgrade-21-to-23.md @@ -1,8 +1,9 @@ --- layout: doc -title: Upgrading the Fedora 21 Template -permalink: /doc/fedora-template-upgrade-21/ +title: Upgrading the Fedora 21 Template to Fedora 23 +permalink: /doc/template/fedora/upgrade-21-to-23/ redirect_from: +- /doc/fedora-template-upgrade-21/ - /en/doc/fedora-template-upgrade-21/ - /doc/FedoraTemplateUpgrade21/ - /wiki/FedoraTemplateUpgrade21/ diff --git a/managing-os/fedora-template-upgrade-23.md b/managing-os/templates/fedora/upgrade-23-to-24.md similarity index 97% rename from managing-os/fedora-template-upgrade-23.md rename to managing-os/templates/fedora/upgrade-23-to-24.md index d58df084..0f5c7208 100644 --- a/managing-os/fedora-template-upgrade-23.md +++ b/managing-os/templates/fedora/upgrade-23-to-24.md @@ -1,8 +1,9 @@ --- layout: doc -title: Upgrading the Fedora 23 Template -permalink: /doc/fedora-template-upgrade-23/ +title: Upgrading the Fedora 23 Template to Fedora 24 +permalink: /doc/template/fedora/upgrade-23-to-24/ redirect_from: +- /doc/fedora-template-upgrade-23/ - /en/doc/fedora-template-upgrade-23/ - /doc/FedoraTemplateUpgrade23/ - /wiki/FedoraTemplateUpgrade23/ diff --git a/managing-os/uninstalling-windows-tools-2.md b/managing-os/windows/uninstalling-windows-tools-2.md similarity index 100% rename from managing-os/uninstalling-windows-tools-2.md rename to managing-os/windows/uninstalling-windows-tools-2.md diff --git a/managing-os/windows-appvms.md b/managing-os/windows/windows-appvms.md similarity index 100% rename from managing-os/windows-appvms.md rename to managing-os/windows/windows-appvms.md diff --git a/managing-os/windows-tools-2.md b/managing-os/windows/windows-tools-2.md similarity index 100% rename from managing-os/windows-tools-2.md rename to managing-os/windows/windows-tools-2.md diff --git a/managing-os/windows-tools-3.md b/managing-os/windows/windows-tools-3.md similarity index 100% rename from managing-os/windows-tools-3.md rename to managing-os/windows/windows-tools-3.md