From b7db91c4177c4fb0fa6b31d83ec551e20ba1e708 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 16 2023 13:41:30 +0000
Subject: [PATCH 1/3] *: Remove all '.Note' and '.Warning'


Those elements are no longer needed.

---

diff --git a/modules/release_guide/pages/beta_RC_compose.adoc b/modules/release_guide/pages/beta_RC_compose.adoc
index c0a343c..285b77e 100644
--- a/modules/release_guide/pages/beta_RC_compose.adoc
+++ b/modules/release_guide/pages/beta_RC_compose.adoc
@@ -34,7 +34,6 @@ the output from the previous step. Consult the request ticket for the
 list of builds expected in this output.
 +
 [NOTE]
-.Note
 ====
 The very first run of an Beta, or GA compose should have no builds
 listed under the compose tag. It is important to clear pre-existing
@@ -49,7 +48,6 @@ $ koji untag-build --all f{branched}-compose [build1 build2 ...]
 ====
 +
 [NOTE]
-.Note
 ====
 The order in which packages are added into the
 f{branched}-compose tag matter. If the builds are untagged
@@ -64,7 +62,6 @@ $ koji tag-build f{branched}-compose [build1 build2 ...]
 ....
 +
 [NOTE]
-.Note
 ====
 These steps may be completed on a local machine as long as the user has
 appropriate permissions in the koji tool.
@@ -123,7 +120,6 @@ The numbering scheme begins with 1.1 and the second number is
 incremented after each compose.
 +
 [NOTE]
-.Note
 ====
 Pungi requires numbers in the format #.# as an argument. It is because
 of this that composes always start with the number 1 and the second
@@ -131,7 +127,6 @@ number is incremented with each compose.
 ====
 +
 [NOTE]
-.Note
 ====
 If the compose fails with a directory missing error, then create the
 compose directory with `mkdir /mnt/koji/compose/{branched}`
@@ -174,7 +169,6 @@ $ ls /mnt/koji/compose/{branched}/[compose_id]
 ....
 +
 [NOTE]
-.Note
 ====
 Take care executing the synchronization if the next compose is already
 running. Be sure to grab the correct directory.
@@ -196,7 +190,6 @@ $ sudo -u ftpsync sh -c 'for dir in Everything Cloud Container Kinoite Labs Modu
 ....
 +
 [NOTE]
-.Note
 ====
 If multiple composes are run like 1.2, 1.3, add multiple --link-dest
 arguments above with multiple composes
diff --git a/modules/release_guide/pages/beta_freeze.adoc b/modules/release_guide/pages/beta_freeze.adoc
index e8ad880..1a0b165 100644
--- a/modules/release_guide/pages/beta_freeze.adoc
+++ b/modules/release_guide/pages/beta_freeze.adoc
@@ -50,7 +50,6 @@ $ bodhi releases create --name F{branched}M --long-name "Fedora {branched} Modul
 Please update fas account username in above command.
 
 [WARNING]
-.Warning
 ====
 Due to a https://github.com/fedora-infra/bodhi/issues/2177[bug] in
 Bodhi, it is critical that Bodhi processes be restarted any time
@@ -58,7 +57,6 @@ Bodhi, it is critical that Bodhi processes be restarted any time
 ====
 
 [NOTE]
-.Note
 ====
 Add the container and flatpak releases if they weren't already added to
 bodhi
@@ -132,7 +130,6 @@ During feezes we need to push to stable builds included in the compose.
 QA will file a ticket with the nvrs to push.
 
 [NOTE]
-.Note
 ====
 If you are pushing a bodhi update that contains multiple builds, you
 need only pass bodhi-push a single build nvr and all the others in that
diff --git a/modules/release_guide/pages/beta_release.adoc b/modules/release_guide/pages/beta_release.adoc
index 4cc33d4..987546b 100644
--- a/modules/release_guide/pages/beta_release.adoc
+++ b/modules/release_guide/pages/beta_release.adoc
@@ -21,8 +21,6 @@ $ sh scripts/stage-release.sh {branched}_Beta Fedora-{branched}-YYYYMMDD.0 _Beta
 Please update YYYYMMDD in the above command accordingly.
 
 [NOTE]
-.Note
-
 ====
 Make sure to grab the directory size usage numbers which is used to send
 an email to [.title-ref]#mirror-admin@lists.fedoraproject.org# list.
diff --git a/modules/release_guide/pages/contributing.adoc b/modules/release_guide/pages/contributing.adoc
index d52e183..3ebe242 100644
--- a/modules/release_guide/pages/contributing.adoc
+++ b/modules/release_guide/pages/contributing.adoc
@@ -36,7 +36,6 @@ $ git remote add upstream https://pagure.io/releng.git
 ----
 
 [NOTE]
-.Note
 ====
 If you are not currently familiar with git, it is highly recommended to
 visit git's upstream and familiarize yourself.
diff --git a/modules/release_guide/pages/mass_rebuild.adoc b/modules/release_guide/pages/mass_rebuild.adoc
index c116577..c81043c 100644
--- a/modules/release_guide/pages/mass_rebuild.adoc
+++ b/modules/release_guide/pages/mass_rebuild.adoc
@@ -81,7 +81,6 @@ maintainers:
 * How to opt out of the mass rebuild
 
 [NOTE,subs="attributes+"]
-.Note
 ====
 See https://fedoraproject.org/wiki/Fedora_{branched}_Mass_Rebuild[the Fedora {branched}
 Wiki example].
@@ -94,7 +93,6 @@ Send out the same information posted on the wiki to the
 [.title-ref]#devel-announce@lists.fedoraproject.org# mailing list.
 
 [NOTE]
-.Note
 ====
 See the template in releng repository
 https://pagure.io/releng/blob/main/f/mail-templates/01-mass-rebuild-start.txt[template].
@@ -130,7 +128,6 @@ $ koji add-target f{rawhide}-rebuild f{rawhide}-build
 ....
 
 [NOTE]
-.Note
 ====
 *koji add-target* _target-name_ _buildroot-tag_ _destination-tag_
 describes the syntax format above. If the _destination-tag_ is not
diff --git a/modules/release_guide/pages/overview.adoc b/modules/release_guide/pages/overview.adoc
index 46cc1f2..4a26351 100644
--- a/modules/release_guide/pages/overview.adoc
+++ b/modules/release_guide/pages/overview.adoc
@@ -88,7 +88,6 @@ images, and other bits. These commands are named pungi and
 livecd-creator.
 
 [NOTE]
-.Note
 ====
 There is work currently being done to replace livecd-creator with
 https://github.com/rhinstaller/lorax/blob/master/src/sbin/livemedia-creator[livemedia-creator].
diff --git a/modules/release_guide/pages/sop_adding_build_targets.adoc b/modules/release_guide/pages/sop_adding_build_targets.adoc
index a27157b..fed2fa8 100644
--- a/modules/release_guide/pages/sop_adding_build_targets.adoc
+++ b/modules/release_guide/pages/sop_adding_build_targets.adoc
@@ -89,7 +89,6 @@ koji add-target f17 f17-build
 ....
 
 [NOTE]
-.Note
 ====
 The `-pending` tags are used by
 https://fedoraproject.org/wiki/Bodhi[Bodhi] and
diff --git a/modules/release_guide/pages/sop_adding_side_build_targets.adoc b/modules/release_guide/pages/sop_adding_side_build_targets.adoc
index 720b608..712261f 100644
--- a/modules/release_guide/pages/sop_adding_side_build_targets.adoc
+++ b/modules/release_guide/pages/sop_adding_side_build_targets.adoc
@@ -20,7 +20,6 @@ The typical tag format is _PRODUCT_-_DESCRIPTOR_. The _DESCRIPTOR_
 should be something brief that clearly shows why the tag exists.
 +
 [NOTE]
-.Note
 ====
 Don't think too hard about what makes a good descriptor. The descriptor
 for the XFCE version 4.8 side-build target was _xfce48_. KDE often
@@ -47,7 +46,6 @@ $ koji taginfo f28-kde
 ....
 +
 [NOTE]
-.Note
 ====
 If the tag already exists, continue searching for an available tag by
 appending `-2` and incrementing the number by one until an available tag
@@ -186,7 +184,6 @@ $ ./mass-tag.py --source <SIDE_TAG_NAME> --target <MAIN_TAG_NAME> > mass_tag.txt
 ....
 +
 [NOTE]
