QubesOS · parulin · Sep 15, 2025 · Sep 15, 2025 · Sep 21, 2025 · Sep 28, 2025
diff --git a/conf.py b/conf.py
@@ -50,6 +50,8 @@
         "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":
@@ -156,3 +158,7 @@
 .. |debian-codename| replace:: bookworm
 .. |debian-version| replace:: 12
 """
+
+# -- -- Options for the nitpicky mode ----------------------------------------
+
+nitpicky = True
diff --git a/developer/releases/3_1/schedule.rst b/developer/releases/3_1/schedule.rst
@@ -3,7 +3,7 @@ Qubes R3.1 release schedule
 ===========================
 
 
-This schedule is based on :ref:`Version Scheme <developer/releases/version-scheme:release schedule>`.
+This schedule is based on our :ref:`release-schedule-policy`.
 
 .. list-table::
    :widths: 38 38

diff --git a/developer/releases/3_2/schedule.rst b/developer/releases/3_2/schedule.rst
@@ -3,7 +3,7 @@ Qubes R3.2 release schedule
 ===========================
 
 
-This schedule is based on :ref:`Version Scheme <developer/releases/version-scheme:release schedule>`.
+This schedule is based on our :ref:`release-schedule-policy`.
 
 .. list-table::
    :widths: 38 38

diff --git a/developer/releases/4_0/schedule.rst b/developer/releases/4_0/schedule.rst
@@ -3,7 +3,7 @@ Qubes R4.0 release schedule
 ===========================
 
 
-This schedule is based on :ref:`Version Scheme <developer/releases/version-scheme:release schedule>`.
+This schedule is based on our :ref:`release-schedule-policy`.
 
 .. list-table::
    :widths: 88 88

diff --git a/developer/releases/4_1/schedule.rst b/developer/releases/4_1/schedule.rst
@@ -3,7 +3,7 @@ Qubes R4.1 release schedule
 ===========================
 
 
-The table below is based on our :ref:`release schedule policy <developer/releases/version-scheme:release schedule>`.
+The table below is based on our :ref:`release-schedule-policy`.
 
 .. list-table::
    :widths: 10 10

diff --git a/developer/releases/4_2/schedule.rst b/developer/releases/4_2/schedule.rst
@@ -2,10 +2,7 @@
 Qubes R4.2 release schedule
 ===========================
 
-
-**Please note:** *This page is still an unfinished draft in progress. It is being updated as Qubes 4.2 development and testing continues.*
-
-The table below is based on our :ref:`release schedule policy <developer/releases/version-scheme:release schedule>`.
+The table below is based on our :ref:`release-schedule-policy`.
 
 .. list-table::
    :widths: 10 10

diff --git a/developer/releases/4_3/schedule.rst b/developer/releases/4_3/schedule.rst
@@ -3,9 +3,13 @@ Qubes R4.3 release schedule
 ===========================
 
 
-**Please note:** *This page is still an unfinished draft in progress. It is being updated as Qubes 4.3 development and testing continues.*
+.. note::
 
-The table below is based on our :ref:`release schedule policy <developer/releases/version-scheme:release schedule>`.
+   This page is still an **unfinished draft in progress**. It is being updated as Qubes 4.3 development and testing continues.
+
+   To get the latest news, check the `news on the main website <https://www.qubes-os.org/news/>`_.
+
+The table below is based on our :ref:`release-schedule-policy`.
 
 .. list-table::
    :widths: 10 10
@@ -15,9 +19,9 @@ The table below is based on our :ref:`release schedule policy <developer/release
    * - Date
      - Stage
    * - 2025-08-10
-     - 4.3.0-rc1 release
+     - `4.3.0-rc1 release <https://www.qubes-os.org/news/2025/08/10/qubes-os-4-3-0-rc1-available-for-testing/>`_
    * - 2025-09-19
-     - 4.3.0-rc2 release
-   * - 2025-10-20
-     - 4.3.0-rc3 release
+     - `4.3.0-rc2 release <https://www.qubes-os.org/news/2025/09/19/qubes-os-4-3-0-rc2-available-for-testing/>`_
+
+A 4.3.0-rc3 release will follow the 4.3.0-rc2.
 
diff --git a/developer/releases/version-scheme.rst b/developer/releases/version-scheme.rst
@@ -29,15 +29,19 @@ When enough progress has been made, we announce the first stable release, e.g. `
 
 Please see :doc:`issue tracking </introduction/issue-tracking>` for information about how releases are handled in the issue tracker.
 
-Release schedule
-----------------
+.. _release-schedule-policy:
+
+Release schedule policy
+-----------------------
 
 
-There is no specific schedule for releases other than a general roadmap. When the time comes, we declare a feature freeze, tag ``-rc1``, and release an ISO. From this point on, no new features are accepted, and our schedule begins.
+There is **no specific schedule for releases** other than a general roadmap. When the time comes, we declare a feature freeze, tag ``-rc1``, and release an ISO. From this point on, no new features are accepted, and our schedule begins.
 
-Each release candidate period is as follows: For the first two weeks, we accept and assign bug reports to be fixed before the next release candidate. For the next two weeks, we generally focus on fixing assigned bug reports, so issues discovered during this period may be postponed until a later RC. Finally, there is a one week current-testing freeze, during which time no new packages are released, in the hope that they will be installed and tested by wider user base.
+Each release candidate period is as follows:
 
-The next RC is released five weeks after the former. All packages are published in the ``current`` repository, and the cycle starts over. There should always be at least one release candidate before the final release.
+1. For the first two weeks, **we accept and assign bug reports** to be fixed before the next release candidate.
+2. For the next two weeks, we generally **focus on fixing assigned bug reports**, so issues discovered during this period may be postponed until a later RC.
+3. Finally, there is a one week current-testing freeze, during which time **no new packages are released**, in the hope that they will be installed and tested by wider user base.
 
 .. list-table::
    :widths: 26 26
@@ -53,9 +57,12 @@ The next RC is released five weeks after the former. All packages are published
    * - ``current-testing`` freeze
      - one week
 
+The next RC is usually **released five weeks after the former**. All packages are published in the ``current`` repository, and the cycle starts over. There should always be at least one release candidate before the final release.
 
 Starting with the second cycle (that is, after ``-rc1``), two weeks into the cycle (after the primary bug-reporting period), we decide whether there should be another RC. If, based on the bugs that have been reported, we decide that the latest RC will be designated as the stable release, then we decide on its release date, which should be no more than one week later.
 
+To get a real life example, check the :doc:`4_1/schedule`.
+
 |Release cycle|
 
 Bug priorities

diff --git 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
@@ -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.

diff --git a/project-security/verifying-signatures.rst b/project-security/verifying-signatures.rst
@@ -647,7 +647,7 @@ Why am I getting "CRC error; […] no signature found […]"?
 You’re not verifying against the correct :ref:`detached PGP signature file <project-security/verifying-signatures:how to verify detached pgp signatures on qubes isos>`, or the signature file has been modified. Try downloading it again or from a different source.
 
 Do I have to verify both the :ref:`detached PGP signature file <project-security/verifying-signatures:how to verify detached pgp signatures on qubes isos>` and the :ref:`cryptographic hash values <project-security/verifying-signatures:how to verify the cryptographic hash values of qubes isos>`?
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
 No, either method is sufficient by itself, but you can do both if you like.

diff --git a/user/advanced-topics/resize-disk-image.rst b/user/advanced-topics/resize-disk-image.rst
@@ -28,8 +28,8 @@ In case of template-based qubes, the private storage (the /home directory and us
 .. _increasing-the-size-of-disk-images-1:
 
 
-Increasing the size of Disk Images
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Increasing the size of Disk Images with :program:`qvm-volume`
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
 

diff --git 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 </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).
 

diff --git a/user/how-to-guides/how-to-set-a-wallpaper.rst b/user/how-to-guides/how-to-set-a-wallpaper.rst
@@ -15,7 +15,9 @@ In default Qubes OS installation, you can use the default XFCE screenshot tool (
 .. figure:: /attachment/doc/howto-screenshot-1.png
    :alt: image of Qubes Menu with the page for Other tools open and the Screenshot tool highlighted
    :align: center
+
 |
+
 .. figure:: /attachment/doc/howto-screenshot-2.png
    :alt: image of the default XFCE screenshot tool
    :align: center

diff --git 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 </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
 ----------

diff --git a/user/templates/windows/index.rst b/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
diff --git a/user/templates/windows/windows.rst b/user/templates/windows/windows.rst
-Original file line number
+Diff line change
@@ Expand Up @@
     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
     ----------
@@ Expand Down @@