Merge branch 'master' into spelling-grammar-fixes

Resolved conflicts in:
      basics_user/doc-guidelines.md
      basics_user/reporting-bugs.md
      common-tasks/backup-restore.md
      common-tasks/software-update-dom0.md
      common-tasks/software-update-vm.md
      common-tasks/usb.md
      configuration/disk-trim.md
      configuration/external-audio.md
      configuration/network-printer.md
      configuration/resize-disk-image.md
      configuration/resize-root-disk-image.md
      customization/fedora-minimal-template-customization.md
      managing-os/hvm.md
      managing-os/templates/archlinux.md
      privacy/whonix-install.md
      security/yubi-key.md
      troubleshooting/install-nvidia-driver.md
      troubleshooting/macbook-troubleshooting.md

reference/dom0-tools.md

@@ -1,37 +0,0 @@
----
-layout: doc
-title: Dom0 Tools
-permalink: /doc/dom0-tools/
-redirect_from:
-- /en/doc/dom0-tools/
-- /doc/DomZeroTools/
-- /wiki/DomZeroTools/
----
-
-QVM-tools:
-
--   [qubes-dom0-update](/doc/dom0-tools/qubes-dom0-update/)
--   [qubes-prefs](/doc/dom0-tools/qubes-prefs/)
--   [qvm-add-appvm](/doc/dom0-tools/qvm-add-appvm/)
--   [qvm-add-template](/doc/dom0-tools/qvm-add-template/)
--   [qvm-backup-restore](/doc/dom0-tools/qvm-backup-restore/)
--   [qvm-backup](/doc/dom0-tools/qvm-backup/)
--   [qvm-block](/doc/dom0-tools/qvm-block/)
--   [qvm-clone](/doc/dom0-tools/qvm-clone/)
--   [qvm-create-default-dvm](/doc/dom0-tools/qvm-create-default-dvm/)
--   [qvm-create](/doc/dom0-tools/qvm-create/)
--   [qvm-firewall](/doc/dom0-tools/qvm-firewall/)
--   [qvm-grow-private](/doc/dom0-tools/qvm-grow-private/)
--   [qvm-ls](/doc/dom0-tools/qvm-ls/)
--   [qvm-kill](/doc/dom0-tools/qvm-kill/)
--   [qvm-pci](/doc/dom0-tools/qvm-pci/)
--   [qvm-prefs](/doc/dom0-tools/qvm-prefs/)
--   [qvm-remove](/doc/dom0-tools/qvm-remove/)
--   [qvm-revert-template-changes](/doc/dom0-tools/qvm-revert-template-changes/)
--   [qvm-run](/doc/dom0-tools/qvm-run/)
--   [qvm-service](/doc/dom0-tools/qvm-service/)
--   [qvm-shutdown](/doc/dom0-tools/qvm-shutdown/)
--   [qvm-start](/doc/dom0-tools/qvm-start/)
--   [qvm-sync-appmenus](/doc/dom0-tools/qvm-sync-appmenus/)
--   [qvm-template-commit](/doc/dom0-tools/qvm-template-commit/)
-

reference/glossary.md