-.Note
 ====
 The _MAIN_TAG_NAME_ for Fedora is typically the pending subtag, e.g.
 `f28-pending` when bodhi is not managing updates. After bodhi is enabled
diff --git a/modules/release_guide/pages/sop_bodhi_activation.adoc b/modules/release_guide/pages/sop_bodhi_activation.adoc
index dab0069..7f78765 100644
--- a/modules/release_guide/pages/sop_bodhi_activation.adoc
+++ b/modules/release_guide/pages/sop_bodhi_activation.adoc
@@ -50,7 +50,6 @@ $ bodhi releases create --name F{branched}M --long-name "Fedora {branched} Modul
 Please update fas account username in above command.        
 
 [WARNING]
-.Warning
 ====
 Due to a https://github.com/fedora-infra/bodhi/issues/2177[bug] in
 Bodhi, it is critical that Bodhi processes be restarted any time
@@ -58,7 +57,6 @@ Bodhi, it is critical that Bodhi processes be restarted any time
 ====
 
 [NOTE]
-.Note
 ====
 Add the container and flatpak releases if they weren't already added to
 bodhi
diff --git a/modules/release_guide/pages/sop_branch_freeze.adoc b/modules/release_guide/pages/sop_branch_freeze.adoc
index 75af952..9305884 100644
--- a/modules/release_guide/pages/sop_branch_freeze.adoc
+++ b/modules/release_guide/pages/sop_branch_freeze.adoc
@@ -14,7 +14,6 @@ that release and stop pushing updates.
 change freeze is going to happen at least one day in advance.
 
 [NOTE]
-.Note
 ====
 For updates pushers: In Change freeze only updates that fix accepted
 blockers or Freeze break bugs are allowed into the main tree. Please
@@ -23,7 +22,6 @@ updates-testing.
 ====
 
 [NOTE]
-.Note
 ====
 For Final/GA release: During Final freeze, we dont want to block any
 packages in koji as it will effect the RC composes. So, please update
diff --git a/modules/release_guide/pages/sop_composing_fedora.adoc b/modules/release_guide/pages/sop_composing_fedora.adoc
index da22869..b310bfd 100644
--- a/modules/release_guide/pages/sop_composing_fedora.adoc
+++ b/modules/release_guide/pages/sop_composing_fedora.adoc
@@ -48,7 +48,6 @@ the output from the previous step. Consult the request ticket for the
 list of builds expected in this output.
 +
 [NOTE]
-.Note
 ====
 The very first run of an Beta, or GA compose should have no builds
 listed under the compose tag. It is important to clear pre-existing
@@ -62,7 +61,6 @@ $ koji untag-build --all f[release_version]-compose [build1 build2 ...]
 ====
 +
 [NOTE]
-.Note
 ====
 The order in which packages are added into the
 f[release_version]-compose tag matter. If the builds are untagged
@@ -76,7 +74,6 @@ $ koji tag-build f[release_version]-compose [build1 build2 ...]
 ....
 +
 [NOTE]
-.Note
 ====
 These steps may be completed on a local machine as long as the user has
 appropriate permissions in the koji tool.
@@ -91,7 +88,6 @@ $ koji list-tagged f[release_version]-signing-pending
 ....
 +
 [NOTE]
-.Note
 ====
 If there are unsigned builds then wait for the automated queue to pick
 them up and sign them. Contact a member of the Fedora infrastructure
@@ -150,7 +146,6 @@ The numbering scheme begins with 1.1 and the second number is
 incremented after each compose.
 +
 [NOTE]
-.Note
 ====
 Pungi requires numbers in the format #.# as an argument. It is because
 of this that composes always start with the number 1 and the second
@@ -158,7 +153,6 @@ number is incremented with each compose.
 ====
 +
 [NOTE]
-.Note
 ====
 If the compose fails with a directory missing error, then create the
 compose directory with `mkdir /mnt/koji/compose/[release_version]`
@@ -198,7 +192,6 @@ $ ls /mnt/koji/compose/[release_version]/[compose_id]
 ....
 +
 [NOTE]
-.Note
 ====
 Take care executing the synchronization if the next compose is already
 running. Be sure to grab the correct directory.
@@ -218,7 +211,6 @@ $ sudo -u ftpsync sh -c 'for dir in Everything Cloud Container Kinoite Labs Modu
 ....
 +
 [NOTE]
-.Note
 ====
 If multiple composes are run like 1.2, 1.3, add multiple --link-dest
 arguments above with multiple composes
@@ -334,7 +326,6 @@ $ sudo ostree summary -u
 ....
 
 [NOTE]
-.Note
 ====
 Before pushing the updates to fxx-updates, run the last branched compose
 so that both branched and rc composes have the same content. Once the
@@ -579,7 +570,6 @@ $ sh scripts/stage-release.sh 32 Fedora-32-20200415.0 32_RC-1.1 fedora-32 0
 ....
 
 [NOTE]
-.Note
 ====
 Make sure to grab the directory size usage numbers which is used to send
 an email to [.title-ref]#mirror-admin@lists.fedoraproject.org# list.
diff --git a/modules/release_guide/pages/sop_create_release_signing_key.adoc b/modules/release_guide/pages/sop_create_release_signing_key.adoc
index 1a60697..3623010 100644
--- a/modules/release_guide/pages/sop_create_release_signing_key.adoc
+++ b/modules/release_guide/pages/sop_create_release_signing_key.adoc
@@ -92,7 +92,6 @@ $ sigul grant-key-access fedora-{branched} kevin
 ....
 
 [NOTE]
-.Note
 ====
 *IMPORTANT:* Grant the access to autopen user as it's required for
 robosignatory autosigning and then restart robosignatory service
diff --git a/modules/release_guide/pages/sop_deprecate_ftbfs_packages.adoc b/modules/release_guide/pages/sop_deprecate_ftbfs_packages.adoc
index d2416a1..1b01625 100644
--- a/modules/release_guide/pages/sop_deprecate_ftbfs_packages.adoc
+++ b/modules/release_guide/pages/sop_deprecate_ftbfs_packages.adoc
@@ -3,7 +3,6 @@
 === Description
 
 [NOTE]
-.Note
 ====
 FTBFS = "Fails To Build From Source"
 ====
diff --git a/modules/release_guide/pages/sop_end_of_life.adoc b/modules/release_guide/pages/sop_end_of_life.adoc
index edd3931..cc504a1 100644
--- a/modules/release_guide/pages/sop_end_of_life.adoc
+++ b/modules/release_guide/pages/sop_end_of_life.adoc
@@ -105,7 +105,6 @@ $ bodhi releases edit --name "F31F" --state archived
 ....
 
 [WARNING]
-.Warning
 ====
 Due to a https://github.com/fedora-infra/bodhi/issues/2177[bug] in
 Bodhi, it is critical that Bodhi processes be restarted any time
diff --git a/modules/release_guide/pages/sop_file_ftbfs.adoc b/modules/release_guide/pages/sop_file_ftbfs.adoc
index df11054..9b65928 100644
--- a/modules/release_guide/pages/sop_file_ftbfs.adoc
+++ b/modules/release_guide/pages/sop_file_ftbfs.adoc
@@ -3,7 +3,6 @@
 === Description
 
 [NOTE]
-.Note
 ====
 FTBFS = "Fails To Build From Source"
 ====
@@ -46,7 +45,6 @@ Update the [.title-ref]#massrebuildsinfo.py#::
   * tracking_bug
   +
   [NOTE]
-  .Note
   ====
   Most of these values are already updated during mass rebuild, only one
   that might need updating is [.title-ref]#tracking_bug#
@@ -64,7 +62,6 @@ $ bugzilla login
 ....
   +
   [NOTE]
-  .Note
   ====
   Login as [.title-ref]#releng@fedoraproject.org#
   ====
diff --git a/modules/release_guide/pages/sop_mass_rebuild_modules.adoc b/modules/release_guide/pages/sop_mass_rebuild_modules.adoc
index 569347f..8b183a8 100644
--- a/modules/release_guide/pages/sop_mass_rebuild_modules.adoc
+++ b/modules/release_guide/pages/sop_mass_rebuild_modules.adoc
@@ -96,7 +96,6 @@ $ ./mass-rebuild-modules.py <path_to_token_file> build --wait 2>&1 | tee ~/massb
 ____
 
 [NOTE]
