Ubuntu Code of Conduct

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

harassment-clause
Merge into trunk

Proposed by Michael Hall on 2016-07-12

Status:

Work in progress

Proposed branch:

lp://staging/~mhall119/ubuntu-codeofconduct/harassment-clause

Merge into:

lp://staging/ubuntu-codeofconduct

Diff against target:

14 lines (+3/-2)

1 file modified

CodeOfConduct.txt (+3/-2)

To merge this branch:

bzr merge lp://staging/~mhall119/ubuntu-codeofconduct/harassment-clause

Undecided

Confirmed

Link a bug report

Reviewer	Date Requested	Status
Stephen Michael Kellat (community)		Abstain on 2016-07-14
Ubuntu Community Council	2016-07-12	Pending
Review via email: mp+299835@code.staging.launchpad.net

Description of the change

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

Revision history for this message

Michael Hall (mhall119) wrote on 2016-07-12:

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

Revision history for this message

Stephen Michael Kellat (skellat) wrote on 2016-07-14:

-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