diff --git a/bylaws/2-cf-membership.md b/bylaws/2-cf-membership.md index 2c7b5a3..9af6b13 100644 --- a/bylaws/2-cf-membership.md +++ b/bylaws/2-cf-membership.md @@ -45,7 +45,7 @@ A **project** within the CF represents collaborative innovation in open-source t ## Membership Rights and Requirements -As a CF member, you're not just a part of our community; you shape its future. You're entitled to: +As a member, you're not just a part of our community; you shape its future. You're entitled to: - **Voice and Vote**: Contribute to discussions, sponsor issues, and vote in elections and referendums. - **Individual Representation:** Remember, your membership represents you, not your employer or any legal entity. @@ -86,7 +86,7 @@ Relevant Florida Statute(s): The CFC may suspend or revoke the membership of any member that is found to be in violation of CF policies. - **Suspension:** The CFC may suspend a member for up to 90 days, during which the member may not participate in CF activities or vote in CFC elections. -- **Revocation:** The CFC may act to revoke or suspend CF membership if it believes (in good faith) that the member is engaging in willful misconduct. +- **Revocation:** The CFC may act to revoke or suspend membership if it believes (in good faith) that the member is engaging in willful misconduct. These situations will be recorded as violations of the [Code of Conduct][coc] and handled as per the [Code of Conduct Resolution process][coc-reports]. diff --git a/bylaws/3-cf-council.md b/bylaws/3-cf-council.md index e0cf593..9e9def1 100644 --- a/bylaws/3-cf-council.md +++ b/bylaws/3-cf-council.md @@ -26,7 +26,8 @@ While the [Extended Governance Committee (EGC)](#extended-governance-committee-e ## Composition and Membership -The CFC comprises elected members (Councilors) recognized for their contributions to the open-source community. As representatives of diverse organizations, Councilors are committed to prioritizing the interests of the CF community in their decision-making. +Councilors are elected by CF members to represent their interests and ensure the foundation operates responsibly. +They are expected to prioritize the CF community's interests in their decision-making, serving as representatives from diverse organizations committed to the foundation's objectives. An up-to-date list of Councilors will be maintained in the `cf-council` [CONTACTS.yaml][] attribute. @@ -35,7 +36,7 @@ An up-to-date list of Councilors will be maintained in the `cf-council` [CONTACT **Selection and Elections:** The selection process for Councilors is designed to reflect the diversity of the open-source community. - Any member that has been active within the CF community for at least six months can run or be nominated. -- Every active CF member is entitled to one vote in annual [elections][]. +- Every active member is entitled to one vote in annual [elections][]. Relevant Florida Statute(s): diff --git a/bylaws/8-amendments.md b/bylaws/8-amendments.md index 296f20c..a81d0b2 100644 --- a/bylaws/8-amendments.md +++ b/bylaws/8-amendments.md @@ -10,7 +10,7 @@ Amendments and changes to CF Bylaws and Policies are proposed, reviewed, and app 2. **Categorization of Changes:** The CFC reviews each proposal to classify it as either 'Trivial' (e.g., typographical corrections) or 'Substantive' (affecting governance or operations). Trivial Changes may be quickly approved, whereas Substantive Changes undergo a detailed review. -3. **Community Involvement:** For Substantive Changes, a 30-day review period allows all CF members to provide feedback. Member involvement is crucial to ensure diverse perspectives are considered. +3. **Community Involvement:** For Substantive Changes, a 30-day review period allows all members to provide feedback. Member involvement is crucial to ensure diverse perspectives are considered. 4. **Resolution Process:** The CFC addresses and resolves any member-raised objections, ensuring consensus and addressing concerns. diff --git a/policies/code-of-conduct.md b/policies/code-of-conduct.md index 20b6731..7b9f46c 100644 --- a/policies/code-of-conduct.md +++ b/policies/code-of-conduct.md @@ -32,7 +32,7 @@ Welcome to the Code of Conduct (CoC) for the Commonhaus Foundation (CF). We're d The CF adheres to the [Contributor Covenant v1.4](#contributor-covenant-code-of-conduct) as its foundational Code of Conduct (CoC), embracing a commitment to create a welcoming and inclusive environment. This CoC underpins all foundation activities and is a requirement for new projects within three months of joining. -Leadership across the CF, including [Council members (CFC)][cfc] and project leaders, are [expected](#leadership-expectations) to respect and uphold this CoC to foster an environment of respect and collaboration. The [Code of Conduct Panel (CoCP)](#code-of-conduct-panel) provides an avenue for appeals or escalations, if necessary. +Leadership across the CF, including [Councilors][cfc] and project representatives, are [expected](#leadership-expectations) to respect and uphold this CoC to foster an environment of respect and collaboration. The [Code of Conduct Panel (CoCP)](#code-of-conduct-panel) provides an avenue for appeals or escalations, if necessary. ### Member Expectations @@ -100,7 +100,7 @@ To escalate an issue to the CoCP, send an email to the [`coc-escalation` mailing ### Code of Conduct Panel -The CoCP is a foundation-wide team composed of the CFC Chairperson and 4 elected individuals who are not members of the CFC. +The CoCP is a foundation-wide team composed of the CFC Chairperson and 4 elected individuals who are not Councilors. CoCP members serve for two year terms. CF contributors and members from the broader community can be nominated to the CoCP. CoCP members should consider objectivity and diversity of experience and perspective when electing CoCP members. @@ -117,12 +117,12 @@ Any member of the CFC or CoCP who is involved in the report must recuse themselv ### Reports to the CoC report mailing list -All members of the CFC are subscribed to the the [`report` mailing list][CONTACTS.yaml]. +All Councilors are subscribed to the the [`report` mailing list][CONTACTS.yaml]. We understand that the person reporting the issue (**reporter**) may not be the individual directly affected or harmed (**target**). In such cases, communication will primarily be with the reporter unless the target explicitly gives permission. -1. **Acknowledgement:** Upon receipt of a report, a CFC member acknowledges it, confirming receipt to the reporter or target. -2. **Point of Contact:** If no response has been sent by the next CFC meeting, the CFC Chairperson will ensure a CFC member is designated as the primary point of contact. +1. **Acknowledgement:** Upon receipt of a report, a Councilor acknowledges it, confirming receipt to the reporter or target. +2. **Point of Contact:** If no response has been sent by the next CFC meeting, the Chairperson will ensure a Councilor is designated as the primary point of contact. 3. **Information Gathering:** All relevant information is collected and centralized for review. 4. **Discussion:** The gathered information is discussed to contextualize the facts and opinions. 5. **Determination:** A consensus is reached on the appropriate response using the standard [CFC decision-making process][cc-dm]. diff --git a/policies/conflict-of-interest.md b/policies/conflict-of-interest.md index 5d730f6..ea48b80 100644 --- a/policies/conflict-of-interest.md +++ b/policies/conflict-of-interest.md @@ -18,7 +18,7 @@ This document outlines the Conflict of Interest Policy for the Commonhaus Founda This policy applies to all individuals within the CF who possess decision-making authority with respect to Foundation activities, assets, income, or expenses. This includes: -- Members of the [Commonhaus Foundation Council (CFC)][cfc] +- Members of the [Commonhaus Foundation Council (CFC)][cfc] (Councilors) - Members of the [Extended Governance Committee (EGC)][egc] - Appointed officers of the CF - Key employees[^1] @@ -65,13 +65,13 @@ Upon the disclosure of a potential conflict, the CFC shall determine if a confli The minutes of any CFC meeting that addresses conflict of interest disclosure or resolution will include: - The names of individuals with a potential conflict, the nature of their interest, and whether it was considered a conflict. -- Details on alternative options reviewed, the CFC members who deliberated and voted, including how conflicts of interest were managed during these discussions. +- Details on alternative options reviewed, the Councilors who deliberated and voted, including how conflicts of interest were managed during these discussions. - The outcome of the vote, specifying the transaction's terms and approval date if relevant. #### Annual Disclosure and Compliance -- CFC members (Councilors), EGC Members, and key employees (if any) must annually affirm that they have received, read, understood this policy, and that they agree to comply with it. -- General CF members must affirm that they have received, read, understood this policy, and that they agree to comply with it, when applicable. +- Councilors, EGC Members, and key employees (if any) must annually affirm that they have received, read, understood this policy, and that they agree to comply with it. +- General members must affirm that they have received, read, understood this policy, and that they agree to comply with it, when applicable. ## Review of Policy diff --git a/policies/succession-plan.md b/policies/succession-plan.md index 57483f2..2995996 100644 --- a/policies/succession-plan.md +++ b/policies/succession-plan.md @@ -19,7 +19,7 @@ Administrative access empowers the CF to: ## Scope of Access and Intervention -**Limited Interference:** Although the CF maintains administrative access, every option to contact the current code owners will be made before we do so. Action will require a consensus of [X%] of the project's active contributors or CF Council members. +**Limited Interference:** Although the CF maintains administrative access, every option to contact the current code owners will be made before we do so. Action will require a consensus of [X%] of the project's active contributors or Councilors. **Project Autonomy:** Projects need not join the CF GitHub organization. They're free to stay within their preferred GitHub (or Gitlab, BitBucket, etc.) organization and/or repository.