-.Note
 ====
 The token file should be located in infra's private ansible repo, or ask
 infra to get it to you using this
@@ -104,7 +103,6 @@ https://pagure.io/fedora-infrastructure/issue/8048#comment-587789[process].
 ====
 
 [NOTE]
-.Note
 ====
 The [.title-ref]#build# option is really important to pay attention,
 since the mass branching of modules will also use the same script, just
diff --git a/modules/release_guide/pages/sop_mass_rebuild_packages.adoc b/modules/release_guide/pages/sop_mass_rebuild_packages.adoc
index 606a906..9cf3ca8 100644
--- a/modules/release_guide/pages/sop_mass_rebuild_packages.adoc
+++ b/modules/release_guide/pages/sop_mass_rebuild_packages.adoc
@@ -53,7 +53,6 @@ maintainers:
 * How to opt out of the mass rebuild
 
 [NOTE]
-.Note
 ====
 See https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild[the Fedora 26
 Wiki example].
@@ -66,7 +65,6 @@ Send out the same information posted on the wiki to the
 [.title-ref]#devel-announce@lists.fedoraproject.org# mailing list.
 
 [NOTE]
-.Note
 ====
 See
 https://lists.fedoraproject.org/archives/list/devel-announce@lists.fedoraproject.org/message/QAMEEWUG7ND5E7LQYXQSQLRUDQPSBINA/[the
@@ -101,7 +99,6 @@ $ koji add-target f26-rebuild f26-build
 ....
 
 [NOTE]
-.Note
 ====
 *koji add-target* _target-name_ _buildroot-tag_ _destination-tag_
 describes the syntax format above. If the _destination-tag_ is not

From 5f10c4fb0aa58d238b425f40c6a4cf91407cc893 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 16 2023 13:41:30 +0000
Subject: [PATCH 2/3] *: Fix indentation and whitespace


---

diff --git a/modules/release_guide/pages/beta_RC_compose.adoc b/modules/release_guide/pages/beta_RC_compose.adoc
index 285b77e..b0a6a46 100644
--- a/modules/release_guide/pages/beta_RC_compose.adoc
+++ b/modules/release_guide/pages/beta_RC_compose.adoc
@@ -1,6 +1,6 @@
 include::_partials/attributes.adoc[]
 
-== Beta Release candidate
+= Beta Release candidate
 
 When Quality Engineering (QE) requests a Release Candidate (RC) they do
 so by opening an issue in the releng repository on pagure. Release
@@ -132,7 +132,7 @@ If the compose fails with a directory missing error, then create the
 compose directory with `mkdir /mnt/koji/compose/{branched}`
 ====
 
-==== Syncing the Compose
+=== Syncing the Compose
 
 We sync the compose to `/pub/alt/stage` to enable faster access to new
 content for QA and the larger Fedora community.
@@ -205,7 +205,7 @@ $ sudo -u ftpsync chmod 755 /pub/alt/stage/{branched}_[release_label]-[#.#]
 Once the compose and sync is complete the issue in pagure should be
 updated and closed.
 
-==== Verification
+=== Verification
 
 The method for verifying a compose has completed is checking
 `/mnt/koji/compose/{branched}/[compose_dir]/STATUS`. Any status
diff --git a/modules/release_guide/pages/beta_freeze.adoc b/modules/release_guide/pages/beta_freeze.adoc
index 1a0b165..22a5493 100644
--- a/modules/release_guide/pages/beta_freeze.adoc
+++ b/modules/release_guide/pages/beta_freeze.adoc
@@ -1,16 +1,16 @@
 include::_partials/attributes.adoc[]
 
-== Beta freeze and Bodhi Activation Point
+= Beta freeze and Bodhi Activation Point
 
-=== Description
+== Description
 
 Bodhi must be activated after two weeks of
 https://docs.pagure.org/releng/sop_mass_branching.html[Mass Branching]
 at 14:00 UTC.
 
-=== Action
+== Action
 
-==== Making koji changes
+=== Making koji changes
 
 Make the following koji tag changes
 
@@ -27,7 +27,7 @@ $ koji add-tag-inheritance f{branched}-override f{branched}-updates
 $ koji edit-tag --perm=admin f{branched}
 ....
 
-==== Update bodhi rpm release
+=== Update bodhi rpm release
 
 Set the bodhi rpm to release to not to automatically create the update
 and also bodhi knows to compose the updates
@@ -37,7 +37,7 @@ and also bodhi knows to compose the updates
 $ bodhi releases edit --name "F{branched}" --stable-tag f{branched}-updates --testing-repository updates-testing --package-manager dnf --no-create-automatic-updates --composed-by-bodhi --state frozen
 ....
 
-==== Add the modular release
+=== Add the modular release
 
 Run the following command on your own workstation to add the modular
 release
@@ -69,7 +69,8 @@ ansible
 
 === Update all relevant projects in ansible
 As in https://pagure.io/fedora-infra/ansible/pull-request/1327[this Ansible Pull request] create changes for the {branched} release
-==== Run the playbooks
+
+=== Run the playbooks
 
 ....
 $ rbac-playbook openshift-apps/greenwave.yml
@@ -98,7 +99,7 @@ $ sudo systemctl restart fm-consumer@config
 $ sudo systemctl restart koji-sync-listener
 ....
 
-==== Send Announcement
+=== Send Announcement
 
 Email *devel-announce* and *test-announce* lists about Bodhi Activation.
 Please find the body of the email in templates dir in https://pagure.io/releng/blob/main/f/mail-templates/04-beta-freeze.txt[releng repository]
@@ -143,10 +144,8 @@ $ sudo -u apache bodhi-push --builds '<nvr1>,<nvr2>,...' --username <username>
 ....
 
 
-=== Consider Before Running
+== Consider Before Running
 
 No considerations at this time. The docs git repository is simply a
 static html hosting space and we can just re-render the docs and push to
 it again if necessary.
-
-
diff --git a/modules/release_guide/pages/beta_release.adoc b/modules/release_guide/pages/beta_release.adoc
index 987546b..e0405a0 100644
--- a/modules/release_guide/pages/beta_release.adoc
+++ b/modules/release_guide/pages/beta_release.adoc
@@ -1,9 +1,10 @@
 include::_partials/attributes.adoc[]
 
-== Fedora Beta Release
+= Fedora Beta Release
+
 Based on the GO/NOGO meeting if the currnet compose is GO. The following steps need to be taken.
 
-=== Koji changes
+== Koji changes
 
 [source,subs="attributes+"]
 ....
@@ -11,7 +12,7 @@ $ koji clone-tag --all --latest-only f{branched} f{branched}-Beta
 $ koji clone-tag --all --latest-only f{branched}-modular f{branched}-Beta-modular
 ....
 
-=== Stage release to mirrors
+== Stage release to mirrors
 
 [source,subs="attributes+"]
 ....
@@ -26,7 +27,7 @@ Make sure to grab the directory size usage numbers which is used to send
 an email to [.title-ref]#mirror-admin@lists.fedoraproject.org# list.
 ====
 
-=== Sync the signed checksums to stage
+== Sync the signed checksums to stage
 
 We need to sync the signed checksums to /pub/alt/stage/ by running the
 following command
@@ -36,14 +37,14 @@ following command
 $ for dir in Cloud Container Everything Kinoite Labs Modular Sericea Server Silverblue Spins Workstation metadata; do sudo -u ftpsync rsync -avhH /mnt/koji/compose/{branched}/Fedora-{branched}-20221105.0/compose/$dir/ /pub/alt/stage/{branched}_RC-1.7/$dir/ --link-dest=/pub/fedora/linux/releases/{branched}/Everything/ --link-dest=/pub/alt/stage/{branched}_RC-1.2/Everything/ --link-dest=/pub/alt/stage/{branched}_RC-1.3/Everything --link-dest=/pub/alt/stage/{branched}_RC-1.4/Everything --link-dest=/pub/alt/stage/{branched}_RC-1.5/Everything --link-dest=/pub/alt/stage/{branched}_RC-1.6/Everything --link-dest=/pub/alt/stage/{branched}_RC-1.7/Everything; done
 ....
 
-=== Set release in Bodhi to pending
+== Set release in Bodhi to pending
 
 [source,subs="attributes+"]
 ....
 $ bodhi releases edit --name F{branched} --state pending
 ....
 
-=== Lift RelEng freeze
+== Lift RelEng freeze
 
 Lift the RelEng Freeze so that the updates will be pushed to stable.
 This is done by editing
@@ -52,11 +53,11 @@ variable] in infra ansible repo and then run the bodhi playbook.
 Set also https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/vars/all/FedoraBranchedBodhi.yaml[FedoraBranchedBodhi
 variable] to postbeta
 
