From 3c88f6e33372a2c35b25795a3e915aacad1a5975 Mon Sep 17 00:00:00 2001
From: Minecon724 <minecon724@noreply.git.m724.eu>
Date: Sun, 4 May 2025 13:38:55 +0200
Subject: [PATCH] Add better build instructions

---
 ABOUT-FORK.md | 45 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/ABOUT-FORK.md b/ABOUT-FORK.md
index 7c8f48a7b2..71a1b6b6c5 100644
--- a/ABOUT-FORK.md
+++ b/ABOUT-FORK.md
@@ -28,28 +28,51 @@ This fork is a drop-in replacement. You can switch back and forth, as there are
 You can see [all changes here](/git724/forgejo/commits/branch/v11.0/forgejo/search?q=Minecon724&all=). \
 Don't be overwhelmed, as commits are very granular.
 
-### Builds
+### Download
 
-Docker builds [are available here](https://hub.docker.com/r/minecon724/forgejo724) for arm64.
+Docker builds [are available here](https://hub.docker.com/r/minecon724/forgejo724) for amd64 and arm64.
+
+### Changelog
+
+- 11.0.0
+  - Dropped [pronouns patch](/git724/forgejo/commit/e82e33e1161288dd395592a1ea232611a9376c36), because [it's upstream](https://codeberg.org/forgejo/forgejo/pulls/6835) (I stole it unknowingly)
+  - Simplified [Improve theme picker](/git724/forgejo/commit/9542895e03e487cfd0a7c673257cc383295b5d76), because of [some good changes upstream](https://codeberg.org/forgejo/forgejo/pulls/7168)
+
+---
+
+## For developers
+
+### Building
 
 To build, [follow the official instructions](https://forgejo.org/docs/next/contributor/from-source/)
 
-To build for multiple architectures:
-1. Setup: (only do this once)
+Build a single image for multiple architectures:
+1. Setup: (do this once)
    ```bash
    docker buildx create --name mybuilder --use
    docker buildx inspect --bootstrap
+   docker run --privileged --rm tonistiigi/binfmt --install all
    ```
 2. Build:
    ```bash
    docker buildx build --platform linux/amd64,linux/arm64 -t user/repo:tag --push .
    ```
-   You can add more architectures, if you wish.
+   Replace the tag. You can add more architectures, if you wish.
 
-You may get rate-limited (429) by code.forgejo.org. Try building for one architecture at a time.
+### Merge
+Make sure you checked out the branch to merge to.
+1. ```bash
+   git remote add upstream https://codeberg.org/forgejo/forgejo.git
+   ```
+2. ```bash
+   git fetch --no-tags upstream
+   ```
+3. ```bash
+   git merge upstream/$BRANCH
+   ```
 
-### Changelog
-
-- 11.0
-  - Dropped [pronouns patch](/git724/forgejo/commit/e82e33e1161288dd395592a1ea232611a9376c36), because [it's upstream](https://codeberg.org/forgejo/forgejo/pulls/6835) (I stole it unknowingly)
-  - Simplified [Improve theme picker](/git724/forgejo/commit/9542895e03e487cfd0a7c673257cc383295b5d76), because of [some good changes upstream](https://codeberg.org/forgejo/forgejo/pulls/7168)
+### Tag a release
+```
+git tag $TAG
+git push origin tag $TAG
+```
\ No newline at end of file