Added concrete example document #9393

michellesanver · 2018-03-05T14:37:44Z

In a meeting that took place the 21st of February 2018 we defined this list as a start to a concrete example document, to specifically list out some things that are unwanted behaviour.

sstok

Some minor syntax issues. Content looks good 👍

sstok · 2018-03-05T14:58:06Z

contributing/code_of_conduct_concrete_example_document.rst

@@ -0,0 +1,16 @@
+Code of Conduct: Concrete Example Document
+==========================================
+This is a living document that serves to give concrete examples to 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.


Documentation lines are usually limited to 72 characters or somewhere near 👍 and headers are followed by a single empty line (sphinxdoc can be picky about this 😄 )

http://symfony.com/doc/current/contributing/documentation/standards.html

sstok · 2018-03-05T14:59:24Z

contributing/code_of_conduct_concrete_example_document.rst

+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’ (rejected) names


Maybe we can add a short explanation about this? Like the one in the referenced source.

javiereguiluz

It's really sad to read that all this happened for real 😞. Thanks for contributing it!

javiereguiluz · 2018-03-05T15:04:15Z

contributing/code_of_conduct_concrete_example_document.rst

+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’ (rejected) names


The deadname concept is not that well-known, so what do you think about linking it to https://en.wiktionary.org/wiki/deadname or adding a brief description like this one?

- Deliberate misgendering or use of deadnames (which are the original names given to transgender people before initiating their transition).

greg0ire · 2018-03-05T15:25:56Z

contributing/code_of_conduct_concrete_example_document.rst

+Code of Conduct: Concrete Example Document
+==========================================
+
+This is a living document that serves to give concrete examples to


Not sure "of" is right in this case

I would say "of" is the correct preposition in this case.

Yeah, of is better. Changed it. Thanks! :)

egircys

Can it be placed under contributing/code_of_conduct/concrete_example_document.rst?

michellesanver · 2018-03-06T09:31:42Z

@egircys Of course! Didn't know quite where to place it. I moved it there now 👍

greg0ire · 2018-03-06T13:43:35Z

@michellesanver Travis says you should add that document to a toctree (it's unreachable otherwise).

lsmith77 · 2018-03-06T15:42:11Z

realtes to https://github.com/symfony/diversity/issues/2

wouterj · 2018-03-10T22:41:31Z

contributing/code_of_conduct/concrete_example_document.rst

+- 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


Can you fix some minor syntatic things here:

Please use * as list indicator

Please end all entries with a semi-colon, except from the last item which should end with a final stop (.).

Thanks! Fixed :)

fabpot

Looks like a great list to me. Thanks.

fabpot · 2018-04-16T17:09:41Z

contributing/code_of_conduct/concrete_example_document.rst

+- 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


Would it makes sense to add something like "even as a joke" (or something similar)?

That does make sense, thanks! Added.

This PR was submitted for the master branch but it was squashed and merged into the 2.7 branch instead (closes symfony#9394). Discussion ---------- Adding Code of Conduct Adding the Contributor Covenant Code of Conduct version 1.4. Relates to symfony/diversity#1 **TODO** - [x] Add the link to the enforcement team page - [x] Add the link to the enforcement process - [x] Add the link to concrete real-world examples of unwanted behavior - [x] Change "Project maintainers" to "Enforcement team members" Part of symfony#9340 and symfony#9393 Replaces symfony/symfony#24896 Commits ------- 02e4860 update contributor covenant link & documents fix 2de768f change project team to enforcement team 0e7b539 add link to core team e61a403 Replace ethnicity with ethnic origin 2f8aa5d Change "race" to "ethnic origin" 1b0e633 Change "project's leadership" to "core team" 464ea45 add link to examples document eba3ecf Adding Code of Conduct

fabpot · 2018-04-30T17:12:51Z

Thank you very much @michellesanver for taking the time to create the document and everybody for the constructive feedback.

…llesanver) This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #9393). Discussion ---------- Added concrete example document In a meeting that took place the 21st of February 2018 we defined this list as a start to a concrete example document, to specifically list out some things that are unwanted behaviour. Commits ------- cccf869 Update concrete_example_document.rst c762418 Syntax 201738f Updated to say that some jokes are not ok 7911a86 Added concrete example document

carsonbot added the Status: Needs Review label Mar 5, 2018

GwendolenLynch approved these changes Mar 5, 2018

View reviewed changes

sstok suggested changes Mar 5, 2018

View reviewed changes

javiereguiluz approved these changes Mar 5, 2018

View reviewed changes

michellesanver force-pushed the master branch from 7f5e05e to 8e132f5 Compare March 5, 2018 15:18

greg0ire reviewed Mar 5, 2018

View reviewed changes

Pierstoval approved these changes Mar 5, 2018

View reviewed changes

michellesanver force-pushed the master branch from e59a1e9 to d9d8cd0 Compare March 5, 2018 15:58

greg0ire approved these changes Mar 5, 2018

View reviewed changes

egircys mentioned this pull request Mar 5, 2018

Adding Code of Conduct #9394

Merged

4 tasks

egircys reviewed Mar 5, 2018

View reviewed changes

sstok approved these changes Mar 5, 2018

View reviewed changes

michellesanver force-pushed the master branch from fa1a5c3 to bfe943c Compare March 6, 2018 09:30

javiereguiluz added the diversity & inclusion Related to Symfony Diversity Initiative https://github.com/symfony/diversity label Mar 7, 2018

wouterj reviewed Mar 10, 2018

View reviewed changes

fabpot reviewed Apr 16, 2018

View reviewed changes

dunglas approved these changes Apr 16, 2018

View reviewed changes

egircys approved these changes Apr 19, 2018

View reviewed changes

lsmith77 approved these changes Apr 19, 2018

View reviewed changes

egircys and others added 7 commits April 30, 2018 19:09

Adding Code of Conduct

eba3ecf

add link to examples document

464ea45

Change "project's leadership" to "core team"

1b0e633

Change "race" to "ethnic origin"

2f8aa5d

Replace ethnicity with ethnic origin

e61a403

add link to core team

0e7b539

change project team to enforcement team

2de768f

Egidijus Gircys and others added 2 commits April 30, 2018 19:09

update contributor covenant link & documents fix

02e4860

michellesanver and others added 4 commits April 30, 2018 19:13

Added concrete example document

7911a86

Updated to say that some jokes are not ok

201738f

Syntax

c762418

Update concrete_example_document.rst

cccf869

fabpot changed the base branch from master to 2.7 April 30, 2018 17:13

fabpot force-pushed the master branch from cd7ac9c to cccf869 Compare April 30, 2018 17:13

fabpot merged commit cccf869 into symfony:2.7 Apr 30, 2018

xabbuh added this to the 2.7 milestone May 14, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added concrete example document #9393

Added concrete example document #9393

michellesanver commented Mar 5, 2018

sstok left a comment

sstok Mar 5, 2018

michellesanver Mar 5, 2018

sstok Mar 5, 2018

javiereguiluz left a comment

javiereguiluz Mar 5, 2018

michellesanver Mar 5, 2018

greg0ire Mar 5, 2018

Pierstoval Mar 5, 2018

GwendolenLynch Mar 5, 2018

michellesanver Mar 5, 2018

egircys left a comment

michellesanver commented Mar 6, 2018

greg0ire commented Mar 6, 2018 •

edited

Loading

lsmith77 commented Mar 6, 2018

wouterj Mar 10, 2018

michellesanver Apr 17, 2018

fabpot left a comment

fabpot Apr 16, 2018

michellesanver Apr 17, 2018

fabpot commented Apr 30, 2018

Added concrete example document #9393

Added concrete example document #9393

Conversation

michellesanver commented Mar 5, 2018

sstok left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

javiereguiluz left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

egircys left a comment

Choose a reason for hiding this comment

michellesanver commented Mar 6, 2018

greg0ire commented Mar 6, 2018 • edited Loading

lsmith77 commented Mar 6, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fabpot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fabpot commented Apr 30, 2018

greg0ire commented Mar 6, 2018 •

edited

Loading