Skip to content

Commit 6d9dfcd

Browse files
authored
Merge pull request #2697 from ruby/all-revert-coc
Revert all changes about CoC after 9/28/2021
2 parents f19a80e + 828dd48 commit 6d9dfcd

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

en/community/mailing-lists/ruby-talk-guidelines/index.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ You should follow these guidelines when posting to the ruby-talk mailing list.
99

1010

1111
1. **Always** be friendly, considerate, tactful, and tasteful. We want to
12-
keep this list hospitable and safe for everyone.
12+
keep this list hospitable to the growing ranks of newbies, very
13+
young people, and their teachers, as well as cater to fire breathing
14+
wizards. :-)
1315

1416
2. Keep your content relevant and easy to follow. Try to keep your
1517
content brief and to the point, but also try to include all relevant

en/conduct/index.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ community. It applies to all "collaborative space", which is defined as
1616
community communications channels (such as mailing lists, submitted patches,
1717
commit comments, etc.).
1818

19+
* Participants will be tolerant of opposing views.
1920
* Participants must ensure that their language and actions are free of personal attacks and disparaging personal remarks.
20-
* Participants should speak and act with good intentions, but understand that intent and impact are not equivalent.
21-
* Behaviour which can be considered harassment against protected classes will not be tolerated.
21+
* When interpreting the words and actions of others, participants should always assume good intentions.
22+
* Behaviour which can be reasonably considered harassment will not be tolerated.

0 commit comments

Comments
 (0)