Align incubation & graduation dd questions

Signed-off-by: Bob Killen <bkillen@linuxfoundation.org>

.github/ISSUE_TEMPLATE/template-graduation-application.md

@@ -34,12 +34,6 @@ _The project has been adopted by the following organizations in a testing and in
 
 ## Application Process Principles
 
-### Suggested
-
-N/A
-
-### Required
-
 - [ ] **Engage with the domain specific TAG(s) to increase awareness through a presentation or completing a General Technical Review.**
   - This was completed and occurred on DD-MMM-YYYY, and can be discovered at $LINK.
 
@@ -68,7 +62,7 @@ Completion of this due diligence document, resolution of concerns raised, and pr
 
 ## Governance and Maintainers
 
-Note: this section may be augmented by the completion of a Governance Review from TAG Contributor Strategy.
+Note: this section may be augmented by the completion of a Governance Review from the Project Reviews subproject.
 
 ### Suggested
 
@@ -98,14 +92,6 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 <!-- (Project assertion goes here) --> 
 
-- [ ] **Document complete list of current maintainers, including names, contact information, domain of responsibility, and affiliation.**
-
-<!-- (Project assertion goes here) --> 
-
-- [ ] **A number of active maintainers which is appropriate to the size and scope of the project.**
-
-<!-- (Project assertion goes here) --> 
-
 - [ ] **Document a complete maintainer lifecycle process (including roles, onboarding, offboarding, and emeritus status).**
 
 <!-- (Project assertion goes here) --> 
@@ -114,6 +100,14 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 <!-- (Project assertion goes here) --> 
 
+- [ ] **Document complete list of current maintainers, including names, contact information, domain of responsibility, and affiliation.**
+
+<!-- (Project assertion goes here) -->
+
+- [ ] **A number of active maintainers which is appropriate to the size and scope of the project.**
+
+<!-- (Project assertion goes here) --> 
+
 - [ ] **Project maintainers from at least 2 organizations that demonstrates survivability.**
 
 <!-- (Project assertion goes here) --> 
@@ -140,7 +134,7 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 ## Contributors and Community
 
-Note: this section may be augmented by the completion of a Governance Review from TAG Contributor Strategy.
+Note: this section may be augmented by the completion of a Governance Review from the Project Reviews subproject.
 
 ### Suggested
 
@@ -152,7 +146,6 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 - [ ] **Clearly defined and discoverable process to submit issues or changes.**
 
-
 <!-- (Project assertion goes here) --> 
 
 - [ ] **Project must have, and document, at least one public communications channel for users and/or contributors.**
@@ -217,7 +210,7 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 ## Security
 
-Note: this section may be augmented by a joint-assessment performed by TAG Security.
+Note: this section may be augmented by a joint-assessment performed by TAG Security and Compliance.
 
 ### Suggested
 
@@ -255,12 +248,6 @@ Note: this section may be augmented by a joint-assessment performed by TAG Secur
 
 ## Ecosystem
 
-### Suggested
-
-N/A
-
-### Required
-
 - [ ] **Publicly documented list of adopters, which may indicate their adoption level (dev/trialing, prod, etc.)**
 
 <!-- (Project assertion goes here) --> 

.github/ISSUE_TEMPLATE/template-incubation-application.md

@@ -35,12 +35,6 @@ _The project has been adopted by the following organizations in a testing and in
 
 ## Application Process Principles
 
-### Suggested
-
-N/A
-
-### Required
-
 - [ ] **Engage with the domain specific TAG(s) to increase awareness through a presentation or completing a General Technical Review.**
   - This was completed and occurred on DD-MMM-YYYY, and can be discovered at $LINK.
 
@@ -69,15 +63,15 @@ Completion of this due diligence document, resolution of concerns raised, and pr
 
 ## Governance and Maintainers
 
-Note: this section may be augmented by the completion of a Governance Review from TAG Contributor Strategy.
+Note: this section may be augmented by the completion of a Governance Review from the Project Reviews subproject.
 
 ### Suggested
 
-- [ ] **Clear and discoverable project governance documentation.**
+- [ ] **Governance has continuously been iterated upon by the project as a result of their experience applying it, with the governance history demonstrating evolution of maturity alongside the project's maturity evolution.**
 
 <!-- (Project assertion goes here) --> 
 
-- [ ] **Governance has continuously been iterated upon by the project as a result of their experience applying it, with the governance history demonstrating evolution of maturity alongside the project's maturity evolution.**
+- [ ] **Clear and discoverable project governance documentation.**
 
 <!-- (Project assertion goes here) --> 
 
@@ -137,7 +131,7 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 ## Contributors and Community
 
