Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork5.2k
Added concrete example document#9393
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Some minor syntax issues. Content looks good 👍
| @@ -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. | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Changed :)
| 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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Maybe we can add a short explanation about this? Like the one in the referenced source.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
It's really sad to read that all this happened for real 😞. Thanks for contributing it!
| 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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Thedeadname concept is not that well-known, so what do you think about linking it tohttps://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).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Changed :)
| Code of Conduct: Concrete Example Document | ||
| ========================================== | ||
| This is a living document that serves to give concrete examples to |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
to => of ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Not sure "of" is right in this case
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
I would say "of" is the correct preposition in this case.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Yeah, of is better. Changed it. Thanks! :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Can it be placed undercontributing/code_of_conduct/concrete_example_document.rst?
@egircys Of course! Didn't know quite where to place it. I moved it there now 👍 |
greg0ire commentedMar 6, 2018 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
@michellesanver Travis says you should add that document to a toctree (it's unreachable otherwise). |
| - 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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
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 (
.).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Thanks! Fixed :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Looks like a great list to me. Thanks.
| - 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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Would it makes sense to add something like "even as a joke" (or something similar)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
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 (closessymfony#9394).Discussion----------Adding Code of ConductAdding the Contributor Covenant Code of Conduct version 1.4.Relates tosymfony/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 ofsymfony#9340 andsymfony#9393Replacessymfony/symfony#24896Commits-------02e4860 update contributor covenant link & documents fix2de768f change project team to enforcement team0e7b539 add link to core teame61a403 Replace ethnicity with ethnic origin2f8aa5d Change "race" to "ethnic origin"1b0e633 Change "project's leadership" to "core team"464ea45 add link to examples documenteba3ecf Adding Code of Conduct
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 documentIn 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.rstc762418 Syntax201738f Updated to say that some jokes are not ok7911a86 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.