From 2984e2091588b561a8247a62db036c786af9ae26 Mon Sep 17 00:00:00 2001
From: Filip Valder <fvalder@redhat.com>
Date: Feb 07 2022 15:44:25 +0000
Subject: Add some mention regarding modular compose paths


Signed-off-by: Filip Valder <fvalder@redhat.com>

---

diff --git a/modules/ROOT/pages/building-modules/fedora/module-obsoletes.adoc b/modules/ROOT/pages/building-modules/fedora/module-obsoletes.adoc
index 86d8b77..2879513 100644
--- a/modules/ROOT/pages/building-modules/fedora/module-obsoletes.adoc
+++ b/modules/ROOT/pages/building-modules/fedora/module-obsoletes.adoc
@@ -75,7 +75,8 @@ First, testing metadata are checked to make sure your libmodulemd is able to han
 module obsoletes. Then the actual metadata in the `obsoletes/` directory are validated.
 
 . *After a successful validation*, file a https://pagure.io/releng/fedora-module-defaults/pull-requests[pull request]
-for the module obsolete to be included in the repository.
+for the module obsolete to be included in the repository. Use branch _main_ for including module
+obsoletes into Fedora Rawhide. Check fedora-module-defaults repository for all the branches.
 
 === Configure pungi for module obsoletes and create a modular compose
 
@@ -88,10 +89,12 @@ for the module obsolete to be included in the repository.
     module_obsoletes_dir = {
         'scm': 'git',
         'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
-        'branch': 'main',
+        'branch': 'main',  # main for Rawhide, otherwise must match the fedora-module-defaults branch
         'dir': 'obsoletes'
     }
 ----
++
+NOTE: Check https://pagure.io/pungi-fedora[pungi-fedora] for all the branches.
 
 . Follow https://docs.pagure.org/pungi[pungi docs] on how to create a modular compose.
 +
@@ -100,6 +103,16 @@ and the corresponding configuration reference.
 
 === Final repodata contain module obsoletes
 
+There are several paths how module obsoletes can appear in the compose metadata:
+
+. Forward: Just follow the steps above and wait for a next modular compose of Fedora Rawhide to
+appear.
+
+. Backward (backporting): Since the module obsoletes are checked within any modular compose build,
+you may wait for some other module's update to push the changes through. This can be an issue in
+case of an already EOLed/dead module. Again, follow the steps above and contact releng team
+requesting manual modular compose build.
+
 When the obsoletes metadata appear in the repodata (`modules.yaml` file), DNF is expected
 to handle the information regarding obsoletes and react accordingly.