From df5fd695705cf5747372aa795f3a8307066d8baf Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Thu, 25 Jan 2018 22:03:34 -0600 Subject: [PATCH] Group version-specific documents together --- doc.md | 28 +++++----------------------- managing-os/templates/debian.md | 13 +++++++++++-- managing-os/templates/fedora.md | 17 +++++++++++++++-- managing-os/windows.md | 16 ++++++++++++++++ releases/notes.md | 16 ++++++++++++++++ releases/schedules.md | 14 ++++++++++++++ 6 files changed, 77 insertions(+), 27 deletions(-) create mode 100644 managing-os/windows.md create mode 100644 releases/notes.md create mode 100644 releases/schedules.md diff --git a/doc.md b/doc.md index a0681ee8..6ce1320f 100644 --- a/doc.md +++ b/doc.md @@ -86,21 +86,11 @@ Managing Operating Systems within Qubes * [Pentesting: BlackArch](/doc/pentesting/blackarch/) * [Pentesting: Kali](/doc/pentesting/kali/) * [Pentesting: PTF](/doc/pentesting/ptf/) - * [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 25 Template to Fedora 26](/doc/template/fedora/upgrade-25-to-26/) - * [Fedora: Upgrading the Fedora 24 Template to Fedora 25](/doc/template/fedora/upgrade-24-to-25/) - * [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) + * [Windows](/doc/windows/) + * [Creating and Using HVM Domains](/doc/hvm/) * [Tips for Using Linux in an HVM](/doc/linux-hvm-tips/) * [Creating a NetBSD VM](/doc/netbsd/) + * [How to Reinstall a TemplateVM](/doc/reinstall-template) Security Guides @@ -278,15 +268,7 @@ Building Releases -------- + * [Release notes](/doc/releases/notes/) + * [Release schedules](/doc/releases/schedules/) * [Release checklist](/doc/releases/todo/) - * [Qubes R1.0 release notes](/doc/releases/1.0/release-notes/) - * [Qubes R2.0 release notes](/doc/releases/2.0/release-notes/) - * [Qubes R3.0 release notes](/doc/releases/3.0/release-notes/) - * [Qubes R3.0 release schedule](/doc/releases/3.0/schedule/) - * [Qubes R3.1 release notes](/doc/releases/3.1/release-notes/) - * [Qubes R3.1 release schedule](/doc/releases/3.1/schedule/) - * [Qubes R3.2 release notes](/doc/releases/3.2/release-notes/) - * [Qubes R3.2 release schedule](/doc/releases/3.2/schedule/) - * [Qubes R4.0 release notes](/doc/releases/4.0/release-notes/) - * [Qubes R4.0 release schedule](/doc/releases/4.0/schedule/) diff --git a/managing-os/templates/debian.md b/managing-os/templates/debian.md index d43e1f90..d83fdc61 100644 --- a/managing-os/templates/debian.md +++ b/managing-os/templates/debian.md @@ -25,8 +25,8 @@ can also obtain the key from [git repository](https://github.com/QubesOS/qubes-core-agent-linux/blob/master/misc/qubes-archive-keyring.gpg), which is also integrity-protected using signed git tags. -Install -------- +Installing +---------- Templates can be installed with the following command: @@ -57,6 +57,12 @@ Simply replace all instances of "jessie" with "stretch". Full instructions are on [this page][stretch] +Upgrading +--------- + +To upgrade your Debian TemplateVM, please consult the guide that corresponds to your situation: + + * [Upgrading the Debian 8 Template to Debian 9](/doc/template/debian/upgrade-8-to-9/) Known issues @@ -101,9 +107,12 @@ Contributing If you want to help in improving the template, feel free to [contribute](/wiki/ContributingHowto). + More information ---------------- * [Debian wiki](https://wiki.debian.org/Qubes) + [stretch]: https://www.qubes-os.org/doc/template/debian/upgrade-8-to-9/ + diff --git a/managing-os/templates/fedora.md b/managing-os/templates/fedora.md index 30e613c6..0cf82e50 100644 --- a/managing-os/templates/fedora.md +++ b/managing-os/templates/fedora.md @@ -11,8 +11,8 @@ The Fedora [TemplateVM] is the default TemplateVM in Qubes OS. This page is about the standard (or "full") Fedora TemplateVM. For the minimal version, please see the [Fedora Minimal] page. -Installation ------------- +Installing +---------- The Fedora TemplateVM comes preinstalled with Qubes OS. However, there may be times when you wish to install a fresh copy from the Qubes repositories, e.g.: @@ -45,6 +45,19 @@ After installing a fresh Fedora TemplateVM, we recommend performing the followin (If necessary, replace `26` with your desired Fedora version.) +Upgrading +--------- + +To upgrade your Fedora TemplateVM, please consult the guide that corresponds to your situation: + + * [Upgrading the Fedora 25 Template to Fedora 26](/doc/template/fedora/upgrade-25-to-26/) + * [Upgrading the Fedora 24 Template to Fedora 25](/doc/template/fedora/upgrade-24-to-25/) + * [Upgrading the Fedora 23 Template to Fedora 24](/doc/template/fedora/upgrade-23-to-24/) + * [Upgrading the Fedora 21 Template to Fedora 23](/doc/template/fedora/upgrade-21-to-23/) + * [Upgrading the Fedora 20 Template to Fedora 21](/doc/template/fedora/upgrade-20-to-21/) + * [Upgrading the Fedora 18 Template to Fedora 20](/doc/template/fedora/upgrade-18-to-20/) + + [TemplateVM]: /doc/templates/ [Fedora Minimal]: /doc/templates/fedora-minimal/ [end-of-life]: https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle#Maintenance_Schedule diff --git a/managing-os/windows.md b/managing-os/windows.md new file mode 100644 index 00000000..69771c5f --- /dev/null +++ b/managing-os/windows.md @@ -0,0 +1,16 @@ +--- +layout: doc +title: Windows VMs +permalink: /doc/windows/ +--- + +Windows VMs in Qubes OS +======================= + +For more information about Windows VMs in Qubes OS, please see the specific guides below: + + * [Installing and Using Windows-based AppVMs (Qubes R2 Beta 3 and later)](/doc/windows-appvms/) + * [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/) + * [ * [Creating and Using HVM and Windows Domains](/doc/hvm/) diff --git a/releases/notes.md b/releases/notes.md new file mode 100644 index 00000000..cb1119f9 --- /dev/null +++ b/releases/notes.md @@ -0,0 +1,16 @@ +--- +layout: doc +title: Release Notes +permalink: /doc/releases/notes/ +--- + +Release Notes +============= + + * [Qubes R1.0 release notes](/doc/releases/1.0/release-notes/) + * [Qubes R2.0 release notes](/doc/releases/2.0/release-notes/) + * [Qubes R3.0 release notes](/doc/releases/3.0/release-notes/) + * [Qubes R3.1 release notes](/doc/releases/3.1/release-notes/) + * [Qubes R3.2 release notes](/doc/releases/3.2/release-notes/) + * [Qubes R4.0 release notes](/doc/releases/4.0/release-notes/) + diff --git a/releases/schedules.md b/releases/schedules.md new file mode 100644 index 00000000..50c6824c --- /dev/null +++ b/releases/schedules.md @@ -0,0 +1,14 @@ +--- +layout: doc +title: Release Schedules +permalink: /doc/releases/schedules/ +--- + +Release Schedules +================= + + * [Qubes R3.0 release schedule](/doc/releases/3.0/schedule/) + * [Qubes R3.1 release schedule](/doc/releases/3.1/schedule/) + * [Qubes R3.2 release schedule](/doc/releases/3.2/schedule/) + * [Qubes R4.0 release schedule](/doc/releases/4.0/schedule/) +