Merge pull request #23 from robszewczyk/feature/coc-updates

Modify the Code of Conduct to be in-line with Zigbee Aliance text

Merging, since I'm here.

CODE_OF_CONDUCT.md

@@ -1,19 +1,24 @@
+# Project CHIP Open Source Code of Conduct
 
-# Contributor Covenant Code of Conduct
+This Project CHIP Open Source – Code of Conduct applies to all those
+contributing to, participating in, or maintaining the Project CHIP
+open source project, including Zigbee Alliance members and
+non-members.
 
 ## Our Pledge
 
 In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to make participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
+contributors and maintainers pledge to make participation in our
+project and our community a harassment-free experience for everyone,
+regardless of age, body size, disability, ethnicity, sex
+characteristics, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance,
+race, religion, or sexual identity and orientation.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to creating a positive
+environment include:
 
 * Using welcoming and inclusive language
 * Being respectful of differing viewpoints and experiences
@@ -23,48 +28,54 @@ include:
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
+* The use of violent threats, abusive, discriminatory, or derogatory language
+* 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
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
+* Publishing others' private information, such as a physical or
+  electronic address, without explicit permission
+* Posting of violent content
+* Engaging in unwanted physical contact
+* Other conduct which could reasonably be considered inappropriate in
+  a professional setting
+* Advocating for or encouraging any of the above behaviors
 
 ## Our Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Project maintainers are expected to take appropriate and fair
+corrective action in response to any instances of unacceptable
+behavior.  Project maintainers have the right and responsibility to
+remove, edit, or reject comments, commits, code, wiki edits, issues,
+and other contributions that are not aligned to this Code of Conduct,
+or to ban temporarily or permanently any contributor for other
+behaviors that they deem inappropriate, threatening, offensive, or
+harmful.
 
 ## Scope
 
-This Code of Conduct applies within all project spaces, and it also applies when
-an individual is representing the project or its community in public spaces.
-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.
+This Code of Conduct applies within all project spaces, and it also
+applies when an individual is representing the project or its
+community in public spaces. 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.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
+Instances of abusive, harassing, or otherwise unacceptable behavior
+may be reported by contacting the Project CHIP open source team at
+[INSERT EMAIL ADDRESS]. All complaints will be reviewed and
+investigated and will result in a response that is deemed necessary
+and appropriate to the circumstances. The Project CHIP open source
+team should maintain confidentiality with regard to the reporter of an
+incident. Further details of specific enforcement policies may be
+posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct
+in good faith may face temporary or permanent repercussions as
+determined by Project CHIP open source leadership.
 
 ## Attribution