Skip to content

Commit 9f99178

Browse files
docs: overhaul contributing and maintenance docs for end-of-year 2023 (#5038)
* docs: overhaul contributing and maintenance docs for end-of-year 2023 * Missed a note: re-requesting review * Switch from rebasing to squashing * Update Gitter to Discord * Add 'I want to provide a PR' optional checkboxes * Updated issue templates * Shorter name for Docs
1 parent eca4fec commit 9f99178

19 files changed

+514
-362
lines changed

.github/CODE_OF_CONDUCT.md

+42-33
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,36 @@
33
## Be friendly and patient
44

55
We understand that everyone has different levels of experience or knowledge in many diverse fields, be it technical or
6-
non-technical in nature. We also have areas of knowledge we are eager to expand; we want to be a community where people
7-
can not only contribute, but feel comfortable to ask questions as well and learn along the way. If someone says something
8-
wrong, or says something accidentally offensive, respond with patience and try to keep it polite and civil. Remember that
9-
we all were newbies at one point.
6+
non-technical in nature.
7+
We also have areas of knowledge we are eager to expand; we want to be a community where people can not only contribute, but feel comfortable to ask questions as well and learn along the way.
8+
If someone says something wrong, or says something accidentally offensive, respond with patience and try to keep it polite and civil.
9+
Remember that we all were newbies at one point.
1010

1111
## Be welcoming
1212

13-
We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not
14-
limited to, members of any race, ethnicity, culture, national origin, color, immigration status, social and economic class,
15-
educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief,
16-
religion, and mental and physical ability.
13+
We strive to be a community that welcomes and supports people of all backgrounds and identities.
14+
This includes, but is not limited to, members of any race, ethnicity, culture, national origin, color, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
1715

1816
## Be considerate
1917

20-
Your work will be used by other people, and you in turn will depend on the work of others. Any decision you make will affect
21-
users and colleagues, and you should take those consequences into account when making decisions. Remember that we’re a world-wide
22-
community, so you might not be communicating in someone else’s primary language.
18+
Your work will be used by other people, and you in turn will depend on the work of others.
19+
Any decision you make will affect users and colleagues, and you should take those consequences into account when making decisions.
20+
Remember that we’re a world-wide community, so you might not be communicating in someone else’s primary language.
2321

2422
## Be respectful
2523

26-
Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all
27-
experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important
28-
to remember that a community where people feel uncomfortable or threatened is not a productive one. Members of the JS Foundation
29-
community should be respectful when dealing with other members as well as with people outside the JS Foundation community.
24+
Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners.
25+
We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack.
26+
It’s important to remember that a community where people feel uncomfortable or threatened is not a productive one.
27+
Members of the OpenJS Foundation community should be respectful when dealing with other members as well as with people outside the OpenJS Foundation community.
3028

3129
## Be careful in the words that you choose
3230

33-
We are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put
34-
down other participants. Harassment and other exclusionary behavior aren’t acceptable. This includes, but is not limited to:
31+
We are a community of professionals, and we conduct ourselves professionally.
32+
Be kind to others.
33+
Do not insult or put down other participants.
34+
Harassment and other exclusionary behavior aren’t acceptable.
35+
This includes, but is not limited to:
3536

3637
- Violent threats or language directed against another person.
3738
- Discriminatory jokes and language.
@@ -40,55 +41,63 @@ down other participants. Harassment and other exclusionary behavior aren’t acc
4041
- Personal insults, especially those using racist or sexist terms.
4142
- Unwelcome sexual attention.
4243
- Advocating for, or encouraging, any of the above behavior.
43-
- Repeated harassment of others. In general, if someone asks you to stop, then stop.
44+
- Repeated harassment of others.
45+
In general, if someone asks you to stop, then stop.
4446

4547
## When we disagree, try to understand why
4648

47-
Disagreements, both social and technical, happen all the time and JS Foundation projects are no exception. It is important
48-
that we resolve disagreements and differing views constructively. Remember that we’re different. The strength of the JS
49-
Foundation comes from its varied community, people from a wide range of backgrounds. Different people have different
50-
perspectives on issues. Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong. Don’t
51-
forget that it is human to err and blaming each other doesn’t get us anywhere. Instead, focus on helping to resolve issues
52-
and learning from mistakes.
49+
Disagreements, both social and technical, happen all the time and OpenJS Foundation projects are no exception.
50+
It is important that we resolve disagreements and differing views constructively.
51+
Remember that we’re different.
52+
The strength of the OpenJS Foundation comes from its varied community, people from a wide range of backgrounds.
53+
Different people have different perspectives on issues.
54+
Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong.
55+
Don’t forget that it is human to err and blaming each other doesn’t get us anywhere.
56+
Instead, focus on helping to resolve issues and learning from mistakes.
5357

5458
Original text courtesy of the Speak Up! project and Django Project.
5559

5660
## QUESTIONS?
5761

58-
If you have questions, please see the FAQ. If that doesn’t answer your questions, feel free to email [email protected].
62+
If you have questions, please see the FAQ.
63+
If that doesn’t answer your questions, feel free to email [email protected].
5964

6065
# OpenJS Foundation Code of Conduct
6166

62-
The OpenJS Foundation and its member projects use the Contributor
63-
Covenant v1.4.1 as its Code of Conduct. Refer to the following
64-
for the full text:
67+
The OpenJS Foundation and its member projects use the Contributor Covenant v1.4.1 as its Code of Conduct.
68+
Refer to the following for the full text:
6569

66-
- [english](https://www.contributor-covenant.org/version/1/4/code-of-conduct)
67-
- [translations](https://www.contributor-covenant.org/translations)
70+
- [Contributor Covenant v1.4.1 in english](https://www.contributor-covenant.org/version/1/4/code-of-conduct)
71+
- [Contributor Covenant v1.4.1 translations](https://www.contributor-covenant.org/translations)
6872

6973
Refer to the section on reporting and escalation in this document for the specific emails that can be used to report and escalate issues.
7074

7175
## Reporting
7276

7377
### Project Spaces
7478

75-
For reporting issues in spaces related to a member project please use the email provided by the project for reporting. Projects handle CoC issues related to the spaces that they maintain. Projects maintainers commit to:
79+
For reporting issues in spaces related to a member project please use the email provided by the project for reporting.
80+
Projects handle CoC issues related to the spaces that they maintain.
81+
Projects maintainers commit to:
7682

7783
- maintain the confidentiality with regard to the reporter of an incident
7884
- to participate in the path for escalation as outlined in
7985
the section on Escalation when required.
8086

8187
### Foundation Spaces
8288

83-
For reporting issues in spaces managed by the OpenJS Foundation, for example, repositories within the OpenJS organization, use the email `[email protected]`. The Cross Project Council (CPC) is responsible for managing these reports and commits to:
89+
For reporting issues in spaces managed by the OpenJS Foundation, for example, repositories within the OpenJS organization, use the email `[email protected]`.
90+
The Cross Project Council (CPC) is responsible for managing these reports and commits to:
8491

8592
- maintain the confidentiality with regard to the reporter of an incident
8693
- to participate in the path for escalation as outlined in
8794
the section on Escalation when required.
8895

8996
## Escalation
9097

91-
The OpenJS Foundation maintains a Code of Conduct Panel (CoCP). This is a foundation-wide team established to manage escalation when a reporter believes that a report to a member project or the CPC has not been properly handled. In order to escalate to the CoCP send an email to `"[email protected]`.
98+
The OpenJS Foundation maintains a Code of Conduct Panel (CoCP).
99+
This is a foundation-wide team established to manage escalation when a reporter believes that a report to a member project or the CPC has not been properly handled.
100+
In order to escalate to the CoCP send an email to `"[email protected]`.
92101

93102
For more information, refer to the full
94103
[Code of Conduct governance document](https://github.com/openjs-foundation/cross-project-council/blob/master/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md).

0 commit comments

Comments
 (0)