Skip to content

Commit 2340a3f

Browse files
authored
Merge pull request #631 from JonathanGregory/rules260422
remove rules and add links to merged CONTRIBUTING and rules
2 parents 7bd7a9a + c346316 commit 2340a3f

7 files changed

Lines changed: 12 additions & 113 deletions

File tree

conventions.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,12 @@ group: "navigation"
105105
</div>
106106

107107
<div class="col-md-6">
108+
109+
<h2>Rules for contributing to CF</h2>
110+
111+
<p>Rules and guidelines for <a href="https://github.com/cf-convention/cf-conventions?tab=contributing-ov-file#contributing-to-the-cf-conventions">changes to the CF conventions</a>
112+
113+
<p>Rules for <a href="https://cfconventions.org/standard_name_rules.html">changing CF standard names and other controlled vocabulary</a>
108114

109115
<h2><a href="./conventions_contributors.html">List of contributors</a> to CF conventions</h2>
110116

discussion.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ Discussions by category: &#x2753;&nbsp;[Questions and answers about using CF][gi
2020

2121
Proposals to change CF are made, debated and decided as [GitHub issues][github_issues] in three repositories:
2222

23-
* [Vocabulary issues][github_vocabularies], in the [vocabularies repository](https://github.com/cf-convention/vocabularies), for proposing additions or amendments to standard names, their definitions, or other CF controlled vocabulary (area types and standardized regions). [Open a new issue](https://github.com/cf-convention/vocabularies/issues/new/choose). See also [closed vocabulary issues][github_vocabularies_closed].
23+
* [Vocabulary issues][github_vocabularies], in the [vocabularies repository](https://github.com/cf-convention/vocabularies), for proposing additions or amendments to standard names, their definitions, or other CF controlled vocabulary (area types and standardized regions), according to the [rules for changes to CF vocabularies](https://cfconventions.org/standard_name_rules.html). [Open a new issue](https://github.com/cf-convention/vocabularies/issues/new/choose). See also [closed vocabulary issues][github_vocabularies_closed].
2424

2525
As well as in GitHub issues, the status of proposals about standard names is shown by the [CEDA vocabulary editor][vocab_editor]. To see a list of resolved proposals (accepted or rejected) for standard names from March 2011 onwards, click "Inactive" in the [CEDA vocabulary editor][vocab_editor].
2626

27-
* [Conventions issues][github_conventions], in the [conventions repository](https://github.com/cf-convention/cf-conventions), for proposing enhancements and reporting defects in the CF conventions. [Open a new issue](https://github.com/cf-convention/cf-conventions/issues/new/choose). See also [closed conventions issues][github_conventions_closed], classified by reason for closure: [change agreed][github_conventions_change]&nbsp;&bull;&nbsp;[agreement not to change][github_conventions_nochange]&nbsp;&bull;&nbsp;[dormant][github_conventions_dormant]. "Dormant" means the discussion on a proposed change did not reach a conclusion. Dormant issues may be reopened if there is a new impetus or ideas that might help bring about an agreement.
27+
* [Conventions issues][github_conventions], in the [conventions repository](https://github.com/cf-convention/cf-conventions), for proposing enhancements and reporting defects in the CF conventions, according to the rules and guidelines for [contributing to the CF conventions](https://github.com/cf-convention/cf-conventions?tab=contributing-ov-file#contributing-to-the-cf-conventions). [Open a new issue](https://github.com/cf-convention/cf-conventions/issues/new/choose). See also [closed conventions issues][github_conventions_closed], classified by reason for closure: [change agreed][github_conventions_change]&nbsp;&bull;&nbsp;[agreement not to change][github_conventions_nochange]&nbsp;&bull;&nbsp;[dormant][github_conventions_dormant]. "Dormant" means the discussion on a proposed change did not reach a conclusion. Dormant issues may be reopened if there is a new impetus or ideas that might help bring about an agreement.
2828

2929
* [Website and governance issues][github_website], in the [website repository](https://github.com/cf-convention/cf-convention.github.io), for proposing changes and reporting defects in the [CF website][website] or CF governance. [Open a new issue](https://github.com/cf-convention/cf-convention.github.io/issues/new/choose).
3030

errors.md

Lines changed: 0 additions & 25 deletions
This file was deleted.

governance.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ group: "navigation"
88

99
## Governance Documents
1010

11-
* [Rules for making changes to the CF Conventions][rules]
12-
* Discussion about these rules can be found in the [CF mailing list archives][mail], in June and July, 2007. See messages with the subject line "proposed rules for changes to CF conventions".
13-
* The rules were amended in January 2016 following [CF trac ticket 146][ticket146]
14-
* [Rules for correcting errors in the CF documents][errors]
1511
* [CF constitution](constitution.md)
1612
* CF white paper (Lawrence et al., 2006) \[ [PDF][pdf], [HTML][html] \]
1713

index.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ markdown="1" signals that the text within the div is markdown, not HTML. -->
5757

5858
See also the links in the navigation bar at the top of this page.
5959

60-
Proposals for changing CF (GitHub issues):<br>[vocabulary](https://github.com/cf-convention/vocabularies/issues) (including standard names), [conventions](https://github.com/cf-convention/cf-conventions/issues), [website and governance](https://github.com/cf-convention/cf-convention.github.io/issues)
60+
Rules for contributing to CF: [vocabulary](https://cfconventions.org/standard_name_rules.html) (including standard names), [conventions](https://github.com/cf-convention/cf-conventions?tab=contributing-ov-file#contributing-to-the-cf-conventions)
61+
62+
Proposals for changing CF: [vocabulary](https://github.com/cf-convention/vocabularies/issues), [conventions](https://github.com/cf-convention/cf-conventions/issues), [website and governance](https://github.com/cf-convention/cf-convention.github.io/issues)
6163

6264
[CF GitHub organisation](https://github.com/cf-convention)
6365

rules.md

Lines changed: 0 additions & 80 deletions
This file was deleted.

standard_name_rules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ title: Vocabulary rules
77
# Rules for Changes to CF Standard Names, Area Types and Standardized Region List Vocabularies
88

99
**These rules apply only to changes in CF controlled vocabularies.
10-
The rules for changes to the CF conventions themselves are given [here](http://cfconventions.org/rules.html).**
10+
The rules for changes to the CF conventions themselves are given [here](https://github.com/cf-convention/cf-conventions?tab=contributing-ov-file#contributing-to-the-cf-conventions).**
1111

1212
New proposals are made by opening a new issue in the cf-convention/vocabularies github repository.
1313
The 'Standard Names' template should be used, even if the proposal relates to one of the other vocabularies.

0 commit comments

Comments
 (0)