Merge branch 'develop' into updates-governance-model-without-members

Author: clausmullie

CONTRIBUTING.md

@@ -14,7 +14,7 @@ There’s lots of work going on at the Foundation and we’d love your help with
 Currently we are:
 
 + working with several [codebases](https://publiccode.net/codebases/) and refining our codebase stewardship process
-+ finalizing membership of several public organizations
++ building partnerships with diverse organizations
 + scaling our engagement and outreach
 
 In the meantime, please join us in any way you can.
@@ -29,7 +29,7 @@ We’re especially interested in learning what you need to implement the [Standa
 
 ## Public organizations
 
-We’re looking for public members to help shape the Foundation for Public Code’s long term future. As a member, you’ll have the chance to shape the Foundation’s processes and governance. Find out more about the [benefits and requirements of becoming a member](https://publiccode.net/membership/) and get in touch with us at <membership@publiccode.net>.
+We’re looking for public partners to help shape the Foundation for Public Code’s long term future. Find out more about the [benefits and requirements of becoming a partner](organization/partnerships.md) and get in touch with us at <partnerships@publiccode.net>.
 
 ## Institutional giving and philanthropy
 

activities/board-support/board-meeting-process.md

@@ -13,7 +13,7 @@ The secretary of the Foundation for Public Code Vereniging is responsible for th
 
 The secretary can be assisted in these tasks with:
 
-* tracking progress by members on agreed actions
+* tracking progress by board members on agreed actions
 * helping board members provide input in a timely and complete manner
 * minuting, noting and collating information that the board can use
 * helping craft a complete agenda

activities/codebase-stewardship/index.md

@@ -36,7 +36,7 @@ We've seen that most codebases communities have similar needs.
 Conference calls have become essential for collaboration.
 Each codebase community will benefit from having a regular (monthly or quarterly) product steering conference call where stakeholders and product managers from each deployment can come together and talk about what their needs are presently and in the future, thus we host a [Jitsi](../tool-management/jitsi-guides.md) video conference server for the communities.
 Simlilarly, each codebase community will benefit from having a weekly or bi-weekly technical call where the developers can discuss how they should change the codebase.
-In each of these types of calls we typically coach members to become the (rotating) chair of the call, although we may chair the calls in the beginning.
+In each of these types of calls we typically coach community members to become the (rotating) chair of the call, although we may chair the calls in the beginning.
 By being present in the calls, stewards can listen for early signs of friction, and ensure that it is addressed before it grows.
 Stewards should ensure after any call that a summary is sent to a persistent and searchable primary communication channel for the codebase community, like an email list.
 These summaries should contain a brief list of topics discussed and any conclusions reached and any follow-up actions agreed to.

activities/codebase-stewardship/reviewing-codebase-incubation-progress.md

@@ -13,7 +13,7 @@ At the latest, this forward look should happen about three months before the [ge
 It should be clearly communicated that the information collected in the forward look will feed into a report for the general assembly.
 The forward look can either be part of a regular product steering meeting if such exists, or a separate meeting.
 
-Afterwards, the codebase stewards prepare an overview of all codebases in stewardship for members so they can make informed decisions during the general assembly.
+Afterwards, the codebase stewards prepare an overview of all codebases in stewardship for the general assembly so they can make informed decisions.
 Of particular interest for the codebase stewards is if the general assembly wants to prioritize a codebase for strategic reasons, even if compliance with the Standard for Public Code is unlikely in the coming year.
 Such decision will give the codebase stewards the mandate to continue stewarding the incubated codebase.
-Alternatively, the members can decide to stop the incubation of a codebase that doesn't present ongoing or renewed ambitions and simply end stewardship.
+Alternatively, the general assembly can decide to stop the incubation of a codebase that doesn't present ongoing or renewed ambitions and simply end stewardship.

activities/communication/blogging.md

@@ -18,7 +18,7 @@ The blog is our primary tool for talking about:
 * our community: interviews with and guest posts by community members
 * our position on important issues: why we’ve made the political, technological, organizational or design decisions we have
 
-Not all information published on the blog needs to support our marketing strategy - for example, an in-depth discussion about a technology choice we’ve made may not persuade potential Foundation for Public Code members, but will be interesting to technologists in our community.
+Not all information published on the blog needs to support our marketing strategy - for example, an in-depth discussion about a technology choice we’ve made may not persuade potential Foundation for Public Code partners, but will be interesting to technologists in our community.
 
 To make sure we have the editorial freedom to publish about all of our work (no matter how niche), there’s no direct link to the blog on [publiccode.net](https://publiccode.net/). Instead, we may feature important blogposts. (We’ll build this functionality once we have important blogposts.)
 

activities/communication/communications-plan.md

@@ -14,7 +14,7 @@ Our communications need to reflect our core values: open, quality, trust, commun
 
 Our messages range from neutral in tone to positive and inspirational. Our community won’t be sustainable if we attract people motivated by fear or anger.
 
-Our communications are usually in plain English, but we link to highly relevant pages in other languages, for example about our members’ work.
+Our communications are usually in plain English, but we link to highly relevant pages in other languages, for example about our partners’ work.
 
 Our communications should showcase the Foundation for Public Code as:
 
@@ -33,7 +33,7 @@ We have separate goals and objectives for different audiences and fora.
 
 ## Audience
 
-Our audience is individuals from potential public member organizations, codebase communities, donors, staff, and board members.
+Our audience is individuals from potential public partner organizations, codebase communities, donors, staff, and board members.
 
 We believe we'll find them in fora organized by and for:
 
@@ -82,7 +82,7 @@ These responses indicate success:
 * recommendations or referrals
 * invitations to speak at or contribute to their platforms (publications and events)
 * request to collaborate on projects through codebase stewardship
-* request to become a member
+* request to become a partner
 
 ### Middle management
 
@@ -208,7 +208,7 @@ Since we can't do everything all of the time, we prioritize scalablity and reusa
 
 Though many specific things we do are also offered by other organizations, we're the only organization focused on open source software for public organizations that does all of this together:
 
-* is non-profit and member owned with membership only open to public organizations
+* is non-profit and specialized in the needs of public organizations
 * offers codebase stewardship for different projects
 * offers productization and marketing of the codebases
 * actually provides guidance and support to help public organizations make their code open
@@ -218,7 +218,7 @@ Though many specific things we do are also offered by other organizations, we're
 
 We are also actively building our ecosystem by:
 
-* connecting members with like-minded parties (members and other public organizations, affiliates and structural funders)
+* connecting partners with like-minded parties (partners and other public organizations, affiliates and structural funders)
 * boosting awareness of public code
 * setting standards and creating reusable resources (by providing thought leadership!)
 * demonstrating the value of public code with well documented, public business cases and risk analyses
@@ -254,7 +254,7 @@ Staff should use the [basic tweet template](basic-tweet-template.md) as a starti
 We rarely create press releases - we believe our news should usually be available to everyone at the same time. Instead, we prefer to:
 
 * publish our news in blogposts
-* link and share our members' or others' news stories and press releases
+* link and share our partners' or others' news stories and press releases
 
 When we have a press release, we:
 

activities/creating-affiliations/affiliate-template.md

@@ -10,11 +10,12 @@ This document confirms that [ORGANIZATION] has become an affiliate of the Founda
 
 [BLURB ABOUT ORGANIZATION]
 
-The Foundation for Public Code is a non-profit, member-owned association of public organizations, with a mission to enable public-purpose software and policy that is open and collaborative.
+The Foundation for Public Code is a non-profit association whose mission is to enable public-purpose software and policy that is open and collaborative.
 
-With this document the [ORGANIZATION] confirms that they want to act as an affiliate of the Foundation for Public Code. This includes helping to generate feedback on:
+With this document the [ORGANIZATION] confirms that they want to act as an affiliate of the Foundation for Public Code.
+This includes helping to generate feedback on:
 
-- its governance models, membership and financial structure
+- its governance models, partnerships and financial structure
 - codebase stewardship activities
 - the Standard for Public Code
 

activities/creating-affiliations/index.md

@@ -6,13 +6,15 @@ type: Index
 
 # Creating affiliations
 
-The Foundation for Public Code is a [member-owned association](../member-relations/index.md).
-Membership is only open to public organizations.
-Non-profit organizations that we collaborate with we can become [affiliates](../../glossary/affiliate-definition.md).
+Partnership is only open to public organizations.
+Other organizations that we collaborate with can become [affiliates](../../glossary/affiliate-definition.md).
 
 [See our current affiliates](../../organization/affiliates.md).
 
-If you're interested in being affiliated with us, or have any questions, please email us at <[email protected]>.
+If you're interested in being affiliated with us, or have any questions, please email us at <[email protected]>.
+
+## Resources
+
 To declare the affiliation, [the affiliate template](affiliate-template.md) can be of help.
 
 ## Further Reading

activities/creating-partnerships/index.md

@@ -6,13 +6,13 @@ type: Index
 
 # Creating partnerships
 
-The Foundation for Public Code is a [member-owned association](../member-relations/index.md).
-However, membership might not be possible for all organizations that we want to collaborate with.
-Collaboration can instead be done through a partnership.
+The Foundation for Public Code is actively looking for diverse public organizations to collaborate with.
 
 [See our current partnerships](../../organization/partnerships.md).
 
-If you're interested in partnership for your organization, or have any questions, please email us at <[email protected]>.
+Only public organizations can become partners.
+Other organizations can become [affiliates](../creating-affiliations/index.md)
+If you're interested in partnership for your organization, or have any questions, please email us at <[email protected]>.
 
 ## Resources
 

activities/creating-partnerships/partnership-template.md

@@ -62,8 +62,3 @@ Read more about what Foundation for Public Code stewardship means:[http://public
 2. **Partnership cancellation**
   * Either party can cancel this agreement by giving notice in writing
   * Cancellation will not result in any financial obligations towards either party
-
-## Towards membership
-
-1. **Evaluate partnership:** Evaluate the partnership and have those lessons learned to inform becoming a member of the Foundation for Public Code
-2. **Steps to becoming a member:** identify stakeholders to engage, understand budgeting requirements and develop legal structure for membership.