From eba3ecfe14d7a699fc8ee62207548b661e4ada99 Mon Sep 17 00:00:00 2001 From: Egidijus Gircys Date: Sun, 4 Mar 2018 13:27:53 +0100 Subject: [PATCH 01/12] Adding Code of Conduct --- contributing/code_of_conduct/index.rst | 91 ++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 contributing/code_of_conduct/index.rst diff --git a/contributing/code_of_conduct/index.rst b/contributing/code_of_conduct/index.rst new file mode 100644 index 00000000000..f8cd6905534 --- /dev/null +++ b/contributing/code_of_conduct/index.rst @@ -0,0 +1,91 @@ +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, +education, socio-economic status, 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 +-------------------- + +:doc:`Enforcement team members ` +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. + +Enforcement team members 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 enforcement team members. + +Enforcement +----------- + +Instances of abusive, harassing, or otherwise unacceptable behavior +:doc:`may be reported ` +by contacting the :doc:`enforcement team members `. +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. + +Enforcement team members 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 https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +Related documents +----------------- + +.. toctree:: + :maxdepth: 1 + + reporting_guidelines + enforcement_team + +.. _Contributor Covenant: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html From 464ea458a11f92a37ec5ea7dd8f2f880b5bb8ce1 Mon Sep 17 00:00:00 2001 From: Egidijus Gircys Date: Mon, 5 Mar 2018 18:58:59 +0100 Subject: [PATCH 02/12] add link to examples document --- contributing/code_of_conduct/index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/contributing/code_of_conduct/index.rst b/contributing/code_of_conduct/index.rst index f8cd6905534..394f1994115 100644 --- a/contributing/code_of_conduct/index.rst +++ b/contributing/code_of_conduct/index.rst @@ -87,5 +87,6 @@ Related documents reporting_guidelines enforcement_team + concrete_example_document .. _Contributor Covenant: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html From 1b0e63363707dcf16a0a64439bf1d803c3cbb591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Egidijus=20Gir=C4=8Dys?= Date: Tue, 6 Mar 2018 17:38:27 +0100 Subject: [PATCH 03/12] Change "project's leadership" to "core team" --- contributing/code_of_conduct/index.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contributing/code_of_conduct/index.rst b/contributing/code_of_conduct/index.rst index 394f1994115..5f7c518017b 100644 --- a/contributing/code_of_conduct/index.rst +++ b/contributing/code_of_conduct/index.rst @@ -70,8 +70,7 @@ obligated to maintain confidentiality with regard to the reporter of an incident Further details of specific enforcement policies may be posted separately. Enforcement team members 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. +faith may face temporary or permanent repercussions as determined by the core team. Attribution ----------- From 2f8aa5d19f9d4214167d893b42eeb96dbaad8412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Egidijus=20Gir=C4=8Dys?= Date: Wed, 7 Mar 2018 10:34:41 +0100 Subject: [PATCH 04/12] Change "race" to "ethnic origin" --- contributing/code_of_conduct/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing/code_of_conduct/index.rst b/contributing/code_of_conduct/index.rst index 5f7c518017b..3f791091cc6 100644 --- a/contributing/code_of_conduct/index.rst +++ b/contributing/code_of_conduct/index.rst @@ -8,7 +8,7 @@ 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, -education, socio-economic status, nationality, personal appearance, race, +education, socio-economic status, nationality, personal appearance, ethnic origin, religion, or sexual identity and orientation. Our Standards From e61a403dfde60d3c44f90eea18773136014becd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Egidijus=20Gir=C4=8Dys?= Date: Wed, 7 Mar 2018 10:49:59 +0100 Subject: [PATCH 05/12] Replace ethnicity with ethnic origin --- contributing/code_of_conduct/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contributing/code_of_conduct/index.rst b/contributing/code_of_conduct/index.rst index 3f791091cc6..ac9db09e237 100644 --- a/contributing/code_of_conduct/index.rst +++ b/contributing/code_of_conduct/index.rst @@ -7,8 +7,8 @@ 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, -education, socio-economic status, nationality, personal appearance, ethnic origin, +size, disability, ethnic origin, gender identity and expression, level of experience, +education, socio-economic status, nationality, personal appearance, religion, or sexual identity and orientation. Our Standards From 0e7b539a94d132002a5189e023d31fa857a3ad65 Mon Sep 17 00:00:00 2001 From: Egidijus Gircys Date: Fri, 20 Apr 2018 10:39:01 +0200 Subject: [PATCH 06/12] add link to core team --- contributing/code_of_conduct/index.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contributing/code_of_conduct/index.rst b/contributing/code_of_conduct/index.rst index ac9db09e237..95f104e5ced 100644 --- a/contributing/code_of_conduct/index.rst +++ b/contributing/code_of_conduct/index.rst @@ -70,7 +70,8 @@ obligated to maintain confidentiality with regard to the reporter of an incident Further details of specific enforcement policies may be posted separately. Enforcement team members who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by the core team. +faith may face temporary or permanent repercussions as determined by the +:doc:`core team `. Attribution ----------- From 2de768f9b594c5529e6534f02b1611195816c9b9 Mon Sep 17 00:00:00 2001 From: Egidijus Gircys Date: Fri, 20 Apr 2018 10:50:08 +0200 Subject: [PATCH 07/12] change project team to enforcement team --- contributing/code_of_conduct/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing/code_of_conduct/index.rst b/contributing/code_of_conduct/index.rst index 95f104e5ced..2593023e086 100644 --- a/contributing/code_of_conduct/index.rst +++ b/contributing/code_of_conduct/index.rst @@ -65,7 +65,7 @@ Instances of abusive, harassing, or otherwise unacceptable behavior :doc:`may be reported ` by contacting the :doc:`enforcement team members `. 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 +is deemed necessary and appropriate to the circumstances. The enforcement team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. From 02e486026d58058e3f44d1cb1198a0899c31af67 Mon Sep 17 00:00:00 2001 From: Egidijus Gircys Date: Fri, 20 Apr 2018 15:57:54 +0200 Subject: [PATCH 08/12] update contributor covenant link & documents fix --- contributing/code_of_conduct/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contributing/code_of_conduct/index.rst b/contributing/code_of_conduct/index.rst index 2593023e086..e0ddb07476f 100644 --- a/contributing/code_of_conduct/index.rst +++ b/contributing/code_of_conduct/index.rst @@ -79,7 +79,7 @@ Attribution This Code of Conduct is adapted from the `Contributor Covenant`_, version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html -Related documents +Related Documents ----------------- .. toctree:: @@ -89,4 +89,4 @@ Related documents enforcement_team concrete_example_document -.. _Contributor Covenant: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html +.. _Contributor Covenant: https://www.contributor-covenant.org From 7911a8660c8f1700dfe921dea865d75475c3f316 Mon Sep 17 00:00:00 2001 From: Michelle Sanver Date: Mon, 5 Mar 2018 15:31:31 +0100 Subject: [PATCH 09/12] Added concrete example document --- .../concrete_example_document.rst | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 contributing/code_of_conduct/concrete_example_document.rst diff --git a/contributing/code_of_conduct/concrete_example_document.rst b/contributing/code_of_conduct/concrete_example_document.rst new file mode 100644 index 00000000000..99ae4934690 --- /dev/null +++ b/contributing/code_of_conduct/concrete_example_document.rst @@ -0,0 +1,30 @@ +Code of Conduct: Concrete Example Document +========================================== + +This is a living document that serves to give concrete examples of +unwanted behaviour. These examples have all taken place somewhere in the +PHP community in the past, and are clear code of conduct violations +according to the Symfony code of conduct. + +Concrete Examples +----------------- + +- Unwelcome comments regarding a person’s lifestyle choices and practices, + including those related to food, health, parenting, drugs, and employment. +- Deliberate misgendering or use of `dead names`_ (The birth name + of a person who has since changed their name, often a transgender person). +- Threats of violence like "The person that created this PR should be + punched in the face" +- Incitement of violence towards any individual, including encouraging a + person to commit suicide or to engage in self-harm +- Sustained disruption of discussion +- Pattern of inappropriate social contact, such as requesting/assuming + inappropriate levels of intimacy with others +- Continued one-on-one communication after requests to cease +- Putting down people based on their technology choices or their work + +The original list is inspired and modified from `geek feminism`_ and +confirmed by experiences from PHPWomen. + +.. _dead names: https://en.wiktionary.org/wiki/deadname +.. _geek feminism: https://geekfeminism.org/about/code-of-conduct From 201738fa0e51905e284f898af64285a4d70bbf3c Mon Sep 17 00:00:00 2001 From: Michelle Sanver Date: Tue, 17 Apr 2018 14:11:31 +0200 Subject: [PATCH 10/12] Updated to say that some jokes are not ok --- contributing/code_of_conduct/concrete_example_document.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing/code_of_conduct/concrete_example_document.rst b/contributing/code_of_conduct/concrete_example_document.rst index 99ae4934690..72433f66290 100644 --- a/contributing/code_of_conduct/concrete_example_document.rst +++ b/contributing/code_of_conduct/concrete_example_document.rst @@ -16,7 +16,7 @@ Concrete Examples - Threats of violence like "The person that created this PR should be punched in the face" - Incitement of violence towards any individual, including encouraging a - person to commit suicide or to engage in self-harm + person to commit suicide or to engage in self-harm (even as a joke). - Sustained disruption of discussion - Pattern of inappropriate social contact, such as requesting/assuming inappropriate levels of intimacy with others From c7624185543446dfcca334c747ed3113a6f0f5ed Mon Sep 17 00:00:00 2001 From: Michelle Sanver Date: Tue, 17 Apr 2018 14:12:27 +0200 Subject: [PATCH 11/12] Syntax --- .../concrete_example_document.rst | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/contributing/code_of_conduct/concrete_example_document.rst b/contributing/code_of_conduct/concrete_example_document.rst index 72433f66290..452acfc79dc 100644 --- a/contributing/code_of_conduct/concrete_example_document.rst +++ b/contributing/code_of_conduct/concrete_example_document.rst @@ -9,19 +9,19 @@ according to the Symfony code of conduct. Concrete Examples ----------------- -- Unwelcome comments regarding a person’s lifestyle choices and practices, - including those related to food, health, parenting, drugs, and employment. -- Deliberate misgendering or use of `dead names`_ (The birth name - of a person who has since changed their name, often a transgender person). -- Threats of violence like "The person that created this PR should be - punched in the face" -- Incitement of violence towards any individual, including encouraging a +* Unwelcome comments regarding a person’s lifestyle choices and practices, + including those related to food, health, parenting, drugs, and employment; +* Deliberate misgendering or use of `dead names`_ (The birth name + of a person who has since changed their name, often a transgender person); +* Threats of violence like "The person that created this PR should be + punched in the face"; +* Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm (even as a joke). -- Sustained disruption of discussion -- Pattern of inappropriate social contact, such as requesting/assuming - inappropriate levels of intimacy with others -- Continued one-on-one communication after requests to cease -- Putting down people based on their technology choices or their work +* Sustained disruption of discussion; +* Pattern of inappropriate social contact, such as requesting/assuming + inappropriate levels of intimacy with others; +* Continued one-on-one communication after requests to cease; +* Putting down people based on their technology choices or their work. The original list is inspired and modified from `geek feminism`_ and confirmed by experiences from PHPWomen. From cccf8694575d6265bcf1e888c1ad4315fa7c4d9c Mon Sep 17 00:00:00 2001 From: Michelle Sanver Date: Tue, 17 Apr 2018 14:16:08 +0200 Subject: [PATCH 12/12] Update concrete_example_document.rst --- contributing/code_of_conduct/concrete_example_document.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing/code_of_conduct/concrete_example_document.rst b/contributing/code_of_conduct/concrete_example_document.rst index 452acfc79dc..6f1277a625a 100644 --- a/contributing/code_of_conduct/concrete_example_document.rst +++ b/contributing/code_of_conduct/concrete_example_document.rst @@ -16,7 +16,7 @@ Concrete Examples * Threats of violence like "The person that created this PR should be punched in the face"; * Incitement of violence towards any individual, including encouraging a - person to commit suicide or to engage in self-harm (even as a joke). + person to commit suicide or to engage in self-harm (even as a joke); * Sustained disruption of discussion; * Pattern of inappropriate social contact, such as requesting/assuming inappropriate levels of intimacy with others;