From 1b6aeb4816a1458f88d91cd78ae97d32127bb3ff Mon Sep 17 00:00:00 2001 From: parulin <161326115+parulin@users.noreply.github.com> Date: Mon, 15 Sep 2025 04:25:12 -0400 Subject: [PATCH 1/2] Put a toctree inside the Windows index --- user/templates/windows/windows.rst | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/user/templates/windows/windows.rst b/user/templates/windows/windows.rst index 9b209cbb..78413c94 100644 --- a/user/templates/windows/windows.rst +++ b/user/templates/windows/windows.rst @@ -2,17 +2,15 @@ Windows qubes ============= - Like any other unmodified OSes, Windows can be installed in Qubes as an :doc:`HVM ` domain. -Qubes Windows Tools (QWT) are then usually installed to provide integration with the rest of the Qubes system; they also include Xen’s paravirtualized (PV) drivers to increase performance compared to qemu emulated devices. Alternatively, only Xen’s PV drivers can be installed if integration with Qubes isn’t required or if the tools aren’t supported on a given version of Windows. In the latter case, one would have to :ref:`enable inter-VM networking ` to be able to exchange files with HVMs. +:term:`Qubes Windows Tools (QWT)` are then usually installed to provide integration with the rest of the Qubes system; they also include Xen’s paravirtualized (PV) drivers to increase performance compared to qemu emulated devices. Alternatively, only Xen’s PV drivers can be installed if integration with Qubes isn’t required or if the tools aren’t supported on a given version of Windows. In the latter case, one would have to :ref:`enable networking between two qubes ` to be able to exchange files with HVMs. -For more information about Windows VMs in Qubes OS, please see the following external resources: +.. toctree:: + :caption: Windows related documentation + :maxdepth: 2 -- :doc:`Installing and Using Windows-based VMs ` - -- :doc:`Installing and Using Qubes Windows Tools ` - -- `Create a Gaming HVM in Qubes `__ - -- :doc:`Migrate Windows qubes from old Qubes versions ` + qubes-windows + qubes-windows-tools + Create a Gaming HVM in Qubes + qubes-windows-migrate From 7c8dc2c4f02a026e401d5dfa34e7e417027789e6 Mon Sep 17 00:00:00 2001 From: parulin <161326115+parulin@users.noreply.github.com> Date: Mon, 15 Sep 2025 04:42:34 -0400 Subject: [PATCH 2/2] Convert windows.rst to index.rst --- conf.py | 2 ++ index.rst | 2 +- introduction/intro.rst | 8 ++++---- user/how-to-guides/how-to-organize-your-qubes.rst | 2 +- user/templates/templates.rst | 2 +- user/templates/windows/{windows.rst => index.rst} | 0 6 files changed, 9 insertions(+), 7 deletions(-) rename user/templates/windows/{windows.rst => index.rst} (100%) diff --git a/conf.py b/conf.py index a0fcd220..05529c5d 100644 --- a/conf.py +++ b/conf.py @@ -47,6 +47,8 @@ redirects = { "https://www.qubes-os.org/doc/visual-style-guide/", "user/downloading-installing-upgrading/downloads": "https://www.qubes-os.org/downloads/", + "user/templates/windows/windows": + "/user/templates/windows/", } diff --git a/index.rst b/index.rst index 8acb0110..c9b46ed7 100644 --- a/index.rst +++ b/index.rst @@ -101,7 +101,7 @@ Core documentation for Qubes users. user/templates/debian/debian-upgrade user/templates/minimal-templates user/templates/xfce-templates - user/templates/windows/windows + user/templates/windows/index .. _troubleshooting: diff --git a/introduction/intro.rst b/introduction/intro.rst index 4b70a70b..d63ae4a6 100644 --- a/introduction/intro.rst +++ b/introduction/intro.rst @@ -15,7 +15,7 @@ single-user desktop computing. Qubes OS `leverages Xen-based virtualization `, have specific: - + - **Purposes:** with a predefined set of one or many isolated applications, for personal or professional projects, to manage the :doc:`network stack `, :doc:`the firewall `, or to fulfill other @@ -24,8 +24,8 @@ These qubes, which are implemented as :ref:`virtual machines (VMs)` or :doc:`stripped-down ` virtual machines based on popular operating systems, such as :doc:`Fedora `, :doc:`Debian `, and - :doc:`Windows `. - + :doc:`Windows `. + - **Levels of trust:** from complete to non-existent. All windows are displayed in a unified desktop environment with :doc:`unforgeable colored window borders ` so that different security levels are easily identifiable. @@ -51,7 +51,7 @@ Features - **Multiple operating systems** Use multiple operating systems at the same time, including :doc:`Fedora `, :doc:`Debian `, and - :doc:`Windows ` + :doc:`Windows ` - **Disposables** Create :doc:`disposables ` on the fly that self-destruct when shut down. diff --git a/user/how-to-guides/how-to-organize-your-qubes.rst b/user/how-to-guides/how-to-organize-your-qubes.rst index ec5a0251..a227a37a 100644 --- a/user/how-to-guides/how-to-organize-your-qubes.rst +++ b/user/how-to-guides/how-to-organize-your-qubes.rst @@ -102,7 +102,7 @@ After learning about all this, Carol decided that it was ultimately up to her to - **A qube for credit monitoring, credit reports, and credit history services.** Carol has worked hard to build up a good credit score, and she’s concerned about identity theft, so she has one qube dedicated to managing her free credit monitoring services and downloading her free annual credit reports. -- **Two qubes for taxes.** Carol has a :doc:`Windows qube ` for running her Windows-only tax software. She also has an offline vault where she stores all of her tax-related forms and documents, organized by year. +- **Two qubes for taxes.** Carol has a :doc:`Windows qube ` for running her Windows-only tax software. She also has an offline vault where she stores all of her tax-related forms and documents, organized by year. - **A qube for financial planning and tracking.** Carol loves spreadsheets, so this offline qube is where she maintains a master spreadsheet to track all of her investments and her savings rate. She also keeps her budgeting spreadsheet, insurance spreadsheet, and written investment policy statement here. This qube is based on a template with some additional productivity software, like LibreOffice and Gnumeric (so that Carol can run her own Monte Carlo simulations). diff --git a/user/templates/templates.rst b/user/templates/templates.rst index c709f466..4d8d6973 100644 --- a/user/templates/templates.rst +++ b/user/templates/templates.rst @@ -70,7 +70,7 @@ By installing these templates, you are trusting not only the Qubes developers an Windows ------- -Windows templates are constructed differently from Linux-based templates as Windows is a closed source system that can be modified only after installing. So it is not possible to provide preconfigured Windows templates for Qubes. The process of installing a Windows qube and connecting it to the Qubes environment via installing Qubes Windows Tools (QWT) is described in several chapters in :doc:`Windows qubes `. +Windows templates are constructed differently from Linux-based templates as Windows is a closed source system that can be modified only after installing. So it is not possible to provide preconfigured Windows templates for Qubes. The process of installing a Windows qube and connecting it to the Qubes environment via installing Qubes Windows Tools (QWT) is described in several chapters in :doc:`Windows qubes `. Installing ---------- diff --git a/user/templates/windows/windows.rst b/user/templates/windows/index.rst similarity index 100% rename from user/templates/windows/windows.rst rename to user/templates/windows/index.rst