Skip to content

Commit 090f9f3

Browse files
authored
Merge pull request opensearch-project#19 from dblock/dedup-code-of-conduct
De-dup code of conduct.
2 parents bbdc1dc + 41af98b commit 090f9f3

File tree

2 files changed

+4
-31
lines changed

2 files changed

+4
-31
lines changed

CODE_OF_CONDUCT.md

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
## Code of Conduct
22

3-
This code of conduct applies to all spaces provided by the OpenSource project including in code, documentation, issue trackers, mailing lists, chat channels, wikis, blogs, social media and any other communication channels used by the project.
4-
3+
This code of conduct applies to all spaces provided by the OpenSearch project including in code, documentation, issue trackers, mailing lists, chat channels, wikis, blogs, social media and any other communication channels used by the project.
54

65
**Our open source communities endeavor to:**
76

@@ -10,8 +9,7 @@ This code of conduct applies to all spaces provided by the OpenSource project in
109
* Be Respectful: We are committed to encouraging differing viewpoints, accepting constructive criticism and work collaboratively towards decisions that help the project grow. Disrespectful and unacceptable behavior will not be tolerated.
1110
* Be Collaborative: We are committed to supporting what is best for our community and users. When we build anything for the benefit of the project, we should document the work we do and communicate to others on how this affects their work.
1211

13-
14-
**Our Responsibility. As contributors, members, or bystanders we each individually have the responsibility to behave professionally and respectfully at all times. Disrespectful and unacceptable behaviors include, but are not limited to:**
12+
**Our Responsibility.** As contributors, members, or bystanders we each individually have the responsibility to behave professionally and respectfully at all times. Disrespectful and unacceptable behaviors include, but are not limited to:
1513

1614
* The use of violent threats, abusive, discriminatory, or derogatory language;
1715
* Offensive comments related to gender, gender identity and expression, sexual orientation, disability, mental illness, race, political or religious affiliation;
@@ -21,6 +19,5 @@ This code of conduct applies to all spaces provided by the OpenSource project in
2119
* Publishing private information, such as physical or electronic address, without permission;
2220
* Other conduct which could reasonably be considered inappropriate in a professional setting;
2321
* Advocating for or encouraging any of the above behaviors.
24-
* Enforcement and Reporting Code of Conduct Issues:
2522

26-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported. [Contact us](mailto:[email protected]). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
23+
**Enforcement and Reporting Code of Conduct Issues.** Instances of abusive, harassing, or otherwise unacceptable behavior may be reported. [Contact us](mailto:[email protected]). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.

codeofconduct.markdown

+1-25
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,4 @@
22
layout: fullwidth
33
primary_title: Code of Conduct
44
---
5-
6-
This code of conduct applies to all spaces provided by the OpenSearch project including in code, documentation, issue trackers, mailing lists, chat channels, wikis, blogs, social media and any other communication channels used by the project.
7-
8-
9-
## Our open source communities endeavour to:
10-
11-
* Be Inclusive: We are committed to being a community where everyone can join and contribute. This means using inclusive and welcoming language.
12-
* Be Welcoming: We are committed to maintaining a safe space for everyone to be able to contribute.
13-
* Be Respectful: We are committed to encouraging differing viewpoints, accepting constructive criticism and work collaboratively towards decisions that help the project grow. Disrespectful and unacceptable behavior will not be tolerated.
14-
* Be Collaborative: We are committed to supporting what is best for our community and users. When we build anything for the benefit of the project, we should document the work we do and communicate to others on how this affects their work.
15-
16-
## Our Responsibility. As contributors, members, or bystanders we each individually have the responsibility to behave professionally and respectfully at all times. Disrespectful and unacceptable behaviors include, but are not limited to:
17-
18-
* The use of violent threats, abusive, discriminatory, or derogatory language;
19-
* Offensive comments related to gender, gender identity and expression, sexual orientation, disability, mental illness, race, political or religious affiliation;
20-
* Posting of sexually explicit or violent content;
21-
* The use of sexualized language and unwelcome sexual attention or advances;
22-
* Public or private harassment of any kind;
23-
* Publishing private information, such as physical or electronic address, without permission;
24-
* Other conduct which could reasonably be considered inappropriate in a professional setting;
25-
* Advocating for or encouraging any of the above behaviours.
26-
27-
## Enforcement and Reporting Code of Conduct Issues:
28-
29-
Instances of abusive, harassing, or otherwise unacceptable behaviour may be reported. [Contact us](mailto:[email protected]). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
5+
{% include_relative CODE_OF_CONDUCT.md %}

0 commit comments

Comments
 (0)