Skip to content

Commit

Permalink
Merge branch 'cf-convention:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
cofinoa authored Sep 19, 2024
2 parents 04d8f37 + e243612 commit 60dede1
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Q&A about using CF
url: https://github.com/orgs/cf-convention/discussions/new?category=q-a-about-using-cf
about: Ask a question about how to use any aspect of CF or how it works (conventions, vocabulary, website, governance, GitHub etc.)
- name: Comments and ideas for changing CF
url: https://github.com/orgs/cf-convention/discussions/new?category=comments-and-ideas-for-changing-cf
about: Start a discussions about an improvement to any aspect of CF (conventions, vocabulary, website, governance, GitHub etc.)
5 changes: 2 additions & 3 deletions Meetings/2024-Workshop.md
Original file line number Diff line number Diff line change
Expand Up @@ -277,16 +277,15 @@ For the second part the overall aim is to have a dynamic and flexible agenda tha
<td>&emsp;14:00 - 17:30&emsp;</td>
<td>&emsp;Hackathon sessions&emsp;<br/>&emsp;including break&emsp;<br/>
&emsp;<b>See <a href="https://drive.google.com/file/d/1qAoPLlF6nh7C_9kQZo19sIT6D-S7tA4Y/view?usp=drive_link">Google doc</a> for Zoom link to use for each hackathon</b>&emsp;</td>
<td>&emsp;<em>Erin Turnbull: Localized metadata & CF/ERDDAP</em>&emsp;<br/>
&emsp;<em>TBD: CF roadmap/white paper</em>&emsp;</td>
<td>&emsp;<em>David Hassell: CF roadmap/white paper</em>&emsp;</td>
</tr>
<tr>
<td/>
<td/>
<td><br/>Dinner at 19:00 at <a href="https://www.thekniferestaurant.se/">The Knife!</a> <a href="https://docs.google.com/spreadsheets/d/1a7V5O-x7Ena0FLaBYlhew0nZ91ViUcmwSSv6UXDQv68/edit?gid=0#gid=0">Place your order online</a> by 13:30.</td>
</tr>
<tr>
<td/><br/>&emsp;CEST (UTC+2)&emsp;</td>
<td><br/>&emsp;CEST (UTC+2)&emsp;</td>
<td><br/>&emsp;<strong><em>Friday, 20 September</em></strong>&emsp;</td>
<td>&emsp;&emsp;</td>
</tr>
Expand Down
6 changes: 6 additions & 0 deletions vocabularies.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ group: "navigation"
[HTML](Data/cf-standard-names/current/build/cf-standard-name-table.html) &nbsp;
[XML](Data/cf-standard-names/current/src/cf-standard-name-table.xml) &nbsp;
[KWIC_Index](Data/cf-standard-names/current/build/kwic_index_for_cf_standard_names.html) &nbsp;
[NERC Vocabulary Server](https://vocab.nerc.ac.uk/collection/P07/current/) &nbsp;

### HTML versions (most current first)
N.B. For technical reasons, no standard name table was published with version number 38
Expand Down Expand Up @@ -229,6 +230,7 @@ click "Inactive" to see resolved proposals (from March 2011 onwards) i.e. those
## Area Type Table (v11, 06 July 2023)
[HTML](Data/area-type-table/current/build/area-type-table.html) &nbsp;
[XML](Data/area-type-table/current/src/area-type-table.xml) &nbsp;
[NERC Vocabulary Server](https://vocab.nerc.ac.uk/collection/P29/current/) &nbsp;

### Previous Versions (HTML)
[v10](Data/area-type-table/10/build/area-type-table.html) &nbsp;
Expand Down Expand Up @@ -258,6 +260,7 @@ click "Inactive" to see resolved proposals (from March 2011 onwards) i.e. those
[HTML](Data/standardized-region-list/standardized-region-list.html) &nbsp;
[XML](Data/standardized-region-list/standardized-region-list.xml) &nbsp;
Old Format [HTML](Data/cf-standard-names/docs/standardized-region-names.html) &nbsp;
[NERC Vocabulary Server](https://vocab.nerc.ac.uk/collection/P30/current/) &nbsp;

### Previous Versions (HTML)
[v3](Data/standardized-region-list/standardized-region-list.3.html) &nbsp;
Expand All @@ -268,3 +271,6 @@ Old Format [HTML](Data/cf-standard-names/docs/standardized-region-names.html) &n
[v3](Data/standardized-region-list/standardized-region-list.3.xml) &nbsp;
[v2](Data/standardized-region-list/standardized-region-list.2.xml) &nbsp;
[v1](Data/standardized-region-list/standardized-region-list.1.xml) &nbsp;

## CF Attributes
[NERC Vocabulary Server](https://vocab.nerc.ac.uk/collection/P31/current/)

0 comments on commit 60dede1

Please sign in to comment.