From cd5acfea81f5e921f77c28fd1c68ffe979471cdd Mon Sep 17 00:00:00 2001
From: awokd <34515595+awokd@users.noreply.github.com>
Date: Wed, 31 Jan 2018 13:35:12 +0000
Subject: [PATCH] templates 4.0 updates

Add 4.0 and split out version specific content
---
 managing-os/templates.md | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/managing-os/templates.md b/managing-os/templates.md
index 3189aa57..b936c7e3 100644
--- a/managing-os/templates.md
+++ b/managing-os/templates.md
@@ -45,7 +45,23 @@ By installing these templates, you are trusting not only ITL and the distributio
 * [Archlinux](/doc/templates/archlinux/)
 
 
-Important Notes
+Important Notes (R4.0)
+---------------
+
+ * Whenever a TemplateBasedVM is created, the contents of the `/home`
+   directory of its parent TemplateVM are *not* copied to the child TemplateBasedVM's
+   `/home`. The child TemplateBasedVM's `/home`
+   is always independent from its parent TemplateVM's `/home`, which means that any
+   subsequent changes to the parent TemplateVM's `/home` will not affect
+   the child TemplateBasedVM's `/home`.
+   
+ * Template VMs are created in a thin pool, making `qvm-trim-template`
+   no longer necessary.
+
+   The root filesystems in Standalone VMs can employ
+   TRIM/discard on the root fs using normal tools and configuration options.
+
+Important Notes (R3.2 and earlier)
 ---------------
 
  * Whenever a TemplateBasedVM is created, the contents of the `/home`
@@ -54,6 +70,16 @@ Important Notes
    is independent from its parent TemplateVM's `/home`, which means that any
    subsequent changes to the parent TemplateVM's `/home` will no longer affect
    the child TemplateBasedVM's `/home`.
+   
+ * Template VMs can occupy more space on the dom0 filesystem than necessary
+   because they cannot employ automatic TRIM/discard on the root fs. The
+   `qvm-trim-template` command in dom0 is used to recover this unused space.
+
+   Conversely, the root filesystems in Standalone VMs *can* employ
+   TRIM/discard on the root fs using normal tools and configuration options.
+   
+Important Notes (all versions)
+---------------
 
  * Once a TemplateBasedVM has been created, any changes in its `/home`,
    `/usr/local`, or `/rw/config` directories will be persistent across reboots,
@@ -71,18 +97,11 @@ Important Notes
    update a template from dom0 (and thereby lose any user modifications in the
    existing template), you must first uninstall the existing template from dom0:
 
-       $ sudo yum remove qubes-template-fedora-25
+       $ sudo dnf remove qubes-template-fedora-25
 
  * Standalone VMs using Template VMs as a basis can be created easily. These
    VMs receive a *copy* of the operating system and do not get automatically
    updated when Template VMs are updated--they must be updated individually.
-   
- * Template VMs can occupy more space on the dom0 filesystem than necessary
-   because they cannot employ automatic TRIM/discard on the root fs. The
-   `qvm-trim-template` command in dom0 is used to recover this unused space.
-
-   Conversely, the root filesystems in Standalone VMs *can* employ
-   TRIM/discard on the root fs using normal tools and configuration options.
  
  * On XFCE based Dom0, a manual action may be required to remove the "Start Menu"
    sub-menu of the removed TemplateVM. For example, to remove a dangling sub-menu