Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CoC to add more examples of good/bad conduct #733

Open
wants to merge 6 commits into
base: release
Choose a base branch
from

Conversation

nainar
Copy link

@nainar nainar commented Nov 10, 2019

I am on the CoC WG for AMP and as we move to OpenJS foundation we are going to be adopting this CoC.

Which is why we wanted to make some suggestions to make this CoC stronger.

Changes made:

  • Addition of discrimination and sexism as unacceptable behaviors.
  • Calling out harassment solely and not limiting it to public or private harassment.
  • Removal of the word project since this CoC is adopted by foundations and projects alike
  • Addition of gender neutral language as good behaviour.

Hope these edits are acceptable.

OpenJS issue for reference.

I am on the CoC WG for AMP and as we move to OpenJS foundation we are going to be adopting this CoC. 

Which is why we wanted to make some suggestions to make this CoC stronger. 

Changes made:
- Addition of discrimination and sexism as unacceptable behaviors. 
- Calling out harassment solely and not limiting it to public or private harassment.
- Removal of the word project since this CoC is adopted by foundations and projects alike
- Addition of gender neutral language as good behaviour.

Hope these edits are acceptable. 

OpenJS issue for reference.
content/version/2/0/code_of_conduct.md Outdated Show resolved Hide resolved
content/version/2/0/code_of_conduct.md Outdated Show resolved Hide resolved
nainar and others added 3 commits November 11, 2019 14:36
Co-Authored-By: Jordan Harband <ljharb@gmail.com>
Co-Authored-By: Jordan Harband <ljharb@gmail.com>
@nainar
Copy link
Author

nainar commented Nov 19, 2019

What's the process on getting these merged? Are we looking for more approvals here?

@CoralineAda
Copy link
Member

CoralineAda commented Nov 20, 2019 via email

@nainar
Copy link
Author

nainar commented Nov 25, 2019

No problem! Just wanted to clarify the procedure going forward! Take your time!

@@ -11,15 +11,19 @@ We as members, contributors, and leaders pledge to make participation in our com

We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.

We believe that a diverse community where people treat each other with respect is stronger, more vibrant, and has more potential contributors and more sources for ideas. We aim for more diversity.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"diverse, welcoming, and inclusive"? Also, please drop "we aim for…" as that seems redundant?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
* Focusing on what is best not just for us as individuals, but for the overall community
* Using inclusive, gender-neutral language in the documents we provide and when we talk to people. When referring to a group of people, we aim to use gender-neutral terms like “team”, “folks”, “everyone”.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The language here feels a bit casual. Would you like to take a pass at making it match more of the rest of the style of the document, or would you rather that I propose new language?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made some changes inline. Take a look?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What Language @CoralineAda ? Kindly inform.

@nainar
Copy link
Author

nainar commented Jan 10, 2020

@CoralineAda pinging for review.

@tobie
Copy link
Contributor

tobie commented Mar 24, 2020

@CoralineAda and I chatted about this offline yesterday. The sense is that these change requests are too community-specific to be upstreamed at this point. The idea behind the Contributor Covenant, as expressed in the text itself ("Adapted from the Contributor Covenant"), is that communities should take ownership of their code of conduct and feel free to adapt it to their own needs. This is what she recommends we do here. I will take this feedback to the OpenJSF CPC today and we'll see how to best address it at the foundation level.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants