From d9964a81306402d2b05f01d9d687d0c28331d2b0 Mon Sep 17 00:00:00 2001 From: Alexander Stein Date: Mon, 31 Oct 2022 16:15:01 -0400 Subject: [PATCH] Fix broken uri-use page links in updated reference docs of develop branch (#1518) * Fix documentation relative paths in Metaschema Recently added links in documentation refer to href="/OSCAL" and not href="https://pages.nist.gov/OSCAL" in error or to simplify link gen and lookup. Now that we are remapping the full URLs to local paths and offsets for link-checking, we want these to be consistent across the board in Metaschema after usnistgov/OSCAL#1263. * Pushing generated website pages manual override [ci skip]. * Restore rel paths for develop branch ref model docs and fix link checks. * Test full URLs per @dave-waltermire-nist's PR feedback. --- .../workflows/workflow-generate-website.yml | 2 +- .../workflow-validate-website-content.yml | 2 +- .../develop/assessment-plan/xml-outline.md | 21 ++-- .../develop/assessment-results/xml-outline.md | 28 ++--- .../reference/develop/catalog/xml-outline.md | 42 +++---- .../reference/develop/complete/xml-outline.md | 119 ++++++++---------- .../xml-outline.md | 7 +- .../reference/develop/profile/xml-outline.md | 21 ++-- .../oscal_assessment-common_metaschema.xml | 68 +++++----- .../oscal_assessment-plan_metaschema.xml | 2 +- .../oscal_assessment-results_metaschema.xml | 6 +- src/metaschema/oscal_component_metaschema.xml | 4 +- .../oscal_control-common_metaschema.xml | 2 +- ...oscal_implementation-common_metaschema.xml | 18 +-- .../oscal_mapping-common_metaschema.xml | 2 +- src/metaschema/oscal_mapping_metaschema.xml | 2 +- src/metaschema/oscal_metadata_metaschema.xml | 12 +- src/metaschema/oscal_poam_metaschema.xml | 10 +- src/metaschema/oscal_ssp_metaschema.xml | 34 ++--- 19 files changed, 184 insertions(+), 218 deletions(-) diff --git a/.github/workflows/workflow-generate-website.yml b/.github/workflows/workflow-generate-website.yml index b659741dfa..6e2b9fa8ba 100644 --- a/.github/workflows/workflow-generate-website.yml +++ b/.github/workflows/workflow-generate-website.yml @@ -143,7 +143,7 @@ jobs: id: linkchecker uses: lycheeverse/lychee-action@4a5af7cd2958a2282cefbd9c10f63bdb89982d76 with: - args: --exclude-file ./build/config/.lycheeignore --verbose --no-progress './docs/public/**/*.html' --accept 200,206,429 + args: --exclude-file ./build/config/.lycheeignore --verbose --no-progress --accept 200,206,429 './docs/public/**/*.html' --remap "https://pages.nist.gov/OSCAL/ file://${GITHUB_WORKSPACE}/docs/public/" --exclude-mail format: markdown output: html-link-report.md env: diff --git a/.github/workflows/workflow-validate-website-content.yml b/.github/workflows/workflow-validate-website-content.yml index 0809ab3fd5..dfce652c58 100644 --- a/.github/workflows/workflow-validate-website-content.yml +++ b/.github/workflows/workflow-validate-website-content.yml @@ -35,7 +35,7 @@ jobs: id: linkchecker uses: lycheeverse/lychee-action@4a5af7cd2958a2282cefbd9c10f63bdb89982d76 with: - args: --exclude-file ./build/config/.lycheeignore --verbose --no-progress --accept 200,206,429 './published/**/*.html' --exclude-mail + args: --exclude-file ./build/config/.lycheeignore --verbose --no-progress --accept 200,206,429 "./${INPUT_SITE_GIT_REF}/**/*.html" --remap "https://pages.nist.gov/OSCAL/ file://${GITHUB_WORKSPACE}/${INPUT_SITE_GIT_REF}/" --exclude-mail env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Create issue if bad links detected diff --git a/docs/content/reference/develop/assessment-plan/xml-outline.md b/docs/content/reference/develop/assessment-plan/xml-outline.md index 4612f9db39..8a59fdc90d 100644 --- a/docs/content/reference/develop/assessment-plan/xml-outline.md +++ b/docs/content/reference/develop/assessment-plan/xml-outline.md @@ -1141,10 +1141,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -1839,10 +1838,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -2597,10 +2595,9 @@ The following outline is a representation of the [XML format](https://github.com

</dependency>

-
- <task> (recursive: model like parent task) </task> [0 to ∞] -

[Empty]

-
+
+

<task> (recursive: model like parent task) </task> [0 to ∞]

+
<associated-activity activity-uuid="uuid"> … </associated-activity> [0 to ∞]
diff --git a/docs/content/reference/develop/assessment-results/xml-outline.md b/docs/content/reference/develop/assessment-results/xml-outline.md index 067dabdac8..a48a215cb7 100644 --- a/docs/content/reference/develop/assessment-results/xml-outline.md +++ b/docs/content/reference/develop/assessment-results/xml-outline.md @@ -695,10 +695,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -2255,10 +2254,9 @@ The following outline is a representation of the [XML format](https://github.com

</dependency>

-
- <task> (recursive: model like parent task) </task> [0 to ∞] -

[Empty]

-
+
+

<task> (recursive: model like parent task) </task> [0 to ∞]

+
<associated-activity activity-uuid="uuid"> … </associated-activity> [0 to ∞]
@@ -2994,10 +2992,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -5892,10 +5889,9 @@ The following outline is a representation of the [XML format](https://github.com

</dependency>

-
- <task> (recursive: model like parent task) </task> [0 to ∞] -

[Empty]

-
+
+

<task> (recursive: model like parent task) </task> [0 to ∞]

+
<associated-activity activity-uuid="uuid"> … </associated-activity> [0 to ∞]
diff --git a/docs/content/reference/develop/catalog/xml-outline.md b/docs/content/reference/develop/catalog/xml-outline.md index d06df8b55d..583ba03279 100644 --- a/docs/content/reference/develop/catalog/xml-outline.md +++ b/docs/content/reference/develop/catalog/xml-outline.md @@ -928,10 +928,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -1151,10 +1150,9 @@ The following outline is a representation of the [XML format](https://github.com

</mapping>

-
- <control> (recursive: model like parent control) </control> [0 to ∞] -

[Empty]

-
+
+

<control> (recursive: model like parent control) </control> [0 to ∞]

+

</control>

@@ -1350,10 +1348,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -1374,10 +1371,9 @@ The following outline is a representation of the [XML format](https://github.com

A choice of:

-
- <group> (recursive: model like ancestor group) </group> [0 to ∞] -

[Empty]

-
+
+

<group> (recursive: model like ancestor group) </group> [0 to ∞]

+
@@ -1572,10 +1568,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -1795,10 +1790,9 @@ The following outline is a representation of the [XML format](https://github.com

</mapping>

-
- <control> (recursive: model like parent control) </control> [0 to ∞] -

[Empty]

-
+
+

<control> (recursive: model like parent control) </control> [0 to ∞]

+

</control>

diff --git a/docs/content/reference/develop/complete/xml-outline.md b/docs/content/reference/develop/complete/xml-outline.md index 1a5217f52a..34709a0c1b 100644 --- a/docs/content/reference/develop/complete/xml-outline.md +++ b/docs/content/reference/develop/complete/xml-outline.md @@ -927,10 +927,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -1150,10 +1149,9 @@ The following outline is a representation of the [XML format](https://github.com

</mapping>

-
- <control> (recursive: model like parent control) </control> [0 to ∞] -

[Empty]

-
+
+

<control> (recursive: model like parent control) </control> [0 to ∞]

+

</control>

@@ -1349,10 +1347,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -1373,10 +1370,9 @@ The following outline is a representation of the [XML format](https://github.com

A choice of:

-
- <group> (recursive: model like ancestor group) </group> [0 to ∞] -

[Empty]

-
+
+

<group> (recursive: model like ancestor group) </group> [0 to ∞]

+
@@ -1571,10 +1567,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -1794,10 +1789,9 @@ The following outline is a representation of the [XML format](https://github.com

</mapping>

-
- <control> (recursive: model like parent control) </control> [0 to ∞] -

[Empty]

-
+
+

<control> (recursive: model like parent control) </control> [0 to ∞]

+

</control>

@@ -3749,10 +3743,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -3773,10 +3766,9 @@ The following outline is a representation of the [XML format](https://github.com

A choice of:

-
- <group> (recursive: model like ancestor group) </group> [0 to ∞] -

[Empty]

-
+
+

<group> (recursive: model like ancestor group) </group> [0 to ∞]

+
@@ -4205,10 +4197,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -10397,10 +10388,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -11095,10 +11085,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -11853,10 +11842,9 @@ The following outline is a representation of the [XML format](https://github.com

</dependency>

-
- <task> (recursive: model like parent task) </task> [0 to ∞] -

[Empty]

-
+
+

<task> (recursive: model like parent task) </task> [0 to ∞]

+
<associated-activity activity-uuid="uuid"> … </associated-activity> [0 to ∞]
@@ -13105,10 +13093,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -14665,10 +14652,9 @@ The following outline is a representation of the [XML format](https://github.com

</dependency>

-
- <task> (recursive: model like parent task) </task> [0 to ∞] -

[Empty]

-
+
+

<task> (recursive: model like parent task) </task> [0 to ∞]

+
<associated-activity activity-uuid="uuid"> … </associated-activity> [0 to ∞]
@@ -15404,10 +15390,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -18302,10 +18287,9 @@ The following outline is a representation of the [XML format](https://github.com

</dependency>

-
- <task> (recursive: model like parent task) </task> [0 to ∞] -

[Empty]

-
+
+

<task> (recursive: model like parent task) </task> [0 to ∞]

+
<associated-activity activity-uuid="uuid"> … </associated-activity> [0 to ∞]
@@ -23697,10 +23681,9 @@ The following outline is a representation of the [XML format](https://github.com

</dependency>

-
- <task> (recursive: model like parent task) </task> [0 to ∞] -

[Empty]

-
+
+

<task> (recursive: model like parent task) </task> [0 to ∞]

+
<associated-activity activity-uuid="uuid"> … </associated-activity> [0 to ∞]
diff --git a/docs/content/reference/develop/plan-of-action-and-milestones/xml-outline.md b/docs/content/reference/develop/plan-of-action-and-milestones/xml-outline.md index 306c477a0c..00f25be773 100644 --- a/docs/content/reference/develop/plan-of-action-and-milestones/xml-outline.md +++ b/docs/content/reference/develop/plan-of-action-and-milestones/xml-outline.md @@ -3696,10 +3696,9 @@ The following outline is a representation of the [XML format](https://github.com

</dependency>

-
- <task> (recursive: model like parent task) </task> [0 to ∞] -

[Empty]

-
+
+

<task> (recursive: model like parent task) </task> [0 to ∞]

+
<associated-activity activity-uuid="uuid"> … </associated-activity> [0 to ∞]
diff --git a/docs/content/reference/develop/profile/xml-outline.md b/docs/content/reference/develop/profile/xml-outline.md index 231b3fb974..f590660c1d 100644 --- a/docs/content/reference/develop/profile/xml-outline.md +++ b/docs/content/reference/develop/profile/xml-outline.md @@ -876,10 +876,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
@@ -900,10 +899,9 @@ The following outline is a representation of the [XML format](https://github.com

A choice of:

-
- <group> (recursive: model like ancestor group) </group> [0 to ∞] -

[Empty]

-
+
+

<group> (recursive: model like ancestor group) </group> [0 to ∞]

+
@@ -1332,10 +1330,9 @@ The following outline is a representation of the [XML format](https://github.com

<p> or other elements defined as markup-multiline [0 to ∞]

-
- <part> (recursive: model like parent part) </part> [0 to ∞] -

[Empty]

-
+
+

<part> (recursive: model like parent part) </part> [0 to ∞]

+
<link href="uri-reference" rel="token" media-type="string" resource-fragment="string"> … </link> [0 to ∞]
diff --git a/src/metaschema/oscal_assessment-common_metaschema.xml b/src/metaschema/oscal_assessment-common_metaschema.xml index 43e8886a46..a96a51fb79 100644 --- a/src/metaschema/oscal_assessment-common_metaschema.xml +++ b/src/metaschema/oscal_assessment-common_metaschema.xml @@ -80,7 +80,7 @@ Assessment Method Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment method elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment method can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment method elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment method can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -104,7 +104,7 @@ Assessment Activity Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment activity elsewhere in this or other OSCAL instances. The locally defined UUID of the activity can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment activity elsewhere in this or other OSCAL instances. The locally defined UUID of the activity can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -128,7 +128,7 @@ Step Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this step elsewhere in this or other OSCAL instances. The locally defined UUID of the step (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this step elsewhere in this or other OSCAL instances. The locally defined UUID of the step (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -207,7 +207,7 @@ Task Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this task elsewhere in this or other OSCAL instances. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this task elsewhere in this or other OSCAL instances. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. Task Type @@ -292,7 +292,7 @@ Task Universally Unique Identifier Reference - A machine-oriented identifier reference to a unique task. + A machine-oriented identifier reference to a unique task. @@ -309,7 +309,7 @@ Activity Universally Unique Identifier Reference - A machine-oriented identifier reference to an activity defined in the list of activities. + A machine-oriented identifier reference to an activity defined in the list of activities. @@ -493,7 +493,7 @@ Assessment Subject Placeholder Universally Unique Identifier - A machine-oriented, globally unique identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined UUID of the assessment subject placeholder can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined UUID of the assessment subject placeholder can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -507,7 +507,7 @@ Task Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -586,7 +586,7 @@ Subject Universally Unique Identifier Reference - A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID. + A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID. @@ -607,7 +607,7 @@ Identifies the Subject - A human-oriented identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else. + A human-oriented identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else. type @@ -652,7 +652,7 @@ Assessment Platform Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment platform can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment platform can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -672,7 +672,7 @@ Component Universally Unique Identifier Reference - A machine-oriented identifier reference to a component that is implemented as part of an inventory item. + A machine-oriented identifier reference to a component that is implemented as part of an inventory item. @@ -729,7 +729,7 @@ Finding Target Identifier Reference - A machine-oriented identifier reference for a specific target qualified by the type. + A machine-oriented identifier reference for a specific target qualified by the type. @@ -792,7 +792,7 @@ Finding Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -824,7 +824,7 @@ Implementation Statement UUID - A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related. + A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related. @@ -834,7 +834,7 @@ Observation Universally Unique Identifier Reference - A machine-oriented identifier reference to an observation defined in the list of observations. + A machine-oriented identifier reference to an observation defined in the list of observations. @@ -845,7 +845,7 @@ Risk Universally Unique Identifier Reference - A machine-oriented identifier reference to a risk defined in the list of risks. + A machine-oriented identifier reference to a risk defined in the list of risks. @@ -858,7 +858,7 @@ Observation Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this observation elsewhere in this or other OSCAL instances. The locally defined UUID of the observation can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this observation elsewhere in this or other OSCAL instances. The locally defined UUID of the observation can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -1002,7 +1002,7 @@ Actor Universally Unique Identifier Reference - A machine-oriented identifier reference to the tool or person based on the associated type. + A machine-oriented identifier reference to the tool or person based on the associated type. Actor Role @@ -1024,7 +1024,7 @@ Task Universally Unique Identifier Reference - A machine-oriented identifier reference to a unique task. + A machine-oriented identifier reference to a unique task. @@ -1053,7 +1053,7 @@ Assessment Subject Placeholder Universally Unique Identifier Reference - A machine-oriented identifier reference to a unique assessment subject placeholder defined by this task. + A machine-oriented identifier reference to a unique assessment subject placeholder defined by this task. @@ -1092,7 +1092,7 @@ -

This value must be an absolute URI that serves as a naming system identifier.

+

This value must be an absolute URI that serves as a naming system identifier.

 @@ -1116,7 +1116,7 @@ Risk Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk elsewhere in this or other OSCAL instances. The locally defined UUID of the risk can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk elsewhere in this or other OSCAL instances. The locally defined UUID of the risk can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -1163,12 +1163,12 @@ Mitigating Factor Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mitigating factor elsewhere in this or other OSCAL instances. The locally defined UUID of the mitigating factor can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mitigating factor elsewhere in this or other OSCAL instances. The locally defined UUID of the mitigating factor can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. Implementation UUID - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this implementation statement elsewhere in this or other OSCAL instancess. The locally defined UUID of the implementation statement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this implementation statement elsewhere in this or other OSCAL instancess. The locally defined UUID of the implementation statement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -1210,7 +1210,7 @@ Risk Log Entry Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk log entry elsewhere in this or other OSCAL instances. The locally defined UUID of the risk log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk log entry elsewhere in this or other OSCAL instances. The locally defined UUID of the risk log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -1251,7 +1251,7 @@ Response Universally Unique Identifier Reference - A machine-oriented identifier reference to a unique risk response. + A machine-oriented identifier reference to a unique risk response. @@ -1300,7 +1300,7 @@ Observation Universally Unique Identifier Reference - A machine-oriented identifier reference to an observation defined in the list of observations. + A machine-oriented identifier reference to an observation defined in the list of observations. @@ -1321,7 +1321,7 @@ Party UUID Reference - A machine-oriented identifier reference to the party who is making the log entry. + A machine-oriented identifier reference to the party who is making the log entry. Actor Role @@ -1384,7 +1384,7 @@ -

This value must be an absolute URI that serves as a naming system identifier.

+

This value must be an absolute URI that serves as a naming system identifier.

 @@ -1607,7 +1607,7 @@ Remediation Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this remediation elsewhere in this or other OSCAL instances. The locally defined UUID of the risk response can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this remediation elsewhere in this or other OSCAL instances. The locally defined UUID of the risk response can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. Remediation Intent @@ -1650,7 +1650,7 @@ Required Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this required asset elsewhere in this or other OSCAL instances. The locally defined UUID of the asset can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this required asset elsewhere in this or other OSCAL instances. The locally defined UUID of the asset can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -1713,7 +1713,7 @@ Part Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this part elsewhere in this or other OSCAL instances. The locally defined UUID of the part can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this part elsewhere in this or other OSCAL instances. The locally defined UUID of the part can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. Part Name @@ -1732,7 +1732,7 @@ Part Namespace A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name. -

This value must be an absolute URI that serves as a naming system identifier.

+

This value must be an absolute URI that serves as a naming system identifier.

When a ns is not provided, its value should be assumed to be http://csrc.nist.gov/ns/oscal and the name should be a name defined by the associated OSCAL model.

 diff --git a/src/metaschema/oscal_assessment-plan_metaschema.xml b/src/metaschema/oscal_assessment-plan_metaschema.xml index 790af4fcb0..5e2306939a 100644 --- a/src/metaschema/oscal_assessment-plan_metaschema.xml +++ b/src/metaschema/oscal_assessment-plan_metaschema.xml @@ -21,7 +21,7 @@ Assessment Plan Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment plan in this or other OSCAL instances. The locally defined UUID of the assessment plan can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment plan in this or other OSCAL instances. The locally defined UUID of the assessment plan can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. diff --git a/src/metaschema/oscal_assessment-results_metaschema.xml b/src/metaschema/oscal_assessment-results_metaschema.xml index 9ae9a4e924..39e9638924 100644 --- a/src/metaschema/oscal_assessment-results_metaschema.xml +++ b/src/metaschema/oscal_assessment-results_metaschema.xml @@ -23,7 +23,7 @@ Assessment Results Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment results instance in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment results instance in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -67,7 +67,7 @@ Results Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this set of results in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this set of results in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -193,7 +193,7 @@ Assessment Log Entry Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference an assessment event in this or other OSCAL instances. The locally defined UUID of the assessment log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference an assessment event in this or other OSCAL instances. The locally defined UUID of the assessment log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. diff --git a/src/metaschema/oscal_component_metaschema.xml b/src/metaschema/oscal_component_metaschema.xml index 8146d96d3e..c579e43750 100644 --- a/src/metaschema/oscal_component_metaschema.xml +++ b/src/metaschema/oscal_component_metaschema.xml @@ -318,7 +318,7 @@ Component Reference - A machine-oriented identifier reference to a component. + A machine-oriented identifier reference to a component. @@ -455,7 +455,7 @@ Control Statement Reference Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). diff --git a/src/metaschema/oscal_control-common_metaschema.xml b/src/metaschema/oscal_control-common_metaschema.xml index de51c93368..3934e1dfbd 100644 --- a/src/metaschema/oscal_control-common_metaschema.xml +++ b/src/metaschema/oscal_control-common_metaschema.xml @@ -42,7 +42,7 @@ Part Namespace An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name. -

This value must be an absolute URI that serves as a naming system identifier.

+

This value must be an absolute URI that serves as a naming system identifier.

When a ns is not provided, its value should be assumed to be http://csrc.nist.gov/ns/oscal and the name should be a name defined by the associated OSCAL model.

 diff --git a/src/metaschema/oscal_implementation-common_metaschema.xml b/src/metaschema/oscal_implementation-common_metaschema.xml index 695ac69450..bf72c46a95 100644 --- a/src/metaschema/oscal_implementation-common_metaschema.xml +++ b/src/metaschema/oscal_implementation-common_metaschema.xml @@ -31,7 +31,7 @@ Component Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -252,7 +252,7 @@ Service Protocol Information Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. Protocol Name @@ -346,7 +346,7 @@ User Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -432,7 +432,7 @@ Inventory Item Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. - A machine-oriented identifier reference to a component that is implemented as part of an inventory item. + A machine-oriented identifier reference to a component that is implemented as part of an inventory item. @@ -640,7 +640,7 @@ Control Statement Reference - A human-oriented identifier reference to a control statement. + A human-oriented identifier reference to a control statement. Set Parameter Value @@ -670,7 +670,7 @@ We need to determine if both identifier-type='machine-oriented' and identifier-type='human-oriented'. Option 2 is identifier-type='unspecified'. --> - A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document. + A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document. id Identification System Type @@ -684,7 +684,7 @@ -

This value must be an absolute URI that serves as a naming system identifier.

+

This value must be an absolute URI that serves as a naming system identifier.

 @@ -694,7 +694,7 @@ Parameter ID - A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context. + A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context. System ISSO diff --git a/src/metaschema/oscal_mapping-common_metaschema.xml b/src/metaschema/oscal_mapping-common_metaschema.xml index d0be2ab220..1956eb9f98 100644 --- a/src/metaschema/oscal_mapping-common_metaschema.xml +++ b/src/metaschema/oscal_mapping-common_metaschema.xml @@ -32,7 +32,7 @@ Relationship Value Namespace A namespace qualifying the relationship's value. This allows different organizations to associate distinct semantics for relationships with the same name. -

This value must be an absolute URI that serves as a naming system identifier.

+

This value must be an absolute URI that serves as a naming system identifier.

When a ns is not provided, its value should be assumed to be http://csrc.nist.gov/ns/oscal and the name should be a name defined by the associated OSCAL model.

 diff --git a/src/metaschema/oscal_mapping_metaschema.xml b/src/metaschema/oscal_mapping_metaschema.xml index 8ba99643c8..cb4b8bfb18 100644 --- a/src/metaschema/oscal_mapping_metaschema.xml +++ b/src/metaschema/oscal_mapping_metaschema.xml @@ -49,7 +49,7 @@ A mapping between two target resources. Mapping Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mapping definition elsewhere in this or other OSCAL instances. The locally defined UUID of the mapping can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same mapping across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mapping definition elsewhere in this or other OSCAL instances. The locally defined UUID of the mapping can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same mapping across revisions of the document. diff --git a/src/metaschema/oscal_metadata_metaschema.xml b/src/metaschema/oscal_metadata_metaschema.xml index dced70a942..aedd79902f 100644 --- a/src/metaschema/oscal_metadata_metaschema.xml +++ b/src/metaschema/oscal_metadata_metaschema.xml @@ -274,7 +274,7 @@ -

This value must be an absolute URI that serves as a naming system identifier.

+

This value must be an absolute URI that serves as a naming system identifier.

 @@ -319,7 +319,7 @@ -

Since the reference target of an organizational affiliation must be another party (whether further qualified as person or organization) as inidcated by its uuid. As a machine-oriented identifier with uniqueness across document and trans-document scope, this uuid value is sufficient to reference the data item locally or globally across related documents, e.g., in an imported OSCAL instance.

+

Since the reference target of an organizational affiliation must be another party (whether further qualified as person or organization) as inidcated by its uuid. As a machine-oriented identifier with uniqueness across document and trans-document scope, this uuid value is sufficient to reference the data item locally or globally across related documents, e.g., in an imported OSCAL instance.

Parties of both the person or organization type can be associated with an organization using the member-of-organization.

 @@ -713,7 +713,7 @@ Property Namespace A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name. -

This value must be an absolute URI that serves as a naming system identifier.

+

This value must be an absolute URI that serves as a naming system identifier.

When a ns is not provided, its value should be assumed to be http://csrc.nist.gov/ns/oscal and the name should be a name defined by the associated OSCAL model.

 @@ -911,7 +911,7 @@ A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role. Responsible Role ID - A human-oriented identifier reference to a role performed. + A human-oriented identifier reference to a role performed. @@ -1133,11 +1133,11 @@ -

This value must be an absolute URI that serves as a naming system identifier.

+

This value must be an absolute URI that serves as a naming system identifier.

 -

A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions, representations or digital surrogates of the same document.

+

A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions, representations or digital surrogates of the same document.

A document identifier provides an additional data point for identifying a document that can be assigned by a publisher or organization for purposes in a wider system, such as a digital object identifier (DOI) or a local content management system identifier.

Use of a document identifier allows for document creators to associate sets of documents that are related in some way by the same document-id.

An OSCAL document always has an implicit document identifier provided by the document's UUID, defined by the uuid on the top-level object. Having a default UUID-based identifier ensures all documents can be minimally identified when other document identifiers are not provided.

diff --git a/src/metaschema/oscal_poam_metaschema.xml b/src/metaschema/oscal_poam_metaschema.xml index 840ee94c39..10bac95629 100644 --- a/src/metaschema/oscal_poam_metaschema.xml +++ b/src/metaschema/oscal_poam_metaschema.xml @@ -24,7 +24,7 @@ POA&M Universally Unique Identifier - A machine-oriented, globally unique identifier with instancescope that can be used to reference this POA&M instance in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with instancescope that can be used to reference this POA&M instance in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -99,7 +99,7 @@ POA&M Item Universally Unique Identifier - A machine-oriented, globally unique identifier with instance scope that can be used to reference this POA&M item entry in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with instance scope that can be used to reference this POA&M item entry in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -138,7 +138,7 @@ Finding Universally Unique Identifier Reference - A machine-oriented identifier reference to a finding defined in the list of findings. + A machine-oriented identifier reference to a finding defined in the list of findings. @@ -154,7 +154,7 @@ Observation Universally Unique Identifier Reference - A machine-oriented identifier reference to an observation defined in the list of observations. + A machine-oriented identifier reference to an observation defined in the list of observations. @@ -166,7 +166,7 @@ Risk Universally Unique Identifier Reference - A machine-oriented identifier reference to a risk defined in the list of risks. + A machine-oriented identifier reference to a risk defined in the list of risks. diff --git a/src/metaschema/oscal_ssp_metaschema.xml b/src/metaschema/oscal_ssp_metaschema.xml index 41aa0c8e3a..e98fbf64d0 100644 --- a/src/metaschema/oscal_ssp_metaschema.xml +++ b/src/metaschema/oscal_ssp_metaschema.xml @@ -35,7 +35,7 @@ System Security Plan Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this system security plan (SSP) elsewhere in this or other OSCAL instances. The locally defined UUID of the SSP can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this system security plan (SSP) elsewhere in this or other OSCAL instances. The locally defined UUID of the SSP can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -198,7 +198,7 @@ Information Type Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this information type elsewhere in this or other OSCAL instances. The locally defined UUID of the information type can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this information type elsewhere in this or other OSCAL instances. The locally defined UUID of the information type can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -223,7 +223,7 @@ -

This value must be an absolute URI that serves as a naming system identifier.

+

This value must be an absolute URI that serves as a naming system identifier.

 @@ -231,7 +231,7 @@ Information Type Systematized Identifier - A human-oriented, globally unique identifier qualified by the given identification system used, such as NIST SP 800-60. This identifier has cross-instance scope and can be used to reference this system elsewhere in this or other OSCAL instances. This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A human-oriented, globally unique identifier qualified by the given identification system used, such as NIST SP 800-60. This identifier has cross-instance scope and can be used to reference this system elsewhere in this or other OSCAL instances. This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. id @@ -413,7 +413,7 @@ Diagram ID - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this diagram elsewhere in this or other OSCAL instances. The locally defined UUID of the diagram can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this diagram elsewhere in this or other OSCAL instances. The locally defined UUID of the diagram can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -541,7 +541,7 @@ Leveraged Authorization Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope and can be used to reference this leveraged authorization elsewhere in this or other OSCAL instances. The locally defined UUID of the leveraged authorization can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope and can be used to reference this leveraged authorization elsewhere in this or other OSCAL instances. The locally defined UUID of the leveraged authorization can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -557,7 +557,7 @@ party-uuid field - A machine-oriented identifier reference to the party that manages the leveraged system. + A machine-oriented identifier reference to the party that manages the leveraged system. @@ -690,7 +690,7 @@ Control Requirement Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control requirement elsewhere in this or other OSCAL instances. The locally defined UUID of the control requirement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control requirement elsewhere in this or other OSCAL instances. The locally defined UUID of the control requirement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -784,7 +784,7 @@ Control Statement Reference Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). @@ -827,12 +827,12 @@ Component Universally Unique Identifier Reference - A machine-oriented identifier reference to the component that is implemeting a given control. + A machine-oriented identifier reference to the component that is implemeting a given control. By-Component Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this by-component entry elsewhere in this or other OSCAL instances. The locally defined UUID of the by-component entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this by-component entry elsewhere in this or other OSCAL instances. The locally defined UUID of the by-component entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -876,7 +876,7 @@ Provided Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this provided entry elsewhere in this or other OSCAL instances. The locally defined UUID of the provided entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this provided entry elsewhere in this or other OSCAL instances. The locally defined UUID of the provided entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -911,7 +911,7 @@ Responsibility Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this responsibility elsewhere in this or other OSCAL instances. The locally defined UUID of the responsibility can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this responsibility elsewhere in this or other OSCAL instances. The locally defined UUID of the responsibility can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -960,7 +960,7 @@ Inherited Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inherited entry elsewhere in this or other OSCAL instances. The locally defined UUID of the inherited control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inherited entry elsewhere in this or other OSCAL instances. The locally defined UUID of the inherited control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -996,7 +996,7 @@ Satisfied Universally Unique Identifier - A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this satisfied control implementation entry elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. + A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this satisfied control implementation entry elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document. @@ -1055,12 +1055,12 @@ Provided UUID - A machine-oriented identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system. + A machine-oriented identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system. Responsibility UUID - A machine-oriented identifier reference to a control implementation that satisfies a responsibility imposed by a leveraged system. + A machine-oriented identifier reference to a control implementation that satisfies a responsibility imposed by a leveraged system.