Merge branch 'main' into agones-bot

googleforgames · Jul 30, 2024 · a084b58 · a084b58
2 parents b360205 + 96c3d26
commit a084b58
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -107,9 +107,9 @@ You can see them on our calendar
 [mailing list or Slack](https://agones.dev/site/community/)
 for notifications.
 
-## Becoming a Contributor on Agones
+## Becoming a Collaborator on Agones
 
-If you have submitted at least one Pull Request and had it merged, you may wish to become an official contributor.
+If you have submitted at least one Pull Request and had it merged, you may wish to become an official collaborator.
 This will give you the ability to have tickets assigned to you (or you can assign tickets to yourself!).
 
 We have a [community membership guide](./docs/governance/community_membership.md), that outlines the process.

diff --git a/docs/governance/community_membership.md b/docs/governance/community_membership.md
@@ -6,11 +6,11 @@ This is based on the [Kubernetes Community Membership](https://github.com/kubern
 
 There are currently two roles for this project, but that may grow in the future.
 
-| Role        | Responsibilities                 | Requirements                                                       | Defined by                                                              |
-|-------------|----------------------------------|--------------------------------------------------------------------|-------------------------------------------------------------------------|
-| Contributor | Can have tickets assigned        | Have one PR merged                                                 | Read access to the Agones repository                                    |
-| Releaser    | Create Agones releases           | Sponsored by 2 approvers                                           | Commit access to the Agones repository                                  |
-| Approver    | Review and approve contributions | Sponsored by 2 approvers and multiple contributions to the project | Commit access to the Agones repository and [OWNERS] file approver entry |
+| Role         | Responsibilities                 | Requirements                                                       | Defined by                                                              |
+|--------------|----------------------------------|--------------------------------------------------------------------|-------------------------------------------------------------------------|
+| Collaborator | Can have tickets assigned        | Have one PR merged                                                 | Read access to the Agones repository                                    |
+| Releaser     | Create Agones releases           | Sponsored by 2 approvers                                           | Commit access to the Agones repository                                  |
+| Approver     | Review and approve contributions | Sponsored by 2 approvers and multiple contributions to the project | Commit access to the Agones repository and [OWNERS] file approver entry |
 
 
 ## New contributors
@@ -27,11 +27,11 @@ policies, procedures, conventions, etc., and technical and/or writing ability.
 Role-specific expectations, responsibilities, and requirements are enumerated
 below.
 
-## Contributor
+## Collaborator
 
-For regular contributors that wish to have issues assigned to them, we have the contributor role.
+For regular contributors that wish to have issues assigned to them, we have the collaborator role.
 
-To become a contributor, create an issue using the 
+To become a collaborator, create an issue using the 
 [become a repo collaborator issue template](https://github.com/googleforgames/agones/issues/new?assignees=thisisnotapril&labels=area%2Fcommunity&projects=&template=become-a-repo-collaborator.md&title=Collaborator+Request)
 and we will review it as a team.