-=== Beta Installation and Cleanup
+== Beta Installation and Cleanup
 
 This section outlines the steps that should be followed to ensure that older copies of Fedora betas are removed from the servers and that the correct permissions are set on the directories.
 
-==== Remove older betas
+=== Remove older betas
 
 This cleanup step is to remove the older betas from the `/pub/fedora-secondary/releases/test` and `/pub/fedora/linux/releases/test/` directories. This can be done using the rm command:
 
@@ -68,7 +69,7 @@ $ rm -rf /pub/fedora/linux/releases/test/{branched}_Beta
 
 Note that {branched} should be replaced with the name of the beta release, such as 36_Beta, 37_Beta, etc.
 
-==== Set correct permissions
+=== Set correct permissions
 
 This step is to set the correct permissions on the directories. This can be done using the chmod command:
 
diff --git a/modules/release_guide/pages/final_RC_compose.adoc b/modules/release_guide/pages/final_RC_compose.adoc
index d8c9a4d..58daad8 100644
--- a/modules/release_guide/pages/final_RC_compose.adoc
+++ b/modules/release_guide/pages/final_RC_compose.adoc
@@ -1,4 +1,4 @@
 include::_partials/attributes.adoc[]
 
-== Final Release candidate
+= Final Release candidate
 
diff --git a/modules/release_guide/pages/final_freeze.adoc b/modules/release_guide/pages/final_freeze.adoc
index 4df6bf2..87e37cd 100644
--- a/modules/release_guide/pages/final_freeze.adoc
+++ b/modules/release_guide/pages/final_freeze.adoc
@@ -1,16 +1,16 @@
 include::_partials/attributes.adoc[]
 
-== Fedora Final Freeze
+= Fedora Final Freeze
 
 Before freezing everything we need to do the last stable push in bodhi.
 
-=== Stable push
+== Stable push
 
 ....
 $sudo -u apache bodhi-push --releases --stable '{branched},{branched}M'
 ....
 
-=== Ansible changes
+== Ansible changes
 
 Freeze is enabled by editing
 https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/vars/all/RelEngFrozen.yaml[RelEngFrozen
@@ -20,10 +20,10 @@ variable] in infra ansible repo and then run the bodhi playbook.
 $ sudo rbac-playbook groups/bodhi-backend.yml
 ....
 
+== Update bodhi release
 
-=== Update bodhi release
 ....
 $ bodhi releases edit --name {branched} --state frozen
 ....
 
-=== Process stable push requests
\ No newline at end of file
+== Process stable push requests
diff --git a/modules/release_guide/pages/final_release.adoc b/modules/release_guide/pages/final_release.adoc
index 77c8c20..2257a4f 100644
--- a/modules/release_guide/pages/final_release.adoc
+++ b/modules/release_guide/pages/final_release.adoc
@@ -1,20 +1,20 @@
 include::_partials/attributes.adoc[]
 
-== Fedora Final Release
+= Fedora Final Release
 
-=== Update FedoraPreviousPrevious.yaml in ansible repository
+== Update FedoraPreviousPrevious.yaml in ansible repository
 
 set the https://pagure.io/fedora-infra/ansible/blob/main/f/vars/all[variable] to True in ansible repository.
 
+== Koji changes
 
-=== Koji changes
 [source,subs="attributes+"]
 ....
 $ koji edit-tag --lock f{branched}
 $ koji edit-tag --lock f{branched}-modular
 ....
 
-=== Bodhi Changes
+== Bodhi Changes
 
 Set the bodhi release to `current`
 [source,subs="attributes+"]
@@ -31,7 +31,7 @@ $ bodhi releases edit --name F{old_release}F --eol YYYY-MM-DD
 $ bodhi releases edit --name F{old_release}M --eol YYYY-MM-DD
 ....
 
-=== Disable Branched Compose
+== Disable Branched Compose
 
 Now that we have a final GOLD compose, we dont need nightly branched
 composes anymore. This is disabled in
@@ -42,7 +42,7 @@ role] in infra ansible repo and then running the playbook.
 $ sudo rbac-playbook groups/releng-compose.yml
 ....
 
-=== Lift RelEng freeze
+== Lift RelEng freeze
 
 Lift the RelEng Freeze so that the updates will be pushed to stable.
 This is done by editing
@@ -53,7 +53,7 @@ variable] in infra ansible repo and then run the bodhi playbook.
 $ sudo rbac-playbook groups/bodhi-backend.yml
 ....
 
-=== Stage Final Release for Mirrors
+== Stage Final Release for Mirrors
 
 . Gather the needed info for running the staging script: Release
 Version: the numerical version number of the release `{branched}` ComposeID: The
@@ -70,13 +70,13 @@ $ scripts/stage-release.sh {branched} Fedora-{branched}-20160614.0 {branched}_RC
 . Sync the release to the Red Hat internal archive following internally
 documented
 
-=== Check and set EOL on previous releases to reflect reality
+== Check and set EOL on previous releases to reflect reality
 
 . check PDC for active releases and respective EOL date
 . if needed run the adjust-eol-all.py script from releng repository to
 correct any mistakes
 
-=== Verification
+== Verification
 
 Verification is somewhat difficult as one cannot look at the content via
 the web server due to permissions. Typically we ask somebody from the
diff --git a/modules/release_guide/pages/mass_rebuild.adoc b/modules/release_guide/pages/mass_rebuild.adoc
index c81043c..922bddd 100644
--- a/modules/release_guide/pages/mass_rebuild.adoc
+++ b/modules/release_guide/pages/mass_rebuild.adoc
@@ -1,18 +1,18 @@
 include::_partials/attributes.adoc[]
 
-== Mass rebuild information.
+= Mass rebuild information.
 
-=== Description
+== Description
 
 Periodically we do mass rebuilds of rawhide during the development cycle. This SOP will outline the steps necessary to do this.
 
-=== Assumptions
+== Assumptions
 
 This assumes that the mass rebuild has already been approved and scheduled via release engineering and FESCo. Coordinate with infrastructure as well for any needed koji updates.
 
 This also assumes that the mass rebuild does not need to be done in dependency order, and that the mass rebuild does not involve a ABI change.
 
-=== Considerations
+== Considerations
 
 The most important thing to keep in mind while doing a mass rebuild is to communicate clearly what actions are being performed and the status of the rebuild.
 
@@ -20,20 +20,20 @@ Check in on scripts frequently to avoid a long stalled command from adding signi
 
 Check with secondary arches, whether they up-to-date enough with primary, create rebuild tag and target when they are. It will then take care of rebuilds of the arch specific packages in appropriate kojis.
 
-=== Actions
+== Actions
 
-==== Preparatory Steps
+=== Preparatory Steps
 
 The following steps may be completed in the weeks leading up to the scheduled mass rebuild.
 
-=== Mass Rebuild
+== Mass Rebuild
 
-==== Description
+=== Description
 
 Periodically we do mass rebuilds of rawhide during the development
 cycle. This SOP will outline the steps necessary to do this.
 
-==== Assumptions
+=== Assumptions
 
 This assumes that the mass rebuild has already been approved and
 scheduled via release engineering and FESCo. Coordinate with
@@ -43,7 +43,7 @@ This also assumes that the mass rebuild does not need to be done in
 dependency order, and that the mass rebuild does not involve a ABI
 change.
 
-==== Considerations
+=== Considerations
 
 * The most important thing to keep in mind while doing a mass rebuild is
 to communicate clearly what actions are being performed and the status
@@ -54,9 +54,9 @@ adding significant delays in completing the rebuild.
 primary, create rebuild tag and target when they are. It will then take
 care of rebuilds of the arch specific packages in appropriate kojis.
 
-==== Actions
+== Actions
 
-===== Preparatory Steps
+=== Preparatory Steps
 
 The following steps may be completed in the weeks leading up to the
 scheduled mass rebuild.
