Fix merge conflicts

Author: s-makin

.github/CODEOWNERS

@@ -14,7 +14,7 @@ MIR/ @slyon @setharnold @joalif @didrocks @cpaelzer @MylesJP @pushkarnk
 # - TAs not required for SRU content approvals
 SRU/
 # - SRU team owns all SRU docs anywhere in the repo
-SRU/ @basak
+SRU/ @basak @enr0n @tjaalton @panlinux @julian-klode @raof @awhitcroft
 
 # Technical Board PR approvals
 # - TAs not required for Tech Board content approvals
@@ -39,7 +39,8 @@ community/ @aaronprisk @ilvipero
 **/dmb-*.md @cpaelzer @lvoytek @rbasak @utkarsh2102 @athos-ribeiro @bdrung @julian-klode
 
 # TAs' & special teams' ack required for changes to the CODEOWNERS file
-/.github/CODEOWNERS @s-makin @rkratky @slyon @setharnold @joalif @didrocks @cpaelzer @MylesJP @pushkarnk @panlinux @paride @ginggs @schopin-pro @mwhudson @utkarsh2102 @tjaalton @seb128 @raof @aaronprisk @ilvipero @basak @teward
+/.github/CODEOWNERS @s-makin @rkratky @slyon @setharnold @joalif @didrocks @cpaelzer @MylesJP @pushkarnk @panlinux @paride @ginggs @schopin-pro @mwhudson @utkarsh2102 @tjaalton @seb128 @raof @aaronprisk @ilvipero @basak @teward @enr0n @julian-klode @awhitcroft
 
 # +1 maintenance PR approvals
 plus-one-*.md @schopin-pro @s-makin @rkratky
+

.readthedocs.yaml

@@ -8,6 +8,9 @@ version: 2
 # Set the version of Python and other tools you might need
 build:
   os: ubuntu-24.04
+  apt_packages:
+    - graphviz
+    - distro-info
   tools:
     python: "3.13"
   jobs:
@@ -22,8 +25,6 @@ build:
       then
         exit 183;
       fi
-  apt_packages:
-    - distro-info
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:

docs/.custom_wordlist.txt

@@ -86,6 +86,7 @@ unapplied
 unapply
 unpatched
 unshareable
+unstaged
 update_excuses
 uploader
 uploaders

docs/SRU/explanation/index.rst

@@ -16,7 +16,7 @@ Contact the SRU team
 
 .. end-canonical-contact-admonition
 
-- If you **don't have upload access** to the archive, ask your sponsor for help in the first instance. For details, see `Sponsorship Process <https://wiki.ubuntu.com/SponsorshipProcess>`__.
+- If you **don't have upload access** to the archive, ask your sponsor for help in the first instance. For details, see :ref:`sponsorship`.
 
 - If you **don't have a sponsor**, you can use the `Ubuntu Patch Pilots <https://discourse.ubuntu.com/t/ubuntu-patch-pilots/37705>`__ Program. Ask a patch pilot in the following channels:
 

docs/SRU/howto/contact.rst

@@ -1,8 +1,20 @@
-How-to
-======
+.. _stable-release-updates:
+
+Stable Release Updates
+======================
 
 As a contributor, follow these guides to upload an SRU and to ensure that it works correctly.
 
+
+Introduction to SRU for contributors
+------------------------------------
+
+.. toctree::
+    :maxdepth: 1
+
+    introduction-to-sru
+
+
 Submit a package update
 -----------------------
 
@@ -16,6 +28,7 @@ You can submit a standard SRU that fixes a bug or a non-standard update such as
     prepare-special
     special
 
+
 Troubleshooting
 ---------------
 
@@ -29,6 +42,7 @@ Follow these guides if an issue occurs during the SRU or after its release.
     phasing
     regression
 
+
 Contact
 -------
 
@@ -38,4 +52,3 @@ You can discuss SRUs on the following public channels.
     :maxdepth: 1
 
     contact
-

docs/SRU/howto/index.rst

@@ -1,7 +1,7 @@
-.. _stable-release-updates:
+.. _introduction-to-sru:
 
-Stable Release Updates
-======================
+Introduction to SRU
+===================
 
 To fix newly discovered bugs and make updates after the publication of an :term:`Ubuntu Stable Release`, use the **Stable Release Update (SRU)** process.
 
@@ -67,4 +67,3 @@ Updates removal
 If a bug fixed by an update doesn't get any testing or verification feedback for 90 days, an automated "call for testing" comment is made on the bug report. If no testing occurs within an additional 15 days, totaling 105 days without any testing, the :term:`Stable Release Managers` removes the package from proposed and close the bug task as **Won't Fix**.
 
 Also, updates are removed from proposed if they introduce a non-trivial regression.
-

docs/how-ubuntu-is-made/processes/stable-release-updates.rst renamed to docs/SRU/howto/introduction-to-sru.rst

@@ -685,16 +685,25 @@ be taken to not leave the kernel with a mismatched firmware package.
 
 However, it is a very large package (over 500MiB in size), and making it
 instantly available in the -security pocket to all Ubuntu users in the world
