Differences

This shows you the differences between two versions of the page.

--- coc [2018/06/20 20:23] – Added first released version. madmaurice
+++ coc [2018/06/20 20:26] – [11. License and attribution] wrong link format madmaurice
@@ Line 34: / Line 34: @@
 The following behaviors are expected and requested of all community members:
-  * Try to participate in an authentic and active way. In doing so, you
+  * Try to participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
-    contribute to the health and longevity of this community.
   * Exercise consideration and respect in your speech and actions.
   * Attempt collaboration before conflict.
-  * Remember that community event venues may be shared with members of the
+  * Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
-    public; please be respectful to all patrons of these locations.
 ===== 4. Unacceptable Behavior =====
@@ Line 46: / Line 44: @@
 our community:
-  * Violence, threats of violence or violent language directed against another
+  * Violence, threats of violence or violent language directed against another person.
-    person.
+  * Sexist, racist, homophobic, transphobic, antisemitic, ableist or otherwise discriminatory jokes and language.
-  * Sexist, racist, homophobic, transphobic, antisemitic, ableist or otherwise discriminatory
-    jokes and language.
   * Posting or displaying sexually explicit or violent material.
-  * Posting or threatening to post other people's personally identifying
+  * Posting or threatening to post other people's personally identifying information ("doxing").
-    information ("doxing").
+  * Personal insults, particularly those related to gender, sexual orientation, race, religion, physical appearance or disability.
-  * Personal insults, particularly those related to gender, sexual orientation,
-    race, religion, physical appearance or disability.
   * Inappropriate photography or recording.
-  * Inappropriate physical contact. You should have someone's consent before
+  * Inappropriate physical contact. You should have someone's consent before touching them.
-    touching them.
+  * Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
-  * Unwelcome sexual attention. This includes, sexualized comments or jokes;
-    inappropriate touching, groping, and unwelcomed sexual advances.
   * Deliberate intimidation, stalking or following (online or in person).
   * Sustained disruption of community events, including talks and presentations.
@@ Line 130: / Line 122: @@
 ===== 11. License and attribution =====
-The Citizen Code of Conduct was originally developed by the [[Stumptown
+The Citizen Code of Conduct was originally developed by the [[http://stumptownsyndicate.org|Stumptown
-Syndicate|http://stumptownsyndicate.org]] under a [[Creative Commons
+Syndicate]] under a [[http://creativecommons.org/licenses/by-sa/3.0/|Creative Commons
-Attribution-ShareAlike license|http://creativecommons.org/licenses/by-sa/3.0/]].
+Attribution-ShareAlike license]].
+It was forked by [[http://zom.bi|Zom.bi]] and slightly adapted.
-It was forked by [[Zom.bi|http://zom.bi]] and slightly adapted.
+Portions of text derived from the [[https://www.djangoproject.com/conduct/|Django Code of
+Conduct]] and the [[http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy|Geek Feminism Anti-Harassment Policy]].
-Portions of text derived from the [[Django Code of
-Conduct|https://www.djangoproject.com/conduct/]] and the [[Geek Feminism
-Anti-Harassment
-Policy|http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy]].
 //Revision 1. Adapted from the stumptown syndicate revision 2.3 on May 26 2018.//