@@ -174,7 +174,7 @@ the mass rebuild is for have landed in the build system (and a newRepo
 task completed with those features)
 * the comment which is inserted into spec changelogs
 
-===== Starting the Mass Rebuild
+=== Starting the Mass Rebuild
 
 The `mass-rebuild.py` script takes care of:
 
@@ -211,7 +211,7 @@ $ ./mass-rebuild.py 2>&1 | tee ~/massbuild.out
 ....
 ____
 
-===== Monitoring Mass Rebuilds
+=== Monitoring Mass Rebuilds
 
 The community has a very high interest in the status of rebuilds and
 many maintainers will want to know if their build failed right away. The
@@ -260,7 +260,7 @@ Set up the Site for Packages that Need Rebuilt::
 $ while true; do ./need-rebuild.py > f{rawhide}-need-rebuild.html && cp f{rawhide}-need-rebuild.html /mnt/koji/mass-rebuild/f{rawhide}-need-rebuild.html; sleep 600; done
 ....
 
-===== Post Mass Rebuild Tasks
+=== Post Mass Rebuild Tasks
 
 Once the mass rebuild script completes, and all the pending builds have
 finished, the builds will need to be tagged. The `mass-tag.py` script
diff --git a/modules/release_guide/pages/release_eol.adoc b/modules/release_guide/pages/release_eol.adoc
index 4b1aa6c..cce2070 100644
--- a/modules/release_guide/pages/release_eol.adoc
+++ b/modules/release_guide/pages/release_eol.adoc
@@ -1,8 +1,8 @@
 include::_partials/attributes.adoc[]
 
-== End Of Life
+= End Of Life
 
-=== Description
+== Description
 
 Each release of Fedora is maintained as laid out in the
 https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle#Maintenance_Schedule[maintenance
@@ -11,10 +11,9 @@ enters `end of life` status. This procedure describes the tasks
 necessary to move a release to that status. To get the correct EOL date visit 
 https://fedorapeople.org/groups/schedule/f-{branched}/f-{branched}-key-tasks.html[release schedule] for the last release.
 
-=== Actions
+== Actions
 
-
-==== Reminder announcement
+=== Reminder announcement
 
 Send an email to devel@, devel-announce@, test-announce@, announce@
 lists as remainder about the release EOL. Use https://pagure.io/releng/blob/main/f/mail-templates/07-end-of-life.txt[template] from release engineering repo
@@ -24,7 +23,7 @@ lists as remainder about the release EOL. Use https://pagure.io/releng/blob/main
 Please ensure that the reminder email is scheduled to be sent one week before the end of life.
 ====
 
-==== Koji tasks
+=== Koji tasks
 
 * Disable builds by removing targets
 
@@ -49,7 +48,7 @@ and the script on compose-branched01.iad2.fedoraproject.org
 ./scripts/koji_cleanup_signed.py
 ....
 
-==== PDC tasks
+=== PDC tasks
 
 * Set PDC *active* value for the release to *False*
 
@@ -67,7 +66,7 @@ https://pagure.io/releng[releng] repo
 python scripts/pdc/adjust-eol-all.py <token> f{old_release} 2020-11-24
 ....
 
-==== Bodhi tasks
+=== Bodhi tasks
 
 * Run the following bodhi commands to set the releases state to
 *archived*
@@ -80,7 +79,7 @@ $ bodhi releases edit --name "F{old_release}C" --state archived
 $ bodhi releases edit --name "F{old_release}F" --state archived
 ....
 
-==== Fedora Infra Ansible Changes
+=== Fedora Infra Ansible Changes
 
 * We need to make changes to bodhi, koji, mbs, releng, autosign roles in
 ansible repo.
@@ -103,7 +102,7 @@ Another way to run the playbook is using rbac-playbook, in case one don't have s
 Syntax: sudo rbac-playbook mbs.yml
 ====
 
-==== MBS Platform Retirement
+=== MBS Platform Retirement
 
 * To retire the platform in mbs, run the following command on
 mbs-backend01.iad2.fedoraproject.org
@@ -113,18 +112,18 @@ mbs-backend01.iad2.fedoraproject.org
 $ sudo mbs-manager retire platform:f{old_release}
 ....
 
-==== Final announcement
+=== Final announcement
 
 * Send the final announcement to devel@, devel-announce@,
 test-announce@, announce@ lists
 
 Use https://pagure.io/releng/blob/main/f/mail-templates/07-end-of-life.txt[template] from release engineering repo
 
-===== Update FedoraPreviousPrevious.yaml in ansible repository
+==== Update FedoraPreviousPrevious.yaml in ansible repository
 
 * set the variable to False
 
-===== Move the EOL release to archive
+==== Move the EOL release to archive
 
 . Log into to bodhi-backend01 and become root
 +
diff --git a/modules/release_guide/pages/release_process.adoc b/modules/release_guide/pages/release_process.adoc
index 1dd5bb8..36a2767 100644
--- a/modules/release_guide/pages/release_process.adoc
+++ b/modules/release_guide/pages/release_process.adoc
@@ -1,39 +1,39 @@
 include::_partials/attributes.adoc[]
-= Release process.
+= Release process
 
-== Rawhide starts Fedora Linux {branched} development
-== Mass Rebuild: RPMs first, then modules
-== Branch Fedora Linux {branched} from Rawhide
-== Rawhide starts Fedora Linux {rawhide} development
-== Update Greenwave policy product_versions to add branched release
-== Post-branch Freeze (end date approximate)
-== Bodhi updates-testing activation point
-== Beta Freeze (starts at 1400 UTC)
-== Beta Release Public Availability
-== Final Freeze (starts at 1400 UTC)
-== Final Release Public Availability (GA)
-== Fedora Linux {old_release} EOL auto closure
-== Beta release Go/No-Go Meeting
-== Final release Go/No-Go Meeting
-== Update Greenwave policy product_versions to remove EOL release
-== Notifications for retirement of packages with security issues
-== Retire packages with security issues
-== fedora-repos update with the new keys is available in updates-testing
-== Begin reminders for packages that haven't rebuilt in last 2 releases
-== Re-sign F{branched} content with F{rawhide} key
-== Retire Orphaned and Long-Time FTBFS Rawhide Packages
-== Retire FTI packages in NEW state
-== Stage Beta on master minor
-== Bit-flip Beta to mirrors
-== Notify Mirrors of Beta Release
-== Set current release to active in Package database
-== Retire all packages with broken deps
-== Retire FTI packages in NEW state
-== Enable Updates in Bodhi for the current release
-== Stage Final on master minor
-== Bit-flip Final to mirrors
-== Update PDC with F{old_release} EOL date
-== REMINDER: EOL release final update push in 1 week
-== REMINDER: EOL release final update push in 1 day
-== Notify Mirrors of Final Release
-== Remove Beta images
+* Rawhide starts Fedora Linux {branched} development
+* Mass Rebuild: RPMs first, then modules
+* Branch Fedora Linux {branched} from Rawhide
+* Rawhide starts Fedora Linux {rawhide} development
+* Update Greenwave policy product_versions to add branched release
+* Post-branch Freeze (end date approximate)
+* Bodhi updates-testing activation point
+* Beta Freeze (starts at 1400 UTC)
+* Beta Release Public Availability
+* Final Freeze (starts at 1400 UTC)
+* Final Release Public Availability (GA)
+* Fedora Linux {old_release} EOL auto closure
+* Beta release Go/No-Go Meeting
+* Final release Go/No-Go Meeting
+* Update Greenwave policy product_versions to remove EOL release
+* Notifications for retirement of packages with security issues
+* Retire packages with security issues
+* fedora-repos update with the new keys is available in updates-testing
+* Begin reminders for packages that haven't rebuilt in last 2 releases
+* Re-sign F{branched} content with F{rawhide} key
+* Retire Orphaned and Long-Time FTBFS Rawhide Packages
+* Retire FTI packages in NEW state
+* Stage Beta on master minor
+* Bit-flip Beta to mirrors
+* Notify Mirrors of Beta Release
+* Set current release to active in Package database
+* Retire all packages with broken deps
+* Retire FTI packages in NEW state
+* Enable Updates in Bodhi for the current release
+* Stage Final on master minor
+* Bit-flip Final to mirrors
+* Update PDC with F{old_release} EOL date
+* REMINDER: EOL release final update push in 1 week
+* REMINDER: EOL release final update push in 1 day
+* Notify Mirrors of Final Release
+* Remove Beta images
diff --git a/modules/release_guide/pages/sop_bodhi_activation.adoc b/modules/release_guide/pages/sop_bodhi_activation.adoc
index 7f78765..fe73eb1 100644
--- a/modules/release_guide/pages/sop_bodhi_activation.adoc
+++ b/modules/release_guide/pages/sop_bodhi_activation.adoc
@@ -1,16 +1,16 @@
 include::_partials/attributes.adoc[]
 