-causes a lot of strain on the archive network and servers.
+via unattended-upgrades causes a lot of strain on the archive network
+and servers. The kernel team is working on that, but until then we need to
+mitigate the impact to all users.
 
-Therefore, once the verification is done and linux-firmware is ready to be
-released, it should first be released to the updates pocket. Then, after
-phasing has completed, it must be copied to the -security pocket by either
-an archive admin, or a security team member.
+Therefore, for now, once the verification is done and linux-firmware is ready
+to be (SRU) released we have to stagger the release to spread the load.
+
+* First it should be released to the updates pocket - allowing mirrors to sync
+  it and anyone running explicit updates to pick it up.
+
+* Then after phasing has completed, it must be copied to the -security pocket
+  by either an archive admin, or a security team member. That copy should also
+  be spread out over releases. The suggested delay in-between is 4 days,
+  which combined with the "avoid Friday" rule suggests Mon,Thu,Mon,... until
+  all are fully released.
 
 Note that this release process described above only applies to SRUs. Actual
 security updates to this package are not handled through the SRU process
-and remain unchanged.
+but will also need to follow the staged release until properly mitigated.
 
 wireless-regdb
 ~~~~~~~~~~~~~~

docs/SRU/reference/package-specific.rst

@@ -3,7 +3,7 @@
 Team rota
 ---------
 
-.. include:: /howto/contact.rst
+.. include:: /SRU/howto/contact.rst
    :start-after: start-canonical-contact-admonition
    :end-before: end-canonical-contact-admonition
 

docs/SRU/reference/rota.rst

@@ -1,9 +1,7 @@
-:relatedlinks: [Diátaxis](https://diataxis.fr/)
+.. _stable-release-updates-sru:
 
-.. _home:
-
-SRU documentation
-=================
+Stable Release Updates (SRU)
+============================
 
 .. A single sentence that says what the product is, succinctly and
    memorably.
@@ -38,74 +36,61 @@ in practice.
 
 ---------
 
-Getting started
----------------
+Learn how Canonical determines which updates qualify for SRUs, who supervises the update process, who contributes and what responsibilities they have.
 
-The basic SRU process consists of the following steps:
 
-.. include:: explanation/pipeline.rst
-   :start-line: 4
-   :end-before: See also
-
-For next steps, see :ref:`How-to → Perform a standard SRU <howto-perform-standard-sru>`.
+Which updates we release
+------------------------
 
-In this documentation
----------------------
+We follow strict rules to ensure that SRUs fix real-world problems and introduce no disruptions.
 
-.. grid:: 2
+.. toctree::
+    :maxdepth: 1
 
-   .. grid-item-card:: :doc:`How-to guides <howto/index>`
-      :columns: 12
-      :link: howto/index
-      :link-type: doc
+    explanation/principles
+    explanation/requirements
 
-      **Step-by-step guides** covering key operations and common tasks
 
-.. grid:: 2
-   :reverse:
+Who releases updates
+----------------------
 
-   .. grid-item-card:: :doc:`Reference <reference/index>`
-      :columns: 6
-      :link: reference/index
-      :link-type: doc
+The SRU team and other stakeholders review and release updates. Community members outside of Canonical can contribute in the process.
 
-      **Technical information** - specifications, APIs, architecture
+.. toctree::
+    :maxdepth: 1
 
-   .. grid-item-card:: :doc:`Explanation <explanation/index>`
-      :columns: 6
-      :link: explanation/index
-      :link-type: doc
+    explanation/pipeline
+    explanation/roles
 
-      **Discussion and clarification** of key topics
 
+Processes
 ---------
 
-Project and community
----------------------
+You must follow these rules when you upload a package update. Processes such as automatic tests, phasing and user reports prevent regressions in updates. Certain exceptions to standard processes are possible.
+
+.. toctree::
+    :maxdepth: 1
+
+    explanation/standard-processes
+    explanation/non-standard-processes
+    explanation/further-requirements
 
--  `Read our code of
-   conduct <https://ubuntu.com/community/ethos/code-of-conduct>`__: As a
-   community, we adhere to the Ubuntu code of conduct.
 
--  `Get
-   support <https://askubuntu.com/questions/tagged/stable-release-updates>`__:
-   Ask Ubuntu is a question and answer site for Ubuntu users and
-   developers.
+Getting started
+---------------
 
--  `Join our online
-   chat <https://matrix.to/#/#sru:ubuntu.com>`__: Meet us
-   in ``#sru:ubuntu.com`` on Matrix.
+The basic SRU process consists of the following steps:
 
--  `Report bugs <https://bugs.launchpad.net/sru-docs/+filebug>`__: We
-   want to know about the problems, so we can fix them.
+.. include:: explanation/pipeline.rst
+   :start-line: 4
+   :end-before: See also
+
+For next steps, see :ref:`How-to → Perform a standard SRU <howto-perform-standard-sru>`.
 
--  `Contribute documentation <https://launchpad.net/sru-docs>`__: The documentation sources in Launchpad.
 
 .. toctree::
    :hidden:
    :maxdepth: 2
 
-   howto/index
-   explanation/index
    reference/index
    internal