From 35b02c848cff6ca1786a9b9241c1fca8c73fbd9c Mon Sep 17 00:00:00 2001
From: Andrew David Wong <adw@andrewdavidwong.com>
Date: Sun, 4 Feb 2018 17:32:30 -0600
Subject: [PATCH] Reorganize and update CLI tool references pages for 4.0
Requested by: QubesOS/qubes-issues#3495
Requests: QubesOS/qubes-issues#3538
---
doc.md | 6 ++-
reference/dom0-tools.md | 37 ------------------
reference/tools.md | 13 +++++++
reference/tools/3.2/dom0.md | 39 +++++++++++++++++++
.../3.2/dom0}/qubes-dom0-update.md | 3 +-
.../3.2/dom0}/qubes-prefs.md | 3 +-
.../3.2/dom0}/qvm-add-appvm.md | 3 +-
.../3.2/dom0}/qvm-add-template.md | 3 +-
.../3.2/dom0}/qvm-backup-restore.md | 3 +-
.../3.2/dom0}/qvm-backup.md | 3 +-
.../3.2/dom0}/qvm-block.md | 4 +-
.../3.2/dom0}/qvm-clone.md | 3 +-
.../3.2/dom0}/qvm-create-default-dvm.md | 3 +-
.../3.2/dom0}/qvm-create.md | 3 +-
.../3.2/dom0}/qvm-firewall.md | 3 +-
.../3.2/dom0}/qvm-grow-private.md | 3 +-
.../3.2/dom0}/qvm-kill.md | 3 +-
.../{dom0-tools => tools/3.2/dom0}/qvm-ls.md | 3 +-
.../{dom0-tools => tools/3.2/dom0}/qvm-pci.md | 3 +-
.../3.2/dom0}/qvm-prefs.md | 3 +-
.../3.2/dom0}/qvm-remove.md | 3 +-
.../3.2/dom0}/qvm-revert-template-changes.md | 3 +-
.../{dom0-tools => tools/3.2/dom0}/qvm-run.md | 3 +-
.../3.2/dom0}/qvm-service.md | 3 +-
.../3.2/dom0}/qvm-shutdown.md | 3 +-
.../3.2/dom0}/qvm-start.md | 3 +-
.../3.2/dom0}/qvm-sync-appmenus.md | 3 +-
.../3.2/dom0}/qvm-template-commit.md | 3 +-
reference/tools/3.2/domU.md | 19 +++++++++
.../3.2/domU}/qvm-copy-to-vm.md | 3 +-
.../3.2/domU}/qvm-open-in-dvm.md | 3 +-
.../3.2/domU}/qvm-open-in-vm.md | 3 +-
.../{vm-tools => tools/3.2/domU}/qvm-run.md | 3 +-
reference/tools/4.0/dom0.md | 14 +++++++
reference/tools/4.0/domU.md | 14 +++++++
reference/tools/tools-3.2.md | 13 +++++++
reference/tools/tools-4.0.md | 13 +++++++
reference/vm-tools.md | 17 --------
38 files changed, 186 insertions(+), 84 deletions(-)
delete mode 100644 reference/dom0-tools.md
create mode 100644 reference/tools.md
create mode 100644 reference/tools/3.2/dom0.md
rename reference/{dom0-tools => tools/3.2/dom0}/qubes-dom0-update.md (92%)
rename reference/{dom0-tools => tools/3.2/dom0}/qubes-prefs.md (88%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-add-appvm.md (91%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-add-template.md (90%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-backup-restore.md (94%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-backup.md (89%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-block.md (90%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-clone.md (90%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-create-default-dvm.md (92%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-create.md (95%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-firewall.md (94%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-grow-private.md (87%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-kill.md (88%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-ls.md (93%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-pci.md (92%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-prefs.md (99%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-remove.md (90%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-revert-template-changes.md (86%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-run.md (95%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-service.md (98%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-shutdown.md (91%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-start.md (91%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-sync-appmenus.md (88%)
rename reference/{dom0-tools => tools/3.2/dom0}/qvm-template-commit.md (86%)
create mode 100644 reference/tools/3.2/domU.md
rename reference/{vm-tools => tools/3.2/domU}/qvm-copy-to-vm.md (88%)
rename reference/{vm-tools => tools/3.2/domU}/qvm-open-in-dvm.md (86%)
rename reference/{vm-tools => tools/3.2/domU}/qvm-open-in-vm.md (86%)
rename reference/{vm-tools => tools/3.2/domU}/qvm-run.md (89%)
create mode 100644 reference/tools/4.0/dom0.md
create mode 100644 reference/tools/4.0/domU.md
create mode 100644 reference/tools/tools-3.2.md
create mode 100644 reference/tools/tools-4.0.md
delete mode 100644 reference/vm-tools.md
diff --git a/doc.md b/doc.md
index 154fc482..08ddea76 100644
--- a/doc.md
+++ b/doc.md
@@ -176,8 +176,10 @@ Troubleshooting
Reference Pages
---------------
- * [Dom0 Command-Line Tools](/doc/dom0-tools/)
- * [DomU Command-Line Tools](/doc/vm-tools/)
+ * [Command-Line Tools: Qubes 3.2, dom0](/doc/tools/3.2/dom0/)
+ * [Command-Line Tools: Qubes 3.2, domU](/doc/tools/3.2/domU/)
+ * [Command-Line Tools: Qubes 4.0, dom0](/doc/tools/4.0/dom0/)
+ * [Command-Line Tools: Qubes 4.0, domU](/doc/tools/4.0/domU/)
* [Glossary of Qubes Terminology](/doc/glossary/)
* [Qubes Service Framework](/doc/qubes-service/)
* [Command Execution in VMs (and Qubes RPC)](/doc/qrexec/)
diff --git a/reference/dom0-tools.md b/reference/dom0-tools.md
deleted file mode 100644
index 458ec2ab..00000000
--- a/reference/dom0-tools.md
+++ /dev/null
@@ -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/)
-
diff --git a/reference/tools.md b/reference/tools.md
new file mode 100644
index 00000000..5febc899
--- /dev/null
+++ b/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)
diff --git a/reference/tools/3.2/dom0.md b/reference/tools/3.2/dom0.md
new file mode 100644
index 00000000..331c0754
--- /dev/null
+++ b/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/)
+
diff --git a/reference/dom0-tools/qubes-dom0-update.md b/reference/tools/3.2/dom0/qubes-dom0-update.md
similarity index 92%
rename from reference/dom0-tools/qubes-dom0-update.md
rename to reference/tools/3.2/dom0/qubes-dom0-update.md
index 03e3673e..97def7e6 100644
--- a/reference/dom0-tools/qubes-dom0-update.md
+++ b/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/
diff --git a/reference/dom0-tools/qubes-prefs.md b/reference/tools/3.2/dom0/qubes-prefs.md
similarity index 88%
rename from reference/dom0-tools/qubes-prefs.md
rename to reference/tools/3.2/dom0/qubes-prefs.md
index fe19f160..5368466f 100644
--- a/reference/dom0-tools/qubes-prefs.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-add-appvm.md b/reference/tools/3.2/dom0/qvm-add-appvm.md
similarity index 91%
rename from reference/dom0-tools/qvm-add-appvm.md
rename to reference/tools/3.2/dom0/qvm-add-appvm.md
index bd86d695..d061900e 100644
--- a/reference/dom0-tools/qvm-add-appvm.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-add-template.md b/reference/tools/3.2/dom0/qvm-add-template.md
similarity index 90%
rename from reference/dom0-tools/qvm-add-template.md
rename to reference/tools/3.2/dom0/qvm-add-template.md
index 2bef4299..81badcb2 100644
--- a/reference/dom0-tools/qvm-add-template.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-backup-restore.md b/reference/tools/3.2/dom0/qvm-backup-restore.md
similarity index 94%
rename from reference/dom0-tools/qvm-backup-restore.md
rename to reference/tools/3.2/dom0/qvm-backup-restore.md
index a1907025..5456f460 100644
--- a/reference/dom0-tools/qvm-backup-restore.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-backup.md b/reference/tools/3.2/dom0/qvm-backup.md
similarity index 89%
rename from reference/dom0-tools/qvm-backup.md
rename to reference/tools/3.2/dom0/qvm-backup.md
index a260317b..e5ff645c 100644
--- a/reference/dom0-tools/qvm-backup.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-block.md b/reference/tools/3.2/dom0/qvm-block.md
similarity index 90%
rename from reference/dom0-tools/qvm-block.md
rename to reference/tools/3.2/dom0/qvm-block.md
index efa3c1b1..25dcc759 100644
--- a/reference/dom0-tools/qvm-block.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-clone.md b/reference/tools/3.2/dom0/qvm-clone.md
similarity index 90%
rename from reference/dom0-tools/qvm-clone.md
rename to reference/tools/3.2/dom0/qvm-clone.md
index c3abd934..9ea56033 100644
--- a/reference/dom0-tools/qvm-clone.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-create-default-dvm.md b/reference/tools/3.2/dom0/qvm-create-default-dvm.md
similarity index 92%
rename from reference/dom0-tools/qvm-create-default-dvm.md
rename to reference/tools/3.2/dom0/qvm-create-default-dvm.md
index fe907fda..efd61e31 100644
--- a/reference/dom0-tools/qvm-create-default-dvm.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-create.md b/reference/tools/3.2/dom0/qvm-create.md
similarity index 95%
rename from reference/dom0-tools/qvm-create.md
rename to reference/tools/3.2/dom0/qvm-create.md
index 037fcdba..ea8db752 100644
--- a/reference/dom0-tools/qvm-create.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-firewall.md b/reference/tools/3.2/dom0/qvm-firewall.md
similarity index 94%
rename from reference/dom0-tools/qvm-firewall.md
rename to reference/tools/3.2/dom0/qvm-firewall.md
index ff1b5cab..bcc9cae2 100644
--- a/reference/dom0-tools/qvm-firewall.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-grow-private.md b/reference/tools/3.2/dom0/qvm-grow-private.md
similarity index 87%
rename from reference/dom0-tools/qvm-grow-private.md
rename to reference/tools/3.2/dom0/qvm-grow-private.md
index 360a3a5e..6b93a87c 100644
--- a/reference/dom0-tools/qvm-grow-private.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-kill.md b/reference/tools/3.2/dom0/qvm-kill.md
similarity index 88%
rename from reference/dom0-tools/qvm-kill.md
rename to reference/tools/3.2/dom0/qvm-kill.md
index cff5f038..9903453a 100644
--- a/reference/dom0-tools/qvm-kill.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-ls.md b/reference/tools/3.2/dom0/qvm-ls.md
similarity index 93%
rename from reference/dom0-tools/qvm-ls.md
rename to reference/tools/3.2/dom0/qvm-ls.md
index 643a19ef..13f4917f 100644
--- a/reference/dom0-tools/qvm-ls.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-pci.md b/reference/tools/3.2/dom0/qvm-pci.md
similarity index 92%
rename from reference/dom0-tools/qvm-pci.md
rename to reference/tools/3.2/dom0/qvm-pci.md
index 5dba5aee..d7aa69b1 100644
--- a/reference/dom0-tools/qvm-pci.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-prefs.md b/reference/tools/3.2/dom0/qvm-prefs.md
similarity index 99%
rename from reference/dom0-tools/qvm-prefs.md
rename to reference/tools/3.2/dom0/qvm-prefs.md
index eb053384..32850812 100644
--- a/reference/dom0-tools/qvm-prefs.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-remove.md b/reference/tools/3.2/dom0/qvm-remove.md
similarity index 90%
rename from reference/dom0-tools/qvm-remove.md
rename to reference/tools/3.2/dom0/qvm-remove.md
index 4e436dea..412ef8c3 100644
--- a/reference/dom0-tools/qvm-remove.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-revert-template-changes.md b/reference/tools/3.2/dom0/qvm-revert-template-changes.md
similarity index 86%
rename from reference/dom0-tools/qvm-revert-template-changes.md
rename to reference/tools/3.2/dom0/qvm-revert-template-changes.md
index 355d2e26..a0f62648 100644
--- a/reference/dom0-tools/qvm-revert-template-changes.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-run.md b/reference/tools/3.2/dom0/qvm-run.md
similarity index 95%
rename from reference/dom0-tools/qvm-run.md
rename to reference/tools/3.2/dom0/qvm-run.md
index eb7e8b8c..aee15e02 100644
--- a/reference/dom0-tools/qvm-run.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-service.md b/reference/tools/3.2/dom0/qvm-service.md
similarity index 98%
rename from reference/dom0-tools/qvm-service.md
rename to reference/tools/3.2/dom0/qvm-service.md
index e077265b..1d5b8192 100644
--- a/reference/dom0-tools/qvm-service.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-shutdown.md b/reference/tools/3.2/dom0/qvm-shutdown.md
similarity index 91%
rename from reference/dom0-tools/qvm-shutdown.md
rename to reference/tools/3.2/dom0/qvm-shutdown.md
index 1cd80810..d6769487 100644
--- a/reference/dom0-tools/qvm-shutdown.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-start.md b/reference/tools/3.2/dom0/qvm-start.md
similarity index 91%
rename from reference/dom0-tools/qvm-start.md
rename to reference/tools/3.2/dom0/qvm-start.md
index c66afa89..fc3cbfb5 100644
--- a/reference/dom0-tools/qvm-start.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-sync-appmenus.md b/reference/tools/3.2/dom0/qvm-sync-appmenus.md
similarity index 88%
rename from reference/dom0-tools/qvm-sync-appmenus.md
rename to reference/tools/3.2/dom0/qvm-sync-appmenus.md
index f1cee881..16095b72 100644
--- a/reference/dom0-tools/qvm-sync-appmenus.md
+++ b/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/
diff --git a/reference/dom0-tools/qvm-template-commit.md b/reference/tools/3.2/dom0/qvm-template-commit.md
similarity index 86%
rename from reference/dom0-tools/qvm-template-commit.md
rename to reference/tools/3.2/dom0/qvm-template-commit.md
index c0cdd8e5..12d4b19c 100644
--- a/reference/dom0-tools/qvm-template-commit.md
+++ b/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/
diff --git a/reference/tools/3.2/domU.md b/reference/tools/3.2/domU.md
new file mode 100644
index 00000000..71ae0db8
--- /dev/null
+++ b/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/)
+
diff --git a/reference/vm-tools/qvm-copy-to-vm.md b/reference/tools/3.2/domU/qvm-copy-to-vm.md
similarity index 88%
rename from reference/vm-tools/qvm-copy-to-vm.md
rename to reference/tools/3.2/domU/qvm-copy-to-vm.md
index e9ad5c17..2f720aa6 100644
--- a/reference/vm-tools/qvm-copy-to-vm.md
+++ b/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/
diff --git a/reference/vm-tools/qvm-open-in-dvm.md b/reference/tools/3.2/domU/qvm-open-in-dvm.md
similarity index 86%
rename from reference/vm-tools/qvm-open-in-dvm.md
rename to reference/tools/3.2/domU/qvm-open-in-dvm.md
index 17e77d82..53bd4cef 100644
--- a/reference/vm-tools/qvm-open-in-dvm.md
+++ b/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/
diff --git a/reference/vm-tools/qvm-open-in-vm.md b/reference/tools/3.2/domU/qvm-open-in-vm.md
similarity index 86%
rename from reference/vm-tools/qvm-open-in-vm.md
rename to reference/tools/3.2/domU/qvm-open-in-vm.md
index c8259c9b..80fa4a57 100644
--- a/reference/vm-tools/qvm-open-in-vm.md
+++ b/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/
diff --git a/reference/vm-tools/qvm-run.md b/reference/tools/3.2/domU/qvm-run.md
similarity index 89%
rename from reference/vm-tools/qvm-run.md
rename to reference/tools/3.2/domU/qvm-run.md
index 84a2a8bc..7ef27ea3 100644
--- a/reference/vm-tools/qvm-run.md
+++ b/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/
diff --git a/reference/tools/4.0/dom0.md b/reference/tools/4.0/dom0.md
new file mode 100644
index 00000000..3fb9d427
--- /dev/null
+++ b/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>
+
diff --git a/reference/tools/4.0/domU.md b/reference/tools/4.0/domU.md
new file mode 100644
index 00000000..a2ac1716
--- /dev/null
+++ b/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>
+
diff --git a/reference/tools/tools-3.2.md b/reference/tools/tools-3.2.md
new file mode 100644
index 00000000..47ffd430
--- /dev/null
+++ b/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/)
diff --git a/reference/tools/tools-4.0.md b/reference/tools/tools-4.0.md
new file mode 100644
index 00000000..1bd1937e
--- /dev/null
+++ b/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/)
diff --git a/reference/vm-tools.md b/reference/vm-tools.md
deleted file mode 100644
index bca5a278..00000000
--- a/reference/vm-tools.md
+++ /dev/null
@@ -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/)
-