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.

Sign up for GitHub

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
Open

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

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ccd0b06
Update CoC to add some more harmful conduct.
nainar Nov 10, 2019
b0e8f46
Revert some edits
nainar Nov 11, 2019
cc787a3
Update content/version/2/0/code_of_conduct.md
nainar Nov 11, 2019
5eaef03
Update content/version/2/0/code_of_conduct.md
nainar Nov 11, 2019
edfaff3
behavios -> behaviour
nainar Nov 11, 2019
59b4bdf
Coraline's suggested changes
nainar Nov 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion content/version/2/0/code_of_conduct.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.


## Our Standards

Examples of behavior that contributes to a positive environment for our community include:

* Demonstrating empathy and kindness toward other people
* Demonstrating mutual respect and tolerance towards other people
* 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?

Copy link

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.


Examples of unacceptable behavior include:

Expand All @@ -31,6 +35,8 @@ Examples of unacceptable behavior include:
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
* Discriminating against anyone. Although we have phrased the formal diversity statement generically to make it all-inclusive, we recognize that there are specific attributes that are used to discriminate against people. In alphabetical order, some of these attributes include (but are not limited to): age, culture, ethnicity, gender identity or expression, national origin, physical or mental difference, politics, race, religion, sex, sexual orientation, socio-economic status, and subculture. We welcome people regardless of these or other attributes.
* Sexism and racism of any kind (including sexist and racist “jokes”), demeaning or insulting behavior, and harassment are seen as direct violations to this code of conduct. Harassment includes offensive verbal comments related to gender, sexual orientation, disability, physical appearance, body size, race, religion, sexual images in public spaces, deliberate intimidation, stalking, following, harassing photography or recording, inappropriate physical contact, and unwelcome sexual attention.

## Enforcement Responsibilities

Expand Down Expand Up @@ -74,7 +80,7 @@ Community leaders will follow these Community Impact Guidelines in determining t

**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within the project community.
**Consequence**: A permanent ban from any sort of public interaction within the community.

## Attribution

Expand Down