From 432bb0224c93a00f2f3d7d983c834cc8908b676e Mon Sep 17 00:00:00 2001
From: "~ . ~" <156969148+wandmagic@users.noreply.github.com>
Date: Thu, 2 Jan 2025 13:01:44 -0500
Subject: [PATCH 1/3] add poam item documentation
---
.../poam/4-poam-template-to-oscal-mapping.md | 53 ++++++++++++++++++-
1 file changed, 52 insertions(+), 1 deletion(-)
diff --git a/content/documentation/poam/4-poam-template-to-oscal-mapping.md b/content/documentation/poam/4-poam-template-to-oscal-mapping.md
index 2b821a9..e20db93 100644
--- a/content/documentation/poam/4-poam-template-to-oscal-mapping.md
+++ b/content/documentation/poam/4-poam-template-to-oscal-mapping.md
@@ -20,7 +20,58 @@ includes:
### Representing the POA&M
-This is based on the Excel-based [FedRAMP POA&M Template.](https://www.fedramp.gov/assets/resources/templates/FedRAMP-POAM-Template.xlsx)
+The POA&M can be represented in two formats:
+
+#### Legacy Excel Format
+
+The legacy format uses the Excel-based [FedRAMP POA&M Template](https://www.fedramp.gov/assets/resources/templates/FedRAMP-POAM-Template.xlsx). When using this format in OSCAL, reference it in a resource assembly, not that this is not the preffered format, and upgrading to oscal content is advised:
+
+```xml
+
+ Plan of Actions and Milestones (POAM)
+
+
+
+
+
+
+```
+
+#### OSCAL POA&M Format
+
+The OSCAL POA&M format represents the POA&M data natively in OSCAL XML. When using this format, include both the OSCAL XML rlink file reference. base64-encoded content is currently not supportted.
+
+```xml
+
+ Plan of Actions and Milestones (POAM)
+
+
+
+
+
+ 00000000
+
+```
+
+#### Network Component Links
+
+When network components need to reference specific POA&M items, use a link element with a resource-fragment that points to the POA&M item's UUID:
+
+```xml
+
+```
+
+This links to a POA&M item defined as:
+
+```xml
+
+ example poam item
+
+
poam item description
+
+
+
+```
Content that is common across OSCAL file types is described in the
*[FedRAMP OSCAL Documentation](/documentation).*
From 941dcd88c71f657c703e3bccd638a2352d586882 Mon Sep 17 00:00:00 2001
From: wandmagic <156969148+wandmagic@users.noreply.github.com>
Date: Thu, 2 Jan 2025 13:42:55 -0500
Subject: [PATCH 2/3] Update 4-poam-template-to-oscal-mapping.md
Co-authored-by: Kylie Hunter
---
content/documentation/poam/4-poam-template-to-oscal-mapping.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/documentation/poam/4-poam-template-to-oscal-mapping.md b/content/documentation/poam/4-poam-template-to-oscal-mapping.md
index e20db93..5c29433 100644
--- a/content/documentation/poam/4-poam-template-to-oscal-mapping.md
+++ b/content/documentation/poam/4-poam-template-to-oscal-mapping.md
@@ -24,7 +24,7 @@ The POA&M can be represented in two formats:
#### Legacy Excel Format
-The legacy format uses the Excel-based [FedRAMP POA&M Template](https://www.fedramp.gov/assets/resources/templates/FedRAMP-POAM-Template.xlsx). When using this format in OSCAL, reference it in a resource assembly, not that this is not the preffered format, and upgrading to oscal content is advised:
+The legacy format uses the Excel-based [FedRAMP POA&M Template](https://www.fedramp.gov/assets/resources/templates/FedRAMP-POAM-Template.xlsx). When using this format in OSCAL, reference it in a resource assembly. Please note that this is not the preferred format, and upgrading to OSCAL content is advised:
```xml
From b8ec76166c0616bb36b3e78c3f19f70e4d15c2dd Mon Sep 17 00:00:00 2001
From: wandmagic <156969148+wandmagic@users.noreply.github.com>
Date: Thu, 2 Jan 2025 13:43:01 -0500
Subject: [PATCH 3/3] Update 4-poam-template-to-oscal-mapping.md
Co-authored-by: Kylie Hunter
---
content/documentation/poam/4-poam-template-to-oscal-mapping.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/documentation/poam/4-poam-template-to-oscal-mapping.md b/content/documentation/poam/4-poam-template-to-oscal-mapping.md
index 5c29433..aafa77f 100644
--- a/content/documentation/poam/4-poam-template-to-oscal-mapping.md
+++ b/content/documentation/poam/4-poam-template-to-oscal-mapping.md
@@ -37,7 +37,7 @@ The legacy format uses the Excel-based [FedRAMP POA&M Template](https://www.fedr
```
-#### OSCAL POA&M Format
+#### OSCAL POA&M Format (Preferred)
The OSCAL POA&M format represents the POA&M data natively in OSCAL XML. When using this format, include both the OSCAL XML rlink file reference. base64-encoded content is currently not supportted.