From 110ac25c1c540386658c7a11c27b35712cb0d7c1 Mon Sep 17 00:00:00 2001 From: "Jose A. Rivera" Date: Thu, 24 Aug 2017 09:31:57 -0500 Subject: [PATCH] docs: Fix minor inconsistencies in release management --- docs/release-maintenance.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/release-maintenance.md b/docs/release-maintenance.md index a7190c36..09d00dc2 100644 --- a/docs/release-maintenance.md +++ b/docs/release-maintenance.md @@ -7,8 +7,8 @@ gluster-kubernetes project. The project will only support and actively maintain two branches, `master` and the latest release branch. The latest release branch will always be reachable -by two HEADs, either `-stable` or just `stable`. Requests for support -of older branches may be considered on a case-by-case basis, but users will be +by two HEADs, `-latest` and `stable`. Requests for support of older +branches may be considered on a case-by-case basis, but users will be encouraged to use newer versions where possible. ## Version Numbering @@ -45,9 +45,9 @@ new release is made, the `stable` branch will be moved to follow the new release branch. Each MAJOR and MINOR release will get its own branch, forked from `master`. -Each release branch name will be of the form `-latest`, e.g. +Each release branch name will be of the form `-latest`, e.g. `1.0-latest`. PATCH releases to those versions will be made in those branches, -and will be marked by tags of the form `v`, e.g. `v1.0.0`. PATCH +and will be marked by tags of the form `v`, e.g. `v1.0.0`. PATCH releases may contain more than one commit, depending on the whimsy of the release engineers. :)