From 34f5b3cf5683ecfd33d477c8e86cfdc0008d878f Mon Sep 17 00:00:00 2001
From: Arun Isaac
Date: Tue, 15 Aug 2023 09:19:50 +0100
Subject: doc: Advertise support for cgit and klaus.

* doc/forge.skb (Introduction), website/index.skb: Advertise support
for cgit and klaus.
---
 doc/forge.skb     | 9 ++++-----
 website/index.skb | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/doc/forge.skb b/doc/forge.skb
index 5cb2a7a..3f34a96 100644
--- a/doc/forge.skb
+++ b/doc/forge.skb
@@ -35,15 +35,14 @@ software wired up to function as one. In this sense, it is a
 email.])
     (p [guix-forge integrates the following software components:]
        (itemize
+        (item [,(ref :url "https://git.zx2c4.com/cgit/" :text "cgit")
+and ,(ref :url "https://github.com/jonashaag/klaus/" :text "klaus")
+(pick your favourite) to serve project git repositories on the web])
         (item [,(ref :url "https://laminar.ohwg.net/" :text "laminar")
-for continuous integration])
-        (item [,(ref :url "https://github.com/jonashaag/klaus/" :text
-"klaus") to serve project git repositories on the web])))
+for continuous integration])))
     (p [In the future, it will also provide:]
        (itemize
         (item [web server to serve static project sites])
-        (item [,(ref :url "https://git.zx2c4.com/cgit/" :text "cgit")
-to serve project git repositories on the web])
         (item [,(ref :url "https://public-inbox.org/README.html"
 :text "public-inbox") for project discussions])))
     (p [A choice of different software components may be offered
diff --git a/website/index.skb b/website/index.skb
index 9ac81c5..ba37333 100644
--- a/website/index.skb
+++ b/website/index.skb
@@ -23,9 +23,9 @@
   (p [,(emph [guix-forge]) is a Guix service that lets you run a complete ,(ref :url "https://en.wikipedia.org/wiki/Forge_(software)" :text "software forge") in the manner of GitHub, GitLab, etc. Unlike other free software forges such as GitLab, Gitea, etc., ,(emph [guix-forge]) is not a monolith but is an assemblage of several pieces of server software wired up to function as one. In this sense, it is a ,(emph [meta-service]) . ,(emph [guix-forge]) does for software forges what ,(ref :url "https://mailinabox.email/" :text "Mail-in-a-Box") does for email.])
   (p [,(emph [guix-forge]) integrates the following software components:])
   (itemize
+   (item [,(code "[X]") ,(ref :url "https://git.zx2c4.com/cgit/" :text "cgit") and ,(ref :url "https://github.com/jonashaag/klaus/" :text "klaus") (pick your favourite) to serve project git repositories on the web])
    (item [,(code "[X]") ,(ref :url "https://laminar.ohwg.net" :text "laminar") for continuous integration])
    (item [,(code "[ ]") web server to serve static project sites])
-   (item [,(code "[ ]") ,(ref :url "https://git.zx2c4.com/cgit/" :text "cgit") to serve project git repositories on the web])
    (item [,(code "[ ]") ,(ref :url "https://public-inbox.org/README.html" :text "public-inbox") for project discussions]))
   (p [A choice of different software components may be offered provided it does not complicate the interface too much.])
   (p [,(emph [guix-forge]) is provided on a best effort basis. Its design is unstable, and open to change. We will try our best to not break your system configuration often, but it might happen.])
-- 
cgit v1.2.3