Skip to content

Small updates to Code of Conduct language #1079

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

Merged
merged 5 commits into from
Oct 19, 2019
Merged

Small updates to Code of Conduct language #1079

merged 5 commits into from
Oct 19, 2019

Conversation

TimMoore
Copy link

These changes were made in the Lightbend Community Code of Conduct and are being proposed to the upstream Scala Code of Conduct as minor improvements consistent with the spirit of the existing code.

  • Update introductory statement with characteristics from the Contributor Covenant v1.4.1
  • Inline examples of unacceptable behavior from Citizen Code of Conduct
  • Consistently suggest to "contact the moderation team" rather than "contact one of the moderators"
  • Clarify moderation of cursing in "a hateful or aggressive" manner
  • Include Citizen Code of Conduct in the Credits section

These changes were made in the Lightbend Community Code of Conduct
(https://www.lightbend.com/conduct) and are being proposed to the
upstream Scala Code of Conduct as minor improvements consistent with the
spirit of the existing code.

- Update introductory statement with characteristics from the
  Contributor Covenant v1.4.1:
  https://www.contributor-covenant.org/version/1/4/code-of-conduct
- Inline examples of unacceptable behavior from Citizen Code of Conduct
- Consistently suggest to "contact the moderation team" rather than
  "contact one of the moderators"
- Clarify moderation of cursing in "a hateful or aggressive" manner
- Include Citizen Code of Conduct in the Credits section
@tpolecat
Copy link

It's awkward for the language's maintainer to not adopt the language's own CoC, so to the extent that this is necessary for Lightbend (due to many of their community members not being Scala programmers IIUC) I hope we can converge on common language quickly. These changes seem fine to me.

@SethTisue
Copy link
Member

attn @sjrd @darjutak

@SethTisue
Copy link
Member

Consistently suggest to "contact the moderation team" rather than "contact one of the moderators"

I don't see any changes in this area in the diffs?

@TimMoore
Copy link
Author

Consistently suggest to "contact the moderation team" rather than "contact one of the moderators"

I don't see any changes in this area in the diffs?

It's hard to spot because it got lumped in with the inlining of the Citizen Code of Conduct:

https://github.com/scala/scala-lang/pull/1079/files#diff-102cddd805ad66d3e769233af629d8b3R49

- - Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member's behavior, please [contact one of the moderators](#contact) immediately.
+ - Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member's behavior, please [contact the moderation team](#contact) immediately.

@TimMoore
Copy link
Author

To @tpolecat's point, if for some reason these changes aren't accepted, we can change the version at https://www.lightbend.com/conduct to align. I agree that keeping them as close as possible is a good thing, and more important than making minor clarifications that cause them to diverge. However these changes were all suggested by various Lightbend employees as improvements to the original wording or formatting, and I agree that they are improvements, so they seemed worth including with the intent of proposing them back here.

In the future, I think it will be better to suggest the improvements upstream here first, and then align https://www.lightbend.com/conduct with any changes that are merged into this version.

Copy link
Member

@SethTisue SethTisue left a comment

Choose a reason for hiding this comment

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

LGTM, but let's allow at least another week for community review

Copy link
Member

@sjrd sjrd left a comment

Choose a reason for hiding this comment

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

All the changes look positive to me, and in the spirit of the existing CoC.

@SethTisue SethTisue merged commit eb2cacf into scala:master Oct 19, 2019
@SethTisue
Copy link
Member

thanks, all, for the help getting this into final form

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.

8 participants