Posting revised documentation with fixes to previously broken links.

ohsh6o · Jun 16, 2021 · 9daa454 · 9daa454
1 parent 0858d4f
commit 9daa454
Show file tree

Hide file tree

Showing 264 changed files with 53,968 additions and 166,225 deletions.
diff --git a/build/metaschema b/build/metaschema
diff --git a/docs/archetypes/complete-reference/json-definitions.md b/docs/archetypes/complete-reference/json-definitions.md
@@ -1,6 +1,6 @@
 ---
 title: "OSCAL Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Metaschema Reference"
-heading: Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} Model JSON Metaschema Reference
+heading: "Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} Model JSON Metaschema Reference"
 weight: 40
 generateanchors: false
 sidenav:

diff --git a/docs/archetypes/complete-reference/json-index.md b/docs/archetypes/complete-reference/json-index.md
@@ -1,6 +1,6 @@
 ---
 title: "OSCAL Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Index"
-heading: Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Index
+heading: "Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Index"
 weight: 30
 generateanchors: false
 sidenav:

diff --git a/docs/archetypes/complete-reference/json-outline.md b/docs/archetypes/complete-reference/json-outline.md
@@ -1,6 +1,6 @@
 ---
 title: "OSCAL Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Outline"
-heading: Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Outline
+heading: "Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Outline"
 custom_js:
   - "/js/oscal-metaschema-map-expander.js"
 weight: 10

diff --git a/docs/archetypes/complete-reference/json-reference.md b/docs/archetypes/complete-reference/json-reference.md
@@ -1,6 +1,6 @@
 ---
 title: "OSCAL Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Reference"
-heading: Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Reference"
+heading: "Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Reference"
 weight: 20
 generateanchors: false
 sidenav:

diff --git a/docs/archetypes/complete-reference/xml-definitions.md b/docs/archetypes/complete-reference/xml-definitions.md
@@ -1,6 +1,6 @@
 ---
 title: "OSCAL Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Format Metaschema Reference"
-heading: Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Metaschema Reference
+heading: "Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Metaschema Reference"
 weight: 80
 generateanchors: false
 sidenav:

diff --git a/docs/archetypes/complete-reference/xml-index.md b/docs/archetypes/complete-reference/xml-index.md
@@ -1,6 +1,6 @@
 ---
 title: "OSCAL Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Format Index"
-heading: Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Format Index
+heading: "Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Format Index"
 weight: 70
 generateanchors: false
 sidenav:

diff --git a/docs/archetypes/complete-reference/xml-outline.md b/docs/archetypes/complete-reference/xml-outline.md
@@ -1,6 +1,6 @@
 ---
 title: "OSCAL Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Format Outline"
-heading: Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Format Outline
+heading: "Complete {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Format Outline"
 custom_js:
   - "/js/oscal-metaschema-map-expander.js"
 weight: 50

diff --git a/docs/archetypes/model-reference/json-definitions.md b/docs/archetypes/model-reference/json-definitions.md
@@ -1,6 +1,6 @@
 ---
 title: "OSCAL {{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Metaschema Reference"
