Merge pull request #181 from 18F/develop

Merge upstream/master

Author: danielnaab

.github/ISSUE_TEMPLATE/1-feedback.md

@@ -38,6 +38,7 @@ NOTE: For feedback related to the OSCAL syntax itself, please create or add to a
 
 * **What is your feedback?**
 
+* **Is this report specifically related to [the Word or Excel files from fedramp.gov?](fedramp.gov/documents-templates/)** If so, please do not open an issue here. Follow the guidance in [this repository's README](https://github.com/GSA/fedramp-automation#support-and-oscal-deprecation-strategy) and contact [info@fedramp..gov](mailto:info@fedramp.gov).
 
 * **What version of OSCAL are you using? (Check our info on [supported OSCAL versions](https://github.com/GSA/fedramp-automation/blob/master/README.md#support-and-oscal-deprecation-strategy))**
 

.github/ISSUE_TEMPLATE/2-bug_report.md

@@ -13,6 +13,10 @@ assignees: ohsh6o
 
 # Who is the bug affecting?
 
+# Is this report specifically related to [the Word or Excel files from fedramp.gov?](fedramp.gov/documents-templates/)
+
+If so, please do not open an issue here. Follow the guidance in [this repository's README](https://github.com/GSA/fedramp-automation#support-and-oscal-deprecation-strategy) and contact [info@fedramp..gov](mailto:info@fedramp.gov).
+
 # What version of OSCAL are you using? (Check our info on [supported OSCAL versions](https://github.com/GSA/fedramp-automation/blob/master/README.md#support-and-oscal-deprecation-strategy))
 
 # What is affected by this bug?

README.md

@@ -13,13 +13,15 @@ The FedRAMP PMO has [a release strategy and versioning procedures](./documents/a
 
 Changes to the minimally supported version and deprecation notices will be made in advance of a release.
 
+This repository is for the development and enhancement of OSCAL artifacts only. For issues with the [Word and Excel-based templates and artifacts on the fedramp.gov site](https://www.fedramp.gov/documents-templates/), please send requests to [info@fedramp.gov](mailto:info@gfedramp.gov).
+
 ## We Want Your Feedback!
 
 The FedRAMP PMO is releasing the following files for public review and comment:
 
-- **FedRAMP Baselines:** The FedRAMP baselines for High, Moderate, Low, and Tailored for Low Impact-Software as a Service (LI-SaaS) in OSCAL (XML and JSON formats) are available [here](./baselines).
+- **FedRAMP Baselines:** The FedRAMP baselines for High, Moderate, Low, and Tailored for Low Impact-Software as a Service (LI-SaaS) in OSCAL (XML and JSON formats) are available [here](./dist/content/baselines).
 
-- **FedRAMP OSCAL Templates:** The template files are pre-populated with FedRAMP extensions, defined-identifiers, and conformity tags where practical. They also include sample data, and are the basis for their respective guidance documents above. The drafts for public comment are available in both XML and JSON formats [here](./templates/).
+- **FedRAMP OSCAL Templates:** The template files are pre-populated with FedRAMP extensions, defined-identifiers, and conformity tags where practical. They also include sample data, and are the basis for their respective guidance documents above. The drafts for public comment are available in both XML and JSON formats [here](./dist/content/templates/).
 
 - **FedRAMP OSCAL Registry** This registry is the authoritative source for all FedRAMP extensions to the OSCAL syntax, FedRAMP-defined identifiers, and accepted values. The draft for public comment is available [here](./documents/FedRAMP_Extensions.pdf).
 

dist/content/baselines/rev4/json/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog-min.json

@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "498295de-d389-4fa9-b0da-f413a0382be7",
+    "uuid": "281d8fe6-9c19-4a45-b9cf-9fd22254bb28",
     "metadata": {
       "title": "FedRAMP Rev 4 High Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2021-07-19T15:18:14.007941Z",
+      "last-modified": "2021-07-28T02:26:00.595175Z",
       "version": "fedramp1.0.0-oscal1.0.0",
       "oscal-version": "1.0.0",
       "links": [

dist/content/baselines/rev4/json/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.json

@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "06406921-ed88-4ffa-b985-47f9c891771c",
+    "uuid": "37018d2d-3fb3-4b3c-978a-934e195bdff5",
     "metadata": {
       "title": "FedRAMP Rev 4 Tailored Low Impact Software as a Service (LI-SaaS) Baseline",
       "published": "2021-02-17T00:00:00.000-04:00",
-      "last-modified": "2021-07-19T15:18:32.109699Z",
+      "last-modified": "2021-07-28T02:26:18.289423Z",
       "version": "fedramp1.0.0-oscal1.0.0",
       "oscal-version": "1.0.0",
       "links": [

dist/content/baselines/rev4/json/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog-min.json

@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "6aa50b1b-b564-48a4-aa71-f2600729bb7f",
+    "uuid": "29b377dc-5ddb-4346-be27-ddb6236a32fa",
     "metadata": {
       "title": "FedRAMP Rev 4 Low Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2021-07-19T15:18:44.973004Z",
+      "last-modified": "2021-07-28T02:26:31.002046Z",
       "version": "fedramp1.0.0-oscal1.0.0",
       "oscal-version": "1.0.0",
       "links": [