[skip ci] Compare and contrast usnistgov#1703 schema changes.

aj-stein-nist · Apr 3, 2023 · 9a84533 · 9a84533
1 parent 95600be
commit 9a84533
Show file tree

Hide file tree

Showing 89 changed files with 2,222 additions and 2,342 deletions.
diff --git a/docs/content/concepts/processing/profile-resolution.html b/docs/content/concepts/processing/profile-resolution.html
diff --git a/docs/content/reference/develop/_index.md b/docs/content/reference/develop/_index.md
@@ -12,7 +12,7 @@ sidenav:
 oscal:
     type: "branch"
     remote: "usnistgov/OSCAL"
-    branch: "develop"
+    branch: "1703-date-regex-not-updated-to-fixed-v104-version-in-json-schema-or-in-main-branch"
     revision: "develop"
     version: "develop"
 ---
diff --git a/docs/content/reference/develop/assessment-plan/_index.md b/docs/content/reference/develop/assessment-plan/_index.md
@@ -11,12 +11,12 @@ sidenav:
 ---
 
 <p><span class="usa-tag">Release Version</span> Latest Development Snapshot</p>
-<p><span class="usa-tag">Github</span> <a href="https://github.com/usnistgov/OSCAL">usnistgov/OSCAL</a> <span class="usa-tag">Branch</span> <a href="https://github.com/usnistgov/OSCAL/tree/develop">develop</a></p>
+<p><span class="usa-tag">Github</span> <a href="https://github.com/usnistgov/OSCAL">usnistgov/OSCAL</a> <span class="usa-tag">Branch</span> <a href="https://github.com/usnistgov/OSCAL/tree/1703-date-regex-not-updated-to-fixed-v104-version-in-json-schema-or-in-main-branch">1703-date-regex-not-updated-to-fixed-v104-version-in-json-schema-or-in-main-branch</a></p>
 
 The following reference documentation is available for the OSCAL Assessment Plan model.
 
 - **[Conceptual Overview](/concepts/layer/assessment/assessment-plan/):** Provides a high-level overview of the model's intended purpose and role in the [OSCAL architecture](/concepts/layer/). Describes the model's purpose, target audience, and key concepts.
 - **Outline ([JSON/YAML](json-outline/), [XML](xml-outline/)):** Provides a brief listing of the model's information items organized hierarchically. Useful for understanding the structure and basic syntax of the model in a given format.
 - **Reference ([JSON/YAML](json-reference/), [XML](xml-reference/)):** Provides a detailed description of the structure and syntax for the model's information items organized hierarchically. Useful for understanding how to use information items within the model in the given format. 
 - **Index ([JSON/YAML](json-index/), [XML](xml-index/)):** Provides a listing of the model's information items organized by where they are used.
-- **Definitions ([JSON/YAML](json-definitions/), [XML](xml-definitions/)):** Provides a reference for the XML Schema types and JSON Schema definitions derived from this model's [metaschema](https://github.com/usnistgov/OSCAL/blob/develop/src/metaschema/oscal_assessment-plan). A metaschema is used to [express the model](/concepts/layer/overview/#modeling-approach) in a format agnostic way, that is then used to generate the XML and JSON Schema, XML <-> JSON content converters, and this reference documentation.
+- **Definitions ([JSON/YAML](json-definitions/), [XML](xml-definitions/)):** Provides a reference for the XML Schema types and JSON Schema definitions derived from this model's [metaschema](https://github.com/usnistgov/OSCAL/blob/1703-date-regex-not-updated-to-fixed-v104-version-in-json-schema-or-in-main-branch/src/metaschema/oscal_assessment-plan). A metaschema is used to [express the model](/concepts/layer/overview/#modeling-approach) in a format agnostic way, that is then used to generate the XML and JSON Schema, XML <-> JSON content converters, and this reference documentation.
diff --git a/docs/content/reference/develop/assessment-plan/json-definitions.md b/docs/content/reference/develop/assessment-plan/json-definitions.md
@@ -10,7 +10,7 @@ toc:
   headingselectors: "h1.toc1, h2.toc2, h3.toc3, h4.toc4, h5.toc5, h6.toc6"
 ---
 
