Skip to content

Commit

Permalink
Update code-of-conduct.md (o3de#2469)
Browse files Browse the repository at this point in the history
* Update code-of-conduct.md

Removed mentions of CNCF

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>

* Update code-of-conduct.md

Removed now extraneous line regarding other languages.

Signed-off-by: Roddie Kieley <rkieley@redhat.com>

---------

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>
Signed-off-by: Roddie Kieley <rkieley@redhat.com>
Co-authored-by: Roddie Kieley <rkieley@redhat.com>
(cherry picked from commit d9d3a03)
  • Loading branch information
Naomi-Wash authored and RoddieKieley committed Sep 30, 2023
1 parent 26bc1b9 commit d874d60
Showing 1 changed file with 4 additions and 21 deletions.
25 changes: 4 additions & 21 deletions content/docs/contributing/code-of-conduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,7 @@ description: Before you join the O3DE project, make sure you understand the cond
weight: 600
---

## CNCF Community Code of Conduct v1.0

Other languages available:

- [Arabic/العربية](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/ar.md)
- [Chinese/中文](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/zh.md)
- [Czech/Česky](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/cs.md)
- [French/Français](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/fr.md)
- [German/Deutsch](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/de.md)
- [Indonesian/Bahasa Indonesia](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/id.md)
- [Italian/Italiano](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/it.md)
- [Japanese/日本語](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/jp.md)
- [Korean/한국어](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/ko.md)
- [Polish/Polski](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/pl.md)
- [Portuguese/Português](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/pt.md)
- [Russian/Русский](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/ru.md)
- [Spanish/Español](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/es.md)
- [Ukrainian/Українська](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/uk.md)
## Community Code of Conduct v1.0

### Contributor Code of Conduct

Expand Down Expand Up @@ -56,10 +39,10 @@ Conduct may be permanently removed from the project team.
This code of conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community.

Instances of abusive, harassing, or otherwise unacceptable behavior in O3DE may be reported by contacting the [O3DE Code of Conduct Committee](https://github.com/o3de/foundation/tree/main/committee/committee-code-of-conduct) via <conduct@o3de.org>. For other projects, please contact a CNCF project maintainer.
Instances of abusive, harassing, or otherwise unacceptable behavior in O3DE may be reported by contacting the [O3DE Code of Conduct Committee](https://github.com/o3de/foundation/tree/main/committee/committee-code-of-conduct) via <conduct@o3de.org>. For other projects, please contact a project maintainer.

This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available [here](http://contributor-covenant.org/version/1/2/0/).

### CNCF Events Code of Conduct
### Events Code of Conduct

CNCF events are governed by the Linux Foundation [Code of Conduct](https://events.linuxfoundation.org/code-of-conduct/) available on the event page. This is designed to be compatible with the above policy and also includes more details on responding to incidents
O3DF events are governed by the Linux Foundation [Code of Conduct](https://events.linuxfoundation.org/code-of-conduct/) available on the event page. This is designed to be compatible with the above policy and also includes more details on responding to incidents

0 comments on commit d874d60

Please sign in to comment.