From 427e449d66636a17cf415edafa17470f1f6dd87e Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Tue, 17 Dec 2024 08:30:15 +0100 Subject: [PATCH] Remove contradicting statement in 17.x.x branch, create an entry to clarify what legacy means. --- docs/source/_inc/_branch-policy.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/source/_inc/_branch-policy.md b/docs/source/_inc/_branch-policy.md index ee8a6771f6..6d7e054483 100644 --- a/docs/source/_inc/_branch-policy.md +++ b/docs/source/_inc/_branch-policy.md @@ -13,6 +13,13 @@ canary During the development process, a canary release will be cut from the `main` branch. When it becomes worthy of a beta or release candidate version, a new numbered branch should be cut, and non-breaking changes must be merged into it. +legacy +: The term _legacy_ refers to a version that is no longer supported or actively maintained. + They are the versions between official Plone minor releases. + It is recommended that you update to minor Plone releases as soon as possible. + They won't receive any new features. + They might receive occasional bugfixes or security updates, via a pull request, and it's approved by the Volto Team. + `main` : This is the bleeding edge branch in git. It is the branch upon which future development occurs, and from which future releases shall be cut. @@ -38,7 +45,6 @@ canary `17.x.x` : `17.x.x` is no longer supported and became legacy when Volto 18 was released. - It won't receive any bug fixes nor security updates. It is recommended that you update to 18.x.x. If you need a bug fix or security update for this version, please submit a pull request, and the Volto Team will review it to determine whether it's suitable to merge.