Skip to content

Commit

Permalink
Fix an oopsie in the code of conduct with weird list formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
solonovamax committed Sep 6, 2022
1 parent f851276 commit befc0c6
Showing 1 changed file with 17 additions and 24 deletions.
41 changes: 17 additions & 24 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,7 @@ members:
-
discord: [@solonovamax#6983](https://discord.com/channels/@me/566146322273402881)*
- github: [@solonovamax](https://github.com/solonovamax)
-
email: [[email protected]](mailto:[email protected])
- email: [[email protected]](mailto:[email protected])
- dfsek
-
discord: [@dfsek#4208](https://discord.com/channels/@me/378350362236682240)*
Expand Down Expand Up @@ -401,32 +400,27 @@ issue on this github repo, or contact a member of the global moderation team.
## License and Attribution

This set of guidelines is distributed under a
[Creative Commons Attribution-ShareAlike license](https://creativecommons.org/licenses/by-sa/3.0/)
.
[Creative Commons Attribution-ShareAlike license](https://creativecommons.org/licenses/by-sa/3.0/).

These guidelines have been adapted from
[Mozilla's Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/)
, which were adapted from:
[Mozilla's Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/),
which were adapted from:

- Mozilla's original Community Participation Guidelines
- The [Ubuntu Code of Conduct](https://ubuntu.com/community/code-of-conduct)
-
- Mozilla's [View Source Conference Code of Conduct](https://viewsourceconf.org/berlin-2016/code-of-conduct/)
- The [Rust Language Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct)

Mozilla's [View Source Conference Code of Conduct](https://viewsourceconf.org/berlin-2016/code-of-conduct/)
which in turn were based on
[Stumptown Syndicate's Citizen Code of Conduct](http://citizencodeofconduct.org/),
along with some adapted text from the
[LGBTQ in Technology Code of Conduct](https://lgbtq.technology/coc.html)
and the
[WisCon code of conduct](http://wiscon.net/policies/anti-harassment/code-of-conduct/).

- And
the [Rust Language Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct)

which in turn were based
on [Stumptown Syndicate's Citizen Code of Conduct](http://citizencodeofconduct.org/)
, along with some adapted text from
the [LGBTQ in Technology Code of Conduct](https://lgbtq.technology/coc.html) and
the [WisCon code of conduct](http://wiscon.net/policies/anti-harassment/code-of-conduct/)
.

It was then modified by solonovamax with various inclusions from
the [LGBTQ in Technology Code of Conduct](https://lgbtq.technology/coc.html) and
a few other sources.
It was then modified by solonovamax with various inclusions from the
[LGBTQ in Technology Code of Conduct](https://lgbtq.technology/coc.html)
and several other sources.

## Notes

Expand All @@ -443,7 +437,6 @@ people are not comfortable
using [neopronouns](https://www.mypronouns.org/neopronouns). But if someone
refuses to use your more common pronouns, you should report them to us.
Additionally, you may not ask people to use unreasonable pronouns, such as '
acab/acabself', 'that/bitch', 'ur/mom', or
'dream/dreamself' (pronouns related to real people, eg. the minecraft youtuber '
dreamwastaken'). Doing so will be considered mockery of individuals who use
acab/acabself', 'that/bitch', 'ur/mom', or anything else that may be considered
disrectful. Doing so will be considered mockery of individuals who use
non-standard pronouns and is very disrespectful.

0 comments on commit befc0c6

Please sign in to comment.