Diff
1diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
2new file mode 100644
3index 0000000000000000000000000000000000000000..20ad1cceecd280fe6a2bbeca64c3b448d1dce776
4--- /dev/null
5+++ b/CODE_OF_CONDUCT.md
6@@ -0,0 +1,76 @@
7+# Contributor Covenant Code of Conduct
8+
9+## Our Pledge
10+
11+In the interest of fostering an open and welcoming environment, we as
12+contributors and maintainers pledge to making participation in our project and
13+our community a harassment-free experience for everyone, regardless of age, body
14+size, disability, ethnicity, sex characteristics, gender identity and expression,
15+level of experience, education, socio-economic status, nationality, personal
16+appearance, race, religion, or sexual identity and orientation.
17+
18+## Our Standards
19+
20+Examples of behavior that contributes to creating a positive environment
21+include:
22+
23+* Using welcoming and inclusive language
24+* Being respectful of differing viewpoints and experiences
25+* Gracefully accepting constructive criticism
26+* Focusing on what is best for the community
27+* Showing empathy towards other community members
28+
29+Examples of unacceptable behavior by participants include:
30+
31+* The use of sexualized language or imagery and unwelcome sexual attention or
32+ advances
33+* Trolling, insulting/derogatory comments, and personal or political attacks
34+* Public or private harassment
35+* Publishing others' private information, such as a physical or electronic
36+ address, without explicit permission
37+* Other conduct which could reasonably be considered inappropriate in a
38+ professional setting
39+
40+## Our Responsibilities
41+
42+Project maintainers are responsible for clarifying the standards of acceptable
43+behavior and are expected to take appropriate and fair corrective action in
44+response to any instances of unacceptable behavior.
45+
46+Project maintainers have the right and responsibility to remove, edit, or
47+reject comments, commits, code, wiki edits, issues, and other contributions
48+that are not aligned to this Code of Conduct, or to ban temporarily or
49+permanently any contributor for other behaviors that they deem inappropriate,
50+threatening, offensive, or harmful.
51+
52+## Scope
53+
54+This Code of Conduct applies within all project spaces, and it also applies when
55+an individual is representing the project or its community in public spaces.
56+Examples of representing a project or community include using an official
57+project e-mail address, posting via an official social media account, or acting
58+as an appointed representative at an online or offline event. Representation of
59+a project may be further defined and clarified by project maintainers.
60+
61+## Enforcement
62+
63+Instances of abusive, harassing, or otherwise unacceptable behavior may be
64+reported by contacting the project team at ohmyzsh@planetargon.com. All
65+complaints will be reviewed and investigated and will result in a response that
66+is deemed necessary and appropriate to the circumstances. The project team is
67+obligated to maintain confidentiality with regard to the reporter of an incident.
68+Further details of specific enforcement policies may be posted separately.
69+
70+Project maintainers who do not follow or enforce the Code of Conduct in good
71+faith may face temporary or permanent repercussions as determined by other
72+members of the project's leadership.
73+
74+## Attribution
75+
76+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
77+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
78+
79+[homepage]: https://www.contributor-covenant.org
80+
81+For answers to common questions about this code of conduct, see
82+https://www.contributor-covenant.org/faq
83diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
84index ac263fd181110841bdb106599aa5848154d7ff19..f575157c21876fc09fb9bfa48297ad6a4ad1f158 100644
85--- a/CONTRIBUTING.md
86+++ b/CONTRIBUTING.md
87@@ -1,8 +1,10 @@
88 # CONTRIBUTING GUIDELINES
89
90-Oh-My-Zsh is a community-driven project. Contribution is welcome, encouraged and appreciated.
91+Oh-My-Zsh is a community-driven project. Contribution is welcome, encouraged, and appreciated.
92 It is also essential for the development of the project.
93
94+First, please take a moment to review our [code of conduct](CODE_OF_CONDUCT.md).
95+
96 These guidelines are an attempt at better addressing the huge amount of pending
97 issues and pull requests. Please read them closely.
98
99diff --git a/README.md b/README.md
100index 511e6aeff7093ed4785408b815fff9b64b55acd2..dd330d19e020ddd6a1f7729276a253120b156c68 100644
101--- a/README.md
102+++ b/README.md
103@@ -213,12 +213,16 @@ Oh My Zsh isn't for everyone. We'll miss you, but we want to make this an easy b
104
105 If you want to uninstall `oh-my-zsh`, just run `uninstall_oh_my_zsh` from the command-line. It will remove itself and revert your previous `bash` or `zsh` configuration.
106
107-## Contributing
108+## How do I contribute to Oh My Zsh?
109+
110+Before you participate in our delightful community, please read the [code of conduct](CODE_OF_CONDUCT.md).
111
112 I'm far from being a [Zsh](https://www.zsh.org/) expert and suspect there are many ways to improve – if you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
113
114 We also need people to test out pull-requests. So take a look through [the open issues](https://github.com/robbyrussell/oh-my-zsh/issues) and help where you can.
115
116+See [Contributing](CONTRIBUTING.md) for more details.
117+
118 ### Do NOT send us themes
119
120 We have (more than) enough themes for the time being. Please add your theme to the [external themes](https://github.com/robbyrussell/oh-my-zsh/wiki/External-themes) wiki page.