From 170651914acab788a6ebe59248462d7c91d0fa9f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 9 Apr 2017 02:02:03 +0100 Subject: Adopt the Contributor Covenant v1.4 as Libreboot's official Code of Conduct --- www/conduct.md | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ www/git.md | 3 ++ www/publish.sh | 4 +- 3 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 www/conduct.md (limited to 'www') diff --git a/www/conduct.md b/www/conduct.md new file mode 100644 index 00000000..bd0a8144 --- /dev/null +++ b/www/conduct.md @@ -0,0 +1,130 @@ +% Contributor Covenant Code of Conduct + +Our Pledge +---------- + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation. + +Our Standards +------------- + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language (e.g. use of gender-neutral [Singular + They pronouns +](https://gist.github.com/0xabad1dea/8870b192fd1758743f66#file-singularthey-md) + when referring to people, treating women and non-binary people equally to men, + and generally being as polite as possible to people that you talk to, + regardless of how different they may be to you. Treat everyone decently, more + or less) +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or +advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +Our Responsibilities +-------------------- + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +Scope +----- + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +Specifically, in normal circumstances, the scope of this Code of Conduct applies +directly to: + +* The IRC channel (#libreboot on Freenode) +* The subreddit (r/libreboot on reddit.com) +* The notabug instance (at ), which also + includes bug reports and code review +* The contents of any contributions to Libreboot, including commits to the Git + repository + +Other communications channels are unofficial, and not part of the Libreboot +project. + +Enforcement +----------- + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the Libreboot project at at the +[#libreboot IRC channel on +Freenode](https://webchat.freenode.net/?channels=libreboot). All complaints +will be reviewed and investigated and will result in a response that is deemed +necessary and appropriate to the circumstances. The project team is obligated +to maintain confidentiality with regard to the reporter of an incident. Further +details of specific enforcement policies may be posted separately. + +Alternatively, where complaints need to be filed privately, the complaint can +be reported to any of these people via IRC private +message (this list is in alphabetical order): + +* Alyssa Rosenzweig: **alyssa** on Freenode +* Jason Self: **jxself** on Freenode +* Leah Rowe: **\_4of7** on Freenode +* Paul Kocialkowski: **paulk-X** Freenode (X is variable, for this person. + check in the channel) +* Swift Geek: **swiftgeek** on Freenode + +If the complaint is for abuses on the Libreboot subreddit at +[r/libreboot](https://www.reddit.com/r/libreboot/) then there are a separate +group of moderators whom you can contact, via private message on the Reddit +website: + +* hexacat +* pizzaiolo\_ +* libreleah + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +Treatment of each case will be handled pragmatically, on a case-by-case basis. + +Attribution +----------- + +This Code of Conduct is adapted from the +[Contributor Covenant homepage](http://contributor-covenant.org/), version 1.4, +available at + +The contributor covenant is made available under [Creative Commons Attribution +4.0 International Public License](https://creativecommons.org/licenses/by/4.0/) + +External links +-------------- + +[Contributor Covenant homepage](http://contributor-covenant.org) -- +[version that this is based on](http://contributor-covenant.org/version/1/4/) diff --git a/www/git.md b/www/git.md index 02dfe072..fca2f400 100644 --- a/www/git.md +++ b/www/git.md @@ -33,6 +33,9 @@ GNU+Linux distributions package it in their repositories). GNU+Linux is generally recommended as the OS of choice, for Libreboot development. +Development discussion, including code review, falls under the Libreboot +project's official [Code of Conduct](conduct.md). + How to download Libreboot from the Git repository ------------------------------------------------- diff --git a/www/publish.sh b/www/publish.sh index 6f35fd93..a3ae0e53 100755 --- a/www/publish.sh +++ b/www/publish.sh @@ -39,7 +39,9 @@ if [ "${FILE}" != "./index" ]; then fi echo "" >> temp.md -echo "[License](/license.md) -- [Information about the Libreboot authors](/contrib.md)" >> temp.md +printf "[License](/license.md) --\n" >> temp.md +printf "[Information about the Libreboot authors](/contrib.md) --\n" >> temp.md +printf "[Code of conduct](/conduct.md)\n" >> temp.md # change out .md -> .html sed temp.md -i -e 's/\.md\(#[a-z\-]*\)*)/.html\1)/g' -- cgit v1.2.3-70-g09d2 From 534b99bea458a364de9185207e770458e6941930 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 9 Apr 2017 02:31:40 +0100 Subject: Amend the CoC: Remove the parenthesized examples of inclusive language --- www/conduct.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'www') diff --git a/www/conduct.md b/www/conduct.md index bd0a8144..eb06a17e 100644 --- a/www/conduct.md +++ b/www/conduct.md @@ -16,13 +16,7 @@ Our Standards Examples of behavior that contributes to creating a positive environment include: -* Using welcoming and inclusive language (e.g. use of gender-neutral [Singular - They pronouns -](https://gist.github.com/0xabad1dea/8870b192fd1758743f66#file-singularthey-md) - when referring to people, treating women and non-binary people equally to men, - and generally being as polite as possible to people that you talk to, - regardless of how different they may be to you. Treat everyone decently, more - or less) +* Using welcoming and inclusive language * Being respectful of differing viewpoints and experiences * Gracefully accepting constructive criticism * Focusing on what is best for the community -- cgit v1.2.3-70-g09d2 From 64e27e49d2d8c1ad533e054fbe3d85cbc9d932f9 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 9 Apr 2017 03:18:56 +0100 Subject: CoC: Only recommend contacting the moderators privately. --- www/conduct.md | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'www') diff --git a/www/conduct.md b/www/conduct.md index eb06a17e..aef1c53e 100644 --- a/www/conduct.md +++ b/www/conduct.md @@ -72,23 +72,21 @@ project. Enforcement ----------- +All complaints will be reviewed and investigated and will result in a response +that is deemed necessary and appropriate to the circumstances. The project team +is obligated to maintain confidentiality with regard to the reporter of an +incident. Further details of specific enforcement policies may be posted +separately. + Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the Libreboot project at at the -[#libreboot IRC channel on -Freenode](https://webchat.freenode.net/?channels=libreboot). All complaints -will be reviewed and investigated and will result in a response that is deemed -necessary and appropriate to the circumstances. The project team is obligated -to maintain confidentiality with regard to the reporter of an incident. Further -details of specific enforcement policies may be posted separately. - -Alternatively, where complaints need to be filed privately, the complaint can -be reported to any of these people via IRC private -message (this list is in alphabetical order): +reported by contacting one of the moderators privately via IRC private message +(see list below): * Alyssa Rosenzweig: **alyssa** on Freenode * Jason Self: **jxself** on Freenode * Leah Rowe: **\_4of7** on Freenode -* Paul Kocialkowski: **paulk-X** Freenode (X is variable, for this person. +* Paul Kocialkowski: **paulk-X** Freenode (X is variable, for this + person. check in the channel) * Swift Geek: **swiftgeek** on Freenode -- cgit v1.2.3-70-g09d2 From b48d802ad7577df1af15ce04d96c6c0f98450f11 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 9 Apr 2017 03:51:03 +0100 Subject: Abolish the Code of Conduct; convert it into a set of General Guidelines As per discussion with swiftgeek and alyssa in the IRC channel, plus others who participated in the debate. --- www/conduct.md | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'www') diff --git a/www/conduct.md b/www/conduct.md index aef1c53e..a14b3133 100644 --- a/www/conduct.md +++ b/www/conduct.md @@ -1,14 +1,14 @@ -% Contributor Covenant Code of Conduct +% Guidelines of Good Conduct in the Libreboot community Our Pledge ---------- In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, gender identity and expression, level of experience, -nationality, personal appearance, race, religion, or sexual identity and -orientation. +contributors and maintainers wish that participation in our project and our +community will be a harassment-free experience for everyone, regardless of age, +body size, disability, ethnicity, gender identity and expression, level of +experience, nationality, personal appearance, race, religion, or sexual identity +and orientation. Our Standards ------------- @@ -69,8 +69,8 @@ directly to: Other communications channels are unofficial, and not part of the Libreboot project. -Enforcement ------------ +Complaints +---------- All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team @@ -99,12 +99,14 @@ website: * pizzaiolo\_ * libreleah -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - +If you deviate from these guidelines, make sure that it is with good reason. Treatment of each case will be handled pragmatically, on a case-by-case basis. +These are guidelines, and are not set in stone. We, as moderators, may choose +to enforce or not enforce these guidelines, in whole or in part, at our own +discretion. We are, afterall, only human ourselves and we sometimes make +mistakes. + Attribution ----------- -- cgit v1.2.3-70-g09d2 From 0d572d6732f45e5d5870e9f091dc67e24e3bdbf0 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 9 Apr 2017 03:57:31 +0100 Subject: Fix spelling mistakes in the Conduct Guidelines --- www/conduct.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www') diff --git a/www/conduct.md b/www/conduct.md index a14b3133..9786939f 100644 --- a/www/conduct.md +++ b/www/conduct.md @@ -1,4 +1,4 @@ -% Guidelines of Good Conduct in the Libreboot community +% Guidelines for Good Conduct in the Libreboot community Our Pledge ---------- @@ -104,7 +104,7 @@ Treatment of each case will be handled pragmatically, on a case-by-case basis. These are guidelines, and are not set in stone. We, as moderators, may choose to enforce or not enforce these guidelines, in whole or in part, at our own -discretion. We are, afterall, only human ourselves and we sometimes make +discretion. We are, after all, only human ourselves and we sometimes make mistakes. Attribution -- cgit v1.2.3-70-g09d2 From 5e0bd3833ff942a93ed6e85867e49f3a3d8626e8 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 9 Apr 2017 04:07:49 +0100 Subject: guidelines: Change Code of Conduct to Guidelines, in the Attribution section --- www/conduct.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www') diff --git a/www/conduct.md b/www/conduct.md index 9786939f..d9a1eab5 100644 --- a/www/conduct.md +++ b/www/conduct.md @@ -110,8 +110,8 @@ mistakes. Attribution ----------- -This Code of Conduct is adapted from the -[Contributor Covenant homepage](http://contributor-covenant.org/), version 1.4, +These guidelines are adapted from the +[Contributor Covenant](http://contributor-covenant.org/), version 1.4, available at The contributor covenant is made available under [Creative Commons Attribution -- cgit v1.2.3-70-g09d2