From 7269de26511dbfc00f90e192ec7edce666130207 Mon Sep 17 00:00:00 2001 From: Tom Stuart Date: Mon, 2 Mar 2015 19:58:34 +0100 Subject: [PATCH 1/2] Include statement addressing violent imagery --- source/localizable/_code-of-conduct.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/localizable/_code-of-conduct.en.md b/source/localizable/_code-of-conduct.en.md index f94684a..82aa20b 100644 --- a/source/localizable/_code-of-conduct.en.md +++ b/source/localizable/_code-of-conduct.en.md @@ -33,7 +33,7 @@ Unacceptable Behavior Unacceptable behaviors include: intimidating, harassing, abusive, discriminatory, derogatory or demeaning speech or actions by any participant in our community online, at all related events and in one-on-one communications carried out in the context of community business. Community event venues may be shared with members of the public; please be respectful to all patrons of these locations. -Harassment includes: harmful or prejudicial verbal or written comments related to gender, sexual orientation, race, religion, disability; inappropriate use of nudity and/or sexual images in public spaces (including presentation slides); deliberate intimidation, stalking or following; harassing photography or recording; sustained disruption of talks or other events; inappropriate physical contact, and unwelcome sexual attention. +Harassment includes: harmful or prejudicial verbal or written comments related to gender, sexual orientation, race, religion, disability; inappropriate use of nudity and/or sexual images in public spaces (including presentation slides); inappropriate use of images depicting violence toward people or animals in public spaces (including presentation slides); deliberate intimidation, stalking or following; harassing photography or recording; sustained disruption of talks or other events; inappropriate physical contact, and unwelcome sexual attention. Consequences of Unacceptable Behavior From 53b270eba1a5ece221cbfe288ff6b56e74b6f4c6 Mon Sep 17 00:00:00 2001 From: Tom Stuart Date: Tue, 3 Mar 2015 10:16:26 +0100 Subject: [PATCH 2/2] Amend wording --- source/localizable/_code-of-conduct.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/localizable/_code-of-conduct.en.md b/source/localizable/_code-of-conduct.en.md index 82aa20b..94c199e 100644 --- a/source/localizable/_code-of-conduct.en.md +++ b/source/localizable/_code-of-conduct.en.md @@ -33,7 +33,7 @@ Unacceptable Behavior Unacceptable behaviors include: intimidating, harassing, abusive, discriminatory, derogatory or demeaning speech or actions by any participant in our community online, at all related events and in one-on-one communications carried out in the context of community business. Community event venues may be shared with members of the public; please be respectful to all patrons of these locations. -Harassment includes: harmful or prejudicial verbal or written comments related to gender, sexual orientation, race, religion, disability; inappropriate use of nudity and/or sexual images in public spaces (including presentation slides); inappropriate use of images depicting violence toward people or animals in public spaces (including presentation slides); deliberate intimidation, stalking or following; harassing photography or recording; sustained disruption of talks or other events; inappropriate physical contact, and unwelcome sexual attention. +Harassment includes: harmful or prejudicial verbal or written comments related to gender, sexual orientation, race, religion, disability; inappropriate use of nudity and/or sexual images in public spaces (including presentation slides); inappropriate depictions of violence in public spaces (including presentation slides); deliberate intimidation, stalking or following; harassing photography or recording; sustained disruption of talks or other events; inappropriate physical contact, and unwelcome sexual attention. Consequences of Unacceptable Behavior