-== Bodhi Activation Point
+= Bodhi Activation Point
 
-=== Description
+== Description
 
 Bodhi must be activated after two weeks of
 https://docs.pagure.org/releng/sop_mass_branching.html[Mass Branching]
 at 14:00 UTC.
 
-=== Action
+== Action
 
-==== Making koji changes
+=== Making koji changes
 
 Make the following koji tag changes
 
@@ -27,7 +27,7 @@ $ koji add-tag-inheritance f{branched}-override f{branched}-updates
 $ koji edit-tag --perm=admin f{branched}
 ....
 
-==== Update bodhi rpm release
+=== Update bodhi rpm release
 
 Set the bodhi rpm to release to not to automatically create the update
 and also bodhi knows to compose the updates
@@ -37,7 +37,7 @@ and also bodhi knows to compose the updates
 $ bodhi releases edit --name "F{branched}" --stable-tag f{branched}-updates --testing-repository updates-testing --package-manager dnf --no-create-automatic-updates --composed-by-bodhi --state frozen
 ....
 
-==== Add the modular release
+=== Add the modular release
 
 Run the following command on your own workstation to add the modular
 release
@@ -47,7 +47,7 @@ release
 $ bodhi releases create --name F{branched}M --long-name "Fedora {branched} Modular" --id-prefix FEDORA-MODULAR --version {branched} --branch f{branched}m --dist-tag f{branched}-modular --stable-tag f{branched}-modular-updates --testing-tag f{branched}-modular-updates-testing --candidate-tag f{branched}-modular-updates-candidate --pending-stable-tag f{branched}-modular-updates-pending --pending-testing-tag f{branched}-modular-updates-testing-pending --pending-signing-tag f{branched}-modular-signing-pending --override-tag f{branched}-modular-override --state pending --user <fas username>
 ....
 
-Please update fas account username in above command.        
+Please update fas account username in above command.
 
 [WARNING]
 ====
@@ -69,7 +69,8 @@ ansible
 
 === Update all relevant projects in ansible
 As in https://pagure.io/fedora-infra/ansible/pull-request/1327[this Ansible Pull request] create changes for the {branched} release
-==== Run the playbooks
+
+=== Run the playbooks
 
 ....
 $ rbac-playbook openshift-apps/greenwave.yml
@@ -85,7 +86,7 @@ can monitor
 https://greenwave-web-greenwave.app.os.fedoraproject.org/api/v1.0/policies
 to wait for the new policy to appear (it should take a few minutes).
 
-==== Restart bodhi services
+=== Restart bodhi services
 
 Restart bodhi services to understand the bodhi new release on
 bodhi-backend01 (Look at warning in
@@ -98,7 +99,7 @@ $ sudo systemctl restart fm-consumer@config
 $ sudo systemctl restart koji-sync-listener
 ....
 
-==== Send Announcement
+=== Send Announcement
 
 Email *devel-announce* and *test-announce* lists about Bodhi Activation.
 Please find the body of the email in templates dir in https://pagure.io/releng/blob/main/f/mail-templates/04-beta-freeze.txt[releng repository]
@@ -124,7 +125,7 @@ $ bodhi releases info {current}
 
 Check for other variants like modular, container and flatpaks
 
-=== Consider Before Running
+== Consider Before Running
 
 No considerations at this time. The docs git repository is simply a
 static html hosting space and we can just re-render the docs and push to
diff --git a/modules/release_guide/pages/sop_end_of_life.adoc b/modules/release_guide/pages/sop_end_of_life.adoc
index cc504a1..345edfd 100644
--- a/modules/release_guide/pages/sop_end_of_life.adoc
+++ b/modules/release_guide/pages/sop_end_of_life.adoc
@@ -1,8 +1,8 @@
 include::_partials/attributes.adoc[]
 
-== End Of Life
+= End Of Life
 
-=== Description
+== Description
 
 Each release of Fedora is maintained as laid out in the
 https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle#Maintenance_Schedule[maintenance
@@ -10,9 +10,9 @@ schedule]. At the conclusion of the maintenance period, a Fedora release
 enters `end of life` status. This procedure describes the tasks
 necessary to move a release to that status.
 
-=== Actions
+== Actions
 
-==== Set date
+=== Set date
 
 * {blank}
 +
@@ -24,12 +24,12 @@ Releng responsibilities:::
   resource contention
   ** Announce the closure of the release to the package maintainers.
 
-==== Reminder announcement
+=== Reminder announcement
 
 Send an email to devel@, devel-announce@, test-announce@, announce@
 lists as remainder about the release EOL.
 
-===== Announcement Content
+==== Announcement Content
 
 ....
 Hello all,
@@ -52,7 +52,7 @@ Mohan Boddu.
 [1]https://fedoraproject.org/wiki/Upgrading?rd=DistributionUpgrades
 ....
 
-==== Koji tasks
+=== Koji tasks
 
 * Disable builds by removing targets
 
@@ -76,7 +76,7 @@ and the script on compose-branched01.iad2.fedoraproject.org
 ./scripts/koji_cleanup_signed.py
 ....
 
-==== PDC tasks
+=== PDC tasks
 
 * Set PDC *active* value for the release to *False*
 
@@ -92,7 +92,7 @@ https://pagure.io/releng[releng] repo
 python scripts/pdc/adjust-eol-all.py <token> f31 2020-11-24
 ....
 
-==== Bodhi tasks
+=== Bodhi tasks
 
 * Run the following bodhi commands to set the releases state to
 *archived*
@@ -118,7 +118,7 @@ $ sudo systemctl restart fm-consumer@config.service
 $ sudo systemctl restart bodhi-celery.service
 ....
 
-==== Fedora Infra Ansible Changes
+=== Fedora Infra Ansible Changes
 
 * We need to make changes to bodhi, koji, mbs, releng, autosign roles in
 ansible repo.
@@ -415,7 +415,7 @@ $ sudo ansible-playbook /srv/web/infra/ansible/playbooks/manual/autosign.yml
 $ sudo ansible-playbook /srv/web/infra/ansible/playbooks/openshift-apps/bodhi.yml
 ....
 
-==== MBS Platform Retirement
+=== MBS Platform Retirement
 
 * To retire the platform in mbs, run the following command on
 mbs-backend01.iad2.fedoraproject.org
@@ -424,12 +424,12 @@ mbs-backend01.iad2.fedoraproject.org
 $ sudo mbs-manager retire platform:f31
 ....
 
-==== Final announcement
+=== Final announcement
 
 * Send the final announcement to devel@, devel-announce@,
 test-announce@, announce@ lists
 
-===== Announcement content
+==== Announcement content
 
 ....
 Hello all,
@@ -450,16 +450,16 @@ Mohan Boddu.
 [1] https://docs.fedoraproject.org/en-US/quick-docs/dnf-system-upgrade/
 ....
 
-===== Update eol wiki page
+=== Update eol wiki page
 
 https://fedoraproject.org/wiki/End_of_life update with release and
 number of days.
 
-===== Update FedoraPreviousPrevious.yaml in ansible repository
+=== Update FedoraPreviousPrevious.yaml in ansible repository
 
 set the variable to False
 
-===== Move the EOL release to archive
+=== Move the EOL release to archive
 
 . log into to bodhi-backend01 and become root
 +
@@ -535,7 +535,7 @@ $ ln ../20/README .
 ....
 ____
 
-=== Consider Before Running
+== Consider Before Running
 
 * Resource contention in infrastructure, such as outages
 * Extenuating circumstances for specific planned updates, if any
diff --git a/modules/release_guide/pages/sop_file_ftbfs.adoc b/modules/release_guide/pages/sop_file_ftbfs.adoc
index 9b65928..08a9bb8 100644
--- a/modules/release_guide/pages/sop_file_ftbfs.adoc
+++ b/modules/release_guide/pages/sop_file_ftbfs.adoc
@@ -1,6 +1,6 @@
-== File FTBFS
+= File FTBFS
 
