Website: Rename Categories and change order

diff --git a/docs/_data/documentation_page.json b/docs/_data/documentation_page.json
new file mode 100644 (file)
index 0000000..cb8e331
--- /dev/null
+++ b/docs/_data/documentation_page.json
@@ -0,0 +1,3 @@
+[
+  { "category": "Documentation", "title": "A longer description and available features and options", "url": "https://github.com/systemd/mkosi/blob/main/mkosi/resources/mkosi.md" }
+]

diff --git a/docs/_data/extra_pages.json b/docs/_data/project_pages.json
similarity index 67%
rename from docs/_data/extra_pages.json
rename to docs/_data/project_pages.json
index 003cafd9e76c6ed84955da76f02aa739fb4a9f91..eb7b39b6be03fc5b0e0d00de168682295e7b6f5a 100644 (file)
--- a/docs/_data/extra_pages.json
+++ b/docs/_data/project_pages.json
@@ -3,6 +3,5 @@
     { "category": "Project", "title": "Releases", "url": "https://github.com/systemd/mkosi/releases" },
     { "category": "Project", "title": "GitHub Project Page", "url": "https://github.com/systemd/mkosi" },
     { "category": "Project", "title": "Issues", "url": "https://github.com/systemd/mkosi/issues" },
-    { "category": "Project", "title": "Pull Requests", "url": "https://github.com/systemd/mkosi/pulls" },
-    { "category": "Man page", "title": "A longer description and available features and options", "url": "https://github.com/systemd/mkosi/blob/main/mkosi/resources/mkosi.md" }
+    { "category": "Project", "title": "Pull Requests", "url": "https://github.com/systemd/mkosi/pulls" }
 ]

diff --git a/docs/bootable.md b/docs/bootable.md
index 65056ca62d8faa98eb6c4c8266365d68a89bb429..59d4511d857c7ac8f0ec16123f64b6f5701a21d5 100644 (file)
--- a/docs/bootable.md
+++ b/docs/bootable.md
@@ -1,6 +1,6 @@
 ---
 title: Building a bootable image on different distros
-category: Documentation
+category: Tutorials
 layout: default
 SPDX-License-Identifier: LGPL-2.1-or-later
 ---

diff --git a/docs/building-rpms-from-source.md b/docs/building-rpms-from-source.md
index 5511a5abbebdc128004b9c08e6f255c08d862970..d93f9cafb12e50895b0b4afb0ad00e465b8744cd 100644 (file)
--- a/docs/building-rpms-from-source.md
+++ b/docs/building-rpms-from-source.md
@@ -1,6 +1,6 @@
 ---
 title: Building RPMs from source with mkosi
-category: Documentation
+category: Tutorials
 layout: default
 SPDX-License-Identifier: LGPL-2.1-or-later
 ---

diff --git a/docs/distribution-policy.md b/docs/distribution-policy.md
index 87514056b0fa3ccb6b9cb630b6bc7f3288c98568..b5bb94edb0b3b5aed7e6b1524ee978bfd787cbb5 100644 (file)
--- a/docs/distribution-policy.md
+++ b/docs/distribution-policy.md
@@ -1,6 +1,6 @@
 ---
 title: Adding new distributions
-category: Documentation
+category: Tutorials
 layout: default
 SPDX-License-Identifier: LGPL-2.1-or-later
 ---

diff --git a/docs/index.md b/docs/index.md
index f3beac5a77c442c1ba3a34c155fe179525aa56e6..36cb9db44c72793210a0d185b90879fe85a3f1fc 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -9,9 +9,11 @@ A fancy wrapper around `dnf --installroot`, `apt`, `pacman` and `zypper` that ge
 
 ---
 
-{% assign by_category = site.pages | group_by:"category" %}
-{% assign extra_pages = site.data.extra_pages | group_by:"category" %}
-{% assign merged = by_category | concat: extra_pages | sort:"name" %}
+{% assign tutorials = site.pages | group_by:"category" %}
+{% assign project = site.data.project_pages | group_by:"category" %}
+{% assign documentation = site.data.documentation_page | group_by:"category" %}
+{% assign merged = documentation | concat: tutorials | concat: project %}
+
 
 {% for pair in merged %}
   {% if pair.name != "" %}

diff --git a/docs/initrd.md b/docs/initrd.md
index 177dbc085045615fdf070e6dbb0f6d5d5ee89114..3472ae6a4e4feae0d013a21de31d2199a4ed3e93 100644 (file)
--- a/docs/initrd.md
+++ b/docs/initrd.md
@@ -1,6 +1,6 @@
 ---
 title: Building a custom initrd and using it in a mkosi image
-category: Documentation
+category: Tutorials
 layout: default
 SPDX-License-Identifier: LGPL-2.1-or-later
 ---

diff --git a/docs/sysext.md b/docs/sysext.md
index 0266eb49a6c45913275f2acc414c40d5aa65201d..d43ba54539c09f6d581132072b0aa51a54733859 100644 (file)
--- a/docs/sysext.md
+++ b/docs/sysext.md
@@ -1,6 +1,6 @@
 ---
 title: Building system extensions with mkosi
-category: Documentation
+category: Tutorials
 layout: default
 SPDX-License-Identifier: LGPL-2.1-or-later
 ---