-Note: this section may be augmented by the completion of a Governance Review from TAG Contributor Strategy.
+Note: this section may be augmented by the completion of a Governance Review from the Project Reviews subproject.
 
 ### Suggested
 
@@ -207,13 +201,7 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 ## Security
 
-Note: this section may be augmented by a joint-assessment performed by TAG Security.
+Note: this section may be augmented by a joint-assessment performed by TAG Security and Compliance.
-
-### Suggested
-
-N/A
-
-### Required
 
 - [ ] **Clearly defined and discoverable process to report security issues.**
 
@@ -237,12 +225,6 @@ N/A
 
 ## Ecosystem
 
-### Suggested
-
-N/A
-
-### Required
-
 - [ ] **Publicly documented list of adopters, which may indicate their adoption level (dev/trialing, prod, etc.)**
 
 <!-- (Project assertion goes here) --> 

operations/toc-templates/template-dd-pr-graduation.md

@@ -22,15 +22,10 @@ _[The TOC has found the project to have satisfied the criteria for $LEVEL/ The T
 
 ## Application Process Principles
 
-### Suggested
+- [ ] **Engage with the domain specific TAG(s) to increase awareness through a presentation or completing a General Technical Review.**
+  - This was completed and occurred on DD-MMM-YYYY, and can be discovered at $LINK.
 
-N/A
+<!-- (Project assertion goes here) --> 
-
-### Required
-
-- [ ] **Give a presentation and engage with the domain specific TAG(s) to increase awareness**
-
-<!-- (TOC Evaluation goes here) --> 
 
 - [ ]  **TAG provides insight/recommendation of the project in the context of the landscape**
 
@@ -53,7 +48,7 @@ Completion of this due diligence document, resolution of concerns raised, and pr
 
 ## Governance and Maintainers
 
-Note: this section may be augmented by the completion of a Governance Review from TAG Contributor Strategy.
+Note: this section may be augmented by the completion of a Governance Review from the Project Reviews subproject.
 
 ### Suggested
 
@@ -83,14 +78,6 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 <!-- (TOC Evaluation goes here) --> 
 
-- [ ] **Document complete list of current maintainers, including names, contact information, domain of responsibility, and affiliation.**
-
-<!-- (TOC Evaluation goes here) --> 
-
-- [ ] **A number of active maintainers which is appropriate to the size and scope of the project.**
-
-<!-- (TOC Evaluation goes here) --> 
-
 - [ ] **Document a complete maintainer lifecycle process (including roles, onboarding, offboarding, and emeritus status).**
 
 <!-- (TOC Evaluation goes here) -->
@@ -99,6 +86,14 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 <!-- (TOC Evaluation goes here) -->
 
+- [ ] **Document complete list of current maintainers, including names, contact information, domain of responsibility, and affiliation.**
+
+<!-- (TOC Evaluation goes here) -->
+
+- [ ] **A number of active maintainers which is appropriate to the size and scope of the project.**
+
+<!-- (TOC Evaluation goes here) -->   
+
 - [ ] **Project maintainers from at least 2 organizations that demonstrates survivability.**
 
 <!-- (TOC Evaluation goes here) --> 
@@ -107,7 +102,7 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 <!-- (TOC Evaluation goes here) --> 
 
-- [ ] **Document agreement that project will adopt CNCF Code of Conduct.**
+- [ ] **Document adoption of the CNCF Code of Conduct**
 
 <!-- (TOC Evaluation goes here) --> 
 
@@ -125,7 +120,7 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 ## Contributors and Community
 
-Note: this section may be augmented by the completion of a Governance Review from TAG Contributor Strategy.
+Note: this section may be augmented by the completion of a Governance Review from the Project Reviews subproject.
 
 ### Suggested
 
@@ -137,7 +132,6 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 - [ ] **Clearly defined and discoverable process to submit issues or changes.**
 
-
 <!-- (TOC Evaluation goes here) --> 
 
 - [ ] **Project must have, and document, at least one public communications channel for users and/or contributors.**
@@ -162,19 +156,13 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 ## Engineering Principles
 
-### Suggested
+- [ ] **Document project goals and objectives that illustrate the project’s differentiation in the Cloud Native landscape as well as outlines how this project fulfills an outstanding need and/or solves a problem differently. *This requirement may also be satisfied by completing a General Technical Review.***
-
+  - A General Technical Review was completed/updated on DD-MMM-YYYY, and can be discovered at $LINK.
-N/A
-
-### Required
-
-- [ ] **Document project goals and objectives that illustrate the project’s differentiation in the Cloud Native landscape as well as outlines how this project fulfills an outstanding need and/or solves a problem differently.**
 
 <!-- (TOC Evaluation goes here) --> 
 
-- [ ] **Document what the project does, and why it does it - including viable cloud native use cases.**
+- [ ] **Document what the project does, and why it does it - including viable cloud native use cases. *This requirement may also be satisfied by completing a General Technical Review.***
-
+  - A General Technical Review was completed/updated on DD-MMM-YYYY, and can be discovered at $LINK.
-<!-- (TOC Evaluation goes here) --> 
 
 - [ ] **Document and maintain a public roadmap or other forward looking planning document or tracking mechanism.**
 
@@ -184,7 +172,8 @@ N/A
 
 <!-- (TOC Evaluation goes here) --> 
 
-- [ ] **Document overview of project architecture and software design that demonstrates viable cloud native use cases, as part of the project's documentation.**
+- [ ] **Document overview of project architecture and software design that demonstrates viable cloud native use cases, as part of the project's documentation.  *This requirement may also be satisfied by completing a General Technical Review and capturing the output in the project's documentation.***
+  - A General Technical Review was completed/updated on DD-MMM-YYYY, and can be discovered at $LINK.
 
 <!-- (TOC Evaluation goes here) --> 
 
@@ -205,7 +194,7 @@ N/A
 
 ## Security
 
-Note: this section may be augmented by a joint-assessment performed by TAG Security.
+Note: this section may be augmented by a joint-assessment performed by TAG Security and Compliance.
 
 ### Suggested
 
@@ -243,12 +232,6 @@ Note: this section may be augmented by a joint-assessment performed by TAG Secur
 
 ## Ecosystem
 
-### Suggested
-
-N/A
-
-### Required
-
 - [ ] **Publicly documented list of adopters, which may indicate their adoption level (dev/trialing, prod, etc.)**
 
 <!-- (TOC Evaluation goes here) --> 

operations/toc-templates/template-dd-pr-incubation.md

@@ -20,13 +20,7 @@ _[The TOC has found the project to have satisfied the criteria for $LEVEL/ The T
 
 ## Application Process Principles
 
-### Suggested
+- [ ] **Engage with the domain specific TAG(s) to increase awareness through a presentation or completing a General Technical Review.**
-
-N/A
-
-### Required
-
-- [ ] **Give a presentation and engage with the domain specific TAG(s) to increase awareness**
   - This was completed and occurred on DD-MMM-YYYY, and can be discovered at $LINK.
 
 <!-- (TOC Evaluation goes here) --> 
@@ -54,15 +48,15 @@ Completion of this due diligence document, resolution of concerns raised, and pr
 
 ## Governance and Maintainers
 
-Note: this section may be augmented by the completion of a Governance Review from TAG Contributor Strategy.
+Note: this section may be augmented by the completion of a Governance Review from the Project Reviews subproject.
 
 ### Suggested
 
-- [ ] **Clear and discoverable project governance documentation.**
+- [ ] **Governance has continuously been iterated upon by the project as a result of their experience applying it, with the governance history demonstrating evolution of maturity alongside the project's maturity evolution.**
 
 <!-- (TOC Evaluation goes here) --> 
 
-- [ ] **Governance has continuously been iterated upon by the project as a result of their experience applying it, with the governance history demonstrating evolution of maturity alongside the project's maturity evolution.**
+- [ ] **Clear and discoverable project governance documentation.**
 
 <!-- (TOC Evaluation goes here) --> 
 
@@ -108,7 +102,7 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 <!-- (TOC Evaluation goes here) --> 
 
-- [ ] **Document agreement that project will adopt CNCF Code of Conduct.**
+- [ ] **Document adoption of the CNCF Code of Conduct**
 
 <!-- (TOC Evaluation goes here) --> 
 
@@ -122,7 +116,7 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 ## Contributors and Community
 
-Note: this section may be augmented by the completion of a Governance Review from TAG Contributor Strategy.
+Note: this section may be augmented by the completion of a Governance Review from the Project Reviews subproject.
 
 ### Suggested
 
@@ -194,12 +188,6 @@ Note: this section may be augmented by the completion of a Governance Review fro
 
 Note: this section may be augmented by a joint-assessment performed by TAG Security.
 
-### Suggested
-
-N/A
-
-### Required
-
 - [ ] **Clearly defined and discoverable process to report security issues.**
 
 <!-- (TOC Evaluation goes here) --> 
@@ -222,12 +210,6 @@ N/A
 
 ## Ecosystem
 
-### Suggested
-
-N/A
-
-### Required
-
 - [ ] **Publicly documented list of adopters, which may indicate their adoption level (dev/trialing, prod, etc.)**
 
 <!-- (TOC Evaluation goes here) -->