git: d9b55a60fb - main - Update information about the clusteradm team

From: Philip Paeps <philip_at_FreeBSD.org>
Date: Fri, 08 Jul 2022 05:34:11 UTC
The branch main has been updated by philip:

URL: https://cgit.FreeBSD.org/doc/commit/?id=d9b55a60fba211836e97d39920c55a83cc4443b6

commit d9b55a60fba211836e97d39920c55a83cc4443b6
Author:     Philip Paeps <philip@FreeBSD.org>
AuthorDate: 2022-07-08 05:30:46 +0000
Commit:     Philip Paeps <philip@FreeBSD.org>
CommitDate: 2022-07-08 05:30:46 +0000

    Update information about the clusteradm team
    
    Correctly reflect the current membership of the clusteradm team.  While
    here, document the existence of gitadm@.  Also encourage use of specific
    aliases and Bugzilla for reporting issues with the cluster.
    
    PR:             259760
    Reported by:    ygy
---
 website/content/en/administration.adoc | 50 ++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/website/content/en/administration.adoc b/website/content/en/administration.adoc
index 5f73ef30d5..6e0b2d2be3 100644
--- a/website/content/en/administration.adoc
+++ b/website/content/en/administration.adoc
@@ -39,6 +39,7 @@ This page lists teams, groups and individuals within the FreeBSD project with de
 ** <<t-clusteradm, Cluster Administrators>>
 ** <<t-dnsadm, DNS Administrators>>
 ** <<t-forum-admins, Forum Administrators>>
+** <<t-git, Git Administrators>>
 ** <<t-github-automation, GitHub Repository Mirror>>
 ** <<t-jenkins-admin, Jenkins Continuous Integration Testing Administrators>>
 ** <<t-mirror-admin, FTP/WWW Mirror Site Coordinators>>
@@ -189,7 +190,7 @@ admins mail aliases intentionally left incomplete
 The Accounts Team is responsible for setting up accounts for new committers in the project.
 Requests for new accounts will not be acted upon without the proper approval from the appropriate entity.
 
-Email sent to the Accounts Team is currently forwarded to the Cluster Administrators.
+Email sent to the Accounts Team is handled by the Cluster Administrators.
 
 [[t-backups]]
 == Backups Administrators <backups@>
@@ -199,7 +200,7 @@ admins mail aliases intentionally left incomplete
 
 The Backups Administrators handle all backups on the FreeBSD cluster.
 
-Email sent to the Backups Team is currently forwarded to the Cluster Administrators.
+Email sent to the Backups Team is handled by the Cluster Administrators.
 
 [[t-bugmeister]]
 == Bugmeisters <bugmeister@FreeBSD.org>
@@ -213,28 +214,27 @@ The Bugmeisters are responsible for ensuring that the problem report software is
 * {gonzo}
 
 [[t-clusteradm]]
-== Cluster Administrators <admins@>
+== Cluster Administrators <clusteradm@>
 ////
 admins mail aliases intentionally left incomplete
 ////
 
-The Cluster Administrators consists of the people responsible for maintaing the machines and services that the project relies on for its distributed work and communication.
-Issues concerning the projects infrastructure or setting up new machines should be directed to them.
+The Cluster Administrators are responsible for maintaining the machines and services that the project relies on for its distributed work and communication.
+Issues concerning the project's infrastructure or setting up new machines or services should be directed to them.
 This team is led by the lead cluster administrator whose duties and responsbilities are described in the https://www.freebsd.org/internal/clusteradm/[cluster administration charter] in greater detail.
 
 * {allanjude}
 * {bapt}
-* {brd}
+* {dbaio}
 * {dhw}
-* {gavin}
 * {gjb}
 * {lwhsu}
 * {peter}
 * {philip}
-* {sbruno}
-* {simon}
 * {zi} (Lead)
 
+Please consider using one of the more specific aliases (e.g. accounts@, dnsadm@, mirror-admin@,...) or https://bugs.freebsd.org/submit/[opening a bug report] to report problems with the cluster infrastructure.  Select "Services" and then "Core Infrastructure".
+
 [[t-dnsadm]]
 == DNS Administrators <dnsadm@>
 ////
@@ -243,7 +243,7 @@ admins mail aliases intentionally left incomplete
 
 The DNS Administrators are responsible for managing DNS and related services.
 
-E-mail to the DNS Administrators is currently forwarded to the Cluster Administrators.
+Email sent to the DNS Administrators handled by the Cluster Administrators.
 
 [[t-forum-admins]]
 == FreeBSD Forum Administrators <forum-admins@FreeBSD.org>
@@ -255,6 +255,18 @@ The Forum Administrators maintain the FreeBSD Project's Internet forum, located
 * {dutchdaemon}
 * {lme}
 
+[[t-git]]
+== Git Administrators <gitadm@>
+////
+admins mail aliases intentionally left incomplete
+////
+
+The FreeBSD Git Administrators are responsible for maintaining the health of the Git repositories.
+
+Email to the Git Administrators is handled by the Cluster Administrators.
+
+Please https://bugs.freebsd.org/submit/[open a bug report] to report problems with the Git repositories.  Select "Services" and then "Core Infrastructure".
+
 [[t-github-automation]]
 == Repository Automated Mirroring to GitHub Coordinators <github-automation@FreeBSD.org>
 
@@ -281,11 +293,16 @@ This includes maintaining the Jenkins instance and the jobs that run builds and
 * {swills}
 
 [[t-mirror-admin]]
-== FTP/WWW Mirror Site Coordinators <mirror-admin@FreeBSD.org>
+== FTP/WWW Mirror Site Coordinators <mirror-admin@>
+////
+admins mail aliases intentionally left incomplete
+////
 
 The FTP/WWW Mirror Site Coordinators coordinate all the FTP/WWW mirror site administrators to ensure that they are distributing current versions of the software, that they have the capacity to update themselves when major updates are in progress, and making it easy for the general public to find their closest FTP/WWW mirror.
 
-E-mail to the Mirror Site Coordinators is currently forwarded to the Cluster Administrators.
+Email to the Mirror Site Coordinators is handled by the Cluster Administrators.
+
+Please https://bugs.freebsd.org/submit/[open a bug report] to report problems with the mirror infrastructure.  Select "Services" and then "FTP/WWW Sites & Mirrors".
 
 [[t-phabric-admin]]
 == Phabricator Code Review Application Administrators <phabric-admin@FreeBSD.org>
@@ -319,10 +336,15 @@ The Postmaster Team is responsible for mail being correctly delivered to the com
 
 [[t-subversion]]
 == Subversion Administrators <svnadm@>
+////
+admins mail aliases intentionally left incomplete
+////
+
+The FreeBSD Subversion Administrators are responsible for maintaining the health of the Subversion repositories.
 
-The FreeBSD Subversion team is responsible for maintaining the health of the Subversion Repositories.
+Email to the Subversion Administrators is handled by the Cluster Administrators.
 
-Email to the Subversion Administration team is currently forwarded to the Cluster Administrators.
+Please https://bugs.freebsd.org/submit/[open a bug report] to report problems with the Subversion repositories.  Select "Services" and then "Core Infrastructure".
 
 [[t-webmaster]]
 == Webmaster Team <webmaster@FreeBSD.org>