From 9646037a66800b249b2bd691caaf054c31d43220 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 19 Jun 2018 16:12:41 +0100 Subject: [PATCH] Mention forms of harassment in code of conduct --- code-of-conduct.md | 2 +- doc/EN/codeofconduct.org | 2 +- website/EN/codeofconduct.html | 4 ++-- website/EN/faq.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code-of-conduct.md b/code-of-conduct.md index ef31df15..d868b055 100644 --- a/code-of-conduct.md +++ b/code-of-conduct.md @@ -38,7 +38,7 @@ In cases of sincere, good-faith curiosity about someone’s experience or identi ## No hostile communication -No insults, harassment, condescension, ad hominem, threats, or other intimidation. +No insults, harassment (sexual or otherwise), condescension, ad hominem, threats, or other intimidation. Condescension means treating others as inferior. Subtle condescension still violates the Code of Conduct even if not blatantly demeaning. diff --git a/doc/EN/codeofconduct.org b/doc/EN/codeofconduct.org index 04761dde..fc2d1b60 100644 --- a/doc/EN/codeofconduct.org +++ b/doc/EN/codeofconduct.org @@ -44,7 +44,7 @@ No stalking, unwanted personal attention, or unwelcome revealing or speculating In cases of sincere, good-faith curiosity about someone’s experience or identity, ask politely in a manner such that they will feel free to decline the request. * No hostile communication -No insults, harassment, condescension, ad hominem, threats, or other intimidation. +No insults, harassment (sexual or otherwise), condescension, ad hominem, threats, or other intimidation. Condescension means treating others as inferior. Subtle condescension still violates the Code of Conduct even if not blatantly demeaning. diff --git a/website/EN/codeofconduct.html b/website/EN/codeofconduct.html index a67f37ae..9bd4b47e 100644 --- a/website/EN/codeofconduct.html +++ b/website/EN/codeofconduct.html @@ -4,7 +4,7 @@ - + @@ -236,7 +236,7 @@ In cases of sincere, good-faith curiosity about someone’s experience or identi

No hostile communication

-No insults, harassment, condescension, ad hominem, threats, or other intimidation. +No insults, harassment (sexual or otherwise), condescension, ad hominem, threats, or other intimidation.

diff --git a/website/EN/faq.html b/website/EN/faq.html index 4e97a819..27fc5b11 100644 --- a/website/EN/faq.html +++ b/website/EN/faq.html @@ -4,7 +4,7 @@ - +