-heading: {{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} Model JSON Metaschema Reference
+heading: "{{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} Model JSON Metaschema Reference"
 weight: 40
 generateanchors: false
 sidenav:

diff --git a/docs/archetypes/model-reference/json-index.md b/docs/archetypes/model-reference/json-index.md
@@ -1,6 +1,6 @@
 ---
 title: "OSCAL {{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Index"
-heading: {{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Index
+heading: "{{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Index"
 weight: 30
 generateanchors: false
 sidenav:

diff --git a/docs/archetypes/model-reference/json-outline.md b/docs/archetypes/model-reference/json-outline.md
@@ -1,6 +1,6 @@
 ---
 title: "OSCAL {{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Outline"
-heading: {{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Outline
+heading: "{{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} JSON Format Outline"
 custom_js:
   - "/js/oscal-metaschema-map-expander.js"
 weight: 10

diff --git a/docs/archetypes/model-reference/xml-definitions.md b/docs/archetypes/model-reference/xml-definitions.md
@@ -1,6 +1,6 @@
 ---
 title: "OSCAL {{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Format Metaschema Reference"
-heading: {{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Metaschema Reference
+heading: "{{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Metaschema Reference"
 weight: 80
 generateanchors: false
 sidenav:

diff --git a/docs/archetypes/model-reference/xml-index.md b/docs/archetypes/model-reference/xml-index.md
@@ -1,6 +1,6 @@
 ---
 title: "OSCAL {{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Format Index"
-heading: {{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Format Index
+heading: "{{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Format Index"
 weight: 70
 generateanchors: false
 sidenav:

diff --git a/docs/archetypes/model-reference/xml-outline.md b/docs/archetypes/model-reference/xml-outline.md
@@ -1,6 +1,6 @@
 ---
 title: "OSCAL {{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Format Outline"
-heading: {{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Format Outline
+heading: "{{ getenv "HUGO_MODEL_NAME" }} Model {{ if eq (getenv "HUGO_REF_VERSION") "develop" }}Development Snapshot{{ else }}v{{ getenv "HUGO_REF_VERSION" }}{{ end }} XML Format Outline"
 custom_js:
   - "/js/oscal-metaschema-map-expander.js"
 weight: 50

diff --git a/docs/assets/scss/schema-docs.scss b/docs/assets/scss/schema-docs.scss
@@ -134,6 +134,10 @@
   a, a:visited {
     text-decoration: none;
   }
+
+  div.OM-choice {
+    @include u-padding-left(2);
+  }
 }
 
 @mixin reference-header($definition-header-bg,$instance-header-bg,$header-fg) {
@@ -229,7 +233,7 @@
         align-self: right;
     }
   }
-  div.model-entry div.body {
+  div.body {
     @include u-padding-left('105');
     @include u-border-left(2px,'base-lightest');
     @include u-margin-bottom('105');

diff --git a/docs/content/reference/1.0.0-rc2/assessment-plan/json-definitions.md b/docs/content/reference/1.0.0-rc2/assessment-plan/json-definitions.md
@@ -1,7 +1,8 @@
 ---
 title: "OSCAL Assessment Plan Model v1.0.0-rc2 JSON Format Metaschema Reference"
-heading: Assessment Plan Model v1.0.0-rc2 Model JSON Metaschema Reference
+heading: "Assessment Plan Model v1.0.0-rc2 Model JSON Metaschema Reference"
 weight: 40
+generateanchors: false
 sidenav:
   title: JSON Metaschema Reference
 toc:
@@ -3517,7 +3518,7 @@ The following is a reference for the JSON object definitions derived from this m
                               <p>The value of the <code>href</code> can be an internet resource, or a local reference using a fragment e.g. #fragment
                                  that points to a <code>back-matter</code> <code>resource</code> in the same document.</p>
                               <p>If a local reference using a fragment is used, this will be indicated by a fragment
-                                 "#" followed by an identifier which references an identified <code>resource</code> in the document's <code>back-matter</code> or another object that is <a href="/concepts/layer/assessment/#key-concepts">within the scope of the containing OSCAL document</a>.</p>
+                                 "#" followed by an identifier which references an identified <code>resource</code> in the document's <code>back-matter</code> or another object that is within the scope of the containing OSCAL document.</p>
                               <p>If an internet resource is used, the <code>href</code> value will be an absolute or relative URI pointing to the location of the referenced
                                  resource. A relative URI will be resolved relative to the location of the document
                                  containing the link.</p>
@@ -5405,7 +5406,7 @@ The following is a reference for the JSON object definitions derived from this m
                                           <p>The value of the <code>href</code> can be an internet resource, or a local reference using a fragment e.g. #fragment
                                              that points to a <code>back-matter</code> <code>resource</code> in the same document.</p>
                                           <p>If a local reference using a fragment is used, this will be indicated by a fragment
-                                             "#" followed by an identifier which references an identified <code>resource</code> in the document's <code>back-matter</code> or another object that is <a href="../../../assessment-layer/assessment-plan/#key-concepts">within the scope of the containing OSCAL document</a>.</p>
+                                             "#" followed by an identifier which references an identified <code>resource</code> in the document's <code>back-matter</code> or another object that is within the scope of the containing OSCAL document.</p>
                                           <p>If an internet resource is used, the <code>href</code> value will be an absolute or relative URI pointing to the location of the referenced
                                              resource. A relative URI will be resolved relative to the location of the document
                                              containing the link.</p>
@@ -6077,7 +6078,7 @@ The following is a reference for the JSON object definitions derived from this m
                      <h2 id="/assembly/oscal-catalog-common/parameter-guideline/prose" class="toc2 name">prose</h2>
                      <p class="type"><a href="/reference/datatypes/#markup-multiline">markup-multiline</a></p>
                      <p class="occurrence">[1]</p>
-                     <div class="crosslink"><a class="usa-button" href="../xml-definitions/#/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6">Switch to XML</a></div>
+                     <div class="crosslink"><a class="usa-button" href="../xml-definitions/#/assembly/oscal-catalog-common/parameter-guideline/prose">Switch to XML</a></div>
                      <p class="formal-name">Guideline Text</p>
                   </div>
                   <div class="body">
@@ -6364,7 +6365,7 @@ The following is a reference for the JSON object definitions derived from this m
                      <h2 id="/assembly/oscal-assessment-common/assessment-part/prose" class="toc2 name">prose</h2>
                      <p class="type"><a href="/reference/datatypes/#markup-multiline">markup-multiline</a></p>
                      <p class="occurrence">[0 or 1]</p>
-                     <div class="crosslink"><a class="usa-button" href="../xml-definitions/#/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6">Switch to XML</a></div>
+                     <div class="crosslink"><a class="usa-button" href="../xml-definitions/#/assembly/oscal-assessment-common/assessment-part/prose">Switch to XML</a></div>
                      <p class="formal-name">Part Text</p>
                   </div>
                   <div class="body">
@@ -6673,7 +6674,7 @@ The following is a reference for the JSON object definitions derived from this m
                      <h2 id="/assembly/oscal-catalog-common/part/prose" class="toc2 name">prose</h2>
                      <p class="type"><a href="/reference/datatypes/#markup-multiline">markup-multiline</a></p>
                      <p class="occurrence">[0 or 1]</p>
-                     <div class="crosslink"><a class="usa-button" href="../xml-definitions/#/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6">Switch to XML</a></div>
+                     <div class="crosslink"><a class="usa-button" href="../xml-definitions/#/assembly/oscal-catalog-common/part/prose">Switch to XML</a></div>
                      <p class="formal-name">Part Text</p>
                   </div>
                   <div class="body">

diff --git a/docs/content/reference/1.0.0-rc2/assessment-plan/json-index.md b/docs/content/reference/1.0.0-rc2/assessment-plan/json-index.md
@@ -1,7 +1,8 @@
 ---
 title: "OSCAL Assessment Plan Model v1.0.0-rc2 JSON Format Index"
-heading: Assessment Plan Model v1.0.0-rc2 JSON Format Index
+heading: "Assessment Plan Model v1.0.0-rc2 JSON Format Index"
 weight: 30
+generateanchors: false
 sidenav:
   title: JSON Index
 toc: