From f2660e21fb861241390f673caec7817f8f9e7223 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 22 Jun 2020 09:31:14 +0200 Subject: [PATCH 01/17] Add initial CONTRIBUTING.md --- CONTRIBUTING.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..562eed374 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,22 @@ +# Contributing to the netCDF-CF Conventions website + +Dear CF community member, + +Thank you for taking the time to consider making a contribution to the [website of the cf-conventions](cf-website). + +This set of guidelines provides an overview of the process for making changes to the website. + +## Correcting errors +Raise an issue describing the error. +Consider associating that issue to a pull request that corrects the error. +A member of the [CF Information Management and Support Team](info-mgmt) will review the change and merge it, deploying it to the website. + +## Making improvements +Raise an issue describing what you'd like to do. +A member of the [CF Information Management and Support Team](info-mgmt) will review it and decide how to approach the change. +Generally, items on the website affect the governance of CF and therefore require the approval of 2 members of the [Governance Panel](gov-panel) before merging. +However, minor changes of a technical nature may be implemented upon approval of a member of the [CF Information Management and Support Team](info-mgmt). + +[cf-website]: http://cfconventions.org/ +[info-mgmt]: http://cfconventions.org/governance.html#information-management-and-support +[gov-panel]: http://cfconventions.org/governance.html#governance-panel From fd4ce6b55df9553e7d9ffb07f65fdb6e8d7d050c Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 22 Jun 2020 17:53:49 +0200 Subject: [PATCH 02/17] Add issue templates --- .github/ISSUE_TEMPLATE/defect-issue.md | 12 ++++++++++++ .github/ISSUE_TEMPLATE/enhancement-issue.md | 12 ++++++++++++ .github/ISSUE_TEMPLATE/github-problem-issue.md | 12 ++++++++++++ .github/ISSUE_TEMPLATE/governance-issue.md | 12 ++++++++++++ .github/ISSUE_TEMPLATE/typo-issue.md | 12 ++++++++++++ .github/ISSUE_TEMPLATE/update-issue.md | 12 ++++++++++++ 6 files changed, 72 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/defect-issue.md create mode 100644 .github/ISSUE_TEMPLATE/enhancement-issue.md create mode 100644 .github/ISSUE_TEMPLATE/github-problem-issue.md create mode 100644 .github/ISSUE_TEMPLATE/governance-issue.md create mode 100644 .github/ISSUE_TEMPLATE/typo-issue.md create mode 100644 .github/ISSUE_TEMPLATE/update-issue.md diff --git a/.github/ISSUE_TEMPLATE/defect-issue.md b/.github/ISSUE_TEMPLATE/defect-issue.md new file mode 100644 index 000000000..c5fd1199a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/defect-issue.md @@ -0,0 +1,12 @@ +--- +name: Defect +about: Use to correct content mistakes +title: '' +labels: defect +assignees: '' + +--- + +Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). + +Proposals to fix defects must be approved by a member of the Conventions Committee and Standard Names Committee, or the Governance Panel. diff --git a/.github/ISSUE_TEMPLATE/enhancement-issue.md b/.github/ISSUE_TEMPLATE/enhancement-issue.md new file mode 100644 index 000000000..dedf03eb5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/enhancement-issue.md @@ -0,0 +1,12 @@ +--- +name: Enhancement proposal +about: Use to propose enhancements to the website's look and feel +title: '' +labels: defect +assignees: '' + +--- + +Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). + +Enhancement proposals must be approved by a member of the Information Management and Support Team, the Conventions Committee and Standard Names Committee, or the Governance Panel. diff --git a/.github/ISSUE_TEMPLATE/github-problem-issue.md b/.github/ISSUE_TEMPLATE/github-problem-issue.md new file mode 100644 index 000000000..6e2d6cd00 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/github-problem-issue.md @@ -0,0 +1,12 @@ +--- +name: GitHub issue +about: Use to correct technical problems with GitHub +title: '' +labels: defect +assignees: '' + +--- + +Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). + +Proposals to fix GitHub issues must be approved by a member of the Information Management and Support Team. diff --git a/.github/ISSUE_TEMPLATE/governance-issue.md b/.github/ISSUE_TEMPLATE/governance-issue.md new file mode 100644 index 000000000..e98ca3dd6 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/governance-issue.md @@ -0,0 +1,12 @@ +--- +name: Governance issue +about: Use to propose changes to the CF governance processes +title: '' +labels: defect +assignees: '' + +--- + +Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). + +Proposals affecting the CF Governance processes must be approved by a member of the Governance Panel. diff --git a/.github/ISSUE_TEMPLATE/typo-issue.md b/.github/ISSUE_TEMPLATE/typo-issue.md new file mode 100644 index 000000000..02a681c45 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/typo-issue.md @@ -0,0 +1,12 @@ +--- +name: Typo +about: Use to correct typographical errors +title: '' +labels: defect +assignees: '' + +--- + +Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). + +Typo corrections must be approved by a member of the Information Management and Support Team, the Conventions Committee and Standard Names Committee, or the Governance Panel. diff --git a/.github/ISSUE_TEMPLATE/update-issue.md b/.github/ISSUE_TEMPLATE/update-issue.md new file mode 100644 index 000000000..ac1cc621b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/update-issue.md @@ -0,0 +1,12 @@ +--- +name: Update +about: Use to post updates to the website +title: '' +labels: defect +assignees: '' + +--- + +Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). + +Updates to the website must be approved by a member of the Conventions Committee and Standard Names Committee, or the Governance Panel. From 41b0b66440e61ea6e052e4696bb6c6c50387506d Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 22 Jun 2020 18:03:10 +0200 Subject: [PATCH 03/17] Refer to issue templates in CONTRIBUTING --- CONTRIBUTING.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 562eed374..7b9e00615 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,17 +6,16 @@ Thank you for taking the time to consider making a contribution to the [website This set of guidelines provides an overview of the process for making changes to the website. -## Correcting errors -Raise an issue describing the error. -Consider associating that issue to a pull request that corrects the error. -A member of the [CF Information Management and Support Team](info-mgmt) will review the change and merge it, deploying it to the website. +When raising an issue, please use the appropriate issue template. +Consider associating that issue to a pull request that implements the proposed change. +Each issue template notes that the approval of one or more members of the following bodies is necessary for the proposed change to be merged: +- The [CF Information Management and Support Team](info-mgmt), +- The [Conventions Committee and Standard Names Committee](committee), or +- The [Governance Panel](gov-panel) -## Making improvements -Raise an issue describing what you'd like to do. -A member of the [CF Information Management and Support Team](info-mgmt) will review it and decide how to approach the change. -Generally, items on the website affect the governance of CF and therefore require the approval of 2 members of the [Governance Panel](gov-panel) before merging. -However, minor changes of a technical nature may be implemented upon approval of a member of the [CF Information Management and Support Team](info-mgmt). +Details are noted in the relevant issue template. [cf-website]: http://cfconventions.org/ [info-mgmt]: http://cfconventions.org/governance.html#information-management-and-support +[committee]: http://cfconventions.org/governance.html#conventions-committee-and-standard-names-committee [gov-panel]: http://cfconventions.org/governance.html#governance-panel From 3a20d5be14e62d30d9dc5e8e6d7253d817f87bd6 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 22 Jun 2020 18:04:03 +0200 Subject: [PATCH 04/17] Add an extra guard around governance issues --- .github/ISSUE_TEMPLATE/governance-issue.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/governance-issue.md b/.github/ISSUE_TEMPLATE/governance-issue.md index e98ca3dd6..330b2ee36 100644 --- a/.github/ISSUE_TEMPLATE/governance-issue.md +++ b/.github/ISSUE_TEMPLATE/governance-issue.md @@ -9,4 +9,4 @@ assignees: '' Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). -Proposals affecting the CF Governance processes must be approved by a member of the Governance Panel. +Proposals affecting the CF Governance processes must be approved by 2 members of the Governance Panel. From d916a8fdf9dfb507de7bdca371d0f0051d1fd5d8 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 23 Jun 2020 18:52:52 +0200 Subject: [PATCH 05/17] Refer to other repos for proposing other changes --- CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7b9e00615..4b3318d5e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,6 +5,8 @@ Dear CF community member, Thank you for taking the time to consider making a contribution to the [website of the cf-conventions](cf-website). This set of guidelines provides an overview of the process for making changes to the website. +Separate guidelines apply for [changing the CF Conventions or proposing standard names](contribute-conventions). +If you have a general question about CF matters, please raise them as issues in the [discuss repository](discuss). When raising an issue, please use the appropriate issue template. Consider associating that issue to a pull request that implements the proposed change. @@ -16,6 +18,8 @@ Each issue template notes that the approval of one or more members of the follow Details are noted in the relevant issue template. [cf-website]: http://cfconventions.org/ +[contribute-conventions]: https://github.com/cf-convention/cf-conventions/blob/master/CONTRIBUTING.md +[discuss]: https://github.com/cf-convention/discuss/issues [info-mgmt]: http://cfconventions.org/governance.html#information-management-and-support [committee]: http://cfconventions.org/governance.html#conventions-committee-and-standard-names-committee [gov-panel]: http://cfconventions.org/governance.html#governance-panel From 61dfb4095ebed5f9343968aa7322cb2b5c59c9b9 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 23 Jun 2020 18:54:14 +0200 Subject: [PATCH 06/17] Correct issue labels --- .github/ISSUE_TEMPLATE/enhancement-issue.md | 2 +- .github/ISSUE_TEMPLATE/github-problem-issue.md | 2 +- .github/ISSUE_TEMPLATE/governance-issue.md | 2 +- .github/ISSUE_TEMPLATE/typo-issue.md | 2 +- .github/ISSUE_TEMPLATE/update-issue.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/enhancement-issue.md b/.github/ISSUE_TEMPLATE/enhancement-issue.md index dedf03eb5..610383aa0 100644 --- a/.github/ISSUE_TEMPLATE/enhancement-issue.md +++ b/.github/ISSUE_TEMPLATE/enhancement-issue.md @@ -2,7 +2,7 @@ name: Enhancement proposal about: Use to propose enhancements to the website's look and feel title: '' -labels: defect +labels: enhancement assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/github-problem-issue.md b/.github/ISSUE_TEMPLATE/github-problem-issue.md index 6e2d6cd00..70ecec8c6 100644 --- a/.github/ISSUE_TEMPLATE/github-problem-issue.md +++ b/.github/ISSUE_TEMPLATE/github-problem-issue.md @@ -2,7 +2,7 @@ name: GitHub issue about: Use to correct technical problems with GitHub title: '' -labels: defect +labels: github assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/governance-issue.md b/.github/ISSUE_TEMPLATE/governance-issue.md index 330b2ee36..c6bdc9ae9 100644 --- a/.github/ISSUE_TEMPLATE/governance-issue.md +++ b/.github/ISSUE_TEMPLATE/governance-issue.md @@ -2,7 +2,7 @@ name: Governance issue about: Use to propose changes to the CF governance processes title: '' -labels: defect +labels: governance assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/typo-issue.md b/.github/ISSUE_TEMPLATE/typo-issue.md index 02a681c45..2c63fca2e 100644 --- a/.github/ISSUE_TEMPLATE/typo-issue.md +++ b/.github/ISSUE_TEMPLATE/typo-issue.md @@ -2,7 +2,7 @@ name: Typo about: Use to correct typographical errors title: '' -labels: defect +labels: typo assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/update-issue.md b/.github/ISSUE_TEMPLATE/update-issue.md index ac1cc621b..f0b78db90 100644 --- a/.github/ISSUE_TEMPLATE/update-issue.md +++ b/.github/ISSUE_TEMPLATE/update-issue.md @@ -2,7 +2,7 @@ name: Update about: Use to post updates to the website title: '' -labels: defect +labels: update assignees: '' --- From e725d06abeb52f0d93f5010475c749e853ea7eeb Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 23 Jun 2020 18:57:53 +0200 Subject: [PATCH 07/17] Explain more about enhancements --- .github/ISSUE_TEMPLATE/enhancement-issue.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/enhancement-issue.md b/.github/ISSUE_TEMPLATE/enhancement-issue.md index 610383aa0..7abc31c2d 100644 --- a/.github/ISSUE_TEMPLATE/enhancement-issue.md +++ b/.github/ISSUE_TEMPLATE/enhancement-issue.md @@ -1,6 +1,6 @@ --- name: Enhancement proposal -about: Use to propose enhancements to the website's look and feel +about: Use to propose enhancements to the website's look and feel, or to improve the presentation of its conents title: '' labels: enhancement assignees: '' @@ -10,3 +10,4 @@ assignees: '' Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). Enhancement proposals must be approved by a member of the Information Management and Support Team, the Conventions Committee and Standard Names Committee, or the Governance Panel. +Following approval, if no objections are raised, the proposal is merged. From 846e22ca414fa019df0d95a0d1521ebf02ce27bf Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 23 Jun 2020 19:27:40 +0200 Subject: [PATCH 08/17] Fast-track updates --- .github/ISSUE_TEMPLATE/update-issue.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/update-issue.md b/.github/ISSUE_TEMPLATE/update-issue.md index f0b78db90..d517498b2 100644 --- a/.github/ISSUE_TEMPLATE/update-issue.md +++ b/.github/ISSUE_TEMPLATE/update-issue.md @@ -9,4 +9,7 @@ assignees: '' Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). -Updates to the website must be approved by a member of the Conventions Committee and Standard Names Committee, or the Governance Panel. +Updates to the website must be approved by a member of the Conventions Committee and Standard Names Committee, the Governance Panel, or someone to whom they have delegated this responsibility. +Updates should reflect decisions that have already been made by the Governance Panel or one of the Committees. +They can be merged immediately after approval. +Furthermore, if they are proposed by someone who has the authority to merge such an update, that person can self-approve the update. From f4cdc4837170366b352213c1abbf08321ac6f986 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 23 Jun 2020 19:29:16 +0200 Subject: [PATCH 09/17] Note specifically that these issue types apply to this repo --- .github/ISSUE_TEMPLATE/defect-issue.md | 2 +- .github/ISSUE_TEMPLATE/typo-issue.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/defect-issue.md b/.github/ISSUE_TEMPLATE/defect-issue.md index c5fd1199a..9f2011a2f 100644 --- a/.github/ISSUE_TEMPLATE/defect-issue.md +++ b/.github/ISSUE_TEMPLATE/defect-issue.md @@ -1,6 +1,6 @@ --- name: Defect -about: Use to correct content mistakes +about: Use to correct content mistakes found on the CF website title: '' labels: defect assignees: '' diff --git a/.github/ISSUE_TEMPLATE/typo-issue.md b/.github/ISSUE_TEMPLATE/typo-issue.md index 2c63fca2e..928b580b5 100644 --- a/.github/ISSUE_TEMPLATE/typo-issue.md +++ b/.github/ISSUE_TEMPLATE/typo-issue.md @@ -1,6 +1,6 @@ --- name: Typo -about: Use to correct typographical errors +about: Use to correct typographical errors on the CF website title: '' labels: typo assignees: '' From 68fb75dc3309720bde2ab690ef8eec8869d70c05 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 23 Jun 2020 19:30:11 +0200 Subject: [PATCH 10/17] Note that these issues can be merged immediately. --- .github/ISSUE_TEMPLATE/defect-issue.md | 1 + .github/ISSUE_TEMPLATE/github-problem-issue.md | 1 + .github/ISSUE_TEMPLATE/typo-issue.md | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/defect-issue.md b/.github/ISSUE_TEMPLATE/defect-issue.md index 9f2011a2f..cc564ce3e 100644 --- a/.github/ISSUE_TEMPLATE/defect-issue.md +++ b/.github/ISSUE_TEMPLATE/defect-issue.md @@ -10,3 +10,4 @@ assignees: '' Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). Proposals to fix defects must be approved by a member of the Conventions Committee and Standard Names Committee, or the Governance Panel. +They can be merged immediately thereafter. diff --git a/.github/ISSUE_TEMPLATE/github-problem-issue.md b/.github/ISSUE_TEMPLATE/github-problem-issue.md index 70ecec8c6..a01c242a0 100644 --- a/.github/ISSUE_TEMPLATE/github-problem-issue.md +++ b/.github/ISSUE_TEMPLATE/github-problem-issue.md @@ -10,3 +10,4 @@ assignees: '' Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). Proposals to fix GitHub issues must be approved by a member of the Information Management and Support Team. +They can be merged immediately thereafter. diff --git a/.github/ISSUE_TEMPLATE/typo-issue.md b/.github/ISSUE_TEMPLATE/typo-issue.md index 928b580b5..06fdeaabc 100644 --- a/.github/ISSUE_TEMPLATE/typo-issue.md +++ b/.github/ISSUE_TEMPLATE/typo-issue.md @@ -10,3 +10,4 @@ assignees: '' Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). Typo corrections must be approved by a member of the Information Management and Support Team, the Conventions Committee and Standard Names Committee, or the Governance Panel. +They can be merged immediately thereafter. From deae20b1a49a8ce922397f76ec7430c813285413 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 23 Jun 2020 19:34:37 +0200 Subject: [PATCH 11/17] Clarify what comprises governance issues --- .github/ISSUE_TEMPLATE/governance-issue.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/governance-issue.md b/.github/ISSUE_TEMPLATE/governance-issue.md index c6bdc9ae9..b475ae001 100644 --- a/.github/ISSUE_TEMPLATE/governance-issue.md +++ b/.github/ISSUE_TEMPLATE/governance-issue.md @@ -9,4 +9,9 @@ assignees: '' Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). -Proposals affecting the CF Governance processes must be approved by 2 members of the Governance Panel. +Proposals affecting the CF Governance processes must be approved by the Governance Panel. +This includes any proposals that change +- anything concerning the Constitution of CF, +- the constitution of its committees, +- the rules for altering the Convention, and +- the ways in which CF is maintained and published (including GitHub and the website, excluding purely technical details). From 56f06a462483d93911105de730d42733faa69839 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 16 Oct 2020 15:08:50 +0200 Subject: [PATCH 12/17] Add 3w wait period --- .github/ISSUE_TEMPLATE/enhancement-issue.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/enhancement-issue.md b/.github/ISSUE_TEMPLATE/enhancement-issue.md index 7abc31c2d..e89a3fec7 100644 --- a/.github/ISSUE_TEMPLATE/enhancement-issue.md +++ b/.github/ISSUE_TEMPLATE/enhancement-issue.md @@ -10,4 +10,4 @@ assignees: '' Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). Enhancement proposals must be approved by a member of the Information Management and Support Team, the Conventions Committee and Standard Names Committee, or the Governance Panel. -Following approval, if no objections are raised, the proposal is merged. +Following after three weeks have elapsed for comments, if no objections are raised, the proposal can be approved and the proposal merged. From a3af3a1c75889acd1d52d9d620291ff3ce249c9f Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 23 Oct 2020 15:23:03 +0200 Subject: [PATCH 13/17] Specify that proposers cannot approve their own enhancements --- .github/ISSUE_TEMPLATE/enhancement-issue.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/enhancement-issue.md b/.github/ISSUE_TEMPLATE/enhancement-issue.md index e89a3fec7..6a5879747 100644 --- a/.github/ISSUE_TEMPLATE/enhancement-issue.md +++ b/.github/ISSUE_TEMPLATE/enhancement-issue.md @@ -1,6 +1,6 @@ --- name: Enhancement proposal -about: Use to propose enhancements to the website's look and feel, or to improve the presentation of its conents +about: Use to propose enhancements to the website's look and feel, or to improve the presentation of its contents title: '' labels: enhancement assignees: '' @@ -10,4 +10,5 @@ assignees: '' Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). Enhancement proposals must be approved by a member of the Information Management and Support Team, the Conventions Committee and Standard Names Committee, or the Governance Panel. -Following after three weeks have elapsed for comments, if no objections are raised, the proposal can be approved and the proposal merged. +A proposer cannot both approve their own enhancement. +After three weeks have elapsed for comments, if no objections are raised, the proposal can be approved and the proposal merged. From 3d92bcd4dc8790fffc45568f8b9e2a5c9b678216 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 23 Oct 2020 15:33:38 +0200 Subject: [PATCH 14/17] Explain labeling through templates --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4b3318d5e..1e86888ed 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,6 +9,7 @@ Separate guidelines apply for [changing the CF Conventions or proposing standard If you have a general question about CF matters, please raise them as issues in the [discuss repository](discuss). When raising an issue, please use the appropriate issue template. +The template explains the approval process for issues of that type and automatically adds the correct label to the issue you create. Consider associating that issue to a pull request that implements the proposed change. Each issue template notes that the approval of one or more members of the following bodies is necessary for the proposed change to be merged: - The [CF Information Management and Support Team](info-mgmt), From 0e0400f8161af4943bfc67a7f21d2ca8887e7138 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 23 Oct 2020 15:37:34 +0200 Subject: [PATCH 15/17] Remove unnecessary line. --- CONTRIBUTING.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1e86888ed..09dad87bc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,8 +16,6 @@ Each issue template notes that the approval of one or more members of the follow - The [Conventions Committee and Standard Names Committee](committee), or - The [Governance Panel](gov-panel) -Details are noted in the relevant issue template. - [cf-website]: http://cfconventions.org/ [contribute-conventions]: https://github.com/cf-convention/cf-conventions/blob/master/CONTRIBUTING.md [discuss]: https://github.com/cf-convention/discuss/issues From 52180c173135998601416fdb99f5499134af42bc Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 23 Oct 2020 15:57:55 +0200 Subject: [PATCH 16/17] Specify permission for self-approval more clearly --- .github/ISSUE_TEMPLATE/update-issue.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/update-issue.md b/.github/ISSUE_TEMPLATE/update-issue.md index d517498b2..1111a0a9d 100644 --- a/.github/ISSUE_TEMPLATE/update-issue.md +++ b/.github/ISSUE_TEMPLATE/update-issue.md @@ -12,4 +12,7 @@ Before submitting an issue be sure you have read and understand the [contributin Updates to the website must be approved by a member of the Conventions Committee and Standard Names Committee, the Governance Panel, or someone to whom they have delegated this responsibility. Updates should reflect decisions that have already been made by the Governance Panel or one of the Committees. They can be merged immediately after approval. -Furthermore, if they are proposed by someone who has the authority to merge such an update, that person can self-approve the update. + +In special cases the governance committee may temporarily nominate people to self-approve updates on a specific topic. +Such a nomination must have a clearly defined scope and expiration point. +Examples of reasons for such limited-scope self-approval nominations include keeping meeting pages up-to-date with links and meeting materials or recording the minutes of meetings. From fc6303de8ca49ff1674848c80520f7cb26615517 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 23 Oct 2020 17:38:37 +0200 Subject: [PATCH 17/17] Copyedit --- .github/ISSUE_TEMPLATE/enhancement-issue.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/enhancement-issue.md b/.github/ISSUE_TEMPLATE/enhancement-issue.md index 6a5879747..ee40459f2 100644 --- a/.github/ISSUE_TEMPLATE/enhancement-issue.md +++ b/.github/ISSUE_TEMPLATE/enhancement-issue.md @@ -10,5 +10,5 @@ assignees: '' Before submitting an issue be sure you have read and understand the [contributing guidelines](https://github.com/cf-convention/cf-convention.github.io/blob/master/CONTRIBUTING.md). Enhancement proposals must be approved by a member of the Information Management and Support Team, the Conventions Committee and Standard Names Committee, or the Governance Panel. -A proposer cannot both approve their own enhancement. +A proposer cannot approve their own enhancement. After three weeks have elapsed for comments, if no objections are raised, the proposal can be approved and the proposal merged.