Skip to content

Commit

Permalink
Test full URLs per @dave-waltermire-nist's PR feedback.
Browse files Browse the repository at this point in the history
  • Loading branch information
aj-stein-nist committed Oct 31, 2022
1 parent 61540e6 commit d5c3f7b
Show file tree
Hide file tree
Showing 49 changed files with 10,167 additions and 10,167 deletions.
182 changes: 91 additions & 91 deletions docs/content/reference/develop/assessment-plan/json-definitions.md

Large diffs are not rendered by default.

512 changes: 256 additions & 256 deletions docs/content/reference/develop/assessment-plan/json-reference.md

Large diffs are not rendered by default.

182 changes: 91 additions & 91 deletions docs/content/reference/develop/assessment-plan/xml-definitions.md

Large diffs are not rendered by default.

512 changes: 256 additions & 256 deletions docs/content/reference/develop/assessment-plan/xml-reference.md

Large diffs are not rendered by default.

196 changes: 98 additions & 98 deletions docs/content/reference/develop/assessment-results/json-definitions.md

Large diffs are not rendered by default.

1,394 changes: 697 additions & 697 deletions docs/content/reference/develop/assessment-results/json-reference.md

Large diffs are not rendered by default.

196 changes: 98 additions & 98 deletions docs/content/reference/develop/assessment-results/xml-definitions.md

Large diffs are not rendered by default.

1,394 changes: 697 additions & 697 deletions docs/content/reference/develop/assessment-results/xml-reference.md

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions docs/content/reference/develop/catalog/json-definitions.md

Large diffs are not rendered by default.

266 changes: 133 additions & 133 deletions docs/content/reference/develop/catalog/json-reference.md

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions docs/content/reference/develop/catalog/xml-definitions.md

Large diffs are not rendered by default.

266 changes: 133 additions & 133 deletions docs/content/reference/develop/catalog/xml-reference.md

Large diffs are not rendered by default.

314 changes: 157 additions & 157 deletions docs/content/reference/develop/complete/json-definitions.md

Large diffs are not rendered by default.

4,422 changes: 2,211 additions & 2,211 deletions docs/content/reference/develop/complete/json-reference.md

Large diffs are not rendered by default.

314 changes: 157 additions & 157 deletions docs/content/reference/develop/complete/xml-definitions.md

Large diffs are not rendered by default.

4,422 changes: 2,211 additions & 2,211 deletions docs/content/reference/develop/complete/xml-reference.md

Large diffs are not rendered by default.

Large diffs are not rendered by default.

246 changes: 123 additions & 123 deletions docs/content/reference/develop/component-definition/json-reference.md

Large diffs are not rendered by default.

Large diffs are not rendered by default.

246 changes: 123 additions & 123 deletions docs/content/reference/develop/component-definition/xml-reference.md

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions docs/content/reference/develop/mapping/json-definitions.md

Large diffs are not rendered by default.

148 changes: 74 additions & 74 deletions docs/content/reference/develop/mapping/json-reference.md

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions docs/content/reference/develop/mapping/xml-definitions.md

Large diffs are not rendered by default.

148 changes: 74 additions & 74 deletions docs/content/reference/develop/mapping/xml-reference.md

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1,056 changes: 528 additions & 528 deletions docs/content/reference/develop/plan-of-action-and-milestones/json-reference.md

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1,056 changes: 528 additions & 528 deletions docs/content/reference/develop/plan-of-action-and-milestones/xml-reference.md

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions docs/content/reference/develop/profile/json-definitions.md

Large diffs are not rendered by default.

156 changes: 78 additions & 78 deletions docs/content/reference/develop/profile/json-reference.md

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions docs/content/reference/develop/profile/xml-definitions.md

Large diffs are not rendered by default.

156 changes: 78 additions & 78 deletions docs/content/reference/develop/profile/xml-reference.md

Large diffs are not rendered by default.

Large diffs are not rendered by default.

644 changes: 322 additions & 322 deletions docs/content/reference/develop/system-security-plan/json-reference.md

Large diffs are not rendered by default.

126 changes: 63 additions & 63 deletions docs/content/reference/develop/system-security-plan/xml-definitions.md

Large diffs are not rendered by default.

644 changes: 322 additions & 322 deletions docs/content/reference/develop/system-security-plan/xml-reference.md

Large diffs are not rendered by default.

