Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	core/README.md
  • Loading branch information
m-mohr committed Mar 4, 2021
2 parents f3ebca3 + 77c77c6 commit ed62708
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
8 changes: 3 additions & 5 deletions .circleci/rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ plugins:
# Apply some recommended defaults for consistency
- remark-preset-lint-consistent
- remark-preset-lint-recommended
# No HTML for security - can't activate yet due to STAC logo in README.md
# - lint-no-html
- lint-no-html
# General formatting
- - remark-lint-emphasis-marker
- '*'
- remark-lint-hard-break-spaces
- remark-lint-blockquote-indentation
- remark-lint-no-consecutive-blank-lines
# Detect overly long lines - be liberal for now and don't restrict to 80 yet
- - remark-lint-maximum-line-length
- 150
# Code
Expand All @@ -26,6 +24,8 @@ plugins:
- remark-lint-no-duplicate-headings
- remark-lint-no-multiple-toplevel-headings
- remark-lint-no-heading-punctuation
- - remark-lint-no-shortcut-reference-link
- false
- - remark-lint-maximum-heading-length
- 70
- - remark-lint-heading-style
Expand All @@ -41,6 +41,4 @@ plugins:
- space
# Tables
- remark-lint-table-pipes
# - remark-lint-table-pipe-alignment # Wait for https://github.com/remarkjs/remark-lint/issues/226
# Urls
- remark-lint-no-literal-urls
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased][]
## [Unreleased]

## [v1.0.0-beta.1][] - 2020-12-10
## [v1.0.0-beta.1] - 2020-12-10

### Added
- The landing page returns the conformance classes in a property `conformsTo`, which mirrors `GET /conformances` from OGC APIs.
Expand Down
5 changes: 2 additions & 3 deletions core/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# STAC API - Core Specification

- **Conformance URI:** <https://api.stacspec.org/v1.0.0-beta.1/core> ([rendered version](https://api.stacspec.org/v1.0.0-beta.1/core))
- **OpenAPI specification:** [openapi.yaml](openapi.yaml) describes the core endpoints ([rendered version](https://api.stacspec.org/v1.0.0-beta.1/core)),
and [commons.yaml](commons.yaml) is the OpenAPI version of the core [STAC spec](../stac-spec) JSON Schemas.
- **Conformance URI:** <https://api.stacspec.org/v1.0.0-beta.1/core>
- **Extension [Maturity Classification](../extensions.md#extension-maturity):** Pilot
- **Dependencies**: None
- **OpenAPI Specifications**: [openapi.yaml](openapi.yaml) describes the core endpoints, and [commons.yaml](commons.yaml) is the OpenAPI
version of the core [STAC spec](../stac-spec) JSON Schemas.

The core of a STAC API is its landing page, which is the starting point to discover STAC data and what the API supports.

Expand Down

0 comments on commit ed62708

Please sign in to comment.