Merge remote-tracking branch 'origin/windows-toctree' into nitpicky-mode

conf.py

@@ -50,6 +50,8 @@ redirects = {
         "https://www.qubes-os.org/downloads/",
 
     # user/templates/windows URLs
+    "user/templates/windows/windows":
+        "/user/templates/windows/",
     "user/templates/windows/windows-qubes-4-1":
         "qubes-windows.html",
     "user/templates/windows/windows-qubes-4-0":

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:

introduction/intro.rst

@@ -17,7 +17,7 @@ These qubes, which are implemented as :term:`virtual machines (VMs) <vm>`, have
 
 - **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 user-defined purposes.
 
-- **Natures:** :doc:`full-fledged </user/advanced-topics/standalones-and-hvms>` or :doc:`stripped-down </introduction/getting-started/>` virtual machines based on popular operating systems, such as :doc:`Fedora </user/templates/fedora/fedora>`, :doc:`Debian </user/templates/debian/debian>`, and :doc:`Windows </user/templates/windows/windows>`.
+- **Natures:** :doc:`full-fledged </user/advanced-topics/standalones-and-hvms>` or :doc:`stripped-down </introduction/getting-started/>` virtual machines based on popular operating systems, such as :doc:`Fedora </user/templates/fedora/fedora>`, :doc:`Debian </user/templates/debian/debian>`, and :doc:`Windows </user/templates/windows/index>`.
 
 - **Levels of trust:** from complete to non-existent. All windows are displayed in a unified desktop environment with :doc:`unforgeable colored window borders </introduction/getting-started>` so that different security levels are easily identifiable.
 
@@ -38,7 +38,7 @@ Template system
    Use :term:`app qubes <app qube>` to share a root file system without sacrificing security using the innovative :doc:`Template system </user/templates/templates>`.
 
 Multiple operating systems
-   Use multiple operating systems at the same time, including :doc:`Fedora </user/templates/fedora/fedora>`, :doc:`Debian </user/templates/debian/debian/>`, and :doc:`Windows </user/templates/windows/windows>`
+   Use multiple operating systems at the same time, including :doc:`Fedora </user/templates/fedora/fedora>`, :doc:`Debian </user/templates/debian/debian/>`, and :doc:`Windows </user/templates/windows/index>`
 
 :term:`Disposables <disposable>`
    Create :doc:`disposables </user/how-to-guides/how-to-use-disposables>` on the fly that self-destruct when shut down.

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 </user/templates/windows/windows>` 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 </user/templates/windows/index>` 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).
 

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 </user/templates/windows/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 </user/templates/windows/index>`.
 
 Installing
 ----------

user/templates/windows/index.rst

@@ -0,0 +1,16 @@
+=============
+Windows qubes
+=============
+
+Like any other unmodified OSes, Windows can be installed in Qubes as an :doc:`HVM </user/advanced-topics/standalones-and-hvms>` domain.
+
+: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 <user/security-in-qubes/firewall:enabling networking between two qubes>` to be able to exchange files with HVMs.
+
+.. toctree::
+   :caption: Windows related documentation
+   :maxdepth: 2
+
+   qubes-windows
+   qubes-windows-tools
+   Create a Gaming HVM in Qubes <https://forum.qubes-os.org/t/create-a-gaming-hvm/19000>
+   qubes-windows-migrate

user/templates/windows/windows.rst

@@ -1,18 +0,0 @@
-=============
-Windows qubes
-=============
-
-
-Like any other unmodified OSes, Windows can be installed in Qubes as an :doc:`HVM </user/advanced-topics/standalones-and-hvms>` 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 <user/security-in-qubes/firewall:enabling 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:
-
-- :doc:`Installing and Using Windows-based VMs </user/templates/windows/qubes-windows>`
-
-- :doc:`Installing and Using Qubes Windows Tools </user/templates/windows/qubes-windows-tools>`
-
-- `Create a Gaming HVM in Qubes <https://forum.qubes-os.org/t/create-a-gaming-hvm/19000>`__
-
-- :doc:`Migrate Windows qubes from old Qubes versions </user/templates/windows/qubes-windows-migrate>`