1_2_vs_1_3.patch
1 --- version/1/2/0/code_of_conduct.md 2015-11-02 18:33:03.000000000 -0600 2 +++ version/1/3/0/code_of_conduct.md 2015-12-02 08:41:36.000000000 -0600 3 @@ -1,8 +1,14 @@ 4 # Contributor Code of Conduct 5 6 -As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. 7 - 8 -We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. 9 +As contributors and maintainers of this project, and in the interest of 10 +fostering an open and welcoming community, we pledge to respect all people who 11 +contribute through reporting issues, posting feature requests, updating 12 +documentation, submitting pull requests or patches, and other activities. 13 + 14 +We are committed to making participation in this project a harassment-free 15 +experience for everyone, regardless of level of experience, gender, gender 16 +identity and expression, sexual orientation, disability, personal appearance, 17 +body size, race, ethnicity, age, religion, or nationality. 18 19 Examples of unacceptable behavior by participants include: 20 21 @@ -10,13 +16,35 @@ 22 * Personal attacks 23 * Trolling or insulting/derogatory comments 24 * Public or private harassment 25 -* Publishing other's private information, such as physical or electronic addresses, without explicit permission 26 +* Publishing other's private information, such as physical or electronic 27 + addresses, without explicit permission 28 * Other unethical or unprofessional conduct 29 30 -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. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. 31 - 32 -This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. 33 - 34 -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. 35 +Project maintainers have the right and responsibility to remove, edit, or 36 +reject comments, commits, code, wiki edits, issues, and other contributions 37 +that are not aligned to this Code of Conduct, or to ban temporarily or 38 +permanently any contributor for other behaviors that they deem inappropriate, 39 +threatening, offensive, or harmful. 40 + 41 +By adopting this Code of Conduct, project maintainers commit themselves to 42 +fairly and consistently applying these principles to every aspect of managing 43 +this project. Project maintainers who do not follow or enforce the Code of 44 +Conduct may be permanently removed from the project team. 45 + 46 +This Code of Conduct applies both within project spaces and in public spaces 47 +when an individual is representing the project or its community. 48 + 49 +Instances of abusive, harassing, or otherwise unacceptable behavior may be 50 +reported by contacting a project maintainer at [INSERT EMAIL ADDRESS]. All 51 +complaints will be reviewed and investigated and will result in a response that 52 +is deemed necessary and appropriate to the circumstances. Maintainers are 53 +obligated to maintain confidentiality with regard to the reporter of an 54 +incident. 55 + 56 + 57 +This Code of Conduct is adapted from the [Contributor Covenant][homepage], 58 +version 1.3.0, available at 59 +[http://contributor-covenant.org/version/1/3/0/][version] 60 61 -This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) 62 +[homepage]: http://contributor-covenant.org 63 +[version]: http://contributor-covenant.org/version/1/3/0/