Update governance.md

1 files changed, 32 insertions, 17 deletions

diff --git a/governance.md b/governance.md
index 0fe7e44b..ab18c499 100644
--- a/governance.md
+++ b/governance.md
@@ -24,8 +24,9 @@ use the [Apache Licence version 2.0](LICENSE). Documentation repositories should
 
 Kubernetes is a large project. There are many ways to participate and contribute.
 
-The following is a list of roles that are currently assumed by different participants:
+Roles that are currently assumed by different participants are described below.
 
+Code and documentation contributors:
 - **[New Contributor](https://github.com/kubernetes/contrib/issues/1090)**: a
   couple of PRs
 - **Contributor**: more than a couple of PRs (which could include documentation
@@ -43,34 +44,48 @@ The following is a list of roles that are currently assumed by different partici
   repos
 - **Approver**: some [OWNERS](contributors/devel/owners.md) file as an approver; will be needed to get code
   merged
+  - **Area/Component Owner**: design/proposal approval authority for some area 
+    of the project, though escalation is still possible, and most beta/GA API 
+    changes are vetted by the API owners
+  - **API Owners**: lead designers of the project, who are familiar with the 
+    design, requirements, mechanics, conventions, style, scope, gotchas, etc. 
+    of the API
+- [**kubernetes-maintainers**](https://github.com/orgs/kubernetes/teams/kubernetes-maintainers): write access to repo (assign issues/PRs,
+  add/remove labels and milestones, edit issues and PRs, edit wiki,
+  create/delete labels and milestones); technically can lgtm any PR and cause it
+  to be merged by the submit queue; expected to review PRs and fix bugs related
+  to their domains
+- **Project Approvers**: approver in top-level OWNERS file in kubernetes repo;
+  de-facto project elders; technically can 
+  approve virtually any PRs; can sponsor incubator repos
+  
+SIG roles:
 - **SIG Participant**: active in one or more areas of the project; wide 
   variety of roles are represented
 - **SIG Lead**: SIG organizer
-- **Area/Component Owner**: design/proposal approval authority for some area 
-  of the project, though escalation is still possible, and most beta/GA API 
-  changes are vetted by the API owners
-- **API Owners**: lead designers of the project, who are familiar with the 
-  design, requirements, mechanics, conventions, style, scope, gotchas, etc. 
-  of the API
+
+Management roles:
 - **Team Lead**: tech lead or manager of some team at some company working on 
   K8s; can influence priorities of their team members; pragmatically, 
   probably want label/assignment powers
-- **Top-Level OWNERS**: de-facto project elders; technically can 
-  approve virtually any PRs; can sponsor incubator repos
-- [**kubernetes-maintainers**](https://github.com/orgs/kubernetes/teams/kubernetes-maintainers): write access to repo (assign issues/PRs,
-  add/remove labels and milestones, edit issues and PRs, edit wiki,
-  create/delete labels and milestones); technically can lgtm any PR and cause it
-  to be merged by the submit queue; expected to review PRs and fix bugs related
-  to their domains
 - [**kubernetes-pm**](https://github.com/orgs/kubernetes/teams/kubernetes-pm): help to [manage and maintain the project](project-managers/README.md) in
   ways other than just writing code (e.g. managing issues).
-- [**kubernetes-admin**](https://github.com/orgs/kubernetes/teams/kubernetes-admin): direct code write/merge access; for build cops and
-  release czars only.
+
+Rotations:
 - [**Build Cop**](contributors/devel/on-call-build-cop.md): ensure tests pass, submit queue is working, rollback PRs, 
   manually merge as necessary to fix build
 - [**User-Support Rotation**](contributors/devel/on-call-user-support.md): answer questions on stackoverflow, googlegroups, 
   slack, twitter, etc. full time while on duty
-- **Release Czar**: drive release
+
+Release roles:
+- **Minor Release Team**: help with minor release
+- **Minor Release Manager**: drive minor release
+- **Patch Release Team**: help with patch release
+- **Patch Release Manager**: drive patch release
+
+Duty-specific github roles:
+- [**kubernetes-admin**](https://github.com/orgs/kubernetes/teams/kubernetes-admin): direct code write/merge access; for build cops and
+  release czars only.
 - **K8s Org Owner**: can create repos, do ~any github action; the number of
   owners shouldn't scale with the organization's growth, O(1), and optimally it
   should be less than 10 people who are very familiar with project workings and