Merge 840cd6316d into 8a9993eff0

CONTRIBUTING.md

@@ -118,13 +118,12 @@ It is also worth asking on the Slack channels.
 
 We use milestones to track progress of specific planned releases.
 
-For example, if the latest currently-released version is `3.2.1`, an issue/PR which pertains to a
+For example, if the latest currently-released version is `1.2.3`, an issue/PR which pertains to a specific upcoming bugfix or feature release could fall into one of two different active milestones: `1.2.4` (next patch) or `1.3.0` (next minor).
-specific upcoming bugfix or feature release could fall into one of two different active milestones:
-`3.2.2` or `3.3.0`.
 
-Issues and PRs which are deemed backwards-incompatible may be added to the discussion items for
+Issues and PRs which are deemed backwards-incompatible may be added to the next major version
-Helm 4 with [label:v4.x](https://github.com/helm/helm/labels/v4.x). An issue or PR that we are not
+discussion using the relevant version label (e.g. [label:v5.x](https://github.com/helm/helm/labels/v5.x)).
-sure if we will be addressing will not be added to any milestone.
+
+An issue or PR that we are not sure if we will be addressing will not be added to any milestone.
 
 A milestone (and hence release) can be closed when all outstanding issues/PRs have been closed
 or moved to another milestone and the associated release has been published.