From ca0ccab949c0dfe10b150fefb4fd1570884b4a73 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Sat, 10 Jul 2021 14:25:29 -0700 Subject: [PATCH] Update titles and links --- developer/building/qubes-builder-details.md | 2 +- introduction/faq.md | 4 ++-- .../upgrade/upgrade-to-r4_0.md | 4 ++-- user/how-to-guides/how-to-update.md | 8 ++++---- user/templates/debian/debian.md | 2 +- user/templates/fedora/fedora-upgrade.md | 2 +- user/templates/templates.md | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/developer/building/qubes-builder-details.md b/developer/building/qubes-builder-details.md index c0eb3fd4..f3582284 100644 --- a/developer/building/qubes-builder-details.md +++ b/developer/building/qubes-builder-details.md @@ -50,4 +50,4 @@ Most settings are documented in *builder.conf.default* file, which can be used a Notes ----- -* For a list of custom TemplateVMs available in QubesBuilder look at [Supported Versions page](/doc/supported-versions/). +* For a list of custom TemplateVMs available in QubesBuilder look at [Supported Versions page](/doc/supported-releases/). diff --git a/introduction/faq.md b/introduction/faq.md index bf7d3ed8..e46e75c9 100644 --- a/introduction/faq.md +++ b/introduction/faq.md @@ -255,7 +255,7 @@ Please refer to [this page](/doc/vm-sudo/). Please see: - [Installing and updating software in dom0](/doc/how-to-install-software-in-dom0/) -- [Note on dom0 and EOL](/doc/supported-versions/#note-on-dom0-and-eol) +- [Note on dom0 and EOL](/doc/supported-releases/#note-on-dom0-and-eol) ### Do you recommend coreboot as an alternative to vendor BIOS? @@ -632,7 +632,7 @@ Specifically: - If PGP signatures are used, the signing key(s) should have well-publicized fingerprint(s) verifiable via multiple independent channels or be accessible to the developers through a web of trust. - If the software is security-sensitive and requires communication with the outside world, a "split" implementation is highly preferred (for examples, see [Split GPG](/doc/split-gpg/) and [Split Bitcoin](/doc/split-bitcoin/)). -- If the software has dependencies, these should be packaged and available in repos for a [current, Qubes-supported version](/doc/supported-versions/#templates) of Fedora (preferred) or Debian (unless all the insecure dependencies can run in an untrusted VM in a "split" implementation). +- If the software has dependencies, these should be packaged and available in repos for a [current, Qubes-supported version](/doc/supported-releases/#templates) of Fedora (preferred) or Debian (unless all the insecure dependencies can run in an untrusted VM in a "split" implementation). - If the software must be built from source, the source code and any builders must be signed. (Practically speaking, the more cumbersome and time-consuming it is to build from source, the less likely the developers are to use it.) diff --git a/user/downloading-installing-upgrading/upgrade/upgrade-to-r4_0.md b/user/downloading-installing-upgrading/upgrade/upgrade-to-r4_0.md index 5b66a8eb..a7bc5508 100644 --- a/user/downloading-installing-upgrading/upgrade/upgrade-to-r4_0.md +++ b/user/downloading-installing-upgrading/upgrade/upgrade-to-r4_0.md @@ -84,7 +84,7 @@ Restore from your backup We recommend that you restore only your [app qubes](/doc/glossary/#app-qube) and [standalones](/doc/glossary/#standalone) from R3.2. Using [templates](/doc/templates/) and [service qubes](/doc/glossary/#service-qube) from R3.2 is not fully supported (see [#3514](https://github.com/QubesOS/qubes-issues/issues/3514)). Instead, we recommend using the templates that were created specifically for R4.0, which you can [customize](/doc/software-update-vm/) according to your needs. - For the template OS versions supported in R4.0, see [Supported Versions](/doc/supported-versions/#templates). + For the template OS versions supported in R4.0, see [supported releases](/doc/supported-releases/#templates). If the restore tool complains about missing templates, you can select the option to restore the app qubes anyway, then change them afterward to use one of the default R4.0 templates. Note about additional disp-* qubes created during restore @@ -110,7 +110,7 @@ Upgrade all Template and Standalone VM(s) We strongly recommend that you update **all** templates and standalones before use so that you have the latest security patches from upstream distributions. In addition, if the default templates have reached EOL (end-of-life) by the time you install R4.0, we strongly recommend that you upgrade them before use. -Please see [Supported Versions](/doc/supported-versions/) for information on supported OS versions and consult the guides below for specific upgrade instructions: +Please see [supported releases](/doc/supported-releases/) for information on supported OS versions and consult the guides below for specific upgrade instructions: * [Upgrading Fedora templates](/doc/templates/fedora/#upgrading) * [Upgrading Debian templates](/doc/templates/debian/#upgrading) diff --git a/user/how-to-guides/how-to-update.md b/user/how-to-guides/how-to-update.md index fcb30f69..56455396 100644 --- a/user/how-to-guides/how-to-update.md +++ b/user/how-to-guides/how-to-update.md @@ -9,7 +9,7 @@ title: How to update --- *This page is about updating your system while staying on the same [supported -version of Qubes OS](/doc/supported-versions/#qubes-os). If you're instead +version of Qubes OS](/doc/supported-releases/#qubes-os). If you're instead looking to upgrade from your current version of Qubes OS to a newer version, see the [Upgrade Guides](/doc/upgrade/).* @@ -87,7 +87,7 @@ as well as OSes used in [templates](/doc/templates/) (and to receive security updates.** This means that you *must* periodically upgrade Qubes OS and your templates before they reach EOL. You can always see which versions of Qubes OS and select templates are supported on the [Supported -Versions](/doc/supported-versions/) page. +Versions](/doc/supported-releases/) page. In the case of Qubes OS itself, we will make an [announcement](/news/categories/#releases) when a supported Qubes OS release is @@ -104,8 +104,8 @@ for when each Fedora release reaches EOL. You can always find out when an OS reaches EOL from the upstream project that maintains it. We also pass along any EOL notices we receive for official template OSes as a convenience to Qubes users (see [Supported Versions: -Templates](/doc/supported-versions/#templates)). +Templates](/doc/supported-releases/#templates)). The one exception to all this is the specific release used for dom0 (not to be confused with Qubes OS as a whole), which [doesn't have to be -upgraded](/doc/supported-versions/#note-on-dom0-and-eol). +upgraded](/doc/supported-releases/#note-on-dom0-and-eol). diff --git a/user/templates/debian/debian.md b/user/templates/debian/debian.md index d4bb552b..ff16089b 100644 --- a/user/templates/debian/debian.md +++ b/user/templates/debian/debian.md @@ -11,7 +11,7 @@ ref: 134 title: Debian templates --- -The Debian [template](/doc/templates/) is an officially [supported](/doc/supported-versions/#templates) template in Qubes OS. +The Debian [template](/doc/templates/) is an officially [supported](/doc/supported-releases/#templates) template in Qubes OS. This page is about the standard (or "full") Debian template. For the minimal version, please see the [Minimal templates](/doc/templates/minimal/) page. There is also a [Qubes page on the Debian Wiki](https://wiki.debian.org/Qubes). diff --git a/user/templates/fedora/fedora-upgrade.md b/user/templates/fedora/fedora-upgrade.md index fc6d86f6..a7275ad0 100644 --- a/user/templates/fedora/fedora-upgrade.md +++ b/user/templates/fedora/fedora-upgrade.md @@ -197,7 +197,7 @@ See the [news](/news/) announcement for each specific template release for any i ### End-of-life (EOL) releases We strongly recommend against using any Fedora release that has reached [end-of-life (EOL)](https://fedoraproject.org/wiki/End_of_life). -Also see [supported versions](/doc/supported-versions/). +Also see [supported releases](/doc/supported-releases/). ## Additional information diff --git a/user/templates/templates.md b/user/templates/templates.md index 002c6405..c9123cac 100644 --- a/user/templates/templates.md +++ b/user/templates/templates.md @@ -91,7 +91,7 @@ when you wish to install a fresh template from the Qubes repositories, e.g.: * When a template version you're using reaches [end-of-life](/doc/how-to-update/#upgrading-to-avoid-eol). * When a new version of a template that you wish to use becomes - [supported](/doc/supported-versions/). + [supported](/doc/supported-releases/). * When you suspect your template has been compromised. * When you have made modifications to your template that you no longer want.