From aaf0f9a7be8a9be3195f991b4cb353a86dd4f4c6 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 5 Nov 2025 14:10:50 -0800 Subject: [PATCH 1/3] github-org-owners: perform copy editing 1. One sentence per line. 2. Call the steering committee only "steering committee". 3. Use verbs. 4. State a more forceful negative about authority. --- doc/github-org-owners.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/doc/github-org-owners.md b/doc/github-org-owners.md index 3c01f1a..1ba7853 100644 --- a/doc/github-org-owners.md +++ b/doc/github-org-owners.md @@ -17,7 +17,8 @@ For any GitHub-related needs, you can reach out to the org owners by either: - Messaging in the [Github org owners help desk Matrix room](https://matrix.to/#/%23org_owners:nixos.org). ### Authority and processes -This team's role is to manage and unblock users of the github.com/NixOS GitHub organization. The @NixOS/steering gives them autonomy to handle small day-to-day tasks and expects them to escalate bigger decisions. +This team's role is to manage and unblock users of the NixOS GitHub organization. +They have autonomy to handle small day-to-day tasks and the expectation they will escalate bigger decisions to the Steering Committee. All org owners can individually take care of implementing: - Decisions by bodies that have the authority to make GitHub org changes such as: @@ -30,17 +31,16 @@ All org owners can individually take care of implementing: - Updating repository meta information. - Changes requested by a repository admin that have no impact outside their repository. -Org owners need approval from at least one other org owner to take care of implementing -higher-impact changes that are _not controversial_, such as: -- Administer unmaintained repos, such as: +Org owners need approval from at least one other org owner to take care of implementing higher-impact changes that are _not controversial_, such as: +- Administering unmaintained repos. - Performing maintenance. - Giving commit access to trusted people that offer maintenance. - Archiving if appropriate. -- Changes necessary to unblock automation. -- Changes to the structure and CI of the [org repository](https://github.com/NixOS/org). -- Content updates to the [GitHub organisation documentation](./github.md). +- Making changes necessary to unblock automation. +- Making changes to the structure and CI of the [org repository](https://github.com/NixOS/org). +- Authoring content updates to the [GitHub organisation documentation](./github.md). -Org owners have no authority to make other changes. +Org owners do not have authority to make other changes. ### Responsibilities @@ -50,8 +50,7 @@ Org owners have no authority to make other changes. - Receive and process requests. - We expect org owners to be subscribed to the NixOS/org repo. - Each request should land in at least 2 org owners inboxes of some kind. -- Ensure that all non-trivial and non-sensitive org owner actions are - publicly logged in either of the above channels. +- Ensure that all non-trivial and non-sensitive org owner actions are publicly logged in either of the above channels. - Escalate requests outside the given authority to the Steering Committee. - Maintain the [GitHub organisation documentation](./github.md). - Act as janitor for this repository. From 8ad729b44fbd0da4fdaff239401999470d9027ff Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 5 Nov 2025 14:42:36 -0800 Subject: [PATCH 2/3] github-org-owners: link the organization It is linked above, but re-doing the link seems fine to me. Co-authored-by: Michael Daniels --- doc/github-org-owners.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/github-org-owners.md b/doc/github-org-owners.md index 1ba7853..df671de 100644 --- a/doc/github-org-owners.md +++ b/doc/github-org-owners.md @@ -17,7 +17,7 @@ For any GitHub-related needs, you can reach out to the org owners by either: - Messaging in the [Github org owners help desk Matrix room](https://matrix.to/#/%23org_owners:nixos.org). ### Authority and processes -This team's role is to manage and unblock users of the NixOS GitHub organization. +This team's role is to manage and unblock users of the [NixOS GitHub organization](https://github.com/NixOS). They have autonomy to handle small day-to-day tasks and the expectation they will escalate bigger decisions to the Steering Committee. All org owners can individually take care of implementing: From 0ab9642a3ba1fc843adfb33042889688e79ed178 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 5 Nov 2025 14:44:11 -0800 Subject: [PATCH 3/3] github-org-owners: adjust wording on how administering repositories could happen Co-authored-by: Michael Daniels --- doc/github-org-owners.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/github-org-owners.md b/doc/github-org-owners.md index df671de..be51b48 100644 --- a/doc/github-org-owners.md +++ b/doc/github-org-owners.md @@ -32,7 +32,7 @@ All org owners can individually take care of implementing: - Changes requested by a repository admin that have no impact outside their repository. Org owners need approval from at least one other org owner to take care of implementing higher-impact changes that are _not controversial_, such as: -- Administering unmaintained repos. +- Administering unmaintained repos, such as by: - Performing maintenance. - Giving commit access to trusted people that offer maintenance. - Archiving if appropriate.