86 changes: 43 additions & 43 deletions src/metaschema/oscal_assessment-common_metaschema.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/metaschema/oscal_assessment-plan_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<define-flag name="uuid" required="yes" as-type="uuid">
<formal-name>Assessment Plan Universally Unique Identifier</formal-name>
<!-- Identifier Declaration -->
<description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment plan in <a href="/concepts/identifier-use/#ap-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment plan</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</description>
<description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment plan in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ap-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment plan</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</description>
</define-flag>
<model>
<assembly ref="metadata" min-occurs="1" max-occurs="1"/>
Expand Down
12 changes: 6 additions & 6 deletions src/metaschema/oscal_assessment-results_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<define-flag name="uuid" required="yes" as-type="uuid">
<formal-name>Assessment Results Universally Unique Identifier</formal-name>
<!-- Identifier Declaration -->
<description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment results instance in <a href="/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment result</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</description>
<description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment results instance in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment result</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</description>
</define-flag>
<model>
<assembly ref="metadata" min-occurs="1" max-occurs="1"/>
Expand Down Expand Up @@ -67,7 +67,7 @@
<define-flag name="uuid" required="yes" as-type="uuid">
<formal-name>Results Universally Unique Identifier</formal-name>
<!-- Identifier Declaration -->
<description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this set of results in <a href="/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment result</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</description>
<description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this set of results in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment result</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</description>
</define-flag>
<model>
<define-field name="title" min-occurs="1" max-occurs="1" as-type="markup-line">
Expand Down Expand Up @@ -193,7 +193,7 @@
<define-flag name="uuid" required="yes" as-type="uuid">
<formal-name>Assessment Log Entry Universally Unique Identifier</formal-name>
<!-- Identifier Declaration -->
<description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference an assessment event in <a href="/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment log entry</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</description>
<description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference an assessment event in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment log entry</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</description>
</define-flag>
<model>
<define-field name="title" min-occurs="0" max-occurs="1" as-type="markup-line">
Expand Down Expand Up @@ -260,9 +260,9 @@
<remarks>
<p>This value may be one of:</p>
<ol>
<li>an <a href="/concepts/uri-use/#absolute-uri">absolute URI</a> that points to a network resolvable resource,</li>
<li>a <a href="/concepts/uri-use/#relative-reference">relative reference</a> pointing to a network resolvable resource whose base URI is the URI of the containing document, or</li>
<li>a bare URI fragment (i.e., `#uuid`) pointing to a <code>back-matter</code> resource in this or an imported document (see <a href="/concepts/uri-use/#linking-to-another-oscal-object">linking to another OSCAL object</a>).</li>
<li>an <a href="https://pages.nist.gov/OSCAL/concepts/uri-use/#absolute-uri">absolute URI</a> that points to a network resolvable resource,</li>
<li>a <a href="https://pages.nist.gov/OSCAL/concepts/uri-use/#relative-reference">relative reference</a> pointing to a network resolvable resource whose base URI is the URI of the containing document, or</li>
<li>a bare URI fragment (i.e., `#uuid`) pointing to a <code>back-matter</code> resource in this or an imported document (see <a href="https://pages.nist.gov/OSCAL/concepts/uri-use/#linking-to-another-oscal-object">linking to another OSCAL object</a>).</li>
</ol>
</remarks>
</define-flag>
Expand Down
10 changes: 5 additions & 5 deletions src/metaschema/oscal_catalog_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<import href="oscal_mapping-common_metaschema.xml"/>
<define-assembly name="catalog">
<formal-name>Catalog</formal-name>
<description>A structured, <a href="/concepts/terminology/#catalog">organized collection</a> of control information.</description>
<description>A structured, <a href="https://pages.nist.gov/OSCAL/concepts/terminology/#catalog">organized collection</a> of control information.</description>
<root-name>catalog</root-name>
<define-flag name="uuid" as-type="uuid" required="yes">
<formal-name>Catalog Universally Unique Identifier</formal-name>
Expand Down Expand Up @@ -52,11 +52,11 @@
<constraint>
<allowed-values target="metadata/prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal')]/@name">
<enum value="resolution-tool">The tool used to produce a resolved profile.</enum>
<enum value="source-profile-uuid">The document-level <code>uuid</code> of the source profile from which the catalog was produced by <a href="/concepts/processing/profile-resolution/">profile resolution</a>.</enum>
<enum value="source-profile-uuid">The document-level <code>uuid</code> of the source profile from which the catalog was produced by <a href="https://pages.nist.gov/OSCAL/concepts/processing/profile-resolution/">profile resolution</a>.</enum>
</allowed-values>
<allowed-values target="metadata/link/@rel">
<enum value="source-profile">The profile from which the catalog was produced by <a href="/concepts/processing/profile-resolution/">profile resolution</a>.</enum>
<enum value="source-profile-uuid">The document-level <code>uuid</code> of the profile from which the catalog was produced by <a href="/concepts/processing/profile-resolution/">profile resolution</a>.</enum>
<enum value="source-profile">The profile from which the catalog was produced by <a href="https://pages.nist.gov/OSCAL/concepts/processing/profile-resolution/">profile resolution</a>.</enum>
<enum value="source-profile-uuid">The document-level <code>uuid</code> of the profile from which the catalog was produced by <a href="https://pages.nist.gov/OSCAL/concepts/processing/profile-resolution/">profile resolution</a>.</enum>
</allowed-values>
<index name="catalog-parts" target="//part" >
<key-field target="@id"/>
Expand Down Expand Up @@ -162,7 +162,7 @@
</define-assembly>
<define-assembly name="control">
<formal-name>Control</formal-name>
<description>A <a href="/concepts/terminology/#control"
<description>A <a href="https://pages.nist.gov/OSCAL/concepts/terminology/#control"
>structured object</a> representing a requirement or guideline, which when
implemented will reduce an aspect of risk related to an information system and its
information.</description>
Expand Down
16 changes: 8 additions & 8 deletions src/metaschema/oscal_component_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@
<remarks>
<p>This value may be one of:</p>
<ol>
<li>an <a href="/concepts/uri-use/#absolute-uri">absolute URI</a> that points to a network resolvable resource,</li>
<li>a <a href="/concepts/uri-use/#relative-reference">relative reference</a> pointing to a network resolvable resource whose base URI is the URI of the containing document, or</li>
<li>a bare URI fragment (i.e., `#uuid`) pointing to a <code>back-matter</code> resource in this or an imported document (see <a href="/concepts/uri-use/#linking-to-another-oscal-object">linking to another OSCAL object</a>).</li>
<li>an <a href="https://pages.nist.gov/OSCAL/concepts/uri-use/#absolute-uri">absolute URI</a> that points to a network resolvable resource,</li>
<li>a <a href="https://pages.nist.gov/OSCAL/concepts/uri-use/#relative-reference">relative reference</a> pointing to a network resolvable resource whose base URI is the URI of the containing document, or</li>
<li>a bare URI fragment (i.e., `#uuid`) pointing to a <code>back-matter</code> resource in this or an imported document (see <a href="https://pages.nist.gov/OSCAL/concepts/uri-use/#linking-to-another-oscal-object">linking to another OSCAL object</a>).</li>
</ol>
</remarks>
</define-flag>
Expand Down Expand Up @@ -318,7 +318,7 @@
<define-flag required="yes" name="component-uuid" as-type="uuid">
<formal-name>Component Reference</formal-name>
<!-- Identifier Reference -->
<description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code>.</description>
<description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code>.</description>
</define-flag>
<model>
<define-field name="description" as-type="markup-multiline" min-occurs="1" in-xml="WITH_WRAPPER">
Expand Down Expand Up @@ -347,9 +347,9 @@
<remarks>
<p>This value may be one of:</p>
<ol>
<li>an <a href="/concepts/uri-use/#absolute-uri">absolute URI</a> that points to a network resolvable resource,</li>
<li>a <a href="/concepts/uri-use/#relative-reference">relative reference</a> pointing to a network resolvable resource whose base URI is the URI of the containing document, or</li>
<li>a bare URI fragment (i.e., `#uuid`) pointing to a <code>back-matter</code> resource in this or an imported document (see <a href="/concepts/uri-use/#linking-to-another-oscal-object">linking to another OSCAL object</a>).</li>
<li>an <a href="https://pages.nist.gov/OSCAL/concepts/uri-use/#absolute-uri">absolute URI</a> that points to a network resolvable resource,</li>
<li>a <a href="https://pages.nist.gov/OSCAL/concepts/uri-use/#relative-reference">relative reference</a> pointing to a network resolvable resource whose base URI is the URI of the containing document, or</li>
<li>a bare URI fragment (i.e., `#uuid`) pointing to a <code>back-matter</code> resource in this or an imported document (see <a href="https://pages.nist.gov/OSCAL/concepts/uri-use/#linking-to-another-oscal-object">linking to another OSCAL object</a>).</li>
</ol>
</remarks>
</define-flag>
Expand Down Expand Up @@ -455,7 +455,7 @@
<define-flag name="uuid" as-type="uuid" required="yes">
<formal-name>Control Statement Reference Universally Unique Identifier</formal-name>
<!-- Identifier Reference -->
<description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this control statement elsewhere in <a href="/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The <em>UUID</em> of the <code>control statement</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).</description>
<description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this control statement elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The <em>UUID</em> of the <code>control statement</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).</description>
</define-flag>
<model>
<define-field name="description" as-type="markup-multiline" min-occurs="1" in-xml="WITH_WRAPPER">
Expand Down
2 changes: 1 addition & 1 deletion src/metaschema/oscal_control-common_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<formal-name>Part Namespace</formal-name>
<description>An optional namespace qualifying the part's <code>name</code>. This allows different organizations to associate distinct semantics with the same name.</description>
<remarks>
<p>This value must be an <a href="/concepts/uri-use/#absolute-uri">absolute URI</a> that serves as a <a href="/concepts/uri-use/#use-as-a-naming-system-identifier">naming system identifier</a>.</p>
<p>This value must be an <a href="https://pages.nist.gov/OSCAL/concepts/uri-use/#absolute-uri">absolute URI</a> that serves as a <a href="https://pages.nist.gov/OSCAL/concepts/uri-use/#use-as-a-naming-system-identifier">naming system identifier</a>.</p>
<p>When a <code>ns</code> is not provided, its value should be assumed to be <code>http://csrc.nist.gov/ns/oscal</code> and the name should be a name defined by the associated OSCAL model.</p>
</remarks>
</define-flag>
Expand Down
Loading

0 comments on commit d5c3f7b

Please sign in to comment.