Skip to content

Commit

Permalink
Correct some OSCAL Reference links
Browse files Browse the repository at this point in the history
  • Loading branch information
nikitawootten-nist authored and iMichaela committed Jan 29, 2024
1 parent 8f6e124 commit 080fcc3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ <h3 xmlns="http://www.w3.org/1999/xhtml" id="d2e131-head">Use of YAML</h3>
</p>
<p xmlns="http://www.w3.org/1999/xhtml">YAML maps cleanly to JSON, thus allowing easy use of existing JSON/XML
transformers where needed. With that in mind, the
<a class="a" href="https://pages.nist.gov/OSCAL-Reference/latest/complete/json-reference/">OSCAL Complete JSON
<a class="a" href="https://pages.nist.gov/OSCAL-Reference/models/latest/complete/json-reference/">OSCAL Complete JSON
Reference</a>is a valuable resource for understanding the YAML-based information structures used in this document.
All JSON properties and objects defined in the reference equate to a YAML mapping, list, or dictionary.
</p>
Expand Down Expand Up @@ -1805,7 +1805,7 @@ <h4 xmlns="http://www.w3.org/1999/xhtml" id="d2e1522-head">
using XML, MUST be valid as defined by the XML model documentation
for the OSCAL Catalog. See
<a class="a"
href="https://pages.nist.gov/OSCAL-Reference/latest/complete/xml-definitions/">the
href="https://pages.nist.gov/OSCAL-Reference/models/latest/complete/xml-definitions/">the
complete XML reference</a> for model requirements.
</p>
<h4 xmlns="http://www.w3.org/1999/xhtml" id="d2e1533-head">
Expand All @@ -1814,7 +1814,7 @@ <h4 xmlns="http://www.w3.org/1999/xhtml" id="d2e1533-head">
using JSON, MUST be valid as defined by the JSON model
documentation for the OSCAL Catalog. See the
<a class="a"
href="https://pages.nist.gov/OSCAL-Reference/latest/complete/json-reference/">complete
href="https://pages.nist.gov/OSCAL-Reference/models/latest/complete/json-reference/">complete
JSON reference</a> for model requirements.
</p>
<p xmlns="http://www.w3.org/1999/xhtml">The JSON format, in general
Expand All @@ -1833,7 +1833,7 @@ <h4 xmlns="http://www.w3.org/1999/xhtml" id="d2e1547-head">
are no differences in the information structure between these
formats. Therefore, the
<a class="a"
href="https://pages.nist.gov/OSCAL-Reference/latest/complete/json-reference/">complete
href="https://pages.nist.gov/OSCAL-Reference/models/latest/complete/json-reference/">complete
JSON reference</a> provides model requirements.
</p>
<p xmlns="http://www.w3.org/1999/xhtml">The YAML format, in general
Expand Down
2 changes: 1 addition & 1 deletion src/content/resources/concepts/uri-use.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ URIs serving this purpose need to be used as a *locator*. URLs are typically use

#### Linking to another OSCAL object

A pointer to an OSCAL object identified by the referenced identifier, may be a [human-oriented](/resources/concepts/identifier-use/#human-oriented) [`token`](/reference/datatypes/#token) or a [machine-oriented](/resources/concepts/identifier-use/#machine-oriented) [`uuid`](https://pages.nist.gov/OSCAL/reference/datatypes/#uuid).
A pointer to an OSCAL object identified by the referenced identifier, may be a [human-oriented](/resources/concepts/identifier-use/#human-oriented) [`token`](https://pages.nist.gov/OSCAL-Reference/models/datatypes/#token) or a [machine-oriented](/resources/concepts/identifier-use/#machine-oriented) [`uuid`](https://pages.nist.gov/OSCAL-Reference/models/datatypes/#uuid).

This approach uses a [*relative reference*](#relative-reference) consisting of only a URI *fragment* containing the identifier or UUID of the referenced object within the current documents effective data model. The effective data model of a document includes all objects identified with the document and any directly or transitively imported documents. Identifiers with a *cross-instance* [scope](/resources/concepts/identifier-use/#scope) are available to importing documents.

Expand Down
2 changes: 1 addition & 1 deletion src/content/resources/concepts/validation/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ OSCAL reaches across such contexts for JSON, XML, and YAML, so the term has addi

### Does OSCAL provide schemas for OSCAL models?

The OSCAL program develops and maintains schema documents conformant with [JSON Schema](https://github.com/usnistgov/OSCAL/tree/main/json/schema) to validate OSCAL documents in JSON and YAML data formats. For validating XML, we provide schema documents using [XML Schema Definition](https://github.com/usnistgov/OSCAL/tree/main/xml/schema) Language.
The OSCAL program develops and maintains schema documents conformant with [JSON Schema](https://pages.nist.gov/OSCAL-Reference/release-assets/latest/oscal_complete_schema.json) to validate OSCAL documents in JSON and YAML data formats. For validating XML, we provide schema documents using [XML Schema Definition](https://pages.nist.gov/OSCAL-Reference/release-assets/latest/oscal_complete_schema.xsd) Language.

### What tools check that an OSCAL document is valid?

Expand Down

0 comments on commit 080fcc3

Please sign in to comment.