/ static / diffs / 1_3_vs_1_4.patch
1_3_vs_1_4.patch
  1  --- version/1/3/0/code_of_conduct.md	2015-12-02 08:41:36.000000000 -0600
  2  +++ version/1/4/code_of_conduct.md	2016-01-26 09:27:55.000000000 -0600
  3  @@ -1,24 +1,41 @@
  4  -# Contributor Code of Conduct
  5  +# Contributor Covenant Code of Conduct
  6   
  7  -As contributors and maintainers of this project, and in the interest of
  8  -fostering an open and welcoming community, we pledge to respect all people who
  9  -contribute through reporting issues, posting feature requests, updating
 10  -documentation, submitting pull requests or patches, and other activities.
 11  -
 12  -We are committed to making participation in this project a harassment-free
 13  -experience for everyone, regardless of level of experience, gender, gender
 14  -identity and expression, sexual orientation, disability, personal appearance,
 15  -body size, race, ethnicity, age, religion, or nationality.
 16  +## Our Pledge
 17  +
 18  +In the interest of fostering an open and welcoming environment, we as
 19  +contributors and maintainers pledge to making participation in our project and
 20  +our community a harassment-free experience for everyone, regardless of age, body
 21  +size, disability, ethnicity, gender identity and expression, level of experience,
 22  +nationality, personal appearance, race, religion, or sexual identity and
 23  +orientation.
 24  +
 25  +## Our Standards
 26  +
 27  +Examples of behavior that contributes to creating a positive environment
 28  +include:
 29  +
 30  +* Using welcoming and inclusive language
 31  +* Being respectful of differing viewpoints and experiences
 32  +* Gracefully accepting constructive criticism
 33  +* Focusing on what is best for the community
 34  +* Showing empathy towards other community members
 35   
 36   Examples of unacceptable behavior by participants include:
 37   
 38  -* The use of sexualized language or imagery
 39  -* Personal attacks
 40  -* Trolling or insulting/derogatory comments
 41  +* The use of sexualized language or imagery and unwelcome sexual attention or
 42  +advances
 43  +* Trolling, insulting/derogatory comments, and personal or political attacks
 44   * Public or private harassment
 45  -* Publishing other's private information, such as physical or electronic
 46  -  addresses, without explicit permission
 47  -* Other unethical or unprofessional conduct
 48  +* Publishing other's private information, such as a physical or electronic
 49  +  address, without explicit permission
 50  +* Other conduct which could reasonably be considered inappropriate in a
 51  +  professional setting
 52  +
 53  +## Our Responsibilities
 54  +
 55  +Project maintainers are responsible for clarifying the standards of acceptable
 56  +behavior and are expected to take appropriate and fair corrective action in
 57  +response to any instances of unacceptable behavior.
 58   
 59   Project maintainers have the right and responsibility to remove, edit, or
 60   reject comments, commits, code, wiki edits, issues, and other contributions
 61  @@ -26,25 +43,32 @@
 62   permanently any contributor for other behaviors that they deem inappropriate,
 63   threatening, offensive, or harmful.
 64   
 65  -By adopting this Code of Conduct, project maintainers commit themselves to
 66  -fairly and consistently applying these principles to every aspect of managing
 67  -this project. Project maintainers who do not follow or enforce the Code of
 68  -Conduct may be permanently removed from the project team.
 69  +## Scope
 70   
 71   This Code of Conduct applies both within project spaces and in public spaces
 72  -when an individual is representing the project or its community.
 73  +when an individual is representing the project or its community. Examples of
 74  +representing a project or community include using an official project e-mail
 75  +address, posting via an official social media account, or acting as an appointed
 76  +representative at an online or offline event. Representation of a project may be
 77  +further defined and clarified by project maintainers.
 78  +
 79  +## Enforcement
 80   
 81   Instances of abusive, harassing, or otherwise unacceptable behavior may be
 82  -reported by contacting a project maintainer at [INSERT EMAIL ADDRESS]. All
 83  +reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
 84   complaints will be reviewed and investigated and will result in a response that
 85  -is deemed necessary and appropriate to the circumstances. Maintainers are
 86  -obligated to maintain confidentiality with regard to the reporter of an
 87  -incident.
 88  +is deemed necessary and appropriate to the circumstances. The project team is
 89  +obligated to maintain confidentiality with regard to the reporter of an incident.
 90  +Further details of specific enforcement policies may be posted separately.
 91  +
 92  +Project maintainers who do not follow or enforce the Code of Conduct in good
 93  +faith may face temporary or permanent repercussions as determined by other
 94  +members of the project's leadership.
 95   
 96  +## Attribution
 97   
 98  -This Code of Conduct is adapted from the [Contributor Covenant][homepage],
 99  -version 1.3.0, available at
100  -[http://contributor-covenant.org/version/1/3/0/][version]
101  +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
102  +available at [http://contributor-covenant.org/version/1/4][version]
103   
104   [homepage]: http://contributor-covenant.org
105  -[version]: http://contributor-covenant.org/version/1/3/0/
106  +[version]: http://contributor-covenant.org/version/1/4/