Merge pull request #4713 from jeefy/ncw-to-mentoring

Move NCW under Mentoring subproject

15 files changed, 32 insertions, 14 deletions

diff --git a/events/events-team/README.md b/events/events-team/README.md
index 5e096c9e..70c5939e 100644
--- a/events/events-team/README.md
+++ b/events/events-team/README.md
@@ -30,7 +30,7 @@ the logistical and operational pieces together.
 [Project Manager Handbook]
 
 ### Accessibility, Inclusiveness, and Diversity
-Reach out to underrepresented local groups to advertise new contributor workshop - examples: GoBridge, Women Who Code  
+Reach out to underrepresented local groups to advertise contributor summit - examples: GoBridge, Women Who Code  
 Advertise to past and current diversity scholarship winners  
 Code of Conduct process/reporting and training for event staff  
 Confirming that shirt sizes are true to fit, measurements are posted with the registration  
@@ -39,7 +39,7 @@ Advertise childcare (get information from CNCF)
 Advertise quiet room (get information from CNCF)  
 
 ### Content Subteam
-The [Content Subteam Handbook] includes detailed handbooks for Content Coordinator, New Contributor Workshop lead, and other roles.
+The [Content Subteam Handbook] includes detailed handbooks for Content Coordinator, and other roles.
 
 ### Marketing and Comms
 [Marketing Handbook]
diff --git a/events/events-team/content/README.md b/events/events-team/content/README.md
index e8b42d8c..9a0ef2ad 100644
--- a/events/events-team/content/README.md
+++ b/events/events-team/content/README.md
@@ -14,7 +14,6 @@ All roles may have shadows.  Click the role name for that role's Handbook.
 | Role | Needed For | Notes |
 |------|------|------|
 | [Content Coordinator] | Almost all Summits | |
-| [New Contributor Workshop] Lead | Summits with an NCW track | Also some standalone NCW events |
 | [Programmed Sessions] Lead | Summits with an advance session submission process | |
 | [Contributor Workshops] Lead | Some Summits with a session proposal process | |
 | [Unconference] Lead | Summits with an Unconference Track | |
@@ -24,7 +23,6 @@ All roles may have shadows.  Click the role name for that role's Handbook.
 | [Awards Ceremony] Leads | If giving contributor awards | |
 
 [Content Coordinator]: ./content-coordinator.md
-[New Contributor Workshop]: ./new-contributor.md
 [Programmed Sessions]: ./session-manager.md
 [Unconference]: ./unconference.md
 [Contributor Workshops]: ./contributor-workshops.md
diff --git a/mentoring/programs/new-contributor-workshop/OWNERS b/mentoring/programs/new-contributor-workshop/OWNERS
new file mode 100644
index 00000000..0c10d897
--- /dev/null
+++ b/mentoring/programs/new-contributor-workshop/OWNERS
@@ -0,0 +1,17 @@
+reviewers:
+  - alisondy
+  - guineveresaenger
+  - jberkus
+  - jeefy
+  - tpepper
+
+approvers:
+  - alisondy
+  - guineveresaenger
+  - jberkus
+  - jeefy
+  - tpepper
+
+labels:
+  - area/mentorship-planning
+  - sig/contributor-experience
\ No newline at end of file
diff --git a/events/events-team/content/new-contributor-workshops/README.md b/mentoring/programs/new-contributor-workshop/README.md
index 68d982c2..d497a737 100644
--- a/events/events-team/content/new-contributor-workshops/README.md
+++ b/mentoring/programs/new-contributor-workshop/README.md
@@ -5,7 +5,14 @@
 
 This folder contains the [handbook for the New Contributor Workshop Content Lead](./new-contributor-workshop-lead.md) as well as playbooks for each of the New Contributor Workshop sessions.
 
