Merge lp:~mhall119/ubuntu-codeofconduct/harassment-clause into lp:ubuntu-codeofconduct

[Michael Hall]

Following discussions on the ubuntu-community-team mailing list and subsequent UOS session, this makes explicit the anti-harassment sentiments of the Code of Conduct which were previously only infered from the other text.

See http://pad.ubuntu.com/uos-1605-code-of-conduct-review for context

[Michael Hall (mhall119)]

Need to bump the version number before landing, probably to 2.1?

[Stephen Michael Kellat (skellat)]

-1

I'm dealing in my day job with enough "guardhouse lawyers" and other people who actively seek out loopholes in search of great financial rewards. If we're going to use the term "harassment" then a reference to our understood definition needs to be made somewhere. The Code of Conduct does not need to be bulked up necessarily but reference needs to be made to the accepted definition.

review: Abstain

Unmerged revisions

42. By Michael Hall on 2016-07-12

Add specific mention about harassment not being tolerated to the 'Be Respectful' section

=== modified file 'CodeOfConduct.txt'
--- CodeOfConduct.txt	2013-03-25 12:38:48 +0000
+++ CodeOfConduct.txt	2016-07-12 16:16:24 +0000
@@ -35,8 +35,9 @@
   Disagreement is no excuse for poor manners. We work together to
   resolve conflict, assume good intentions and do our best to act in
   an empathic fashion. We don't allow frustration to turn into a
-  personal attack. A community where people feel uncomfortable or
-  threatened is not a productive one.
+  personal attack, and harassment in any form is never tolerated. A 
+  community where people feel uncomfortable or threatened is not a 
+  productive one.
 
   '''Take responsibility for our words and our actions.'''