From d1adfaa4fce88edbd7e751a7edd6f81801b2826d Mon Sep 17 00:00:00 2001
From: "unman@thirdeyesecurity.org" <unman>
Date: Tue, 6 Jun 2023 15:09:23 +0000
Subject: [PATCH] Update to reflect qvm-template tool

---
 .../testing.md                                | 10 +++-----
 user/templates/templates.md                   | 25 ++++++++-----------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/user/downloading-installing-upgrading/testing.md b/user/downloading-installing-upgrading/testing.md
index 5f92b47e..a500a7c6 100644
--- a/user/downloading-installing-upgrading/testing.md
+++ b/user/downloading-installing-upgrading/testing.md
@@ -81,14 +81,12 @@ How to test [templates](/doc/templates/):
 
 To temporarily enable any of these repos, use the `--enablerepo=<repo-name>`
 option. Example commands:
-
 ```
-sudo qubes-dom0-update --enablerepo=qubes-templates-itl-testing
-sudo qubes-dom0-update --enablerepo=qubes-templates-community-testing
+qvm-template --enablerepo=qubes-templates-itl-testing list --available
+qvm-template --enablerepo=qubes-templates-itl-testing install <template_name>
 ```
-
-To enable or disable any of these repos permanently, change the corresponding
-`enabled` value to `1` in `/etc/yum.repos.d/qubes-templates.repo`.
+To enable any of these repos permanently, change the corresponding `enabled` value to `1` in `/etc/qubes/repo-templates`.  
+To disable any of these repos permanently, change the corresponding `enabled` value to `0`.
 
 ## Providing feedback
 
diff --git a/user/templates/templates.md b/user/templates/templates.md
index b0eaf9da..f3740dec 100644
--- a/user/templates/templates.md
+++ b/user/templates/templates.md
@@ -95,28 +95,23 @@ when you wish to install a fresh template from the Qubes repositories, e.g.:
 * When you suspect your template has been compromised.
 * When you have made modifications to your template that you no longer want.
 
-Please refer to each template's installation instructions. Usually, the
-installation method is to execute the following type of command in dom0:
+You can use a command line tool - `qvm-template` - or a GUI - `qvm-template-gui`.
 
+At the command line in dom0, `qvm-template list --available` will show available templates. To install a template, use:
 ```
-$ sudo qubes-dom0-update qubes-template-<DISTRO_NAME>-<RELEASE_NUMBER>
+$ qvm-template install  <template_name>
 ```
 
-`qubes-template-<DISTRO_NAME>-<RELEASE_NUMBER>` is the name of the desired
-template package. Advanced users can install a
-[minimal](/doc/templates/minimal/) version of the template, if one exists, by
-appending `-minimal` directly to the end of the template package name.
-
-If you wish to install a community template, you must enable the community
-template repo:
+You can also use `qvm-template` to upgrade or reinstall templates.
 
+Repo definitions are stored in `/etc/qubes/repo-templates` and associated keys in `/etc/qubes/repo-templates/keys`.  
+There are additional repos for testing releases and community templates.
+To temporarily enable any of these repos, use the `--enablerepo=<repo-name>` option. E.g. :
 ```
-$ sudo qubes-dom0-update --enablerepo=qubes-templates-community qubes-template-<DISTRO_NAME>-<RELEASE_NUMBER>
+$ qvm-template  --enablerepo qubes-templates-community install <template_name>
 ```
-
-If you receive the message that no match is found for
-`qubes-template-<DISTRO_NAME>-<RELEASE_NUMBER>`, see
-[here](/faq/#when-i-try-to-install-a-template-it-says-no-match-is-found).
+To permanently enable a repo, set the line `enabled = 1` in the repo definition in `/etc/qubes/repo-templates`.  
+To permanently disable, set the line to `enabled = 0`.
 
 If you wish to install a template that is in testing, please see
 [here](/doc/testing/#templates).