Skip to content

Commit 0791e3c

Browse files
committed
Reword Collaborator as Member
1 parent 1dd60a3 commit 0791e3c

1 file changed

Lines changed: 42 additions & 42 deletions

File tree

Moderation-Policy.md

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ moderation request, please see [Requesting Moderation][]
99
* [Requesting Moderation][]
1010
* [Consideration of Intent][]
1111
* [Guidelines and Requirements][]
12-
* [Collaborator Posts][]
13-
* [Non-Collaborator Posts][]
12+
* [Member Posts][]
13+
* [Non-Member Posts][]
1414
* [Temporary Interaction Limits][]
1515
* [Temporary and Indefinite Blocks][]
1616
* [Privacy of the nodejs/moderation Repository][]
@@ -27,7 +27,7 @@ supported by the Admin team of the Slack organization.
2727

2828
## Terms
2929

30-
* *Collaborator* refers to any individual with configured triage role or higher
30+
* *Member* refers to any individual with configured triage role or higher
3131
in any Node.js GitHub organization repository. See
3232
[GitHub's Repository roles documentation][] for more information.
3333
* *TSC* refers to the [Node.js Technical Steering Committee][].
@@ -36,7 +36,7 @@ supported by the Admin team of the Slack organization.
3636
* *Moderate* means to modify, lock, or delete one or more Posts to correct or
3737
address Code of Conduct violations.
3838
* *Remove* refers to the act of removing the configured write (commit)
39-
permissions for an individual Collaborator's GitHub account from *all*
39+
permissions for an individual Member's GitHub account from *all*
4040
Node.js GitHub Organizations repositories as well as removing the account from
4141
the Node.js GitHub Organizations membership.
4242
* *Block* refers to the act of prohibiting an individual GitHub account from any
@@ -66,8 +66,8 @@ accomplished in one of four ways:
6666
* Via a new Post in the same thread as the Post being requested for Moderation,
6767
* Via a new Post in the private nodejs/moderation repository.
6868

69-
Note that Collaborators may Moderate non-Collaborator Posts at any time without
70-
submitting an initial request (see: [Non-Collaborator Posts][]).
69+
Note that Members may Moderate non-Members Posts at any time without
70+
submitting an initial request (see: [Non-Member Posts][]).
7171

7272
Use of the [[email protected]][] email address -- or private email to individual
7373
Moderation Team members -- is appropriate when the individual requesting the
@@ -86,7 +86,7 @@ to obscure obscene or offensive content.
8686
External public venues or social media services such as Twitter must never be
8787
used to request Moderation.
8888

89-
Collaborators must never discuss the specific details of a Moderation request
89+
Members must never discuss the specific details of a Moderation request
9090
in any public forum or any social media service outside of the Node.js GitHub
9191
Organizations.
9292

@@ -101,7 +101,7 @@ ignored.
101101

102102
## Consideration of Intent
103103

104-
Before Moderating a Post, Collaborators should carefully consider the possible
104+
Before Moderating a Post, Members should carefully consider the possible
105105
intent of the author. It may be that the author has simply made an error or is
106106
not yet familiar with the [Code of Conduct][]; or it may be that cultural
107107
differences exist, or that the author is unaware that certain content is
@@ -114,7 +114,7 @@ a Post from Moderation.
114114
## Guidelines and Requirements
115115

116116
* All Posts are expected to respect the Node.js [Code of Conduct][].
117-
* Any Collaborator with triage permission to a given repository (except
117+
* Any Member with triage permission to a given repository (except
118118
nodejs/moderation) may Moderate Posts within that repository's issue tracker.
119119
Only the Moderation team is allowed to moderate posts on nodejs/moderation.
120120
* The Moderation Team serves as the final arbiter for all Moderation issues.
@@ -130,50 +130,50 @@ a Post from Moderation.
130130
are not "Moderation". Such edits and their intent must
131131
still be documented with a short note indicating who made the edit and why.
132132

133-
### Collaborator Posts
133+
### Member Posts
134134

135-
* Prior to Moderating any Post authored by a Collaborator, the author must be
135+
* Prior to Moderating any Post authored by a Member, the author must be
136136
given a reasonable opportunity to modify or remove the Post on their own.
137137
* If the author of the Post disagrees that Moderation is required, the matter
138138
can be escalated to the Moderation Team for resolution. In such cases, no
139139
Moderation action may be taken until a decision by the Moderation Team is
140140
made.
141-
* When Moderating any Post authored by another Collaborator, the moderating
142-
Collaborator must:
141+
* When Moderating any Post authored by another Member, the moderating
142+
Member must:
143143
* Explain the justification for Moderating the post,
144144
* Identify all changes made to the Post, and
145145
* Identify the steps previously taken to resolve the issue.
146146
* If the Moderation action included Blocking, an indication of whether the Block
147147
is temporary or indefinite is required, along with an issue posted to the
148148
moderation repository justifying the action.
149-
* Explanations of Moderation actions on Collaborator Posts must be provided in:
149+
* Explanations of Moderation actions on Member Posts must be provided in:
150150
* A new post within the original thread, or
151151
* A new issue within the private nodejs/moderation repository.
152-
* Any Collaborator habitually violating the Code of Conduct or this Moderation
152+
* Any Member habitually violating the Code of Conduct or this Moderation
153153
policy may be Blocked temporarily or, in extreme cases, Removed and Blocked
154154
indefinitely.
155155

156-
### Non-Collaborator Posts
156+
### Non-Member Posts
157157

158-
* Posts authored by non-Collaborators are always subject to immediate Moderation
159-
by any Collaborator if the content is intentionally disruptive or in violation
158+
* Posts authored by non-Members are always subject to immediate Moderation
159+
by any Member if the content is intentionally disruptive or in violation
160160
of the [Code of Conduct][].
161-
* When moderating non-Collaborator posts, the moderating Collaborator must:
161+
* When moderating non-Member posts, the moderating Member must:
162162
* Explain the justification for Moderating the post, and
163163
* Identify all changes made to the Post.
164164
* If the Moderation action included Blocking, an indication of whether the Block
165165
is temporary or indefinite is required, along with a note justifying the
166166
action.
167-
* If an explanation of a Moderation action for a non-Collaborator Post is
167+
* If an explanation of a Moderation action for a non-Member Post is
168168
provided, it must be provided in:
169169
* The original Post being modified (as replacement or appended content),
170170
* A new post within the original thread, or
171171
* A new issue within the private nodejs/moderation repository.
172-
* Moderation of Posts authored by non-Collaborators may result in those
173-
non-Collaborators being Blocked temporarily or indefinitely from further
172+
* Moderation of Posts authored by non-Members may result in those
173+
non-Members being Blocked temporarily or indefinitely from further
174174
participation in the Node.js GitHub organization.
175175
* If it is clear that there is no intention to collaborate in good faith,
176-
it is possible to hide comments of non-Collaborators. In that case there is
176+
it is possible to hide comments of non-Members. In that case there is
177177
an exception to the reporting requirement described above.
178178
* Accounts that are reasonably believed to be bots (other than bots authorized
179179
by the TSC) are subject to immediate Blocking.
@@ -186,40 +186,40 @@ of the [Code of Conduct][].
186186
wasting our time. If you are not using one, please read and follow our
187187
contributing guidelines." Report the user to the moderation repository so they
188188
get blocked if they do it again.
189-
* Collaborators may use the Hide feature in the GitHub interface for off-topic
190-
posts by non-Collaborators.
189+
* Members may use the Hide feature in the GitHub interface for off-topic
190+
posts by non-Members.
191191
* Moderation Team members and TSC voting members can delete any issues or
192192
comments posted by accounts that have been deleted by GitHub. These accounts
193193
show up in the GitHub interface as user `ghost`. There is no need to
194194
screenshot or document these deletions.
195195

196-
There are a few examples of moderating non-Collaborator posts:
196+
There are a few examples of moderating non-Member posts:
197197

198198
Scenario 1:
199-
* A non-Collaborator posts a comment that indicates that they are a bot.
200-
* A collaborator sees the post and hides it.
199+
* A non-Member posts a comment that indicates that they are a bot.
200+
* A member sees the post and hides it.
201201
* No further action is necessary.
202202

203203
Scenario 2:
204-
* A non-Collaborator posts a comment that is against the Code of Conduct.
205-
* A Collaborator sees the comment and asks the author to edit it.
204+
* A non-Member posts a comment that is against the Code of Conduct.
205+
* A Member sees the comment and asks the author to edit it.
206206
* The author refuses to edit their comment.
207-
* The Collaborator deletes the comment and posts an issue in the moderation
207+
* The Member deletes the comment and posts an issue in the moderation
208208
repository explaining their actions.
209209

210210
Scenario 3:
211-
* A non-Collaborator opens a pull request with comments indicating they are a
211+
* A non-Member opens a pull request with comments indicating they are a
212212
bot.
213-
* A Collaborator sees that pull requests, closes it, deletes the comments
213+
* A Member sees that pull requests, closes it, deletes the comments
214214
and posts an issue in the moderation repository explaining their actions.
215215
* A moderation team member sees the issue and decides to block the user from the
216216
organization.
217217

218218
Scenario 4:
219-
* A non-Collaborator posts a comment on an old commit that is against the
219+
* A non-Member posts a comment on an old commit that is against the
220220
Code of Conduct.
221-
* A Collaborator sees the comment, takes a screenshot, and deletes it.
222-
* The Collaborator posts an issue in the moderation repository explaining
221+
* A Member sees the comment, takes a screenshot, and deletes it.
222+
* The Member posts an issue in the moderation repository explaining
223223
their actions.
224224

225225
### Temporary Interaction Limits
@@ -228,7 +228,7 @@ The Moderation Team may, at their discretion, choose to enable [GitHub's
228228
Temporary Interaction Limits][] on any GitHub repository in the Node.js GitHub
229229
Organizations.
230230

231-
Any Collaborator may request that the Moderation Team enable the Temporary
231+
Any Member may request that the Moderation Team enable the Temporary
232232
Interaction Limits by posting an issue to the moderation repository. If the
233233
Moderation Team chooses not to do so, then a comment explaining why that
234234
decision was made must be added to the moderation repository thread.
@@ -247,11 +247,11 @@ Team.
247247

248248
The nodejs/moderation Repository is used to discuss the potentially sensitive
249249
details of any specific moderation issue. The repository is private but
250-
accessible to all Collaborators. The details of any issue discussed within the
250+
accessible to all Members. The details of any issue discussed within the
251251
nodejs/moderation repository are expected to remain confidential and are not to
252252
be discussed in any public forum or social media service.
253253

254-
Any Collaborator found to be violating the privacy of the nodejs/moderation
254+
Any Member found to be violating the privacy of the nodejs/moderation
255255
repository by repeatedly sharing or discussing the details of nodejs/moderation
256256
issues in any public forum or social media service risks being permanently
257257
removed from the Node.js GitHub organization.
@@ -268,7 +268,7 @@ actions taken by the Moderation Team to the TSC.
268268

269269
*Nomination*
270270

271-
Moderation team members are Collaborators who self-nominate or are nominated by
271+
Moderation team members are Members who self-nominate or are nominated by
272272
the TSC. Team members must be approved by the TSC with annual
273273
recertification. If there are no objections after seven days, the nomination is automatically
274274
accepted. If there are objections to a specific nomination, then a TSC vote
@@ -370,8 +370,8 @@ any proposed change, a TSC vote in favor of the change is required.
370370
[Requesting Moderation]: #requesting-moderation
371371
[Consideration of Intent]: #consideration-of-intent
372372
[Guidelines and Requirements]: #guidelines-and-requirements
373-
[Collaborator Posts]: #collaborator-posts
374-
[Non-Collaborator Posts]: #non-collaborator-posts
373+
[Member Posts]: #member-posts
374+
[Non-Member Posts]: #non-member-posts
375375
[Temporary Interaction Limits]: #temporary-interaction-limits
376376
[Temporary and Indefinite Blocks]: #temporary-and-indefinite-blocks
377377
[Privacy of the nodejs/moderation Repository]: #privacy-of-the-nodejsmoderation-repository

0 commit comments

Comments
 (0)