doc/governance: updates based on review comments

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/doc/governance/index.rst b/doc/governance/index.rst
index d1ebabff05642f5de805e2a355de6ed7864cb694..3d242b8169d9fa2c250ce4886b06d83490c13142 100644 (file)
--- a/doc/governance/index.rst
+++ b/doc/governance/index.rst
@@ -4,9 +4,9 @@ Ceph Governance
 Key principles
 ==============
 
- * Decision-making is consensus-driven by those who show up.
+ * Decision-making is consensus-driven by those who participate.
  * Leadership roles are defined primarily by responsibility, not prestige or seniority.
-   * It is normal and healthy for these roles to be passed on to others
+ * It is normal and healthy for these roles to be passed on to others
  * Everyone's role is ultimately to serve the users and participation
    is voluntary.
 
@@ -29,11 +29,16 @@ Membership
 ^^^^^^^^^^
 
  * 3 people
- * Elected by steering committee
-   * Candidates self-nominate or are nominated by other members
-   * Discussion of how roles/responsibilities may be delegated
-   * Ranked-choice vote by steering committee
- * 2 year terms, with one member staggered
+ * Elected by the steering committee
+ * Candidates self-nominate or are nominated by other members
+ * Discussion of how roles/responsibilities may be delegated
+ * Ranked-choice vote by the steering committee
+ * 2 year terms, with one member being elected in even years, and the
+   other two in odd years
+ * To start, first two positions are 2-year, and 3rd is 1-year
+ * Members may resign at any time, and the steering committee may vote
+   to appoint a replacement for the rest of their term
+ * members must involve >1 employer
 
 Ceph Steering Committee
 =======================
@@ -43,8 +48,8 @@ Responsibilities
 
  * Elect executive council
  * Amend governance model (by majority vote)
- * Meet regularly to discuss and decide on tactical and strategic project
-   improvements
+ * Meet regularly to discuss and decide on tactical and strategic projects
+   and improvements
 
 Membership
 ^^^^^^^^^^
@@ -62,11 +67,15 @@ Team Leads
 Responsibilities
 ^^^^^^^^^^^^^^^^
 
- * Manage a component team in Ceph (e.g., RADOS, RGW, RBD, CephFS, Orchestrator, ...)
+ * Manage a `component team`_ in Ceph
  * Ensure PRs are reviewed and merged
+ * Ensure severe bug fixes are backported
  * Run standups
  * Bug triage, scrubs
  * etc.
 
-Selected by the executive council, generally based on recommendation by team members and outgoing lead
+Selected by the executive council, generally based on the recommendation by team members and outgoing lead
 Encourage periodic rotation of lead responsibility among team members
+
+.. _code of conduct: https://ceph.io/en/code-of-conduct/
+.. _component team: https://ceph.io/en/community/team/