From ac931d45070a155611521e97b40d665c230446fa Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 14 Jun 2026 13:35:30 +0200 Subject: [PATCH] docs: structure: move merge-requests related pages Add a new "merge requests" page and move all related pages under that page to give the docs more structure. Signed-off-by: Oliver Smith Part-of: --- docs/conf.py | 2 ++ docs/device-categorization.md | 2 +- docs/index.md | 2 +- docs/merge-requests.md | 11 +++++++++++ docs/{ => merge-requests}/approval-rules.md | 4 ++-- docs/{ => merge-requests}/approval-rules.svg | 0 .../stable-branches.md} | 0 docs/releases.md | 1 - 8 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 docs/merge-requests.md rename docs/{ => merge-requests}/approval-rules.md (97%) rename docs/{ => merge-requests}/approval-rules.svg (100%) rename docs/{releases/backporting.md => merge-requests/stable-branches.md} (100%) diff --git a/docs/conf.py b/docs/conf.py index 4227a8634..656374a33 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -29,8 +29,10 @@ html_title = "postmarketOS Packaging" # Redirects for moved pages redirects = { + "approval-rules": "merge-requests/approval-rules.html", "ci-tags": "ci/ci-tags.html", "hardware-ci": "ci/hardware-ci.html", + "releases/backporting": "merge-requests/stable-branches.html", } def run_dint_doc(app): diff --git a/docs/device-categorization.md b/docs/device-categorization.md index 77a25d457..3070331f0 100644 --- a/docs/device-categorization.md +++ b/docs/device-categorization.md @@ -224,7 +224,7 @@ requested time pass and the device still does not meet the criteria, a merge request to move them to the now appropriate category should be opened. Merge requests moving a device to a lower category are subject to the standard -[pmaports approval rules](./approval-rules). +[pmaports approval rules](./merge-requests/approval-rules). ## See also diff --git a/docs/index.md b/docs/index.md index 5c836db0b..d096a4f77 100644 --- a/docs/index.md +++ b/docs/index.md @@ -14,7 +14,7 @@ in pmaports and the processes around device categorization. :hidden: releases - approval-rules + merge-requests device-categorization deviceinfo-reference ci diff --git a/docs/merge-requests.md b/docs/merge-requests.md new file mode 100644 index 000000000..aaefda2b2 --- /dev/null +++ b/docs/merge-requests.md @@ -0,0 +1,11 @@ +# Merge Requests + +The subpages of this page describe processes for merge requests in pmaports. + +```{eval-rst} +.. toctree:: + :hidden: + + merge-requests/approval-rules + merge-requests/stable-branches +``` diff --git a/docs/approval-rules.md b/docs/merge-requests/approval-rules.md similarity index 97% rename from docs/approval-rules.md rename to docs/merge-requests/approval-rules.md index 298e5958f..227d75070 100644 --- a/docs/approval-rules.md +++ b/docs/merge-requests/approval-rules.md @@ -33,12 +33,12 @@ The following flowchart describes the process: ## Move device from category Moving devices from category is a special operation, see -[device categorization](./device-categorization). +[device categorization](../device-categorization). ## Changing kconfigcheck requirements Changes to `kconfigcheck.toml` are a special operation, see -[kconfigcheck](./kconfigcheck). +[kconfigcheck](../kconfigcheck). ## Testing requirements diff --git a/docs/approval-rules.svg b/docs/merge-requests/approval-rules.svg similarity index 100% rename from docs/approval-rules.svg rename to docs/merge-requests/approval-rules.svg diff --git a/docs/releases/backporting.md b/docs/merge-requests/stable-branches.md similarity index 100% rename from docs/releases/backporting.md rename to docs/merge-requests/stable-branches.md diff --git a/docs/releases.md b/docs/releases.md index 48195e6a6..a7a00c8b4 100644 --- a/docs/releases.md +++ b/docs/releases.md @@ -69,5 +69,4 @@ appear, but you will get a more a more tried and tested, solid experience. :hidden: releases/timeline - releases/backporting ```