Skip to content
This repository was archived by the owner on Sep 20, 2018. It is now read-only.

Conversation

ammeep
Copy link

@ammeep ammeep commented Jun 22, 2015

👋

As discussed here https://github.com/github/opencodeofconduct.github.io/pull/1

I had a go at incorporating the explicit definitions of harassment found here http://geekfeminism.wikia.com/wiki/Community_anti-harassment/Policy

One thing I really like about the GF code of conduct is that there is a secondary document which allows the definition and formation of an Anti Abuse Team. I have included that also.

This is ready for 👀 and feedback cc @bkeepers @caniszczyk

@@ -2,47 +2,66 @@
layout: default
---

_The purpose of creating this effort was to promote more open source organizations and projects to adopt code of conducts. Through our experiences at the [@TODOGroup](https://twitter.com/todogroup), we strongly believe that code of conducts help set the ground rules for participation in communities and more importantly, help build a culture of respect. We hope by [sharing this with you](https://github.com/opencodeofconduct/opencodeofconduct.github.io) will enable you to easily establish a code of conduct for your respective open source community. The following is a code of conduct template. To generate your own code of conduct, change the values of COMMUNITY, CONTACT from their original values as given here, and substitute your own._
The purpose of creating this effort was to promote more open source organizations and projects to adopt code of conducts. Through our experiences at the [@TODOGroup](https://twitter.com/todogroup), we strongly believe that code of conducts help set the ground rules for participation in communities and more importantly, help build a culture of respect. We hope by [sharing this with you](https://github.com/opencodeofconduct/opencodeofconduct.github.io) will enable you to easily establish a code of conduct for your respective open source community. The following is a code of conduct template. To generate your own code of conduct, change the values of COMMUNITY, CONTACT from their original values as given here, and substitute your own._
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_ at the start to bring back the italics

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the second URL here should be this repo, which links to:

[sharing this with you](http://todogroup.org/opencodeofconduct/)

@shiftkey
Copy link
Contributor

@ammeep this is great! Found a couple of minor things to update, but the rest is ✨!

This code of conduct outlines our expectations for participants within the **[COMMUNITY]**, as well as steps to reporting unacceptable behavior. We are committed to providing a welcoming and inspiring community for all and expect our code of conduct to be honored.
Our open source community is dedicated to providing a harassment-free experience for everyone. We do not tolerate harassment of participants in any form.

Anyone who violates this code of conduct may be permanently banned from out community. This is at the discretion of [the Anti-Abuse team](/report-abuse.html).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From our* community

@caniszczyk
Copy link
Member

Sorry for the delay on this one, I totally agree we should incorporate these changes. I'll work on incorporating these changes, just need to refactor them a bit so they can merge cleanly, I'll make sure to keep the original authorship.

@caniszczyk
Copy link
Member

Hey @ammeep, I did my best merging in some of your suggestions with this commit and keeping the attribution towards you:
6b9d181

I really want to strive to keep everything into one file instead of having two files. Please look it over and let me know if it's OK.

Also, I updated some of the language based on the updated Django code of conduct which was much better than it was before: https://www.djangoproject.com/conduct/ (it should meet the standards outlined here: http://geekfeminism.wikia.com/wiki/Code_of_conduct_evaluations)

Any other progress should be made in pull requests that are easier to merge cleanly into master from now on :)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants