Skip to content
Merged
Changes from all commits
Commits
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
23 changes: 14 additions & 9 deletions code-of-conduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the CHAOSS Code of Conduct Team at <[email protected]>. All
reported by contacting the CHAOSS Code of Conduct Team at
<[email protected]>. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand All @@ -73,17 +74,16 @@ CHAOSS members or the general public. We will not name victims without their
affirmative consent.

The CHAOSS Code of Conduct Team will report on a yearly basis the number of
incidence reports. The CHAOSS Code of Conduct Team shall consist of four members:
two from each committee and at least two who are on the Governing Board.
Members are elected by the community every two years or when needed.
incidence reports. The CHAOSS Code of Conduct Team shall consist of three members
elected by the community every two years or when needed.

## Who to Contact

The following people comprise the CHAOSS Code of Conduct Team and are the only recipients of <[email protected]>:
- (To be elected from software committee and on governing board)
- (To be elected from metric committee and on governing board)
- (To be elected from software committee)
- (To be elected from metric committee)
The following people comprise the CHAOSS Code of Conduct Team and are the only
recipients of <[email protected]>:
- (To be elected)
- (To be elected)
- (To be elected)

## Attribution

Expand All @@ -97,6 +97,11 @@ available at https://geekfeminism.org/about/code-of-conduct/

## Version History

* v1.1 proposed on April 2, 2018; accepted by CHAOSS Governing Board on May 1, 2018
- update email address
- change requirements for Code of Conduct team to be more inclusive
- change to three members of team to have a tie-breaking vote

* v1.0 adopted through a CHAOSS Governing Board vote from February 12, 2018

* v1.0 proposed on [January 27, 2018](https://github.com/chaoss/governance/pull/3#issuecomment-360939881) by the working group consisting of:
Expand Down