-=== Description
+== Description
 
 [NOTE]
 ====
@@ -14,7 +14,7 @@ This should be run after the
 https://docs.pagure.org/releng/sop_mass_rebuild_packages.html#post-mass-rebuild-tasks[mass
 rebuild builds are merged into main tag].
 
-=== Action
+== Action
 
 The FTBFS bugs are filed in bugzilla.
 
diff --git a/modules/release_guide/pages/sop_mass_branching.adoc b/modules/release_guide/pages/sop_mass_branching.adoc
index f5bdb21..f8c5425 100644
--- a/modules/release_guide/pages/sop_mass_branching.adoc
+++ b/modules/release_guide/pages/sop_mass_branching.adoc
@@ -2,6 +2,8 @@ include::_partials/attributes.adoc[]
 
 = Mass Branching
 
+== Description
+
 At each alpha freeze we branch the pending release away from `devel/`
 which allows rawhide (currently F{rawhide}) to move on while the pending release goes into
 bugfix and polish mode.

From 4ced6248535c13cccabf42eacf36ed402c203feb Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 16 2023 13:41:30 +0000
Subject: [PATCH 3/3] *: Improve formatting


---

diff --git a/modules/release_guide/pages/final_release.adoc b/modules/release_guide/pages/final_release.adoc
index 2257a4f..8bbff20 100644
--- a/modules/release_guide/pages/final_release.adoc
+++ b/modules/release_guide/pages/final_release.adoc
@@ -2,9 +2,9 @@ include::_partials/attributes.adoc[]
 
 = Fedora Final Release
 
-== Update FedoraPreviousPrevious.yaml in ansible repository
+== Update `FedoraPreviousPrevious.yaml` in ansible repository
 
-set the https://pagure.io/fedora-infra/ansible/blob/main/f/vars/all[variable] to True in ansible repository.
+Set the https://pagure.io/fedora-infra/ansible/blob/main/f/vars/all[variable] to True in ansible repository.
 
 == Koji changes
 
diff --git a/modules/release_guide/pages/mass_rebuild.adoc b/modules/release_guide/pages/mass_rebuild.adoc
index 922bddd..9830af6 100644
--- a/modules/release_guide/pages/mass_rebuild.adoc
+++ b/modules/release_guide/pages/mass_rebuild.adoc
@@ -1,6 +1,6 @@
 include::_partials/attributes.adoc[]
 
-= Mass rebuild information.
+= Mass rebuild information
 
 == Description
 
diff --git a/modules/release_guide/pages/release_eol.adoc b/modules/release_guide/pages/release_eol.adoc
index cce2070..f6bbc8a 100644
--- a/modules/release_guide/pages/release_eol.adoc
+++ b/modules/release_guide/pages/release_eol.adoc
@@ -8,15 +8,15 @@ Each release of Fedora is maintained as laid out in the
 https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle#Maintenance_Schedule[maintenance
 schedule]. At the conclusion of the maintenance period, a Fedora release
 enters `end of life` status. This procedure describes the tasks
-necessary to move a release to that status. To get the correct EOL date visit 
+necessary to move a release to that status. To get the correct EOL date visit
 https://fedorapeople.org/groups/schedule/f-{branched}/f-{branched}-key-tasks.html[release schedule] for the last release.
 
 == Actions
 
 === Reminder announcement
 
-Send an email to devel@, devel-announce@, test-announce@, announce@
-lists as remainder about the release EOL. Use https://pagure.io/releng/blob/main/f/mail-templates/07-end-of-life.txt[template] from release engineering repo
+Send an email to `devel@`, `devel-announce@`, `test-announce@`, `announce@` lists as remainder about the release EOL.
+Use https://pagure.io/releng/blob/main/f/mail-templates/07-end-of-life.txt[template] from release engineering repo
 
 [NOTE]
 ====
@@ -114,14 +114,13 @@ $ sudo mbs-manager retire platform:f{old_release}
 
 === Final announcement
 
-* Send the final announcement to devel@, devel-announce@,
-test-announce@, announce@ lists
+* Send the final announcement to `devel@`, `devel-announce@`, `test-announce@`, `announce@` lists.
 
 Use https://pagure.io/releng/blob/main/f/mail-templates/07-end-of-life.txt[template] from release engineering repo
 
 ==== Update FedoraPreviousPrevious.yaml in ansible repository
 
-* set the variable to False
+* Set the variable to False
 
 ==== Move the EOL release to archive
 
@@ -148,8 +147,8 @@ ____
 $ ls /pub/archive/fedora/linux/releases/
 ....
 ____
-. Do a recursive rsync to update any changes in the trees since the
-previous copy.
+. Do a recursive rsync to update any changes in the trees since the previous
+copy.
 +
 ____
 [source,subs="attributes+"]
@@ -181,9 +180,9 @@ $ cd testing
 $ rsync -avAXSHP {old_release}/ /pub/archive/fedora-secondary/updates/testing/{old_release}/
 ....
 ____
-. Announce to the mirror list this has been done and that in 2 weeks you
-will move the old trees to archives.
-. in two weeks, log into mm-backend01 and run the archive script
+. Announce to the mirror list this has been done and that in 2 weeks you will
+move the old trees to archives.
+. In two weeks, log into mm-backend01 and run the archive script
 +
 ____
 [source,subs="attributes+"]
@@ -193,7 +192,7 @@ $ sudo -u mirrormanager mm2_move-to-archive --originalCategory="Fedora Linux" --
 ____
 . If there are problems, the postgres DB may have issues and so you need
 to get a DBA to update the backend to fix items.
-. wait an hour or so then you can remove the files from the main tree. 
+. Wait an hour or so then you can remove the files from the main tree.
 
 [NOTE]
 ====
diff --git a/modules/release_guide/pages/sop_bodhi_activation.adoc b/modules/release_guide/pages/sop_bodhi_activation.adoc
index fe73eb1..ca421d2 100644
--- a/modules/release_guide/pages/sop_bodhi_activation.adoc
+++ b/modules/release_guide/pages/sop_bodhi_activation.adoc
@@ -72,13 +72,13 @@ As in https://pagure.io/fedora-infra/ansible/pull-request/1327[this Ansible Pull
 
 === Run the playbooks
 
-....
+```
 $ rbac-playbook openshift-apps/greenwave.yml
 $ rbac-playbook openshift-apps/bodhi.yml
 $ rbac-playbook groups/bodhi-backend.yml
 $ rbac-playbook groups/releng-compose.yml
 $ rbac-playbook manual/autosign.yml
-....
+```
 
 Greenwave runs in OpenShift (as implied by the playbook paths), and so
 the change will not be live right away when the playbook finishes. You
@@ -93,11 +93,11 @@ bodhi-backend01 (Look at warning in
 https://docs.pagure.org/releng/sop_bodhi_activation.html#action and the
 bug is https://github.com/fedora-infra/bodhi/issues/2177)
 
-....
+```
 $ sudo systemctl restart bodhi-celery
 $ sudo systemctl restart fm-consumer@config
 $ sudo systemctl restart koji-sync-listener
-....
+```
 
 === Send Announcement
 
diff --git a/modules/release_guide/pages/sop_file_ftbfs.adoc b/modules/release_guide/pages/sop_file_ftbfs.adoc
index 08a9bb8..ddd86ee 100644
--- a/modules/release_guide/pages/sop_file_ftbfs.adoc
+++ b/modules/release_guide/pages/sop_file_ftbfs.adoc
@@ -1,14 +1,11 @@
 = File FTBFS
 
-== Description
+NOTE: FTBFS means "Fails To Build From Source".
 
-[NOTE]
-====
-FTBFS = "Fails To Build From Source"
-====
+== Description
 
-After every mass rebuild, we file FTBFS bugs for the packages that
-failed to build during mass rebuild.
+After every mass rebuild, we file FTBFS bugs for the packages that failed to
+build during mass rebuild.
 
 This should be run after the
 https://docs.pagure.org/releng/sop_mass_rebuild_packages.html#post-mass-rebuild-tasks[mass
@@ -18,56 +15,45 @@ rebuild builds are merged into main tag].
 
 The FTBFS bugs are filed in bugzilla.
 
