Merge branch 'master' into Hardlinks

docs/Misc/how-to-provide-a-docker-compose.md

@@ -4,7 +4,7 @@ When you're running dockers and you need help on discord etc you often hear the
 
 "Provide a docker compose"
 
-If you need to provide this info always remember to provide it from all your *arr (Sonarr, Radarr, Lidarr, Bazarr) and also from your download client(s).
+If you need to provide this info always remember to provide it from all your Starr Apps (Sonarr, Radarr, Lidarr, Bazarr) and also from your download client(s).
 
 If you're using a system with a GUI (Synology, unRAID, OMV, etc.) it's not always easy to provide a docker compose but it's possible.
 
@@ -25,9 +25,10 @@ sudo docker run --rm -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/red5d/
 
 Paste the results on one of the following sites.
 
-- [0bin.net](https://0bin.net/){:target="_blank" rel="noopener noreferrer"} (Reccomended)
+- [0bin.net](https://0bin.net/){:target="_blank" rel="noopener noreferrer"} (Recommended)
 - [Github Gist](https://gist.github.com){:target="_blank" rel="noopener noreferrer"} (Alternative)
 - [Ubuntu Pastebin](https://pastebin.ubuntu.com/){:target="_blank" rel="noopener noreferrer"}
 - [hastebin.com](https://hastebin.com){:target="_blank" rel="noopener noreferrer"}
+- [privatebin.net](https://privatebin.net/){:target="_blank" rel="noopener noreferrer"}
 
 If you use docker run command to create your docker containers, paste your run command in to [composerize](https://www.composerize.com/){:target="_blank" rel="noopener noreferrer"}

docs/Radarr/index.md

@@ -2,15 +2,48 @@
 
 Here you will find a collection of Radarr Guides I made.
 
-## v3 Radarr Branch: latest
+## Master
 
-![version](https://img.shields.io/badge/dynamic/json?query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Fhotio%2Fradarr%2Frelease%2FVERSION.json&label=Latest%20Version&style=for-the-badge&color=4051B5)
+![master](https://img.shields.io/badge/dynamic/json?query=%24.version&url=https://raw.githubusercontent.com/hotio/radarr/release/VERSION.json&label=Current%20Master/Stable%20Version&style=for-the-badge&color=4051B5)
 
-- (stable) (v3)
+(Default/Stable): It has been tested by users on the develop and nightly branches and it’s not known to have any major issues.
-- Builds Pushed only when intentionally released
-- Github Branch: master
-- Docker: [hotio/radarr:release](https://hub.docker.com/r/hotio/radarr){:target="_blank" rel="noopener noreferrer"}
 
-```bash
+This version will receive updates approximately monthly.
-hotio/radarr:release
+
-```
+On GitHub, this is the `master` branch.
+
+## Develop
+
+![develop](https://img.shields.io/badge/dynamic/json?query=%24.version&url=https://raw.githubusercontent.com/hotio/radarr/testing/VERSION.json&label=Current%20Develop/Beta%20Version&style=for-the-badge&color=4051B5)
+
+(Beta): This is the testing edge. Released after tested in nightly to ensure no immediate issues. New features and bug fixes released here first after nightly. It can be considered semi-stable, but is still `beta`.
+
+This version will receive updates either weekly or biweekly depending on development.
+
+!!! warning
+
+    **You may not be able to go back to `master` after switching to this branch.**
+
+On GitHub, this is a snapshot of the `develop` branch at a specific point in time.
+
+## Nightly
+
+![nightly](https://img.shields.io/badge/dynamic/json?query=%24.version&url=https://raw.githubusercontent.com/hotio/radarr/nightly/VERSION.json&label=Current%20Nightly/Unstable%20Version&style=for-the-badge&color=4051B5)
+
+(Alpha/Unstable) : This is the bleeding edge. It is released as soon as code is committed and passes all automated tests. This build may have not been used by us or other users yet. There is no guarantee that it will even run in some cases. This branch is only recommended for advanced users. Issues and self investigation are expected in this branch.
+
+!!! danger
+
+    ***Use this branch only if you know what you are doing and are willing to get your hands dirty to recover a failed update.***
+
+This version is updated immediately.
+
+!!! warning
+
+    **You may not be able to go back to `master` after switching to this branch.**
+
+On GitHub, this is the `develop` branch.
+
+### How do I update Radarr
+
+External link to the official [WikiArr](https://wiki.servarr.com/en/radarr/faq#how-do-i-update-radarr){:target="_blank" rel="noopener noreferrer"}.

docs/Sonarr/index.md

@@ -2,15 +2,26 @@
 
 Here you will find a collection of Sonarr guides I made.
 
-## v3 Sonarr Branch: latest
+## Master
 
-![version](https://img.shields.io/badge/dynamic/json?query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Fhotio%2Fsonarr%2Frelease%2FVERSION.json&label=Latest%20Version&style=for-the-badge&color=4051B5)
+![Main](https://img.shields.io/badge/dynamic/json?query=%24.version&url=https://raw.githubusercontent.com/hotio/sonarr/release/VERSION.json&label=Current%20Master/Stable%20Version&style=for-the-badge&color=4051B5)
 
-- (Stable) (v3)
+(Default/Stable): This has been tested by users on nightly (`develop`) branch and it's not known to have any major issues. This branch should be used by the majority of users.
-- Builds Pushed only when intentionally released
-- Github Branch: main
-- Docker: [hotio/sonarr:release](https://hub.docker.com/r/hotio/sonarr){:target="_blank" rel="noopener noreferrer"}
 
-```bash
+On GitHub, this is the `main` branch.
-hotio/sonarr:release
+
-```
+## Develop
+
+![Develop](https://img.shields.io/badge/dynamic/json?query=%24.version&url=https://raw.githubusercontent.com/hotio/sonarr/nightly/VERSION.json&label=Current%20Develop/Nightly%20Version&style=for-the-badge&color=4051B5)
+
+(Alpha/Unstable) : This is the bleeding edge. It is released as soon as code is committed and passes all automated tests. This build may have not been used by us or other users yet. There is no guarantee that it will even run in some cases. This branch is only recommended for advanced users. Issues and self investigation are expected in this branch.
+
+!!! Warning
+
+    **You may not be able to go back to `main` after switching to this branch.**
+
+On GitHub, this is the `develop` branch.
+
+### How do I update Sonarr
+
+External link to the official [WikiArr](https://wiki.servarr.com/en/sonarr/faq#how-do-i-update-sonarr){:target="_blank" rel="noopener noreferrer"}.