QubesOS · maiska · Sep 16, 2025 · Sep 15, 2025 · Sep 16, 2025 · Sep 16, 2025
diff --git a/introduction/intro.rst b/introduction/intro.rst
@@ -14,8 +14,8 @@ Qubes OS is a free and open-source, security-oriented operating system for
 single-user desktop computing. Qubes OS `leverages Xen-based virtualization <https://wiki.xen.org/wiki/Xen_Project_Software_Overview>`__ to allow for the creation and management of isolated compartments called :term:`qubes <qube>`.
 
 
-These qubes, which are implemented as :ref:`virtual machines (VMs)<user/reference/glossary:vm>`, have specific:
-               
+These qubes, which are implemented as :term:`virtual machines (VMs)<VM>`, have specific:
+
 - **Purposes:** with a predefined set of one or many isolated
   applications, for personal or professional projects, to manage the
   :doc:`network stack </developer/system/networking>`, :doc:`the firewall </user/security-in-qubes/firewall>`, or to fulfill other

diff --git a/introduction/screenshots.rst b/introduction/screenshots.rst
@@ -29,7 +29,7 @@ In this example, the word processor runs in the “work” domain, which has bee
 
 |r2b3-windows-seamless-1.png|
 
-Qubes Release 2 can also run Windows AppVMs in seamless mode, integrated onto the common Qubes trusted desktop, just like Linux AppVMs! The seamless GUI integration has been introduced in Qubes R2 Beta 3. This requires :doc:`Qubes Windows Tools </user/templates/windows/qubes-windows-tools-4-1>` to be installed in the Windows VMs first.
+Qubes Release 2 can also run Windows AppVMs in seamless mode, integrated onto the common Qubes trusted desktop, just like Linux AppVMs! The seamless GUI integration has been introduced in Qubes R2 Beta 3. This requires :doc:`Qubes Windows Tools </user/templates/windows/qubes-windows-tools>` to be installed in the Windows VMs first.
 
 
 ----

diff --git a/user/advanced-topics/standalones-and-hvms.rst b/user/advanced-topics/standalones-and-hvms.rst
@@ -209,7 +209,7 @@ Set memory as appropriate and install the OS into this template in the same way
 
 You can then create a new qube using the new template. If you use this Template as is, then any HVMs based on it will effectively be disposables. All file system changes will be wiped when the HVM is shut down.
 
-Please see :ref:`this page <user/templates/windows/windows-qubes-4-1:windows as a template>` for specific advice on installing and using Windows-based templates.
+:ref:`user/templates/windows/qubes-windows:windows as a template` gives specific advice on installing and using Windows-based templates.
 
 Cloning HVMs
 ------------

diff --git a/user/how-to-guides/how-to-edit-a-policy.rst b/user/how-to-guides/how-to-edit-a-policy.rst
@@ -2,7 +2,7 @@
 How to edit a policy
 ====================
 
-There are three ways to edit a :ref:`policy <user/reference/glossary:policies>`:
+There are three ways to edit a :term:`policy <policies>`:
 
 * with :program:`Qubes OS Global Config`, the **recommended way** for the most common policies
-Original file line number
+Diff line change
@@ Expand Up @@
     |r2b3-windows-seamless-1.png|
-    Qubes Release 2 can also run Windows AppVMs in seamless mode, integrated onto the common Qubes trusted desktop, just like Linux AppVMs! The seamless GUI integration has been introduced in Qubes R2 Beta 3. This requires :doc:`Qubes Windows Tools </user/templates/windows/qubes-windows-tools-4-1>` to be installed in the Windows VMs first.
+    Qubes Release 2 can also run Windows AppVMs in seamless mode, integrated onto the common Qubes trusted desktop, just like Linux AppVMs! The seamless GUI integration has been introduced in Qubes R2 Beta 3. This requires :doc:`Qubes Windows Tools </user/templates/windows/qubes-windows-tools>` to be installed in the Windows VMs first.
     ----
@@ Expand Down @@