Merge pull request EthicalSource#959 from EthicalSource/coralineada/u…

…pdate-governance Updated governance, contributing, and code of conduct
felipec · Jul 5, 2021 · b79e944 · b79e944
2 parents 58dfdc0 + 99b3940
commit b79e944
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 69 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -57,11 +57,14 @@ Examples of representing our community include using an official e-mail address,
 posting via an official social media account, or acting as an appointed
 representative at an online or offline event.
 
+## Reporting
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported
+by sending an email to `conduct at ethicalsource dot dev`.
+
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at coraline c/o 
-idolhands dot com.
+reported to the community leaders responsible for enforcement at `conduct at ethicalsource dot dev`.
 
 All complaints will be reviewed and investigated promptly and fairly.
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,38 +1,42 @@
 # Contributing
 
-Please feel free to submit pull requests or open issues to improve the language of this document 
+Please feel free to submit pull requests or open issues to improve the language of this document
 or to provide additional [translations](https://www.contributor-covenant.org/translations).
 
 You should also check the [issues](https://github.com/EthicalSource/contributor_covenant/issues)
 for the latest discussions involving the current and future versions of the Contributor Covenant.
 
-### Build the website locally
-To build the website locally, first [install Hugo](https://gohugo.io/getting-started/installing)
-using your package manager of choice.  
-For example, on Debian/Ubuntu:
-```
-apt-get install hugo
-```
+If you're new to contributing to projects hosted on Github, or need a refresher,
+you may find [How to make your first pull request on GitHub](https://www.freecodecamp.org/news/how-to-make-your-first-pull-request-on-github-3/)
+a useful resource.
 
-If you are using Arch Linux:
-```
-pacman -S hugo
-```
+## Adding a Project to the List of Adopters
 
-If you are using [Homebrew](https://brew.sh) on macOS:
-```
-brew install hugo
-```
+* Fork the repository.
+* Add a new row to the [adopters.csv](static/adopters.csv) file,
+  with the project name in the first column, and the project URL in the second column.
+* Open a pull request.
 
-### Start the server
-From the repository's root directory, start the development server:
-```
-hugo server -D
-```
+## We respect and appreciate different kinds of contributions.
+Ways that you can contribute:
+
+### Community governance experts
+We value collaboration with contributors who bring their experience with code of
+conduct design or enforcement to continue to improve Contributor Covenant.
+
+### Writers and copy editors
+We welcome contributions to improve the language of our site.
+
+### Designers
+We welcome improvements to the design elements of our website or other ways that
+you can use your talents to improve [contributor-covenant.org](https://contributor-covenant.org).
 
-## Translating
+### Translators and native speakers
+We're always looking for new localizations of the Contributor Covenant and are
+thankful to the volunteers who spend their time on translations.
 
-We're always looking for new localizations of the Contributor Covenant and are thankful to the volunteers who spend their time on translations.
+We also rely on the contributions of native speakers in the form of review,
+edits, and suggestions.
 
 If you are interested in doing a translation, please follow these steps:
 
@@ -47,14 +51,33 @@ If you are interested in doing a translation, please follow these steps:
 1. HTML and plain text versions are automatically generated from your markdown file.
 1. A link to your translation is automatically added to the translations page.
 
-## Adding a Project to the List of Adopters
+### Developers
+Code contributions to improve the development or operation of the [contributor-covenant.org](https://contributor-covenant.org)
+web site are welcome.
 
-* Fork the repository.
-* Add a new row to the [adopters.csv](static/adopters.csv) file,
-  with the project name in the first column, and the project URL in the second column.
-* Open a pull request.
+#### Build the website locally
+To build the website locally, first [install Hugo](https://gohugo.io/getting-started/installing)
+using your package manager of choice.
+For example, on Debian/Ubuntu:
+```
+apt-get install hugo
+```
 
-# Site contributions
+If you are using Arch Linux:
+```
+pacman -S hugo
+```
+
+If you are using [Homebrew](https://brew.sh) on macOS:
+```
+brew install hugo
+```
+
+#### Start the server
+From the repository's root directory, start the development server:
+```
+hugo server -D
+```
 
 ## Code Style
 - Use spaces for indentation
@@ -74,18 +97,6 @@ If you are interested in doing a translation, please follow these steps:
 - Breaking lines should be `1px solid #CCC`
 - Maintain [contrast](https://webaim.org/resources/contrastchecker/) to WCAG AA on normal text, WCAG AAA on large text
 - Use colors from [this palette](https://color.adobe.com/Royal-Purples-color-theme-7468845/edit/?copy=true&base=2&rule=Custom&selected=4&name=Copy%20of%20Royal%20Purples&mode=rgb&rgbvalues=0.2980392156862745,0.06666666666666667,0.3803921568627451,0.8,0.14901960784313725,0.1411764705882353,0.403921568627451,0,0.6784313725490196,0.5372549019607843,0.12156862745098039,0.6784313725490196,1,0.7137254901960784,0.08627450980392157&swatchOrder=0,1,2,3,4)
-- We also use `#FFF`, `#CCC`, and `#111` for main body text
-
-```css
-.class {
-	color: #4C1161;
-	font-size: 1.1rem;
-}
-.second-class,
-.third-class {
-	background-color: white;
-}
-```
 
 ### Markdown
 - Do not use fancy quotes, dashes, and such; the Markdown processor will handle that.
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
@@ -1,37 +1,38 @@
-#
+# Contributor Covenant
 
-## Basics
+This project is managed by the members of the Organization for Ethical Source, in
+accordance with its [governance structure](https://ethicalsource.dev/governance/).
 
-Coraline Ada Ehmke (@coralineada), the benevolent dictator for life (BDFL), holds ultimate decision-making power while seeking to represent a balance of the views and the best interests of the community as a whole.
+We strive to center the [Ethical Source Principles](https://ethicalsource.dev/principles/)
+in all the work we do and the decisions we make.
 
-## Participants
+# Mission
+Contributor Covenant ignited a revolution in how we think about open source
+communities, and continues to be a critical component of its practice.
+Our mission is to guide the continued evolution of Contributor Covenant,
+ensuring that this foundational document continues to serve open source
+communities in their efforts to center justice and equity in their practices.
 
-Membership is open to anyone who wants to join.
+# Decision-making
 
-The BDFL can remove misbehaving members at will for the sake of the common good.
+## Lazy consensus
+Most decisions, such as approval of minor copy edits or the addition of a translation,
+are made in public through comments on pull requests or issues on our Github
+repository. Decisions about such changes are presumed to pass in the absence of
+objections.
 
-In the event that the BDFL is unable or unwilling to continue leadership, the BDFL may appoint a new BDFL or choose to alter the governance structure entirely.
-
-## Policy
-
-The BDFL sets the community's policies and makes decisions for the community, taking reasonable account of input from other community members.
-
-The BDFL is responsible for implementing—or delegating implementation of—policies and other decisions.
-
-If members are not happy with the BDFL's leadership, they are free to voice their concerns or leave the community.
-
-## Process
-
-Community members are free to discuss and debate community policies, practices, and culture.
-
-## Evolution
-
-The BDFL can change the governance structure of the community at will.
+## Committee responsibilities
+In case of major changes, or conflict that contributors cannot resolve themselves,
+the OES's governing committee has the responsibility for final decision-making.
 
+# Code of Conduct
+We strive for fair and transparent enforcement of our code of conduct, and prioritize
+the safety and well-being of those who are affected by a violation of our
+community norms and standards.
 
 ---
 
-[![CommunityRule derived](https://communityrule.info/assets/CommunityRule-derived-000000.svg)](http://communityrule.info)
+Created by [Organization for Ethical Source](https://ethicalsource.dev)
 
-Created with [CommunityRule](http://communityrule.info)   
-[Creative Commons BY-SA](http://creativecommons.org/licenses/by-sa/4.0/).
+[![CommunityRule derived](https://communityrule.info/assets/CommunityRule-derived-000000.svg)](https://communityrule.info)
+[Creative Commons BY-SA](https://creativecommons.org/licenses/by-sa/4.0/)