From 41ad2eba1583239919620d334391eb383caedc72 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 2 Feb 2023 17:09:25 +0000
Subject: [PATCH] update-maintainers/manpages: not all PLC are maintainers.

So list all maintainers separately.
---
 Library/Homebrew/dev-cmd/update-maintainers.rb | 11 +++++------
 Library/Homebrew/manpages.rb                   |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Library/Homebrew/dev-cmd/update-maintainers.rb b/Library/Homebrew/dev-cmd/update-maintainers.rb
index c5751e85a6..2b76426e55 100644
--- a/Library/Homebrew/dev-cmd/update-maintainers.rb
+++ b/Library/Homebrew/dev-cmd/update-maintainers.rb
@@ -28,11 +28,10 @@ module Homebrew
     public_members = GitHub.public_member_usernames("Homebrew")
 
     members = {
-      plc: GitHub.members_by_team("Homebrew", "plc"),
-      tsc: GitHub.members_by_team("Homebrew", "tsc"),
+      plc:         GitHub.members_by_team("Homebrew", "plc"),
+      tsc:         GitHub.members_by_team("Homebrew", "tsc"),
+      maintainers: GitHub.members_by_team("Homebrew", "maintainers"),
     }
-    members[:other] = GitHub.members_by_team("Homebrew", "maintainers")
-                            .except(*members.values.map(&:keys).flatten.uniq)
 
     sentences = {}
     members.each do |group, hash|
@@ -48,8 +47,8 @@ module Homebrew
                   "\\1 is #{sentences[:plc]}.")
     content.gsub!(/(Homebrew's \[Technical Steering Committee.*) is .*\./,
                   "\\1 is #{sentences[:tsc]}.")
-    content.gsub!(/(Homebrew's other current maintainers are).*\./,
-                  "\\1 #{sentences[:other]}.")
+    content.gsub!(/(Homebrew's maintainers are).*\./,
+                  "\\1 #{sentences[:maintainers]}.")
 
     File.write(readme, content)
 
diff --git a/Library/Homebrew/manpages.rb b/Library/Homebrew/manpages.rb
index 9dab44b850..e410587c56 100644
--- a/Library/Homebrew/manpages.rb
+++ b/Library/Homebrew/manpages.rb
@@ -48,7 +48,7 @@ module Homebrew
         readme.read[/(Homebrew's \[Technical Steering Committee.*\.)/, 1]
               .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1')
       variables[:maintainers] =
-        readme.read[/(Homebrew's other current maintainers .*\.)/, 1]
+        readme.read[/(Homebrew's maintainers .*\.)/, 1]
               .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1')
       variables[:alumni] =
         readme.read[/(Former maintainers .*\.)/, 1]