From b500eaf9d299195aba1136aedd3eb7caa8d82a1e Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 4 Jun 2020 14:09:59 +1000 Subject: [PATCH] CHARTER: s12(c): formalise charter versions and changelog We have version numbers (and a changelog) in the Charter, so we should probably actually enshrine that in the Charter. In addition, clean up the changelog format so that it's easier to understand. This change does introduce new requirements for the editors of the Charter, but it simply mirrors the current convention applied to Charter amendments. In addition, define the concept of a "draft Charter version" so that we can make iterative changes to the charter through separate PRs without having to enact each minor change separately. Signed-off-by: Aleksa Sarai --- CHARTER.md | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/CHARTER.md b/CHARTER.md index 0384ef0..6d1b1f8 100644 --- a/CHARTER.md +++ b/CHARTER.md @@ -1,12 +1,18 @@ -# Open Container Initiative Charter v1.2 +# Open Container Initiative Charter v1.2+DRAFT -| Comment | Effective Date | -| ---------------- |:----------------:| -| Initial release | 13 November 2015 | -| Update | 18 May 2020 | -| Update (simplify)| 4 June 2020 | +| Version | Notice Date | Effective Date | Changes | +| --------- | ----------- | -------------- | ---------------------------------------- | +| 1.0 | 2015-11-13 | 2015-11-13 | *Initial release.* | +| 1.1 | 2020-05-06 | 2020-06-05 | • *(Section 1)* Remove scope table. | +| 1.2 | 2020-06-04 | 2020-07-04 | • *(Section 1)* Simplify mission. | +| 1.2+DRAFT | | | • *(Section 12)* Formalise changelog, version numbers, and draft charter versions. | -## 1. Mission of the Open Container Initiative (“OCI”). +> **NOTE**: The "notice date" is the date at which OCI Members were given +> notice regarding the relevant changes, and the "effective date" is the date +> when the respective version of the Charter came into effect -- in accordance +> with Section 12 (a) of this Charter. + +## 1. Mission of the Open Container Initiative ("OCI") The Open Container Initiative provides an open source technical community within which industry participants may easily contribute to building @@ -459,3 +465,15 @@ b. A Member may resign within such thirty-day notice period, or within the not have any effect on commitments made by the OCI Member or participant during the term of membership. Resignation may be made by email to the Executive Director of the Linux Foundation. + +c. Each version of this Charter will have a distinguishing version number, with + a changelog included in the preamble describing material changes to the + Charter. + +d. In order to facilitate collaborative development of this Charter, draft + versions of this Charter may be indicated by the suffix "+DRAFT" added to + the version number. These Charter versions are not enforceable, and the most + recently published non-draft Charter remains in effect until a newer + non-draft Charter is published. For the avoidance of doubt, amendments to a + draft Charter still must go through the same process as amendments to a + non-draft Charter (as described in Section 12 (a) of this Charter).