Merge branch 'main' into notFoundNoErr_GetBadge

woodpecker-ci · Jul 27, 2023 · 9fb8a50 · 9fb8a50
2 parents 86d4547 + 1d2f594
commit 9fb8a50
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/docs/docs/80-downloads.md b/docs/docs/80-downloads.md
@@ -13,10 +13,11 @@ To find out more about the differences between the two releases, please read the
 ## Docker images
 
 Image variants:
-* The `latest` image is the latest stable release
-* The `vX.X.X` images are stable releases
-* The `vX.X` images are based on the latest patch version of a specific minor release (see [Semver](https://semver.org/))
-* The `next` images are based on the current master branch and should not be used for production environments
+
+- The `latest` image is the latest stable release
+- The `vX.X.X` images are stable releases
+- The `vX.X` images are based on the current release branch (e.g. `release/v1.0`) and can be used to get bugfixes asap
+- The `next` images are based on the current `main` branch and should not be used for production environments
 
 ``` bash
 # server

diff --git a/docs/src/pages/faq.md b/docs/src/pages/faq.md
@@ -18,7 +18,7 @@ Woodpecker is having two different kinds of releases: **stable** and **next**.
 
 The **stable** releases (currently version 0.15) is a long-term supported (LTS) stable version. The stable releases are only getting bugfixes.
 
-The **next** release contains all bugfixes and features from `master`. Normally it should be pretty stable, but as its frequently updated, it might contain some bugs from time to time.
+The **next** release contains all bugfixes and features from `main` branch. Normally it should be pretty stable, but as its frequently updated, it might contain some bugs from time to time.
 
 If you want all (new) features of Woodpecker and are willing to accept some possible bugs from time to time, you should use the next release otherwise use the stable release.