Merge branch 'master' into opent

open-policy-agent · Nov 16, 2023 · 661e1ee · 661e1ee
2 parents 5cd3fde + 8f5201f
commit 661e1ee
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/docs/Release_Management.md b/docs/Release_Management.md
@@ -24,20 +24,20 @@ No plan to move to 4.0.0 unless there is a major design change like an incompati
 
 **Minor Releases**
 
-- X.Y.0-alpha.W, W >= 0 (Branch : master)
+- X.Y.0-alpha.W, W >= 0 (Branch: master)
     - Released as needed before we cut a beta X.Y release
     - Alpha release, cut from master branch
-- X.Y.0-beta.W, W >= 0 (Branch : master)
+- X.Y.0-beta.W, W >= 0 (Branch: master)
     - Released as needed before we cut a stable X.Y release
     - More stable than the alpha release to signal users to test things out
     - Beta release, cut from master branch
-- X.Y.0-rc.W, W >= 0 (Branch : master)
+- X.Y.0-rc.W, W >= 0 (Branch: release-X.Y)
     - Released as needed before we cut a stable X.Y release
-    - soak for ~ 2 weeks before cutting a stable release
-    - Release candidate release, cut from master branch
-- X.Y.0 (Branch: master)
-    - Released every ~ 3 months
-    - Stable release, cut from master when X.Y milestone is complete
+    - Soak for a total of ~2 weeks before cutting a stable release
+    - Release candidate release, cut from release-X.Y branch
+- X.Y.0 (Branch: release-X.Y)
+    - Released every ~3 months
+    - Stable release, cut from release-X.Y branch when X.Y milestone is complete
 
 **Patch Releases**