Group version-specific documents together

This commit is contained in:
Andrew David Wong 2018-01-25 22:03:34 -06:00
parent 2778fbccc8
commit df5fd69570
No known key found for this signature in database
GPG Key ID: 8CE137352A019A17
6 changed files with 77 additions and 27 deletions

28
doc.md
View File

@ -86,21 +86,11 @@ Managing Operating Systems within Qubes
* [Pentesting: BlackArch](/doc/pentesting/blackarch/) * [Pentesting: BlackArch](/doc/pentesting/blackarch/)
* [Pentesting: Kali](/doc/pentesting/kali/) * [Pentesting: Kali](/doc/pentesting/kali/)
* [Pentesting: PTF](/doc/pentesting/ptf/) * [Pentesting: PTF](/doc/pentesting/ptf/)
* [Windows: Installing and Using Windows-based AppVMs (Qubes R2 Beta 3 and later)](/doc/windows-appvms/) * [Windows](/doc/windows/)
* [Windows: Creating and Using HVM and Windows Domains (Qubes R2+)](/doc/hvm/) * [Creating and Using HVM Domains](/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)
* [Tips for Using Linux in an HVM](/doc/linux-hvm-tips/) * [Tips for Using Linux in an HVM](/doc/linux-hvm-tips/)
* [Creating a NetBSD VM](/doc/netbsd/) * [Creating a NetBSD VM](/doc/netbsd/)
* [How to Reinstall a TemplateVM](/doc/reinstall-template)
Security Guides Security Guides
@ -278,15 +268,7 @@ Building
Releases Releases
-------- --------
* [Release notes](/doc/releases/notes/)
* [Release schedules](/doc/releases/schedules/)
* [Release checklist](/doc/releases/todo/) * [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/)

View File

@ -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), 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. which is also integrity-protected using signed git tags.
Install Installing
------- ----------
Templates can be installed with the following command: 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] 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 Known issues
@ -101,9 +107,12 @@ Contributing
If you want to help in improving the template, feel free to [contribute](/wiki/ContributingHowto). If you want to help in improving the template, feel free to [contribute](/wiki/ContributingHowto).
More information More information
---------------- ----------------
* [Debian wiki](https://wiki.debian.org/Qubes) * [Debian wiki](https://wiki.debian.org/Qubes)
[stretch]: https://www.qubes-os.org/doc/template/debian/upgrade-8-to-9/ [stretch]: https://www.qubes-os.org/doc/template/debian/upgrade-8-to-9/

View File

@ -11,8 +11,8 @@ The Fedora [TemplateVM] is the default TemplateVM in Qubes OS.
This page is about the standard (or "full") Fedora TemplateVM. This page is about the standard (or "full") Fedora TemplateVM.
For the minimal version, please see the [Fedora Minimal] page. For the minimal version, please see the [Fedora Minimal] page.
Installation Installing
------------ ----------
The Fedora TemplateVM comes preinstalled with Qubes OS. 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.: 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.) (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/ [TemplateVM]: /doc/templates/
[Fedora Minimal]: /doc/templates/fedora-minimal/ [Fedora Minimal]: /doc/templates/fedora-minimal/
[end-of-life]: https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle#Maintenance_Schedule [end-of-life]: https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle#Maintenance_Schedule

16
managing-os/windows.md Normal file
View File

@ -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/)

16
releases/notes.md Normal file
View File

@ -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/)

14
releases/schedules.md Normal file
View File

@ -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/)