@@ -22,7 +22,7 @@ The main principle of Qubes OS is security by compartmentalization (or isolation
 VM
 --
 An abbreviation for "virtual machine." 
-A software implementation of a machine (for example, a computer) which executes programs like a physical machine.
+A software implementation of a machine (for example, a computer) that executes programs like a physical machine.
 
 Qube
 ----
@@ -62,34 +62,38 @@ By default, most domUs lack direct hardware access.
 TemplateVM
 ----------
 Template Virtual Machine. 
-Any [VM](#vm) which supplies its root filesystem to another VM. 
+Any [VM](#vm) that supplies its root filesystem to another VM. 
 TemplateVMs are intended for installing and updating software applications, but not for running them.
 
  * Colloquially, TemplateVMs are often referred to as "templates."
+ * Since every TemplateVM supplies its *own* root filesystem to at least one other VM, no TemplateVM can be based on another TemplateVM.
+   In other words, no TemplateVM is a [TemplateBasedVM](#templatebasedvm).
+ * Since every TemplateVM supplies its *root* filesystem to at least one other VM, no [DVM Template](#dvm-template) is a TemplateVM.
 
 TemplateBasedVM
 ---------------
-Any [VM](#vm) which depends on a [TemplateVM](#templatevm) for its root filesystem.
+Any [VM](#vm) that depends on a [TemplateVM](#templatevm) for its root filesystem.
 
 Standalone(VM)
 --------------
 Standalone (Virtual Machine). 
 In general terms, a [VM](#vm) is described as **standalone** if and only if it does not depend on any other VM for its root filesystem. 
 (In other words, a VM is standalone if and only if it is not a TemplateBasedVM.) 
-More specifically, a **StandaloneVM** is a type of VM in Qubes which is created by cloning a TemplateVM. 
+More specifically, a **StandaloneVM** is a type of VM in Qubes that is created by cloning a TemplateVM. 
 Unlike TemplateVMs, however, StandaloneVMs do not supply their root filesystems to other VMs. 
 (Therefore, while a TemplateVM is a type of standalone VM, it is not a StandaloneVM.)
 
 AppVM
 -----
 Application Virtual Machine. 
-A [VM](#vm) which is intended for running software applications. 
+A [VM](#vm) that is intended for running software applications. 
 Typically a TemplateBasedVM, but may be a StandaloneVM. Never a TemplateVM.
 
 NetVM
 -----
 Network Virtual Machine. 
-A type of [VM](#vm) which connects directly to a network and provides access to that network to other VMs which connect to the NetVM. 
+A type of [VM](#vm) that connects directly to a network.
+Other VMs gain access to a network by connecting to a NetVM (usually indirectly, via a [FirewallVM](#firewallvm)).
 A NetVM called `sys-net` is created by default in most Qubes installations.
 
 Alternatively, "NetVM" may refer to whichever VM is directly connected to a VM for networking purposes. 
@@ -98,18 +102,18 @@ For example, if `untrusted` is directly connected to `sys-firewall` for network
 ProxyVM
 -------
 Proxy Virtual Machine. 
-A type of [VM](#vm) which proxies network access for other VMs. 
-Typically, a ProxyVM sits between a NetVM and another VM (such as an AppVM or a TemplateVM) which requires network access.
+A type of [VM](#vm) that proxies network access for other VMs. 
+Typically, a ProxyVM sits between a NetVM and another VM (such as an AppVM or a TemplateVM) that requires network access.
 
 FirewallVM
 ----------
 Firewall Virtual Machine. 
-A type of [ProxyVM](#proxyvm) which is used to enforce network-level policies (a.k.a. "firewall rules"). 
+A type of [ProxyVM](#proxyvm) that is used to enforce network-level policies (a.k.a. "firewall rules"). 
 A FirewallVM called `sys-firewall` is created by default in most Qubes installations.
 
 DispVM
 ------
-[Disposable Virtual Machine]. A temporary [AppVM](#appvm) based on a [DVM Template](#dvm-template) which can quickly be created, used, and destroyed.
+[Disposable Virtual Machine]. A temporary [AppVM](#appvm) based on a [DVM Template](#dvm-template) that can quickly be created, used, and destroyed.
 
 DVM
 ---
@@ -117,12 +121,18 @@ An abbreviation of [DispVM](#dispvm), typically used to refer to [DVM Templates]
 
 DVM Template
 ------------
-TemplateBasedVMs on which [DispVMs](#dispvm) are based. 
+A type of [TemplateBasedVM](#templatebasedvm) on which [DispVMs](#dispvm) are based.
 By default, a DVM Template named `fedora-XX-dvm` is created on most Qubes installations (where `XX` is the Fedora version of the default TemplateVM). 
-DVM Templates are neither [TemplateVMs](#templatevm) nor [AppVMs](#appvm). 
-They are intended neither for installing nor running software. 
-Rather, they are intended for *customizing* or *configuring* software that has already been installed on the TemplateVM on which the DVM Template is based (see [DispVM Customization]). 
-This software is then intended to be run (in its customized state) in DispVMs that are based on the DVM Template.
+DVM Templates are not [TemplateVMs](#templatevm), since (being TemplateBasedVMs) they do not have root filesystems of their own to provide to other VMs.
+Rather, DVM Templates are complementary to TemplateVMs insofar as DVM Templates provide their own user filesystems to the DispVMs based on them.
+There are two main kinds of DVM Templates:
+
+ * **Dedicated** DVM Templates are intended neither for installing nor running software.
+   Rather, they are intended for *customizing* or *configuring* software that has already been installed on the TemplateVM on which the DVM Template is based (see [DispVM Customization]).
+   This software is then intended to be run (in its customized state) in DispVMs that are based on the DVM Template.
+ * **Non-dedicated** DVM Templates are typically [AppVMs](#appvm) on which DispVMs are based.
+   For example, an AppVM could be used to generate and store trusted data.
+   Then, a DispVM could be created based on the AppVM (thereby making the AppVM a DVM Template) so that the data can be analyzed by an untrusted program without jeopardizing the integrity of the original data.
 
 PV
 --
@@ -139,12 +149,12 @@ Although HVMs are typically slower than paravirtualized VMs due to the required
 
 StandaloneHVM
 -------------
-Any [HVM](#hvm) which is standalone (i.e., does not depend on any other VM for its root filesystem). 
+Any [HVM](#hvm) that is standalone (i.e., does not depend on any other VM for its root filesystem). 
 In Qubes, StandaloneHVMs are referred to simply as **HVMs**.
 
 TemplateHVM
 -----------
-Any [HVM](#hvm) which functions as a [TemplateVM](#templatevm) by supplying its root filesystem to other VMs. 
+Any [HVM](#hvm) that functions as a [TemplateVM](#templatevm) by supplying its root filesystem to other VMs. 
 In Qubes, TemplateHVMs are referred to as **HVM templates**.
 
 TemplateBasedHVM
@@ -157,6 +167,12 @@ Service Virtual Machine.
 A [VM](#vm) the primary purpose of which is to provide a service or services to other VMs. 
 NetVMs and ProxyVMs are examples of ServiceVMs.
 
+SystemVM
+--------
+System Virtual Machine.
+A synonym for [ServiceVM](#servicevm).
+SystemVMs usually have the prefix `sys-`.
+
 PVHVM
 -----
 [PV](#pv) on [HVM](#hvm). 

reference/tools.md

@@ -0,0 +1,13 @@
+---
+layout: doc
+title: Command-Line Tools
+permalink: /doc/tools/
+---
+
+Command-Line Tools
+==================
+
+Please see the page for your version of Qubes OS:
+
+ * [Qubes 4.0 Command-Line Tools](/doc/tools/4.0)
+ * [Qubes 3.2 Command-Line Tools](/doc/tools/3.2)

reference/tools/3.2/dom0.md

@@ -0,0 +1,39 @@
+---
+layout: doc
+title: Dom0 Command-Line Tools for Qubes 3.2
+permalink: /doc/tools/3.2/dom0/
+redirect_from:
+- /doc/tools/3.2/dom0/
+- /en/doc/tools/3.2/dom0/
+- /doc/DomZeroTools/
+- /wiki/DomZeroTools/
+---
+
+Dom0 Command-Line Tools for Qubes 3.2
+=====================================
+
+ * [qubes-dom0-update](/doc/tools/3.2/dom0/qubes-dom0-update/)
+ * [qubes-prefs](/doc/tools/3.2/dom0/qubes-prefs/)
+ * [qvm-add-appvm](/doc/tools/3.2/dom0/qvm-add-appvm/)
+ * [qvm-add-template](/doc/tools/3.2/dom0/qvm-add-template/)
+ * [qvm-backup-restore](/doc/tools/3.2/dom0/qvm-backup-restore/)
+ * [qvm-backup](/doc/tools/3.2/dom0/qvm-backup/)
+ * [qvm-block](/doc/tools/3.2/dom0/qvm-block/)
+ * [qvm-clone](/doc/tools/3.2/dom0/qvm-clone/)
+ * [qvm-create-default-dvm](/doc/tools/3.2/dom0/qvm-create-default-dvm/)
+ * [qvm-create](/doc/tools/3.2/dom0/qvm-create/)
+ * [qvm-firewall](/doc/tools/3.2/dom0/qvm-firewall/)
+ * [qvm-grow-private](/doc/tools/3.2/dom0/qvm-grow-private/)
+ * [qvm-ls](/doc/tools/3.2/dom0/qvm-ls/)
+ * [qvm-kill](/doc/tools/3.2/dom0/qvm-kill/)
+ * [qvm-pci](/doc/tools/3.2/dom0/qvm-pci/)
+ * [qvm-prefs](/doc/tools/3.2/dom0/qvm-prefs/)
+ * [qvm-remove](/doc/tools/3.2/dom0/qvm-remove/)
+ * [qvm-revert-template-changes](/doc/tools/3.2/dom0/qvm-revert-template-changes/)
+ * [qvm-run](/doc/tools/3.2/dom0/qvm-run/)
+ * [qvm-service](/doc/tools/3.2/dom0/qvm-service/)
+ * [qvm-shutdown](/doc/tools/3.2/dom0/qvm-shutdown/)
+ * [qvm-start](/doc/tools/3.2/dom0/qvm-start/)
+ * [qvm-sync-appmenus](/doc/tools/3.2/dom0/qvm-sync-appmenus/)
+ * [qvm-template-commit](/doc/tools/3.2/dom0/qvm-template-commit/)
+

reference/tools/3.2/dom0/qubes-dom0-update.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qubes-dom0-update
-permalink: /doc/dom0-tools/qubes-dom0-update/
+permalink: /doc/tools/3.2/dom0/qubes-dom0-update/
 redirect_from:
+- /doc/dom0-tools/qubes-dom0-update/
 - /en/doc/dom0-tools/qubes-dom0-update/
 - /doc/Dom0Tools/QubesDom0Update/
 - /wiki/Dom0Tools/QubesDom0Update/

reference/tools/3.2/dom0/qubes-prefs.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qubes-prefs
-permalink: /doc/dom0-tools/qubes-prefs/
+permalink: /doc/tools/3.2/dom0/qubes-prefs/
 redirect_from:
+- /doc/dom0-tools/qubes-prefs/
 - /en/doc/dom0-tools/qubes-prefs/
 - /doc/Dom0Tools/QubesPrefs/
 - /wiki/Dom0Tools/QubesPrefs/

reference/tools/3.2/dom0/qvm-add-appvm.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-add-appvm
-permalink: /doc/dom0-tools/qvm-add-appvm/
+permalink: /doc/tools/3.2/dom0/qvm-add-appvm/
 redirect_from:
+- /doc/dom0-tools/qvm-add-appvm/
 - /en/doc/dom0-tools/qvm-add-appvm/
 - /doc/Dom0Tools/QvmAddAppvm/
 - /wiki/Dom0Tools/QvmAddAppvm/

reference/tools/3.2/dom0/qvm-add-template.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-add-template
-permalink: /doc/dom0-tools/qvm-add-template/
+permalink: /doc/tools/3.2/dom0/qvm-add-template/
 redirect_from:
+- /doc/dom0-tools/qvm-add-template/
 - /en/doc/dom0-tools/qvm-add-template/
 - /doc/Dom0Tools/QvmAddTemplate/
 - /wiki/Dom0Tools/QvmAddTemplate/

reference/tools/3.2/dom0/qvm-backup-restore.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-backup-restore
-permalink: /doc/dom0-tools/qvm-backup-restore/
+permalink: /doc/tools/3.2/dom0/qvm-backup-restore/
 redirect_from:
+- /doc/dom0-tools/qvm-backup-restore/
 - /en/doc/dom0-tools/qvm-backup-restore/
 - /doc/Dom0Tools/QvmBackupRestore/
 - /wiki/Dom0Tools/QvmBackupRestore/

reference/tools/3.2/dom0/qvm-backup.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-backup
-permalink: /doc/dom0-tools/qvm-backup/
+permalink: /doc/tools/3.2/dom0/qvm-backup/
 redirect_from:
+- /doc/dom0-tools/qvm-backup/
 - /en/doc/dom0-tools/qvm-backup/
 - /doc/Dom0Tools/QvmBackup/
 - /wiki/Dom0Tools/QvmBackup/

reference/tools/3.2/dom0/qvm-block.md

@@ -1,8 +1,10 @@
 ---
 layout: doc
 title: qvm-block
-permalink: /doc/dom0-tools/qvm-block/
+permalink: /doc/tools/3.2/dom0/qvm-block/
 redirect_from:
+- /doc/dom0-tools/qvm-block/
+- /doc/dom0-tools/qvm-block/
 - /en/doc/dom0-tools/qvm-block/
 - /doc/Dom0Tools/QvmBlock/
 - /wiki/Dom0Tools/QvmBlock/

reference/tools/3.2/dom0/qvm-clone.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-clone
-permalink: /doc/dom0-tools/qvm-clone/
+permalink: /doc/tools/3.2/dom0/qvm-clone/
 redirect_from:
+- /doc/dom0-tools/qvm-clone/
 - /en/doc/dom0-tools/qvm-clone/
 - /doc/Dom0Tools/QvmClone/
 - /wiki/Dom0Tools/QvmClone/

reference/tools/3.2/dom0/qvm-create-default-dvm.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-create-default-dvm
-permalink: /doc/dom0-tools/qvm-create-default-dvm/
+permalink: /doc/tools/3.2/dom0/qvm-create-default-dvm/
 redirect_from:
+- /doc/dom0-tools/qvm-create-default-dvm/
 - /en/doc/dom0-tools/qvm-create-default-dvm/
 - /doc/Dom0Tools/QvmCreateDefaultDvm/
 - /wiki/Dom0Tools/QvmCreateDefaultDvm/

reference/tools/3.2/dom0/qvm-create.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-create
-permalink: /doc/dom0-tools/qvm-create/
+permalink: /doc/tools/3.2/dom0/qvm-create/
 redirect_from:
+- /doc/dom0-tools/qvm-create/
 - /en/doc/dom0-tools/qvm-create/
 - /doc/Dom0Tools/QvmCreate/
 - /wiki/Dom0Tools/QvmCreate/

reference/tools/3.2/dom0/qvm-firewall.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-firewall
-permalink: /doc/dom0-tools/qvm-firewall/
+permalink: /doc/tools/3.2/dom0/qvm-firewall/
 redirect_from:
+- /doc/dom0-tools/qvm-firewall/
 - /en/doc/dom0-tools/qvm-firewall/
 - /doc/Dom0Tools/QvmFirewall/
 - /wiki/Dom0Tools/QvmFirewall/

reference/tools/3.2/dom0/qvm-grow-private.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-grow-private
-permalink: /doc/dom0-tools/qvm-grow-private/
+permalink: /doc/tools/3.2/dom0/qvm-grow-private/
 redirect_from:
+- /doc/dom0-tools/qvm-grow-private/
 - /en/doc/dom0-tools/qvm-grow-private/
 - /doc/Dom0Tools/QvmGrowPrivate/
 - /wiki/Dom0Tools/QvmGrowPrivate/

reference/tools/3.2/dom0/qvm-kill.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-kill
-permalink: /doc/dom0-tools/qvm-kill/
+permalink: /doc/tools/3.2/dom0/qvm-kill/
 redirect_from:
+- /doc/dom0-tools/qvm-kill/
 - /en/doc/dom0-tools/qvm-kill/
 - /doc/Dom0Tools/QvmKill/
 - /wiki/Dom0Tools/QvmKill/

reference/tools/3.2/dom0/qvm-ls.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-ls
-permalink: /doc/dom0-tools/qvm-ls/
+permalink: /doc/tools/3.2/dom0/qvm-ls/
 redirect_from:
+- /doc/dom0-tools/qvm-ls/
 - /en/doc/dom0-tools/qvm-ls/
 - /doc/Dom0Tools/QvmLs/
 - /wiki/Dom0Tools/QvmLs/

reference/tools/3.2/dom0/qvm-pci.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-pci
-permalink: /doc/dom0-tools/qvm-pci/
+permalink: /doc/tools/3.2/dom0/qvm-pci/
 redirect_from:
+- /doc/dom0-tools/qvm-pci/
 - /en/doc/dom0-tools/qvm-pci/
 - /doc/Dom0Tools/QvmPci/
 - /wiki/Dom0Tools/QvmPci/

reference/tools/3.2/dom0/qvm-prefs.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-prefs
-permalink: /doc/dom0-tools/qvm-prefs/
+permalink: /doc/tools/3.2/dom0/qvm-prefs/
 redirect_from:
+- /doc/dom0-tools/qvm-prefs/
 - /en/doc/dom0-tools/qvm-prefs/
 - /doc/Dom0Tools/QvmPrefs/
 - /wiki/Dom0Tools/QvmPrefs/

reference/tools/3.2/dom0/qvm-remove.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-remove
-permalink: /doc/dom0-tools/qvm-remove/
+permalink: /doc/tools/3.2/dom0/qvm-remove/
 redirect_from:
+- /doc/dom0-tools/qvm-remove/
 - /en/doc/dom0-tools/qvm-remove/
 - /doc/Dom0Tools/QvmRemove/
 - /wiki/Dom0Tools/QvmRemove/

reference/tools/3.2/dom0/qvm-revert-template-changes.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-revert-template-changes
-permalink: /doc/dom0-tools/qvm-revert-template-changes/
+permalink: /doc/tools/3.2/dom0/qvm-revert-template-changes/
 redirect_from:
+- /doc/dom0-tools/qvm-revert-template-changes/
 - /en/doc/dom0-tools/qvm-revert-template-changes/
 - /doc/Dom0Tools/QvmRevertTemplateChanges/
 - /wiki/Dom0Tools/QvmRevertTemplateChanges/

reference/tools/3.2/dom0/qvm-run.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-run
-permalink: /doc/dom0-tools/qvm-run/
+permalink: /doc/tools/3.2/dom0/qvm-run/
 redirect_from:
+- /doc/dom0-tools/qvm-run/
 - /en/doc/dom0-tools/qvm-run/
 - /doc/Dom0Tools/QvmRun/
 - /wiki/Dom0Tools/QvmRun/

reference/tools/3.2/dom0/qvm-service.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-service
-permalink: /doc/dom0-tools/qvm-service/
+permalink: /doc/tools/3.2/dom0/qvm-service/
 redirect_from:
+- /doc/dom0-tools/qvm-service/
 - /en/doc/dom0-tools/qvm-service/
 - /doc/Dom0Tools/QvmService/
 - /wiki/Dom0Tools/QvmService/

reference/tools/3.2/dom0/qvm-shutdown.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-shutdown
-permalink: /doc/dom0-tools/qvm-shutdown/
+permalink: /doc/tools/3.2/dom0/qvm-shutdown/
 redirect_from:
+- /doc/dom0-tools/qvm-shutdown/
 - /en/doc/dom0-tools/qvm-shutdown/
 - /doc/Dom0Tools/QvmShutdown/
 - /wiki/Dom0Tools/QvmShutdown/

reference/tools/3.2/dom0/qvm-start.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-start
-permalink: /doc/dom0-tools/qvm-start/
+permalink: /doc/tools/3.2/dom0/qvm-start/
 redirect_from:
+- /doc/dom0-tools/qvm-start/
 - /en/doc/dom0-tools/qvm-start/
 - /doc/Dom0Tools/QvmStart/
 - /wiki/Dom0Tools/QvmStart/

reference/tools/3.2/dom0/qvm-sync-appmenus.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-sync-appmenus
-permalink: /doc/dom0-tools/qvm-sync-appmenus/
+permalink: /doc/tools/3.2/dom0/qvm-sync-appmenus/
 redirect_from:
+- /doc/dom0-tools/qvm-sync-appmenus/
 - /en/doc/dom0-tools/qvm-sync-appmenus/
 - /doc/Dom0Tools/QvmSyncAppmenus/
 - /wiki/Dom0Tools/QvmSyncAppmenus/

reference/tools/3.2/dom0/qvm-template-commit.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-template-commit
-permalink: /doc/dom0-tools/qvm-template-commit/
+permalink: /doc/tools/3.2/dom0/qvm-template-commit/
 redirect_from:
+- /doc/dom0-tools/qvm-template-commit/
 - /en/doc/dom0-tools/qvm-template-commit/
 - /doc/Dom0Tools/QvmTemplateCommit/
 - /wiki/Dom0Tools/QvmTemplateCommit/

reference/tools/3.2/domU.md

@@ -0,0 +1,19 @@
+---
+layout: doc
+title: DomU Command-Line Tools for Qubes 3.2
+permalink: /doc/tools/3.2/domU/
+redirect_from:
+- /doc/tools/3.2/domU/
+- /en/doc/tools/3.2/domU/
+- /doc/VmTools/
+- /wiki/VmTools/
+---
+
+DomU Command-Line Tools for Qubes 3.2
+=====================================
+
+ * [qvm-copy-to-vm](/doc/tools/3.2/domU/qvm-copy-to-vm/)
+ * [qvm-open-in-dvm](/doc/tools/3.2/domU/qvm-open-in-dvm/)
+ * [qvm-open-in-vm](/doc/tools/3.2/domU/qvm-open-in-vm/)
+ * [qvm-run](/doc/tools/3.2/domU/qvm-run/)
+

reference/tools/3.2/domU/qvm-copy-to-vm.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-copy-to-vm
-permalink: /doc/vm-tools/qvm-copy-to-vm/
+permalink: /doc/tools/3.2/domU/qvm-copy-to-vm/
 redirect_from:
+- /doc/vm-tools/qvm-copy-to-vm/
 - /en/doc/vm-tools/qvm-copy-to-vm/
 - /doc/VmTools/QvmCopyToVm/
 - /wiki/VmTools/QvmCopyToVm/

reference/tools/3.2/domU/qvm-open-in-dvm.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-open-in-dvm
-permalink: /doc/vm-tools/qvm-open-in-dvm/
+permalink: /doc/tools/3.2/domU/qvm-open-in-dvm/
 redirect_from:
+- /doc/vm-tools/qvm-open-in-dvm/
 - /en/doc/vm-tools/qvm-open-in-dvm/
 - /doc/VmTools/QvmOpenInDvm/
 - /wiki/VmTools/QvmOpenInDvm/

reference/tools/3.2/domU/qvm-open-in-vm.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-open-in-vm
-permalink: /doc/vm-tools/qvm-open-in-vm/
+permalink: /doc/tools/3.2/domU/qvm-open-in-vm/
 redirect_from:
+- /doc/vm-tools/qvm-open-in-vm/
 - /en/doc/vm-tools/qvm-open-in-vm/
 - /doc/VmTools/QvmOpenInVm/
 - /wiki/VmTools/QvmOpenInVm/

reference/tools/3.2/domU/qvm-run.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: qvm-run
-permalink: /doc/vm-tools/qvm-run/
+permalink: /doc/tools/3.2/domU/qvm-run/
 redirect_from:
+- /doc/vm-tools/qvm-run/
 - /en/doc/vm-tools/qvm-run/
 - /doc/VmTools/QvmRun/
 - /wiki/VmTools/QvmRun/

reference/tools/4.0/dom0.md

@@ -0,0 +1,14 @@
+---
+layout: doc
+title: Dom0 Command-Line Tools for Qubes 4.0
+permalink: /doc/tools/4.0/dom0/
+---
+
+Dom0 Command-Line Tools for Qubes 4.0
+=====================================
+
+Reference pages for these tools are being written.
+This page will be updated when they're available.
+
+Tracking issue: <https://github.com/QubesOS/qubes-issues/issues/3538>
+

reference/tools/4.0/domU.md

@@ -0,0 +1,14 @@
+---
+layout: doc
+title: DomU Command-Line Tools for Qubes 4.0
+permalink: /doc/tools/4.0/domU/
+---
+
+DomU Command-Line Tools for Qubes 4.0
+=====================================
+
+Reference pages for these tools are being written.
+This page will be updated when they're available.
+
+Tracking issue: <https://github.com/QubesOS/qubes-issues/issues/3538>
+

reference/tools/tools-3.2.md

@@ -0,0 +1,13 @@
+---
+layout: doc
+title: Qubes 3.2 Command-Line Tools
+permalink: /doc/tools/3.2/
+---
+
+Qubes 3.2 Command-Line Tools
+============================
+
+Please see the page for your desired domain:
+
+ * [Dom0 Command-Line Tools](/doc/tools/3.2/dom0/)
+ * [DomU Command-Line Tools](/doc/tools/3.2/domU/)

reference/tools/tools-4.0.md

@@ -0,0 +1,13 @@
+---
+layout: doc
+title: Qubes 4.0 Command-Line Tools
+permalink: /doc/tools/4.0/
+---
+
+Qubes 4.0 Command-Line Tools
+============================
+
+Please see the page for your desired domain:
+
+ * [Dom0 Command-Line Tools](/doc/tools/4.0/dom0/)
+ * [DomU Command-Line Tools](/doc/tools/4.0/domU/)

reference/vm-tools.md

@@ -1,17 +0,0 @@
----
-layout: doc
-title: VM Tools
-permalink: /doc/vm-tools/
-redirect_from:
-- /en/doc/vm-tools/
-- /doc/VmTools/
-- /wiki/VmTools/
----
-
-VM tools:
-
--   [qvm-copy-to-vm](/doc/vm-tools/qvm-copy-to-vm/)
--   [qvm-open-in-dvm](/doc/vm-tools/qvm-open-in-dvm/)
--   [qvm-open-in-vm](/doc/vm-tools/qvm-open-in-vm/)
--   [qvm-run](/doc/vm-tools/qvm-run/)
-