From f142192de3d10682d37eb1408fe0b2ae30fa22bf Mon Sep 17 00:00:00 2001 From: Susan Spencer Date: Thu, 8 Sep 2016 02:21:15 +0000 Subject: [PATCH 1/2] code_of_conduct.md edited online with Bitbucket, minor description additions --HG-- branch : develop --- code_of_conduct.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code_of_conduct.md b/code_of_conduct.md index 6e226f09b..e727e1f5d 100644 --- a/code_of_conduct.md +++ b/code_of_conduct.md @@ -18,14 +18,14 @@ include: * Being respectful of differing viewpoints and experiences * Gracefully accepting constructive criticism * Focusing on what is best for the community -* Showing empathy towards other community members +* Showing empathy and kindness towards other community members Examples of unacceptable behavior by participants include: -* The use of sexualized language or imagery and unwelcome sexual attention or -advances +* The use of sexualized language or imagery and unwelcome sexual attention or advances * Trolling, insulting/derogatory comments, and personal or political attacks * Public or private harassment +* Angry, demanding, or self-aggrandizing comments * Publishing others' private information, such as a physical or electronic address, without explicit permission * Other conduct which could reasonably be considered inappropriate in a @@ -49,8 +49,10 @@ This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. +representative at an online or offline event. The Code of Conduct also applies +to attendees of a project-sponsored online or physical event, whether as part +of another larger event or as a project community event. Representation of a +project may be further defined and clarified by project maintainers. ## Enforcement From 6fa93c7c5f27aacd95bf2eba1454191f7e9a89db Mon Sep 17 00:00:00 2001 From: Susan Spencer Date: Thu, 8 Sep 2016 02:29:19 +0000 Subject: [PATCH 2/2] code_of_conduct.md edited online with Bitbucket, addition to examples of behavior --HG-- branch : develop --- code_of_conduct.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code_of_conduct.md b/code_of_conduct.md index e727e1f5d..d57e3e31c 100644 --- a/code_of_conduct.md +++ b/code_of_conduct.md @@ -28,6 +28,7 @@ Examples of unacceptable behavior by participants include: * Angry, demanding, or self-aggrandizing comments * Publishing others' private information, such as a physical or electronic address, without explicit permission +* Fraudulent behavior of any nature * Other conduct which could reasonably be considered inappropriate in a professional setting @@ -46,11 +47,11 @@ threatening, offensive, or harmful. ## Scope This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of +when an individual is participating in or representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. The Code of Conduct also applies -to attendees of a project-sponsored online or physical event, whether as part +representative at an online or offline event. Examples of participating include +attending project-sponsored online or physical events, whether as part of another larger event or as a project community event. Representation of a project may be further defined and clarified by project maintainers.