From 02cf53bceffbad073a632e3986972d1fc1f22621 Mon Sep 17 00:00:00 2001 From: Alison Date: Sun, 14 Aug 2016 05:10:31 -0500 Subject: [PATCH 1/7] add Code of Conduct Needs to be updated with an email address for a maintainer. --- CODE_OF_CONDUCT.md | 74 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..32a47d562 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,74 @@ +# 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 +* 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. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at [INSERT EMAIL ADDRESS]. 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. + +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. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ \ No newline at end of file From 49eb383744721f9c192f4106f78686acebb9c19e Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Thu, 2 Mar 2017 15:09:23 -0800 Subject: [PATCH 2/7] Move COC to docs and link it --- docs/code-of-conduct.rst | 83 ++++++++++++++++++++++++++++++++++++++++ docs/index.rst | 1 + 2 files changed, 84 insertions(+) create mode 100644 docs/code-of-conduct.rst diff --git a/docs/code-of-conduct.rst b/docs/code-of-conduct.rst new file mode 100644 index 000000000..d2aa4e705 --- /dev/null +++ b/docs/code-of-conduct.rst @@ -0,0 +1,83 @@ +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 +- 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. + +Enforcement +----------- + +Instances of abusive, harassing, or otherwise unacceptable behavior may +be reported by contacting the project team at [INSERT EMAIL ADDRESS]. +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. + +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. + +Attribution +----------- + +This Code of Conduct is adapted from the `Contributor +Covenant `__, version 1.4, available at +`http://contributor-covenant.org/version/1/4 `__ + diff --git a/docs/index.rst b/docs/index.rst index 637ca456f..f9759d9ed 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -56,6 +56,7 @@ Information about development is also available: contribute team + code-of-conduct ethical-advertising sponsors open-source-philosophy From f23b34bc7149aacd18b9bffc6e9b202e897241bd Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Thu, 2 Mar 2017 15:11:03 -0800 Subject: [PATCH 3/7] Link from contributing docs --- docs/contribute.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/contribute.rst b/docs/contribute.rst index 78366ca29..6b7b629b2 100644 --- a/docs/contribute.rst +++ b/docs/contribute.rst @@ -7,6 +7,9 @@ You are here to help on Read the Docs? Awesome, feel welcome and read the following sections in order to know what and how to work on something. If you get stuck at any point you can create a `ticket on GitHub`_. +All members of our community are expected to follow our :doc:`/code-of-conduct`. +Please make sure you are welcoming and friendly in all of our spaces. + .. _#readthedocs: irc://irc.freenode.net/readthedocs .. _ticket on GitHub: https://github.com/rtfd/readthedocs.org/issues From 2e4aca0b6de2394367adddf62014d95f24508b91 Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Thu, 2 Mar 2017 15:11:38 -0800 Subject: [PATCH 4/7] No markdown :) --- CODE_OF_CONDUCT.md | 74 ---------------------------------------------- 1 file changed, 74 deletions(-) delete mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index 32a47d562..000000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,74 +0,0 @@ -# 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 -* 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. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at [INSERT EMAIL ADDRESS]. 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. - -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. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at [http://contributor-covenant.org/version/1/4][version] - -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ \ No newline at end of file From 96f04fde480bb9813bf235c14420f93b72ea504e Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Thu, 2 Mar 2017 15:12:23 -0800 Subject: [PATCH 5/7] Fix email --- docs/code-of-conduct.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/code-of-conduct.rst b/docs/code-of-conduct.rst index d2aa4e705..2760ae062 100644 --- a/docs/code-of-conduct.rst +++ b/docs/code-of-conduct.rst @@ -63,7 +63,7 @@ Enforcement ----------- Instances of abusive, harassing, or otherwise unacceptable behavior may -be reported by contacting the project team at [INSERT EMAIL ADDRESS]. +be reported by contacting the project team at dev@readthedocs.org. 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 From a552b495b6430c7146bc088bd6aa554429ccbbea Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Thu, 2 Mar 2017 16:21:00 -0800 Subject: [PATCH 6/7] Update to Django COC --- docs/code-of-conduct.rst | 145 +++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 74 deletions(-) diff --git a/docs/code-of-conduct.rst b/docs/code-of-conduct.rst index 2760ae062..814537e86 100644 --- a/docs/code-of-conduct.rst +++ b/docs/code-of-conduct.rst @@ -1,83 +1,80 @@ -Contributor Covenant Code of Conduct -==================================== +Code of Conduct +=============== -Our Pledge ----------- +Like the technical community as a whole, the Django team and community +is made up of a mixture of professionals and volunteers from all over +the world, working on every aspect of the mission - including +mentorship, teaching, and connecting people. -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. +Diversity is one of our huge strengths, but it can also lead to +communication issues and unhappiness. To that end, we have a few ground +rules that we ask people to adhere to. This code applies equally to +founders, mentors and those seeking help and guidance. -Our Standards -------------- +This isn’t an exhaustive list of things that you can’t do. Rather, take +it in the spirit in which it’s intended - a guide to make it easier to +enrich all of us and the technical communities in which we participate. -Examples of behavior that contributes to creating a positive environment -include: +This code of conduct applies to all spaces managed by the Django project +or Django Software Foundation. This includes IRC, the mailing lists, the +issue tracker, DSF events, and any other forums created by the project +team which the community uses for communication. In addition, violations +of this code outside these spaces may affect a person's ability to +participate within them. -- Using welcoming and inclusive language -- 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 +If you believe someone is violating the code of conduct, we ask that you +report it by emailing dev@readthedocs.org. -Examples of unacceptable behavior by participants include: +- **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. Members of the Django community + should be respectful when dealing with other members as well as with + people outside the Django community. +- **Be careful in the words that you 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. This includes, but is + not limited to: -- 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 + - Violent threats or language directed against another person. + - Discriminatory jokes and language. + - Posting sexually explicit or violent material. + - Posting (or threatening to post) other people's personally + identifying information ("doxing"). + - Personal insults, especially those using racist or sexist terms. + - Unwelcome sexual attention. + - Advocating for, or encouraging, any of the above behavior. + - Repeated harassment of others. In general, if someone asks you to + stop, then stop. -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. - -Enforcement ------------ - -Instances of abusive, harassing, or otherwise unacceptable behavior may -be reported by contacting the project team at dev@readthedocs.org. -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. - -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. - -Attribution ------------ - -This Code of Conduct is adapted from the `Contributor -Covenant `__, version 1.4, available at -`http://contributor-covenant.org/version/1/4 `__ +- **When we disagree, try to understand why.** Disagreements, both + social and technical, happen all the time and Django is no exception. + It is important that we resolve disagreements and differing views + constructively. Remember that we’re different. The strength of Django + comes from its varied community, 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. +Original text courtesy of the `Speak Up! +project `__. +This version was adopted from the `Django Code of Conduct `_. From 583f404054ccf0e6a873a685befcd68d4f18a31d Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Thu, 2 Mar 2017 16:21:50 -0800 Subject: [PATCH 7/7] Update usage --- docs/code-of-conduct.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/code-of-conduct.rst b/docs/code-of-conduct.rst index 814537e86..999294ed8 100644 --- a/docs/code-of-conduct.rst +++ b/docs/code-of-conduct.rst @@ -1,7 +1,7 @@ Code of Conduct =============== -Like the technical community as a whole, the Django team and community +Like the technical community as a whole, the Read the Docs team and community is made up of a mixture of professionals and volunteers from all over the world, working on every aspect of the mission - including mentorship, teaching, and connecting people. @@ -15,9 +15,9 @@ This isn’t an exhaustive list of things that you can’t do. Rather, take it in the spirit in which it’s intended - a guide to make it easier to enrich all of us and the technical communities in which we participate. -This code of conduct applies to all spaces managed by the Django project -or Django Software Foundation. This includes IRC, the mailing lists, the -issue tracker, DSF events, and any other forums created by the project +This code of conduct applies to all spaces managed by the Read the Docs project. +This includes IRC, the mailing lists, the +issue tracker, and any other forums created by the project team which the community uses for communication. In addition, violations of this code outside these spaces may affect a person's ability to participate within them. @@ -44,9 +44,9 @@ report it by emailing dev@readthedocs.org. 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. Members of the Django community + threatened is not a productive one. Members of the Read the Docs community should be respectful when dealing with other members as well as with - people outside the Django community. + people outside the Read the Docs community. - **Be careful in the words that you 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 @@ -65,9 +65,9 @@ report it by emailing dev@readthedocs.org. stop, then stop. - **When we disagree, try to understand why.** Disagreements, both - social and technical, happen all the time and Django is no exception. + social and technical, happen all the time and Read the Docs is no exception. It is important that we resolve disagreements and differing views - constructively. Remember that we’re different. The strength of Django + constructively. Remember that we’re different. The strength of Read the Docs comes from its varied community, 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