From 0aa41ed5755941f9f0dceae32d0a0ebb55318c56 Mon Sep 17 00:00:00 2001
From: Greg Wilson <gvwilson@third-bit.com>
Date: Sun, 1 Mar 2015 16:07:50 -0500
Subject: [PATCH] Adding a contributor code of conduct
---
CONDUCT.md | 13 +++++++++++++
CONTRIBUTING.md | 3 +++
2 files changed, 16 insertions(+)
create mode 100644 CONDUCT.md
diff --git a/CONDUCT.md b/CONDUCT.md
new file mode 100644
index 0000000..607137e
--- /dev/null
+++ b/CONDUCT.md
@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+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, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+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. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 76a7ba8..f59197a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,6 +8,8 @@ and reviews of proposed changes are all equally welcome.
By contributing,
you are agreeing that Software Carpentry may redistribute your work under
[these licenses][license].
+You also agree to abide by our
+[contributor code of conduct][conduct].
## Getting Started
@@ -38,6 +40,7 @@ you are agreeing that Software Carpentry may redistribute your work under
lists the people currently responsible for managing this repository.
Feel free to contact them if you have any questions or languishing pull requests.
+[conduct]: CONDUCT.md
[lesson-template-issues]: https://github.com/swcarpentry/lesson-template/issues
[license]: LICENSE.md
[pro-git]: http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project
--
GitLab