Move concepts from Resources to Learn

src/content/about/blog/archive.md

@@ -31,3 +31,8 @@ For an up-to-date description of all projects and their relationship to one anot
 
 Moving forward, the NIST team will author future blog posts as needed. If you have an OSCAL topic you would like to read about or you want to guest-author a blog post, you can email the [NIST OSCAL team](mailto:oscal@nist.gov?subject=NIST%20Blog) your proposal and the team will work with you to approve and publish the blog post.
 
+### July 7, 2021
+[Innovating Security Compliance Through Open Standards](https://www.easydynamics.com/blog/innovating-security-compliance-through-open-standards/)
+
+### May 19, 2021
+[The Foundation for Interoperable and Portable Security Automation is Revealed in NIST’s OSCAL Project](https://www.nist.gov/blogs/cybersecurity-insights/foundation-interoperable-and-portable-security-automation-revealed)

src/content/learn/_index.md

@@ -10,3 +10,39 @@ suppresstopiclists: true
 
 The following Open Security Controls Assessment Language (OSCAL) learning resources are available to help you understand the concepts behind and use of the OSCAL [models](/concepts/layer/).
 
+### Concepts
+
+The [concepts](./concepts/) section contains detailed information about the organization of OSCAL models, processing specifications, and explanations of important primitives (i.e. identifiers) underlying OSCAL data elements.
+
+### Walkthrough Tutorials
+
+The [tutorials](./tutorials/) section provides step-by-step walk-throughs explaining how to create OSCAL content of various types, such as:
+
+- [general topic tutorials](./tutorials/general/)
+  - [Using the metadata section](./tutorials/general/metadata/): Explains use of the `metadata` section that is required to be provided in all OSCAL content.
+  - [Extending OSCAL models](./tutorials/general/extension/): Discusses how to use OSCAL properties and links to provided extended data in OSCAL content.
+  - [Testing new releases](./tutorials/general/releases/): Provides a few pointers for community members looking to test new OSCAL releases.
+
+- [control layer tutorials](./tutorials/control/)
+  - [Creating a Basic Control Catalog](./tutorials/control/basic-catalog/): Explains how to create a [catalog](/concepts/terminology/#catalog) of [controls](/concepts/terminology/#control) using the OSCAL [catalog model](/concepts/layer/control/catalog/).
+  - [Creating a Basic Profile](/learn/tutorials/profile/): Explains how to create and modify a subset of controls from a catalog in OSCAL by using the OSCAL [profile model](/concepts/layer/control/profile/).
+
+- [implementation layer tutorials](./tutorials/implementation/)
+  - [Creating a Basic Component Definition](./tutorials/implementation/simple-component-definition/): Teaches how to create a component-definition using the OSCAL [component definition](/concepts/layer/implementation/component-definition/) model.
+  - [Representing proof of compliance or test validation information](./tutorials/implementation/validation-modeling/): Describes how to represent test validation information (e.g., FIPS-140-2) using a component in an OSCAL [component definition](/concepts/layer/implementation/component-definition/) or [system security plan](/concepts/layer/implementation/ssp/). 
+
+### Events and Presentations
+
+- Events
+  - [Monthly Workshops](./presentations/mini-workshop/) - 2022-present
+  - [4th NIST OSCAL Conference and Workshop](./presentations/oscal-workshop-2023-04) - May 23, 2023
+  - [3rd NIST OSCAL Workshop](./presentations/oscal-workshop-2022-03/) - March 1-2, 2022
+  - [2nd NIST OSCAL Workshop](./presentations/oscal-workshop-2021-02/) - February 2-3, 2021
+  - [1st NIST OSCAL Workshop](./presentations/OSCAL-workshop-20191105.pdf) - November 5, 2019
+
+- Presentations
+  - [OSCAL Deep Diff Introduction](/presentations/OSCAL-deep-diff-LWtD-20220505.pdf) presented during the [Lunch with the OSCAL Developers](/contribute/dev-lunch/) - May 5, 2022
+  - [Using Leveraged Authorizations in OSCAL](/presentations/oscal-leveraged-authorizations-v6a.pdf) presented during the [OSCAL Model Review](/contribute/model-review/) - July 24, 2020
+  - [OSCAL Assessment Models Overview](/presentations/oscal-ap-ar-poam-v3.pdf) presented during the [Lunch with the OSCAL Developers](/contribute/dev-lunch/) - July 2, 2020
+  - [Security Automation Simplified via NIST OSCAL: We're Not in Kansas Anymore](https://www.youtube.com/watch?v=eP8K7piU5UQ) presented at RSA Conference 2018 - April 18, 2018
+  - [Automating Security and Compliance via a New Standard of Standards](https://www.youtube.com/watch?v=mo3J0tFxixg) presented at Docker Government Summit 2018 - April 11, 2018

src/content/resources/concepts/_index.md → src/content/learn/concepts/_index.md

@@ -10,6 +10,7 @@ aliases:
   - /docs/schemas/
   - /documentation/
   - /concepts/
+weight: 1
 ---
 
 This section of the OSCAL website presents:

src/content/learn/presentations/_index.md

@@ -1,13 +1,15 @@
 ---
-title: Instructional Videos, Presentations, and Blogs
+title: Events and Presentations
 date: 2021-04-22 09:52:36 -0400
 suppresstopiclists: true
+weight: 3
 ---
 
 The following are presentations on OSCAL-related topics. Some of the older presentations were based on earlier versions of OSCAL, which may be slightly different from the current OSCAL releases. In such cases, the  content will still apply conceptually and will give you a good overview of the core OSCAL concepts.
 
-### Workshops
-- [4th NIST OSCAL Workshop](oscal-workshop-2023-04) - May 23, 2023
+### Events
+- [Monthly Workshops](./mini-workshop/) - 2022-present
+- [4th NIST OSCAL Conference and Workshop](oscal-workshop-2023-04) - May 23, 2023
 - [3rd NIST OSCAL Workshop](oscal-workshop-2022-03/) - March 1-2, 2022
 - [2nd NIST OSCAL Workshop](oscal-workshop-2021-02/) - February 2-3, 2021
 - [1st NIST OSCAL Workshop](OSCAL-workshop-20191105.pdf) - November 5, 2019
@@ -17,8 +19,4 @@ The following are presentations on OSCAL-related topics. Some of the older prese
 - [Using Leveraged Authorizations in OSCAL](/presentations/oscal-leveraged-authorizations-v6a.pdf) presented during the [OSCAL Model Review](/contribute/model-review/) - July 24, 2020
 - [OSCAL Assessment Models Overview](/presentations/oscal-ap-ar-poam-v3.pdf) presented during the [Lunch with the OSCAL Developers](/contribute/dev-lunch/) - July 2, 2020
 - [Security Automation Simplified via NIST OSCAL: We're Not in Kansas Anymore](https://www.youtube.com/watch?v=eP8K7piU5UQ) presented at RSA Conference 2018 - April 18, 2018
-- [Automating Security and Compliance via a New Standard of Standards](https://www.youtube.com/watch?v=mo3J0tFxixg) presented at Docker Government Summit 2018 - April 11, 2018
-
-### Blogs
-- [Blog: Innovating Security Compliance Through Open Standards](https://www.easydynamics.com/blog/innovating-security-compliance-through-open-standards/) - July 7, 2021
-- [Blog: The Foundation for Interoperable and Portable Security Automation is Revealed in NIST’s OSCAL Project](https://www.nist.gov/blogs/cybersecurity-insights/foundation-interoperable-and-portable-security-automation-revealed) - May 19, 2021
+- [Automating Security and Compliance via a New Standard of Standards](https://www.youtube.com/watch?v=mo3J0tFxixg) presented at Docker Government Summit 2018 - April 11, 2018

src/content/learn/presentations/mini-workshop/_index.md

@@ -1,15 +1,15 @@
 ---
-title: OSCAL Mini Workshop Series
+title: OSCAL Monthly Workshop Series
 date: 2022-05-26 13:18:18 -0400
-heading: Open Security Controls Assessment Language (OSCAL) Mini Workshop Series
+heading: Open Security Controls Assessment Language (OSCAL) Monthly Workshop Series
 toc:
   enabled: true
 aliases:
   - /learn/presentations/oscal-mini-workshop-series/
 weight: 1
 ---
 
-# OSCAL Mini Workshop Series
+# OSCAL Monthly Workshop Series
 
 The NIST [OSCAL](https://www.nist.gov/OSCAL) team is hosting a new series of mini workshops, that aims to address topics of interest for our community and to open this forum for its members to present their OSCAL-related work. Unless specifically stated, the workshops will not require a deep, technical understanding of OSCAL, and the dialog is informal, allowing the community to interact with the presenters and with the OSCAL team members. 
 
@@ -27,7 +27,7 @@ Who should attend:
 
 ## Call for Proposals
 
-NIST OSCAL Mini Workshop program committee is seeking timely, topical, and thought-provoking **technical presentations or demonstrations** highlighting OSCAL editorial tools, OSCAL-based security assessment automation processes, and Governance Risk and Compliance (GRC) tools supporting OSCAL formats for integration into such processes. 
+NIST OSCAL Monthly Workshop program committee is seeking timely, topical, and thought-provoking **technical presentations or demonstrations** highlighting OSCAL editorial tools, OSCAL-based security assessment automation processes, and Governance Risk and Compliance (GRC) tools supporting OSCAL formats for integration into such processes. 
 
 **NIST does not endorse any of the OSCAL tools or services presented. Presentations or demos promoting such tools or services, as opposed to focusing on the OSCAL-related technical aspects, will not be permitted.**
 
@@ -38,8 +38,8 @@ Please find below the calendar of proposed dates. Before submitting a proposal,
 Submit your proposal via email to [oscal@nist.gov](mailto:oscal@nist.gov), with the subject line: “OSCAL Workshop - [Date: yyyy/mm/dd]”, where the “Date” is the selected date from the calendar below. Please include in your submission a pre-assessment of the OSCAL knowledge level the audience will need using a 4-levels scale with level one (L1/bronze) being equivalent to novice and level four (L4/platinum) being an OSCAL expert. 
 #
 ---
-## Attend the Next Mini Workshop Event
-We'd love for you to be a part of our upcoming virtual OSCAL Mini Workshop! These engaging workshops are held monthly, typically around the middle of the month. **For up-to-date information about the workshops, please visit our [OSCAL CSRC](https://csrc.nist.gov/projects/open-security-controls-assessment-language/oscal-adopters-workshops) page.**
+## Attend the Next Monthly Workshop Event
+We'd love for you to be a part of our upcoming virtual OSCAL Workshop! These engaging workshops are held monthly, typically around the middle of the month. **For up-to-date information about the workshops, please visit our [OSCAL CSRC](https://csrc.nist.gov/projects/open-security-controls-assessment-language/oscal-adopters-workshops) page.**
 
 **Visit our [Events Page](../../../events/)** to explore an interactive web calendar and download our iCalendar for seamless access to both upcoming and past events.
 

src/content/learn/presentations/oscal-workshop-2021-02.md

@@ -4,7 +4,7 @@ date: 2021-04-22 09:52:36 -0400
 heading: 2nd Open Security Controls Assessment Language (OSCAL) Workshop
 toc:
   enabled: true
-weight: 2
+weight: 4
 ---
 
 {{% usa-tag %}}When{{% /usa-tag %}} February 2, 2021 thru February 3, 2021

src/content/learn/presentations/oscal-workshop-2023-04.md

@@ -1,10 +1,10 @@
 ---
-title: 4th OSCAL Workshop
+title: 4th OSCAL Conference and Workshop
 date: 2024-09-3
-heading: 4th Open Security Controls Assessment Language (OSCAL) Workshop
+heading: 4th Open Security Controls Assessment Language (OSCAL) Conference and Workshop
 toc:
     enabled: true
-weight: 4
+weight: 2
 ---
 
 {{% usa-tag %}}When{{% /usa-tag %}} May 23rd, 2023

src/content/learn/tutorials/_index.md

@@ -2,21 +2,23 @@
 title: Walkthrough Tutorials
 date: 2021-04-22 09:52:36 -0400
 suppresstopiclist: true
+weight: 2
 ---
 
 The following tutorials provide step-by-step walk-throughs explaining how to create OSCAL content of various types.
 
-## [General Topics](general/)
+### [General Topics](general/)
 
 - [Using the metadata section](general/metadata/): Explains use of the `metadata` section that is required to be provided in all OSCAL content.
 - [Extending OSCAL models](general/extension/): Discusses how to use OSCAL properties and links to provided extended data in OSCAL content.
 - [Testing new releases](general/releases/): Provides a few pointers for community members looking to test new OSCAL releases.
 
-## [Control Layer Topics](control/)
+### [Control Layer Topics](control/)
 
 - [Creating a Basic Control Catalog](control/basic-catalog/): Explains how to create a [catalog](/concepts/terminology/#catalog) of [controls](/concepts/terminology/#control) using the OSCAL [catalog model](/concepts/layer/control/catalog/).
 - [Creating a Basic Profile](/learn/tutorials/profile/): Explains how to create and modify a subset of controls from a catalog in OSCAL by using the OSCAL [profile model](/concepts/layer/control/profile/).
-## [Implementation Layer Topics](implementation/)
+
+### [Implementation Layer Topics](implementation/)
 
 - [Creating a Basic Component Definition](implementation/simple-component-definition/): Teaches how to create a component-definition using the OSCAL [component definition](/concepts/layer/implementation/component-definition/) model.
 - [Representing test validation information](implementation/validation-modeling/): Describes how to represent test validation information (e.g., FIPS-140-2) using a component in an OSCAL [component definition](/concepts/layer/implementation/component-definition/) or [system security plan](/concepts/layer/implementation/ssp/). 

src/content/resources/_index.md

@@ -14,21 +14,12 @@ sidenav:
 
 The OSCAL project maintains a variety of resources to learn and use OSCAL.
 
-## Learn
+### OSCAL Reference
 
-### Concepts
+The [reference](https://pages.nist.gov/OSCAL-Reference) section contains the full details of all OSCAL models for development snapshots and all published releases, with visualizations of models in [outline form](https://pages.nist.gov/OSCAL-Reference/models/#:~:text=.-,Outline%20Pages), [reference documentation](https://pages.nist.gov/OSCAL-Reference/models/#:~:text=.-,Reference%20Pages) for individual elements, and [indices](https://pages.nist.gov/OSCAL-Reference/models/#:~:text=.-,Index%20Pages) for the location of all elements across all models.
 
-The [concepts](./concepts/) section contains detailed information about the organization of OSCAL models, processing specifications, and explanations of important primitives (i.e. identifiers) underlying OSCAL data elements.
+For each released model, outline entries are linked to their corresponding references. For example, the [Catalog](https://pages.nist.gov/OSCAL-Reference/models/develop/catalog/) outline for the latest [development snapshot](https://pages.nist.gov/OSCAL-Reference/models/develop/catalog/) is provided in [XML](https://pages.nist.gov/OSCAL-Reference/models/develop/catalog/xml-outline/) and in [JSON/YAML](https://pages.nist.gov/OSCAL-Reference/models/develop/catalog/json-outline/) formats. In each format, the outline entries are linked to their definitions and constraints.
 
-### Reference
-
-The [reference](https://pages.nist.gov/OSCAL-Reference) section contains the full details of all OSCAL models for development snapshots and all published releases, with visualizations of models in outline form, reference documentation for individual elements, and indices for the location of all elements across all models.
-
-## Use
-
-### Downloads
-
-The [downloads](./downloads/) page has links and instructions to download releases and development snapshots of the OSCAL data models.
 
 ### Examples
 
@@ -37,3 +28,7 @@ The [examples](./examples/) page has links and information to examples of OSCAL
 ### Tools
 
 The [tools](./tools) page has information about NIST's reference implementations of software and reusable libraries. Additionally, there are links to community-maintained lists of software and information about OSCAL-enabled tools.
+
+### Downloads
+
+The [downloads](./downloads/) page has links and instructions to download releases and development snapshots of the OSCAL data models.