From 3696a08f07879f68807c8923136fbf36a8883416 Mon Sep 17 00:00:00 2001
From: Ben Grande <ben.grande.b@gmail.com>
Date: Fri, 9 Aug 2024 12:08:59 +0200
Subject: [PATCH] doc: organize Qubes Builder options in a list

---
 salt/qubes-builder/README.md | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/salt/qubes-builder/README.md b/salt/qubes-builder/README.md
index 67ea60c..16f360f 100644
--- a/salt/qubes-builder/README.md
+++ b/salt/qubes-builder/README.md
@@ -119,8 +119,12 @@ gpg-qubes-builder --import /path/to/key
 
 ### Builder configuration
 
-When using the Qubes Executor, configure the `builder.yml` `dispvm` option to
-either `dom0` or `dvm-qubes-builder`:
+When using the Qubes Executor, configure the `builder.yml` options:
+
+*   For configuration deduplication, include other files;
+*   When `executor:type:qubes` use the desired DispVM Template:
+    `executor:options:dispvm:`: `"@dispvm"`;
+*   Enforce the use of `split-gpg2`: `gpg-client`: `gpg`.
 
 ```yaml
 include:
@@ -129,17 +133,11 @@ include:
 executor:
   type: qubes
   options:
-    dispvm: "dom0"
-    #dispvm: "dvm-qubes-builder"
+    dispvm: "@dispvm"
 
 gpg-client: gpg
 ```
 
-Setting the Disposable VM  to Dom0 works because it will use the
-`default_dispvm` preference of `qubes-builder`, which is `dvm-qubes-builder`.
-
-Setting the `gpg-client` explicitly to enforce the use of `split-gpg2`.
-
 ### Build Qusal
 
 **Warning**: development only.