-The following is a reference for the JSON object definitions derived from the [metaschema](https://github.com/usnistgov/OSCAL/blob/develop//src/metaschema/oscal_assessment-plan_metaschema.xml) for this [model](/concepts/layer/assessment/assessment-plan/).
+The following is a reference for the JSON object definitions derived from the [metaschema](https://github.com/usnistgov/OSCAL/blob/1703-date-regex-not-updated-to-fixed-v104-version-in-json-schema-or-in-main-branch//src/metaschema/oscal_assessment-plan_metaschema.xml) for this [model](/concepts/layer/assessment/assessment-plan/).
 
 <!-- DO NOT REMOVE. Generated text below -->
 {{< rawhtml >}}

diff --git a/docs/content/reference/develop/assessment-plan/json-index.md b/docs/content/reference/develop/assessment-plan/json-index.md
@@ -10,7 +10,7 @@ toc:
   headingselectors: "h1.toc1"
 ---
 
-The following is an index of each JSON property used in the [JSON format](https://github.com/usnistgov/OSCAL/blob/develop/json/schema/oscal_assessment-plan_schema.json) for this [model](/concepts/layer/assessment/assessment-plan/). Each entry in the index lists all uses of the given property in the format, which is linked to the corresponding entry in the [JSON Format Reference](../json-reference/). Each entry also lists the formal name for the definition which is linked to the corresponding JSON definition in the [JSON Format Metaschema Reference](../json-definitions/).
+The following is an index of each JSON property used in the [JSON format](https://github.com/usnistgov/OSCAL/blob/1703-date-regex-not-updated-to-fixed-v104-version-in-json-schema-or-in-main-branch/json/schema/oscal_assessment-plan_schema.json) for this [model](/concepts/layer/assessment/assessment-plan/). Each entry in the index lists all uses of the given property in the format, which is linked to the corresponding entry in the [JSON Format Reference](../json-reference/). Each entry also lists the formal name for the definition which is linked to the corresponding JSON definition in the [JSON Format Metaschema Reference](../json-definitions/).
 
 <!-- DO NOT REMOVE. Generated text below -->
 {{< rawhtml >}}

diff --git a/docs/content/reference/develop/assessment-plan/json-outline.md b/docs/content/reference/develop/assessment-plan/json-outline.md
@@ -10,7 +10,7 @@ sidenav:
 
 ---
 
-The following outline is a representation of the [JSON format](https://github.com/usnistgov/OSCAL/blob/develop/json/schema/oscal_assessment-plan_schema.json) for this [model](/concepts/layer/assessment/assessment-plan/). For each property, the name links to the corresponding entry in the [JSON Format Reference](../json-reference/). The cardinality and data type are also provided for each property where appropriate.
+The following outline is a representation of the [JSON format](https://github.com/usnistgov/OSCAL/blob/1703-date-regex-not-updated-to-fixed-v104-version-in-json-schema-or-in-main-branch/json/schema/oscal_assessment-plan_schema.json) for this [model](/concepts/layer/assessment/assessment-plan/). For each property, the name links to the corresponding entry in the [JSON Format Reference](../json-reference/). The cardinality and data type are also provided for each property where appropriate.
 
 <!-- DO NOT REMOVE. Generated text below -->
 {{< rawhtml >}}

diff --git a/docs/content/reference/develop/assessment-plan/xml-definitions.md b/docs/content/reference/develop/assessment-plan/xml-definitions.md
@@ -10,7 +10,7 @@ toc:
   headingselectors: "h1.toc1, h2.toc2, h3.toc3, h4.toc4, h5.toc5, h6.toc6"
 ---
 
-The following is a reference for the XML element and attribute types derived from the [metaschema](https://github.com/usnistgov/OSCAL/blob/develop//src/metaschema/oscal_assessment-plan_metaschema.xml) for this [model](/concepts/layer/assessment/assessment-plan/).
+The following is a reference for the XML element and attribute types derived from the [metaschema](https://github.com/usnistgov/OSCAL/blob/1703-date-regex-not-updated-to-fixed-v104-version-in-json-schema-or-in-main-branch//src/metaschema/oscal_assessment-plan_metaschema.xml) for this [model](/concepts/layer/assessment/assessment-plan/).
 
 <!-- DO NOT REMOVE. Generated text below -->{{< rawhtml >}}
 <div xmlns="http://www.w3.org/1999/xhtml" class="xml-definition">

diff --git a/docs/content/reference/develop/assessment-plan/xml-index.md b/docs/content/reference/develop/assessment-plan/xml-index.md
@@ -10,7 +10,7 @@ toc:
   headingselectors: "h1.toc1"
 ---
 
-The following is an index of each XML element and attribute used in the [XML format](https://github.com/usnistgov/OSCAL/blob/develop/xml/schema/oscal_assessment-plan_schema.xsd) for this [model](/concepts/layer/assessment/assessment-plan/). Each entry in the index lists all uses of the given element or attribute in the format, which is linked to the corresponding entry in the [XML Format Reference](../xml-reference/). Each entry also lists the formal name for the given element or attribute which is linked to the corresponding XML type in the [XML Format Metaschema Reference](../xml-definitions/).
+The following is an index of each XML element and attribute used in the [XML format](https://github.com/usnistgov/OSCAL/blob/1703-date-regex-not-updated-to-fixed-v104-version-in-json-schema-or-in-main-branch/xml/schema/oscal_assessment-plan_schema.xsd) for this [model](/concepts/layer/assessment/assessment-plan/). Each entry in the index lists all uses of the given element or attribute in the format, which is linked to the corresponding entry in the [XML Format Reference](../xml-reference/). Each entry also lists the formal name for the given element or attribute which is linked to the corresponding XML type in the [XML Format Metaschema Reference](../xml-definitions/).
 
 <!-- DO NOT REMOVE. Generated text below -->
 {{< rawhtml >}}