-This workshop is held at contributor summits at KubeCon but materials and processes may be used at contributor focused summits and events anywhere.
+This workshop is held periodically by the Kubernetes Community, but materials and processes may be used at contributor focused summits and events anywhere.
+
+## Upcoming Workshops
+
+None scheduled
+
+## Previous Workshops
+* [2019 NA Contributor Summit NCW](https://www.youtube.com/watch?v=uUJrGwAom-E&list=PL69nYSiGNLP0OWp38tPBc-jSlMmwWr6Ci&index=16) (Videos in playlist, links to first NCW video)
 
 ## Sample Track for Beginner Workshop
 
@@ -21,7 +28,6 @@ This workshop is meant for folks who have never contributed to opensource before
 1. [Local Build&Test](./build-and-test.md)
 1. [Pull Request Exercise](./playground-exercise.md)
 1. [Find Your First Issue](./first-issue-help.md)
-1. [SIG Meet-and-Greet](/events/events-team/content/sig-contrib-events.md#sig-meet-and-greet)
 
 ## Sample Track for Intermediate Workshop
 
@@ -37,4 +43,3 @@ This workshop differs from the Beginner workshop in that participants are expect
 1. [Local Build&Test](./build-and-test.md)
 1. Labels, Bots and Git Workflow
 1. [Find Your First Issue](./first-issue-help.md)
-1. [SIG Meet-and-Greet](/events/events-team/content/sig-contrib-events.md#sig-meet-and-greet)
diff --git a/events/events-team/content/new-contributor-workshops/build-and-test.md b/mentoring/programs/new-contributor-workshop/build-and-test.md
index 147d91a3..147d91a3 100644
--- a/events/events-team/content/new-contributor-workshops/build-and-test.md
+++ b/mentoring/programs/new-contributor-workshop/build-and-test.md
diff --git a/events/events-team/content/new-contributor-workshops/community-groups.md b/mentoring/programs/new-contributor-workshop/community-groups.md
index 01a8c80c..01a8c80c 100644
--- a/events/events-team/content/new-contributor-workshops/community-groups.md
+++ b/mentoring/programs/new-contributor-workshop/community-groups.md
diff --git a/events/events-team/content/new-contributor-workshops/contributor-paths.md b/mentoring/programs/new-contributor-workshop/contributor-paths.md
index d14691eb..d14691eb 100644
--- a/events/events-team/content/new-contributor-workshops/contributor-paths.md
+++ b/mentoring/programs/new-contributor-workshop/contributor-paths.md
diff --git a/events/events-team/content/new-contributor-workshops/first-issue-help.md b/mentoring/programs/new-contributor-workshop/first-issue-help.md
index bf3d5ef2..b99488af 100644
--- a/events/events-team/content/new-contributor-workshops/first-issue-help.md
+++ b/mentoring/programs/new-contributor-workshop/first-issue-help.md
@@ -20,7 +20,6 @@ Refer to previous workshops for inspirations
 - Working with your SIG
 - Refer participants to specific SIGs
 - How to "claim" an issue (since non-members cannot self-assign)
-- Encourage attendance at the [SIG Meet-and-Greet](/events/events-team/content/sig-contrib-events.md#sig-meet-and-greet)
 - Path to [membership](/community-membership.md)
 
 ### Ideas
diff --git a/events/events-team/content/new-contributor-workshops/how-we-communicate.md b/mentoring/programs/new-contributor-workshop/how-we-communicate.md
index 777929e2..777929e2 100644
--- a/events/events-team/content/new-contributor-workshops/how-we-communicate.md
+++ b/mentoring/programs/new-contributor-workshop/how-we-communicate.md
diff --git a/events/events-team/content/new-contributor-workshops/labels-and-bots.md b/mentoring/programs/new-contributor-workshop/labels-and-bots.md
index 0e191f03..0e191f03 100644
--- a/events/events-team/content/new-contributor-workshops/labels-and-bots.md
+++ b/mentoring/programs/new-contributor-workshop/labels-and-bots.md
diff --git a/events/events-team/content/new-contributor-workshops/live-pr-demo.md b/mentoring/programs/new-contributor-workshop/live-pr-demo.md
index 27b6c97e..27b6c97e 100644
--- a/events/events-team/content/new-contributor-workshops/live-pr-demo.md
+++ b/mentoring/programs/new-contributor-workshop/live-pr-demo.md
diff --git a/events/events-team/content/new-contributor-workshops/new-contributor-workshop-lead.md b/mentoring/programs/new-contributor-workshop/new-contributor-workshop-lead.md
index 21e1ca03..dfbf0547 100644
--- a/events/events-team/content/new-contributor-workshops/new-contributor-workshop-lead.md
+++ b/mentoring/programs/new-contributor-workshop/new-contributor-workshop-lead.md
@@ -1,7 +1,7 @@
-# New Contributor Content Lead
+# New Contributor Workshop Lead
 
 ## Overview
-The New Contributor Content Lead is in charge of planning and executing the New Contributor Workshop at the Kubernetes Contributor Summit. They will coordinate with the overall Events Team and the organizers of related activities aimed at new contributors.
+The New Contributor Workshop Lead is in charge of planning and executing the New Contributor Workshop. They will coordinate with the overall Events Team and the organizers of related activities aimed at new contributors.
 
 ## Skills and Qualifications
 
@@ -12,8 +12,8 @@ As this role is part of a subproject of SIG-contributor-experience, the New Cont
 
 ## Activities
 
-*These tasks reflect a rough timeline leading from the end of the previous Contributor Summit to the currently planned one.*
-- Attend event planning meetings in preparation for the Contributor Summit, where applicable.
+*These tasks reflect a rough timeline leading from the end of the previous New Contributor Workshop to the currently planned one.*
+- Attend event planning meetings in preparation for the New Contributor Workshop, where applicable.
 - Create a Workshop Content Proposal and link in an Issue to k/community:
     - determine sessions and their overall topic (e.g. How We Communicate, Code Base Walkthrough, etc)
     - determine what difficulty/experience levels will be offered, if any, and coordinate with Lead
@@ -30,10 +30,9 @@ Shadows and co-presenters are expected to assist and review these updates.
     - ensure participants sign the CLA
     - ensure attendees meet technical and experience requirements for their course
     - obtain a comprehensive list of names, emails, and GitHub handles
-- Coordinate with the [SIG Meet and Greet organizer](/events/events-team/content/sig-contrib-events.md#sig-meet-and-greet) (may be a different role to be determined by core team)
 - Ensure to advertise the SIG-Intros.
 - Solicit feedback from workshop participants.
 
 ## Time Commitment
 
-1-2 hours/week most of the time, 4-5 in the weeks leading up to KubeCon, depending on previous teaching/shadowing experience.
+1-2 hours/week most of the time, 4-5 in the weeks leading up to NCW, depending on previous teaching/shadowing experience.
diff --git a/events/events-team/content/new-contributor-workshops/playground-exercise.md b/mentoring/programs/new-contributor-workshop/playground-exercise.md
index 6aca9178..6aca9178 100644
--- a/events/events-team/content/new-contributor-workshops/playground-exercise.md
+++ b/mentoring/programs/new-contributor-workshop/playground-exercise.md
diff --git a/events/events-team/content/new-contributor-workshops/repo-tour.md b/mentoring/programs/new-contributor-workshop/repo-tour.md
index d1f46ee0..d1f46ee0 100644
--- a/events/events-team/content/new-contributor-workshops/repo-tour.md
+++ b/mentoring/programs/new-contributor-workshop/repo-tour.md
diff --git a/events/events-team/content/new-contributor-workshops/workspace-setup.md b/mentoring/programs/new-contributor-workshop/workspace-setup.md
index 19dbef29..19dbef29 100644
--- a/events/events-team/content/new-contributor-workshops/workspace-setup.md
+++ b/mentoring/programs/new-contributor-workshop/workspace-setup.md