Skip to content

Commit

Permalink
Fix lint errors
Browse files Browse the repository at this point in the history
Signed-off-by: Brandon Lum <[email protected]>
  • Loading branch information
lumjjb committed Jun 17, 2021
1 parent 37932f8 commit 57843f1
Showing 1 changed file with 42 additions and 41 deletions.
83 changes: 42 additions & 41 deletions CODE-OF-CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,65 +10,66 @@ native language, operating system choice, current software stack or prior
experience.

In keeping with this commitment, we offer the following guidelines:
* Welcome newcomers at any stage of expertise.
* Everyone has something to contribute.
* Everyone deserves access to materials and community that will help them

* Welcome newcomers at any stage of expertise.
* Everyone has something to contribute.
* Everyone deserves access to materials and community that will help them
learn.
* As long as an individual can be respectful and not disruptive to other
* As long as an individual can be respectful and not disruptive to other
participants, they deserve to participate.
* Provide open and free material.
* Be kind and courteous.
* Interpret the arguments of others in good faith, offering private
* Provide open and free material.
* Be kind and courteous.
* Interpret the arguments of others in good faith, offering private
constructive feedback when communication style bears improvement.
* Leave space for quieter voices.
* Consider who is not in the room.
* Invite participation from experts or user community representatives
* Leave space for quieter voices.
* Consider who is not in the room.
* Invite participation from experts or user community representatives
outside of the working group.
* Participate in online forums to be inclusive of those who cannot attend
* Participate in online forums to be inclusive of those who cannot attend
meetings.
* Work performed within this group, either finalized or in draft, is to be
* Work performed within this group, either finalized or in draft, is to be
used in accordance with the group [Mission and
Charter][charter],
the open source license, and to be used for the equal benefit of all
members of the community. Further information on use of work may be found
in [Security Reviews:
Outcome][review-outcome]


# Incident handling and escalation
## Incident handling and escalation

Content for the purposes of the code of conduct as well as incident is defined
not only as published or draft content but also online discourse, such as slack
messages or emails, and interactions at in-person events. If an incident
involving community conduct occurs, please follow the guidelines below on how to
handle and report the issue:

- If you see content that clearly does not meet the official Code of Conduct,
* If you see content that clearly does not meet the official Code of Conduct,
please send an e-mail to the Co-Chair/TL mailing list
([email protected]) and the creator of the content. (For
more details refer to the [CNCF Code of Conduct][cncf-coc]). If it is regarding a
co-chair, reach out to the two other chairs directly if you are uncomfortable using
the mailing list.
- If you are uncomfortable with a piece of content (but it may not necessarily
more details refer to the [CNCF Code of Conduct][cncf-coc]). If it is
regarding a co-chair, reach out to the two other chairs directly if you are
uncomfortable using the mailing list.
* If you are uncomfortable with a piece of content (but it may not necessarily
violate the code of conduct), we suggest sending a private message to the
content owner expressing your concerns. If this is not resolved, you may wish
to request the help of a Co-Chair/TL via [email protected]
to help mediate the situation.
- Discussions about these potential code of conduct violations and concerns are important, and there are great avenues to
discuss them. This includes bringing up concerns to the [CNCF TOC][cncf-toc]
(which can be done through discussion with Security TAG leadership) or talking
to Security TAG leadership about moderating a post. To help ensure that we can
give focus to these issues and not tangle them up with technical discussions,
we should keep these discussions separate from channels which are focused
around technical exchange.
* Discussions about these potential code of conduct violations and concerns are
important, and there are great avenues to discuss them. This includes bringing
up concerns to the [CNCF TOC][cncf-toc] (which can be done through discussion
with Security TAG leadership) or talking to Security TAG leadership about
moderating a post. To help ensure that we can give focus to these issues and
not tangle them up with technical discussions, we should keep these
discussions separate from channels which are focused around technical
exchange.

For content creators:

- Content must strive to remain _on-topic_, particularly where video and images
* Content must strive to remain _on-topic_, particularly where video and images
are provided. Use of emojis and gifs as responses are content in and of
themselves need to be relevant to the particular post. For examples please
refer to the reference section below.
- If you receive a notice about a piece of content you've created, please seek
refer to the reference section below.
* If you receive a notice about a piece of content you've created, please seek
to understand that in some cases you may not agree with a decision or request.
Being able to practice tolerance and mindfulness is just as important to keep
the community working towards a common goal. The mediation and resolution
Expand All @@ -77,10 +78,10 @@ For content creators:
not zero sum, and often we aim to reach an agreeable compromise where a
discussion of a topic can happen without making members of the community feel
uncomfortable.
- In the event where there is disagreement, we have some guidelines that can
* In the event where there is disagreement, we have some guidelines that can
help prevent escalation
- Do not bring the discussion out of context.
- Do not rationalize the actions you take. We do not expect anyone to
* Do not bring the discussion out of context.
* Do not rationalize the actions you take. We do not expect anyone to
understand what everyone else feels towards certain things (e.g. the same
gestures in certain cultures are good and bad in others). Understand that
something may not be wrong, but it may affect others.
Expand All @@ -102,20 +103,20 @@ voting, opinion, acceptance, emotion, etc.
Example of reasonable image and video: Posting a picture of a community meetup*
or posting a recording to a presentation on cloud native security.

*Note: Many events within the community may include content which is only acceptable depending on the context it is used in.
An example of this is alcohol consumption. It is
important that when posting photos and videos members consider if the post
glorifies alcohol or alcohol is the primary subject of the content
(unacceptable) or if the alcohol is happenstance occurrence in the image
*Note: Many events within the community may include content which is only
acceptable depending on the context it is used in. An example of this is
alcohol consumption. It is important that when posting photos and videos members
consider if the post glorifies alcohol or alcohol is the primary subject of the
content (unacceptable) or if the alcohol is happenstance occurrence in the image
(acceptable).

# Inspiration
## Inspiration

The above guidelines are inspired by and borrowed from other communities:

* https://bridgefoundry.org/code-of-conduct
* https://www.rust-lang.org/policies/code-of-conduct
* https://golang.org/conduct
* <https://bridgefoundry.org/code-of-conduct>
* <https://www.rust-lang.org/policies/code-of-conduct>
* <https://golang.org/conduct>

[cncf-coc]: https://github.com/cncf/foundation/blob/master/code-of-conduct.md
[charter]: https://github.com/cncf/tag-security/blob/main/governance/charter.md
Expand Down

0 comments on commit 57843f1

Please sign in to comment.