From 82ef3d4b0836ca4db7c041232c1e6e7d17ad5e10 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Aug 2015 13:40:52 -0600 Subject: [PATCH 1/6] Remove condescending and patronizing language. Reword some sentences --- README.md | 15 ++++++++------- index.md | 18 +++++++----------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 4f9cdd1..b74fe75 100644 --- a/README.md +++ b/README.md @@ -2,19 +2,19 @@ An easy to reuse open source code of conduct **template** for communities. -Developed by the [@TODOGroup](https://twitter.com/todogroup) to promote code of conducts for open source communities. By participating in this project, you are expected to honor this [code of conduct](http://todogroup.org/opencodeofconduct/#Open+Code+of+Conduct/abuse@todogroup.org). +Developed by the [@TODOGroup](https://twitter.com/todogroup) to promote code of conducts for communities. By participating in this project, you are expected to honor this [code of conduct](http://todogroup.org/opencodeofconduct/#Open+Code+of+Conduct/abuse@todogroup.org). ## FAQ #### Why a code of conduct? -We strongly believe that a code of conduct helps set the ground rules for participation in communities, and more importantly helps to build a culture of respect and improve diversity. According to the latest [FLOSS survey](http://floss2013.libresoft.es/results.en.html), we have lots of work to do in improving diversity across open source communities. +We all know that a code of conduct helps set the ground rules for participation in communities, and more importantly helps to build a place of respect and improve diversity. According to the latest [FLOSS survey](http://floss2013.libresoft.es/results.en.html), we have lots of work to do in improving diversity across open source communities. -Diversity is the spice of life. Having a diverse contributor community from different backgrounds and organizations will help set your community up for long term success. [Research](http://www.scientificamerican.com/article/how-diversity-makes-us-smarter/) shows that diverse communities are more creative, diligent and innovative. +Diversity is a part of life. Having a diverse contributor community from different backgrounds and organizations will help set your community up for long term success. [Research](http://www.scientificamerican.com/article/how-diversity-makes-us-smarter/) shows that diverse communities are more creative, diligent and innovative. #### How is this code of conduct licensed? -A very liberal [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/). +The very accommodating license, [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/). #### What do you mean that the open code of conduct is a template? @@ -31,7 +31,7 @@ It's very hard to develop a one size fits all code of conduct for open source co #### Can I apply this code of conduct for conferences or events? -It wasn't intended for that purpose. +It wasn't intended for that purpose. However, we highly recommend the following resources on the topic, @@ -50,7 +50,8 @@ Please send us a pull request with your suggestions. #### Doesn't this impact the right to free speech? Why are you stomping on my rights? -See this XKCD for our feelings on this matter: https://xkcd.com/1357/ +In the many countries that do have the right to free speech, this means (with obvious exeptions) the government cannot arrest you for saying anything. Many countries contain free speech in their constitution which can only apply to the government for enforcing or creating laws. + As many companies and organizations are owned by private individuals, it means they are only restricted by laws that apply to people and their businesses. The free speech contained in constitutions only apply to the government, restricting the kinds of laws that it can make. So no, this does not impact your right to free speech. ## Thanks @@ -61,4 +62,4 @@ We all stand on the shoulders of giants across many open source communities. We' * Ubuntu: http://www.ubuntu.com/about/about-ubuntu/conduct * Contributor Covenant: http://contributor-covenant.org/ * Geek Feminism: http://geekfeminism.org/about/code-of-conduct/ -* Citizen Code of Conduct: http://citizencodeofconduct.org/ +* Citizen Code of Conduct: http://citizencodeofconduct.org/ diff --git a/index.md b/index.md index 0fe54ae..63af19b 100644 --- a/index.md +++ b/index.md @@ -11,8 +11,8 @@ Our open source community strives to: * **Be welcoming**: We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability. * **Be considerate**: Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language. * **Be respectful**: Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important to remember that a community where people feel uncomfortable or threatened is not a productive one. -* **Be careful in the words that we choose**: we are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable. -* **Try to understand why we disagree**: Disagreements, both social and technical, happen all the time. It is important that we resolve disagreements and differing views constructively. Remember that we’re different. The strength of our community comes from its diversity, people from a wide range of backgrounds. Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong. Don’t forget that it is human to err and blaming each other doesn’t get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes. +* **Be careful in the words that we choose**: We are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable. +* **Try to understand why we disagree**: Disagreements, both social and technical, happen all the time. It is important that we resolve disagreements and differing views constructively. Remember that we’re different. The strength of our community comes from its diversity, people from a wide range of backgrounds. People have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong. Don’t forget that it is human to make errors and mistakes and that blaming each other doesn’t get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes. ## Definitions @@ -21,7 +21,6 @@ Harassment includes, but is not limited to: - Offensive comments related to gender, gender identity and expression, sexual orientation, disability, mental illness, neuro(a)typicality, physical appearance, body size, race, age, regional discrimination, political or religious affiliation - Unwelcome comments regarding a person’s lifestyle choices and practices, including those related to food, health, parenting, drugs, and employment - Deliberate misgendering. This includes deadnaming or persistently using a pronoun that does not correctly reflect a person's gender identity. You must address people by the name they give you when not addressing them by their username or handle -- Physical contact and simulated physical contact (eg, textual descriptions like “*hug*” or “*backrub*”) without consent or after a request to stop - Threats of violence, both physical and psychological - Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm - Deliberate intimidation @@ -34,21 +33,18 @@ Harassment includes, but is not limited to: - Deliberate “outing” of any aspect of a person’s identity without their consent except as necessary to protect others from intentional abuse - Publication of non-harassing private communication -Our open source community prioritizes marginalized people’s safety over privileged people’s comfort. We will not act on complaints regarding: +Our open source community prioritizes people’s safety over people’s comfort. We will not act on complaints regarding: -- ‘Reverse’ -isms, including ‘reverse racism,’ ‘reverse sexism,’ and ‘cisphobia’ - Reasonable communication of boundaries, such as “leave me alone,” “go away,” or “I’m not discussing this with you” -- Refusal to explain or debate social justice concepts -- Communicating in a ‘tone’ you don’t find congenial -- Criticizing racist, sexist, cissexist, or otherwise oppressive behavior or assumptions +- Communicating in a ‘tone’ you don’t like +- Criticizing racist, sexist, cissexist, or otherwise discriminatory behavior or assumptions ### Diversity Statement We encourage everyone to participate and are committed to building a community for all. Although we will fail at times, we seek to treat everyone both as fairly and equally as possible. Whenever a participant has made a mistake, we expect them to take responsibility for it. If someone has been harmed or offended, it is our responsibility to listen carefully and respectfully, and do our best to right the wrong. -Although this list cannot be exhaustive, we explicitly honor diversity in age, gender, gender identity or expression, culture, ethnicity, language, national origin, political beliefs, profession, race, religion, sexual orientation, socioeconomic status, and technical ability. We will not tolerate discrimination based on any of the protected -characteristics above, including participants with disabilities. +Although this list cannot be exhaustive, we treat people the same, regardless of age, gender, gender identity or expression, culture, ethnicity, language, national origin, political beliefs, profession, race, religion, sexual orientation, socioeconomic status, and technical ability. We will not tolerate discrimination based on any of the protected characteristics above, including participants with disabilities. ### Reporting Issues @@ -59,7 +55,7 @@ If you experience or witness unacceptable behavior—or have any other concerns include them as well. Your account of what occurred, and if you believe the incident is ongoing. If there is a publicly available record (e.g. a mailing list archive or a public IRC logger), please include a link. - Any additional information that may be helpful. -After filing a report, a representative will contact you personally, review the incident, follow up with any additional questions, and make a decision as to how to respond. If the person who is harassing you is part of the response team, they will recuse themselves from handling your incident. If the complaint originates from a member of the response team, it will be handled by a different member of the response team. We will respect confidentiality requests for the purpose of protecting victims of abuse. +After filing a report, a representative will contact you personally, review the incident, follow up with any additional questions, and make a decision as to how to respond. If the person who is harassing you is part of the response team, it will be handled by a different member of the response team. If the complaint originates from a member of the response team, it will be handled by another person in the response team. We will respect confidentiality requests for the purpose of protecting victims of abuse. ### Attribution & Acknowledgements From 359e0b3e57532713b2feee44db4d9675dcc0916f Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Aug 2015 13:45:34 -0600 Subject: [PATCH 2/6] Re-word free speech part --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b74fe75..b6d0616 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Please send us a pull request with your suggestions. #### Doesn't this impact the right to free speech? Why are you stomping on my rights? In the many countries that do have the right to free speech, this means (with obvious exeptions) the government cannot arrest you for saying anything. Many countries contain free speech in their constitution which can only apply to the government for enforcing or creating laws. - As many companies and organizations are owned by private individuals, it means they are only restricted by laws that apply to people and their businesses. The free speech contained in constitutions only apply to the government, restricting the kinds of laws that it can make. So no, this does not impact your right to free speech. +As most companies and organizations are owned by private individuals, they are only restricted by laws that apply to people and their businesses. The free speech sections contained in constitutions only apply to the government, restricting the kinds of laws that it can make. So no, this does not impact your right to free speech. ## Thanks From 5d24971f29816b9b8953807044f46eac358f6bf5 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 4 Aug 2015 22:05:54 -0600 Subject: [PATCH 3/6] Restructure and reword more sentences --- index.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/index.md b/index.md index 63af19b..f2ce9b0 100644 --- a/index.md +++ b/index.md @@ -5,39 +5,39 @@ version: v1.0 This code of conduct outlines our expectations for participants within the **[COMMUNITY]** community, as well as steps to reporting unacceptable behavior. We are committed to providing a welcoming and inspiring community for all and expect our code of conduct to be honored. Anyone who violates this code of conduct may be banned from the community. -Our open source community strives to: +Our community strives to: * **Be friendly and patient.** * **Be welcoming**: We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability. * **Be considerate**: Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language. * **Be respectful**: Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important to remember that a community where people feel uncomfortable or threatened is not a productive one. -* **Be careful in the words that we choose**: We are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable. -* **Try to understand why we disagree**: Disagreements, both social and technical, happen all the time. It is important that we resolve disagreements and differing views constructively. Remember that we’re different. The strength of our community comes from its diversity, people from a wide range of backgrounds. People have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong. Don’t forget that it is human to make errors and mistakes and that blaming each other doesn’t get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes. +* **Be careful in the words that you choose**: We are a community made of many different people, and we conduct ourselves politely. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable. +* **Try to understand why others may disagree**: Disagreements, both social and technical, happen all the time. It is important that we resolve disagreements and differing views constructively. Remember that we’re different. The strength of our community comes from its diversity, people from a wide range of backgrounds. People have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong. Don’t forget that it is human to make errors and mistakes and that blaming each other doesn’t get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes. ## Definitions Harassment includes, but is not limited to: -- Offensive comments related to gender, gender identity and expression, sexual orientation, disability, mental illness, neuro(a)typicality, physical appearance, body size, race, age, regional discrimination, political or religious affiliation +- Offensive comments related to gender, gender identity and expression, sexual orientation, disability, mental illness, or lack thereof, physical appearance, body size, race, age, regional discrimination, political or religious affiliation - Unwelcome comments regarding a person’s lifestyle choices and practices, including those related to food, health, parenting, drugs, and employment -- Deliberate misgendering. This includes deadnaming or persistently using a pronoun that does not correctly reflect a person's gender identity. You must address people by the name they give you when not addressing them by their username or handle +- Deliberate misgendering. This includes using one's previous name and persistently using the pronoun that does not reflect the person's gender identity. You must address people by the name they give you when not addressing them by their username or handle - Threats of violence, both physical and psychological - Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm - Deliberate intimidation - Stalking or following - Harassing photography or recording, including logging online activity for harassment purposes - Sustained disruption of discussion -- Unwelcome sexual attention, including gratuitous or off-topic sexual images or behaviour -- Pattern of inappropriate social contact, such as requesting/assuming inappropriate levels of intimacy with others +- Unwelcome sexual attention, including gratuitous or off-topic sexual images or behavior +- Constant attempts of inappropriate social contact, such as requesting/assuming inappropriate levels of intimacy with others - Continued one-on-one communication after requests to cease -- Deliberate “outing” of any aspect of a person’s identity without their consent except as necessary to protect others from intentional abuse +- Deliberately releasing or sharing an individual's or an organization's personal information without permission (privately or publicly) except as necessary to protect others from intentional abuse - Publication of non-harassing private communication Our open source community prioritizes people’s safety over people’s comfort. We will not act on complaints regarding: - Reasonable communication of boundaries, such as “leave me alone,” “go away,” or “I’m not discussing this with you” - Communicating in a ‘tone’ you don’t like -- Criticizing racist, sexist, cissexist, or otherwise discriminatory behavior or assumptions +- Criticizing racist, sexist, or otherwise discriminatory behavior or assumptions ### Diversity Statement From 212e25a35d80e2b5db4bfebfb1f34dda65f4b314 Mon Sep 17 00:00:00 2001 From: Patrick Date: Wed, 5 Aug 2015 10:51:58 -0600 Subject: [PATCH 4/6] Replace entire free speech paragraph --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index b6d0616..c1d2483 100644 --- a/README.md +++ b/README.md @@ -50,8 +50,7 @@ Please send us a pull request with your suggestions. #### Doesn't this impact the right to free speech? Why are you stomping on my rights? -In the many countries that do have the right to free speech, this means (with obvious exeptions) the government cannot arrest you for saying anything. Many countries contain free speech in their constitution which can only apply to the government for enforcing or creating laws. -As most companies and organizations are owned by private individuals, they are only restricted by laws that apply to people and their businesses. The free speech sections contained in constitutions only apply to the government, restricting the kinds of laws that it can make. So no, this does not impact your right to free speech. +We do respect and support freedom of speech. Most would agree that we should stop the line somewhere to keep speech and opinions from going too far. Remember that the Open Code of Conduct is a template for communities to integrate one in their website. You are free to edit the code of conduct so it can fit into your community better. ## Thanks From 77c3d08f2e3a225a571973b1a07e43596813763e Mon Sep 17 00:00:00 2001 From: Patrick Date: Wed, 5 Aug 2015 10:54:34 -0600 Subject: [PATCH 5/6] Edit a word, add a new one --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c1d2483..e9b7578 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Please send us a pull request with your suggestions. #### Doesn't this impact the right to free speech? Why are you stomping on my rights? -We do respect and support freedom of speech. Most would agree that we should stop the line somewhere to keep speech and opinions from going too far. Remember that the Open Code of Conduct is a template for communities to integrate one in their website. You are free to edit the code of conduct so it can fit into your community better. +We do respect and support freedom of speech. Most would agree that we should draw the line somewhere to keep speech and opinions from going too far. Remember that the Open Code of Conduct is a template for communities to easily integrate one in their website. You are free to edit the code of conduct so it can fit into your community better. ## Thanks From 1a37e68b79cc2fa07e424947c13eb22579deefd6 Mon Sep 17 00:00:00 2001 From: Patrick Date: Wed, 5 Aug 2015 14:44:34 -0600 Subject: [PATCH 6/6] Add a note since some people don't get it --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e9b7578..5119047 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ The [contributor convenant](http://www.ashedryden.com/blog/codes-of-conduct-101- Contributions are welcome on how to improve this open code of conduct! -Please send us a pull request with your suggestions. +Please send us a pull request with your suggestions. If we close them, please don't recreate another pull request or issue. #### Doesn't this impact the right to free speech? Why are you stomping on my rights?