From 5d3a5a335f7d8083a40a837998856e68ed4ac6c9 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Tue, 9 Apr 2024 18:23:43 +0200
Subject: [PATCH] Reduce to only one release branch

---
 .github/workflows/syntax.yml     |  4 ++--
 .github/workflows/test_linux.yml |  4 ++--
 .github/workflows/test_mac.yml   |  4 ++--
 .github/workflows/test_win.yml   |  4 ++--
 CONTRIBUTING.md                  | 13 ++++++-------
 README.md                        |  6 +++---
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml
index 193b7a4a..7a2f2844 100644
--- a/.github/workflows/syntax.yml
+++ b/.github/workflows/syntax.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches:
       - main
-      - releases/**
+      - release
   pull_request:
     branches:
       - main
-      - releases/**
+      - release
 
 jobs:
   checkSyntax:
diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml
index f15cc424..d1453e17 100644
--- a/.github/workflows/test_linux.yml
+++ b/.github/workflows/test_linux.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches:
       - main
-      - releases/**
+      - release
   pull_request:
     branches:
       - main
-      - releases/**
+      - release
 
 jobs:
   testLinux:
diff --git a/.github/workflows/test_mac.yml b/.github/workflows/test_mac.yml
index eb176743..fe83ff74 100644
--- a/.github/workflows/test_mac.yml
+++ b/.github/workflows/test_mac.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches:
       - main
-      - releases/**
+      - release
   pull_request:
     branches:
       - main
-      - releases/**
+      - release
 
 jobs:
   testMac:
diff --git a/.github/workflows/test_win.yml b/.github/workflows/test_win.yml
index 09d935ea..108670ee 100644
--- a/.github/workflows/test_win.yml
+++ b/.github/workflows/test_win.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches:
       - main
-      - releases/**
+      - release
   pull_request:
     branches:
       - main
-      - releases/**
+      - release
 
 jobs:
   testWin:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4737c3b8..50d50e09 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,14 +22,13 @@ just make a pull request directly.
 
 ## Picking the Correct Branch for a Pull Request
 
-As of April 2024, pre-releases and point releases (like 2.x) are made from the `main` branch. The
-`main` branch is the default branch. For general changes, please make a new branch in your own fork
-from the current `main` branch. Do not make pull requests from your copy of the `main` branch.
+The `main` branch is the default branch. For general changes, please make a new branch in your own
+fork from the current `main` branch. Do not make pull requests from your copy of the `main` branch.
 
-If you are submitting a fix to a current release, say 2.4, you must do so from the correct release
-branch. For 2.4 this is `releases/v2.4`. If you make such a fix on the `main` branch, **it cannot
-be included in a 2.4.x release**. This also applies to the current documentation published on the
-main website.
+As of April 2024, releases are made from the `release` branch. If you are submitting a fix to a
+current release you must do so from the `release` branch. If you make such a fix on the `main`
+branch, **it cannot be included in a patch release**. This also applies to the documentation for
+the latest release published on the main website.
 
 **Also check the following:**
 
diff --git a/README.md b/README.md
index f7323f56..c384b52c 100644
--- a/README.md
+++ b/README.md
@@ -49,9 +49,9 @@ code, please also read the full
 
 Project credits are available in [CREDITS.md](https://github.com/vkbo/novelWriter/blob/main/CREDITS.md).
 
-**Note:** As of April 2024, pre-releases and point releases (2.x) are made from the `main` branch.
-Patches are made from `releases/v2.x` branches. So if you're submitting a fix to a current release,
-**including changes to documentation**, they must be made to the correct branch.
+**Note:** As of April 2024 only pre-releases are made from the `main` branch. Full releases are
+made from the `release` branch. So if you're submitting a fix to a current release, **including
+changes to documentation**, they must be made to the 'release' branch.
 
 ### Translations