-. {blank}
-+
-Create a bugzilla bug for FTBFS::
+. Create a bugzilla bug for `FTBFS`:
   * use the https://bugzilla.redhat.com/show_bug.cgi?id=1750908[previous
   FTBFS bugzilla bug example] if its not created
-. {blank}
-+
-Set alias for RAWHIDEFTBFS::
-  * remove RAWHIDEFTBFS alias from the previous FTBFS bugzilla
-  * set RAWHIDEFTBFS alias on the new rawhide version FTBFS bugzilla
-  * set the alias on RAWHIDEFailsToInstall bugzilla in same fashion
-. {blank}
+
+. Set alias for `RAWHIDEFTBFS`:
+  * remove `RAWHIDEFTBFS` alias from the previous `FTBFS` bugzilla
+  * set `RAWHIDEFTBFS` alias on the new rawhide version `FTBFS` bugzilla
+  * set the alias on `RAWHIDEFailsToInstall` bugzilla in same fashion
+
+. Install `python-bugzilla-cli` on your local machine if its not installed:
 +
-Install [.title-ref]#python-bugzilla-cli# on your local machine if its
-not installed::
-....
+```
 $ sudo dnf install python-bugzilla-cli
-....
-. {blank}
-+
-Update the [.title-ref]#massrebuildsinfo.py#::
+```
+
+. Update the `massrebuildsinfo.py`:
   * epoch
   * buildtag
   * destag
   * tracking_bug
-  +
-  [NOTE]
-  ====
-  Most of these values are already updated during mass rebuild, only one
-  that might need updating is [.title-ref]#tracking_bug#
-  ====
-. {blank}
+
 +
-Update the [.title-ref]#mass_rebuild_file_bugs.py#::
+NOTE: Most of these values are already updated during mass rebuild, only one
+      that might need updating is `tracking_bug`.
+
+. Update the `mass_rebuild_file_bugs.py`:
   * rebuildid
-. {blank}
+
+. Login into bugzilla in the terminal using `bugzilla login` command:
 +
-Login into bugzilla in the terminal using [.title-ref]#bugzilla login#
-command::
-....
+```
 $ bugzilla login
-....
-  +
-  [NOTE]
-  ====
-  Login as [.title-ref]#releng@fedoraproject.org#
-  ====
-. {blank}
+```
+
++
+NOTE: Login as `releng@fedoraproject.org`
+
+. Run `mass_rebuild_file_bugs.py` locally:
 +
-Run [.title-ref]#mass_rebuild_file_bugs.py# locally::
-....
+```
 $ python mass_rebuild_file_bugs.py
-....
+```
diff --git a/modules/release_guide/pages/sop_mass_branching.adoc b/modules/release_guide/pages/sop_mass_branching.adoc
index f8c5425..ff2a08a 100644
--- a/modules/release_guide/pages/sop_mass_branching.adoc
+++ b/modules/release_guide/pages/sop_mass_branching.adoc
@@ -110,24 +110,22 @@ Apps in https://pagure.io/fedora-infra/ansible[ansible] need to be updated to be
 === Bodhi
 
 Bodhi needs to be updated to add new release. This needs to be done in
-https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2[bodhi2
-role] in infra ansible repo. This change includes, updating
-koji-sync-listener.py, new-updates-sync, pungi configs for rpm updates, bodhi templates.
+https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2[bodhi2 role] in
+infra ansible repo. This change includes, updating `koji-sync-listener.py`,
+`new-updates-sync`, pungi configs for rpm updates, bodhi templates.
 
-....
-- roles/bodhi2/backend/files/new-updates-sync
-- roles/bodhi2/backend/tasks/main.yml
-- roles/bodhi2/backend/templates/pungi.rpm.conf.j2
-- roles/bodhi2/backend/templates/koji_sync_listener.toml
-....
+* `roles/bodhi2/backend/files/new-updates-sync`
+* `roles/bodhi2/backend/tasks/main.yml`
+* `roles/bodhi2/backend/templates/pungi.rpm.conf.j2`
+* `roles/bodhi2/backend/templates/koji_sync_listener.toml`
 
 Please check these files from the https://pagure.io/fedora-infra/ansible/c/549e5d3ace41c04fdbef9d81f359f16c2fe0c2fa?branch=main[commit] for your reference.
 
 === Enable Branched Compose
 
 We need to enable the branched compose. This is done in
-https://pagure.io/fedora-infra/ansible/blob/main/f/roles/releng[releng
-role] of infra ansbile repo.
+https://pagure.io/fedora-infra/ansible/blob/main/f/roles/releng[releng role] of
+infra ansbile repo.
 
 Please check the file `roles/releng/files/branched` from the https://pagure.io/fedora-infra/ansible/c/549e5d3ace41c04fdbef9d81f359f16c2fe0c2fa?branch=main[commit] for your reference.
 
@@ -150,18 +148,15 @@ Robosignatory has two parts, which can be found in
 https://pagure.io/fedora-infra/ansible/blob/main/f/roles/robosignatory[robosignatory
 role] in infra ansible repo.:
 
-[arabic]
-. Disable branched signing, so that we can freeze branched until we get
-a compose.
+. Disable branched signing, so that we can freeze branched until we get a compose.
 . Adding new release.
 
-
 Please check the file `roles/robosignatory/templates/robosignatory.toml.j2` from the https://pagure.io/fedora-infra/ansible/c/a7dcdbd794e728f7b80b1afc6c142c0196b8c1a3?branch=main[commit] for your reference.
 
 === Push the changes
 
-When done editing the files, commit, push and apply them via the
-corresponding ansible playbook:
+When done editing the files, commit, push and apply them via the corresponding
+ansible playbook:
 
 ```
 $ sudo rbac-playbook groups/koji-hub.yml
@@ -426,23 +421,21 @@ be owned by _ftpsync:ftpsync_
 
 === Creating rawhide release
 
-To create a rawhide release in bodhi, you need to run
-
+To create a rawhide release in bodhi, you need to run:
 
 [attributes]
 ``
 $ bodhi releases create --name "F{rawhide}" --long-name "Fedora {rawhide}" --id-prefix FEDORA --version {rawhide} --branch f{rawhide} --dist-tag f{rawhide} --stable-tag f{rawhide} --testing-tag f{rawhide}-updates-testing --candidate-tag f{rawhide}-updates-candidate --pending-stable-tag f{rawhide}-updates-pending --pending-testing-tag f{rawhide}-updates-testing-pending --pending-signing-tag f{rawhide}-signing-pending --state pending --override-tag f{rawhide}-override --create-automatic-updates --not-composed-by-bodhi
 ``
 
-
-To create a container release for rawhide in bodhi, you need to run
+To create a container release for rawhide in bodhi, you need to run:
 
 [attributes]
 ``
 $ bodhi releases create --name "F{rawhide}C" --long-name "Fedora {rawhide} Containers" --id-prefix FEDORA-CONTAINER --version {rawhide} --branch f{rawhide} --dist-tag f{rawhide}-container --stable-tag f{rawhide}-container-updates --testing-tag f{rawhide}-container-updates-testing --candidate-tag f{rawhide}-container-updates-candidate --pending-stable-tag f{rawhide}-container-updates-pending --pending-testing-tag f{rawhide}-container-updates-testing-pending --state pending --override-tag f{rawhide}-container-override
 ``
 
-To create a flatpak release for branched in bodhi, you need to run
+To create a flatpak release for branched in bodhi, you need to run:
 
 [attributes]
 ``
@@ -452,12 +445,12 @@ $ bodhi releases create --name "F{branched}F" --long-name "Fedora {branched} Fla
 You need to run the `bodhi openshift` playbook, so that UI will know
 about the new release. Then, you need to restart
 *fm-consumer@config.service* and *bodhi-celery.service* services on
-*bodhi-backend01.phx2.fedoraproject.org*
+*bodhi-backend01.phx2.fedoraproject.org*:
 
-``
+```
 $ sudo rbac-playbook openshift-apps/bodhi.yml
 $ sudo systemctl restart fm-consumer@config.service bodhi-celery.service
-``
+```
 
 [NOTE]
 ====
@@ -576,9 +569,6 @@ And set current_rawhide variable.
 
 Use https://pagure.io/fedora-infra/ansible/pull-request/1527[this PR] for reference and add new version to the config.
 
-= Consider Before Running
+== Consider Before Running
 
-[NOTE]
-====
-FIXME: Need some love here
-====
+NOTE: FIXME: Need some love here