From fbf629aa18f409645fc30a44e61e354d5f614c35 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Sat, 6 Apr 2019 19:45:13 -0500 Subject: [PATCH] Update to account for removal of deprecated content QubesOS/qubes-issues#4936 --- basics_user/doc-guidelines.md | 1 - common-tasks/software-update-vm.md | 8 ++------ installing/upgrade/upgrade-to-r2.md | 2 +- installing/upgrade/upgrade-to-r3.2.md | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/basics_user/doc-guidelines.md b/basics_user/doc-guidelines.md index de986b3a..c3ae2e7a 100644 --- a/basics_user/doc-guidelines.md +++ b/basics_user/doc-guidelines.md @@ -185,7 +185,6 @@ general `qubes-baz` command: Once you foo, make sure to close the baz before fooing the next bar. ``` -[Here][version-example] is a good example of a page that is correctly subdivided to account for version-specific differences. Subdividing the page into clearly-labeled sections for each version has several benefits: * It preserves good content for older (but still supported) versions. diff --git a/common-tasks/software-update-vm.md b/common-tasks/software-update-vm.md index 53f25bb6..e3d4c72e 100644 --- a/common-tasks/software-update-vm.md +++ b/common-tasks/software-update-vm.md @@ -24,12 +24,8 @@ It's just enough to do the update in the template VM, and then all the AppVMs ba The side effect of this mechanism is, of course, that if you install any software in your AppVM, more specifically in any directory other than `/home`, `/usr/local`, or `/rw` then it will disappear after the AppVM reboots (as the root filesystem for this AppVM will again be "taken" from the TemplateVM). **This means one normally installs software in the TemplateVM, not in AppVMs.** -Unlike VM private filesystems, under R3.x the template VM root filesystem does not support discard by default, so deleting files does not free the space in dom0. -See [these instructions](/doc/template/fedora/upgrade-23-to-24/#compacting-the-upgraded-template) to recover space in dom0. - -In R4.0 and higher, the template root filesystem is created in a thin pool so manual trims are no longer needed. - -See [here](/doc/disk-trim) for further discussion on enabling discards/trim support under all versions. +The template root filesystem is created in a thin pool, so manual trims are not necessary. +See [here](/doc/disk-trim) for further discussion on enabling discards/trim support. Installing (or updating) software in the TemplateVM ---------------------------------------------------- diff --git a/installing/upgrade/upgrade-to-r2.md b/installing/upgrade/upgrade-to-r2.md index a572d1eb..18e827f0 100644 --- a/installing/upgrade/upgrade-to-r2.md +++ b/installing/upgrade/upgrade-to-r2.md @@ -19,7 +19,7 @@ Current Qubes R2 Beta 3 (R2B3) systems can be upgraded in-place to the latest R2 Upgrade Template and Standalone VM(s) ------------------------------------- -- Qubes R2 comes with new template based on Fedora 20. You can upgrade existing template according to procedure described [here](/doc/fedora-template-upgrade-20/). +- Qubes R2 comes with new template based on Fedora 20. You can upgrade existing template according to procedure described [here](/doc/templates/fedora/#upgrading). - **It also possible to download a new Fedora 20-based template from our repositories**. To do this please first upgrade the Dom0 distro as described in the section below. diff --git a/installing/upgrade/upgrade-to-r3.2.md b/installing/upgrade/upgrade-to-r3.2.md index fa2db98a..c391dfe8 100644 --- a/installing/upgrade/upgrade-to-r3.2.md +++ b/installing/upgrade/upgrade-to-r3.2.md @@ -117,7 +117,7 @@ repeated in **all** the user's Template and Standalone VMs. **Note:** This will only upgrade your Fedora template from Qubes 3.1 to Qubes 3.2. This will *not* upgrade your Fedora template from Fedora 23 to Fedora 24. In order to do that, please see the -[Fedora 23 template upgrade instructions](/doc/fedora-template-upgrade-23/). +[Fedora 23 template upgrade instructions](/doc/templates/fedora/#upgrading). 1. Open a terminal in the TemplateVM (or StandaloneVM). (E.g., use Qubes VM Manager's right-click menu, choose "Run Command in VM," and type