From 49c9f9c11c3e5a5a5a2b2048e76aed2f712b14e4 Mon Sep 17 00:00:00 2001
From: qubedmaiska <qubedmaiska@protonmail.com>
Date: Sat, 16 Aug 2025 09:17:57 -0400
Subject: [PATCH] Remove obsolete prompts, extract session comments to
 instructions

---
 project-security/verifying-signatures.rst    | 10 ++++-----
 user/advanced-topics/secondary-storage.rst   | 13 +++---------
 user/templates/windows/windows-qubes-4-0.rst | 22 ++++++++++++++++----
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/project-security/verifying-signatures.rst b/project-security/verifying-signatures.rst
index c7903060..b03ec0b5 100644
--- a/project-security/verifying-signatures.rst
+++ b/project-security/verifying-signatures.rst
@@ -426,11 +426,11 @@ Download both the ISO and its signature file. Put both of them in the same direc
 .. code:: console
 
       $ gpg2 -v --verify Qubes-RX-x86_64.iso.asc Qubes-RX-x86_64.iso
-      $ gpg: armor header: Version: GnuPG v1
-      $ gpg: Signature made <TIME> using RSA key ID 03FA5082
-      $ gpg: using PGP trust model
-      $ gpg: Good signature from "Qubes OS Release X Signing Key"
-      $ gpg: binary signature, digest algorithm SHA256
+      gpg: armor header: Version: GnuPG v1
+      gpg: Signature made <TIME> using RSA key ID 03FA5082
+      gpg: using PGP trust model
+      gpg: Good signature from "Qubes OS Release X Signing Key"
+      gpg: binary signature, digest algorithm SHA256
 
 
 This is just an example, so the output you receive will not look exactly the same. What matters is the line that says ``Good signature from "Qubes OS Release X Signing Key"``. This confirms that the signature on the ISO is good.
diff --git a/user/advanced-topics/secondary-storage.rst b/user/advanced-topics/secondary-storage.rst
index a66561b3..df3e0664 100644
--- a/user/advanced-topics/secondary-storage.rst
+++ b/user/advanced-topics/secondary-storage.rst
@@ -54,13 +54,10 @@ First, collect some information in a dom0 terminal:
       $ sudo lvs
 
 
-Take note of the VG and thin pool names for your second drive., then register it with Qubes:
+Take note of the VG and thin pool names for your second drive, then register it with Qubes, where ``<pool_name>`` is a freely chosen pool name, ``<vg_name>`` is LVM volume group name and ``<thin_pool_name>`` is LVM thin pool name:
 
 .. code:: console
 
-      # <pool_name> is a freely chosen pool name
-      # <vg_name> is LVM volume group name
-      # <thin_pool_name> is LVM thin pool name
       $ qvm-pool --add <pool_name> lvm_thin -o volume_group=<vg_name>,thin_pool=<thin_pool_name>,revisions_to_keep=2
 
 
@@ -79,12 +76,10 @@ It is possible to use an existing Btrfs storage if it is configured. In dom0, av
       btrfs show filesystem
 
 
-To register the storage to qubes:
+To register the storage to qubes use the following command where ``<pool_name>`` is a freely chosen pool name adn ``<dir_path>`` is the mounted path to the second btrfs storage:
 
 .. code:: console
 
-      # <pool_name> is a freely chosen pool name
-      # <dir_path> is the mounted path to the second btrfs storage
       $ qvm-pool --add <pool_name> file-reflink -o dir_path=<dir_path>,revisions_to_keep=2
 
 
@@ -206,12 +201,10 @@ Unmount the temporary Btrfs filesystem:
       $ rmdir /mnt/new_qube_storage
 
 
-Mount the subvolume with compression enabled if desired:
+Mount the subvolume with compression enabled if desired, where ``<compression>`` can take the values ``zlib|lzo|zstd``. ``<subvol>`` is a btrfs subvolume "qubes" in this example.
 
 .. code:: console
 
-      # <compression> zlib|lzo|zstd
-      # <subvol> btrfs subvolume "qubes" in this example
       $ sudo mount /dev/mapper/luks-b20975aa-8318-433d-8508-6c23982c6cde /var/lib/qubes_newpool -o compress=<compression>,subvol=qubes
 
 
diff --git a/user/templates/windows/windows-qubes-4-0.rst b/user/templates/windows/windows-qubes-4-0.rst
index d46ba553..6173a812 100644
--- a/user/templates/windows/windows-qubes-4-0.rst
+++ b/user/templates/windows/windows-qubes-4-0.rst
@@ -147,7 +147,6 @@ An unofficial, third-party tool for automating this process is available `here <
 Summary
 ^^^^^^^
 
-
 .. code:: console
 
       $ qvm-create --class StandaloneVM --label red --property virt_mode=hvm win7new
@@ -158,14 +157,29 @@ Summary
       $ qvm-prefs win7new debug true
       $ qvm-features win7new video-model cirrus
       $ qvm-start --cdrom=untrusted:/home/user/windows_install.iso win7new
-      # restart after the first part of the windows installation process ends
+
+
+Restart after the first part of the windows installation process ends:
+
+.. code:: console
+
       $ qvm-start win7new
-      # once Windows is installed and working
+
+
+Once Windows is installed and working:
+
+.. code:: console
+
       $ qvm-prefs win7new memory 2048
       $ qvm-prefs win7new maxmem 2048
       $ qvm-features --unset win7new video-model
       $ qvm-prefs win7new qrexec_timeout 300
-      # with Qubes Windows Tools installed:
+
+
+With Qubes Windows Tools installed:
+
+.. code:: console
+
       $ qvm-prefs win7new debug false