From 45b36e4f1e3d7da19a6ef14319ab8d42b3508b19 Mon Sep 17 00:00:00 2001
From: Eitan Adler <eadler@FreeBSD.org>
Date: Fri, 26 Jun 2015 23:03:20 +0000
Subject: [PATCH] administration: update add a variety of teams 	- secteam
 needs updating 	- phabric-admin is new 	- forum-admin is new 	-
 github-automation is new 	- jenkins-admin is new 	- fbsd foundation
 needs updating

Reviewed by: gjb, delphij, jmg (older version)
---
 en_US.ISO8859-1/htdocs/administration.xml | 139 +++++++++++++++-------
 1 file changed, 98 insertions(+), 41 deletions(-)

diff --git a/en_US.ISO8859-1/htdocs/administration.xml b/en_US.ISO8859-1/htdocs/administration.xml
index 108f911c17..d55381da21 100644
--- a/en_US.ISO8859-1/htdocs/administration.xml
+++ b/en_US.ISO8859-1/htdocs/administration.xml
@@ -61,10 +61,16 @@
 	<li><a href="#t-bugmeister">Bugmeisters</a></li>
 	<li><a href="#t-clusteradm">Cluster Administrators</a></li>
 	<li><a href="#t-dnsadm">DNS Administrators</a></li>
+	<li><a href="#t-forum-admins">Forum Administrators</a></li>
+	<li><a href="#t-github-automation">GitHub Repository Mirror</a></li>
+	<li><a href="#t-jenkins-admin">Jenkins Continuous Integration
+	  Testing Administrators</a></li>
 	<li><a href="#t-mirror-admin">FTP/WWW Mirror Site
 	  Coordinators</a></li>
 	<li><a href="#t-perforce-admin">Perforce Repository
 	  Administrators</a></li>
+	<li><a href="#t-phabric-admin">Phabricator Code Review
+	  Administration</a></li>
 	<li><a href="#t-postmaster">Postmaster Team</a></li>
 	<li><a href="#t-subversion">Subversion Administrators</a></li>
 	<li><a href="#t-webmaster">Webmaster Team</a></li>
@@ -184,7 +190,6 @@
       href="donations/">FreeBSD Donations Liaison</a> page.</p>
 
   <ul>
-    <li>&a.tabthorpe.email; (Core Team Liaison)</li>
     <li>&a.gjb.email;</li>
     <li>&a.gahr.email;</li>
     <li>&a.pgollucci.email;</li>
@@ -203,20 +208,19 @@
   <ul>
     <li>Steven Beedle &lt;<a
       href="mailto:steven@zna.com">steven@zna.com</a>&gt;</li>
-    <li>Denise Ebery &lt;<a
-      href="mailto:denise@ixsystems.com">denise@ixsystems.com</a>&gt;</li>
     <li>Anne Dickison &lt;<a
-	href="mailto:anne@freebsdfoundation.org">anne@freebsdfoundation.org</a>&gt;</li>
+      href="mailto:anne@freebsdfoundation.org">anne@freebsdfoundation.org</a>&gt;</li>
     <li>&a.deb.email;</li>
-    <li>&a.jkoshy.email;</li>
     <li>&a.dru.email;</li>
+    <li>&a.gnn.email;</li>
     <li>&a.mwlucas.email;</li>
     <li>&a.imp.email;</li>
     <li>&a.kmoore.email;</li>
     <li>&a.murray.email;</li>
     <li>&a.matt.email;</li>
     <li>Jeremy C. Reed &lt;<a
-      href="mailto:reed@reedmedia.net">reed@reedmedia.net</a>&gt;</li>
+    href="mailto:reed@reedmedia.net">reed@reedmedia.net</a>&gt;</li>
+    <li>&a.randi.email;</li>
     <li>&a.rwatson.email;</li>
   </ul>
 
@@ -238,16 +242,17 @@
     <li>&a.benl.email;</li>
     <li>&a.cperciva.email; (Officer Emeritus)</li>
     <li>&a.csjp.email;</li>
-    <li>&a.delphij.email; (Officer Deputy)</li>
-    <li>&a.des.email; (Officer)</li>
+    <li>&a.delphij.email; (Officer)</li>
+    <li>&a.des.email; (Officer Emeritus)</li>
     <li>&a.gavin.email; (Core Team Liaison)</li>
     <li>&a.gjb.email; (Cluster Administrators Team Liaison)</li>
-    <li>&a.imp.email;</li>
+    <li>&a.glebius.email; (Officer Deputy)</li>
+    <li>&a.imp.email; (Officer Emeritus)</li>
     <li>&a.jonathan.email;</li>
     <li>&a.philip.email;</li>
     <li>&a.qingli.email;</li>
     <li>&a.remko.email; (Secretary)</li>
-    <li>&a.rwatson.email;</li>
+    <li>&a.rwatson.email; (Officer Emeritus)</li>
     <li>&a.simon.email; (Officer Emeritus)</li>
     <li>&a.stas.email;</li>
     <li>&a.trasz.email;</li>
@@ -318,10 +323,8 @@
     committers in the project.  Requests for new accounts will not be
     acted upon without the proper approval from the appropriate entity.</p>
 
-  <ul>
-    <li>&a.simon.email;</li>
-    <li>&a.dhw.email;</li>
-  </ul>
+  <p>Email sent to the Accounts Team is currently forwarded to <a
+    href="#t-clusteradm">Cluster Administration</a>.</p>
 
   <h3><a name="t-backups">Backups Administrators</a>
     <!-- admins mail aliases intentionally left incomplete -->
@@ -329,10 +332,8 @@
 
   <p>The Backups Administrators handle all backups on the FreeBSD cluster.</p>
 
-  <ul>
-    <li>&a.simon.email;</li>
-    <li>&a.dhw.email;</li>
-  </ul>
+  <p>Email sent to the Backups Team is currently forwarded to <a
+    href="#t-clusteradm">Cluster Administration</a>.</p>
 
   <h3><a name="t-bugmeister">Bugmeisters</a>
     &lt;<a href="mailto:bugmeister@FreeBSD.org">bugmeister@FreeBSD.org</a>&gt;</h3>
@@ -366,12 +367,10 @@
     in greater detail.</p>
 
   <ul>
-    <li>&a.bhaga.email;</li>
-    <li>&a.bz.email;</li>
+    <li>&a.dhw.email;</li>
     <li>&a.gavin.email;</li>
     <li>&a.gjb.email;</li>
     <li>&a.hiren.email;</li>
-    <li>&a.kensmith.email;</li>
     <li>&a.peter.email; (Lead)</li>
     <li>&a.sbruno.email;</li>
     <li>&a.simon.email;</li>
@@ -385,14 +384,58 @@
   <p>The DNS Administrators are responsible for managing DNS and related
     services.</p>
 
+  <p>E-mail to the DNS Administrators is currently forwarded to <a
+    href="#t-clusteradm">Cluster Administration</a>.</p>
+
+  <h3><a name="t-forum-admins">&os; Forum Administrators</a>
+    &lt;<a href="mailto:forum-admins@FreeBSD.org">forum-admins@FreeBSD.org</a>&gt;</h3>
+
+  <p>The Forum Administrators maintain the &os; Project's web forum site,
+    located at <a href="https://forums.freebsd.org/">https://forums.freebsd.org/</a>
+    and lead the group of moderators who work to ensure the relevance and quality of
+    forum content.</p>
+
   <ul>
-    <li>&a.gjb.email;</li>
-    <li>&a.simon.email;</li>
-    <li>&a.zi.email;</li>
-    <li>&a.peter.email;</li>
-    <li>&a.bz.email;</li>
+    <li>&a.brd.email;</li>
+    <li>&a.danger.email;</li>
+    <li>&a.dutchdaemon.email;</li>
+    <li>&a.lme.email;</li>
+    <li>&a.wblock.email;</li>
   </ul>
 
+  <h3><a name="t-github-automation">Repository Automated Mirroring to GitHub
+    Coordinators</a> &lt;<a href="mailto:github-automation@FreeBSD.org"
+    >github-automation@FreeBSD.org</a>&gt;</h3>
+
+  <p>The GitHub Automation team oversees the export of &os; source
+    code repository content to the read-only repository instances on
+    GitHub</p>
+
+  <ul>
+    <li>&a.koobs.email;</li>
+    <li>&a.mva.email;</li>
+    <li>&a.robak.email;</li>
+    <li>&a.rodrigc.email;</li>
+    <li>&a.uqs.email;</li>
+  </ul>
+
+  <h3><a name="t-jenkins-admin">Jenkins Continuous Integration Testing
+    Administrators</a> &lt;<a href="mailto:jenkins-admin@FreeBSD.org"
+    >jenkins-admin@FreeBSD.org</a>&gt;</h3>
+
+  <p>The Jenkins Administrators run continuous build and integration tests
+    against the HEAD revision of the &os; Source Code.</p>
+
+  <ul>
+    <li>Ahmed Kamal &lt;<a
+      href="mailto:email.ahmedkamal@googlemail.com"
+      >email.ahmedkamal@googlemail.com</a>&gt;</li>
+    <li>&a.jmmv.email;</li>
+    <li>&a.lwhsu.email;</li>
+    <li>&a.rodrigc.email;</li>
+    <li>&a.swills.email;</li>
+  </ul>
+ 
   <h3><a name="t-mirror-admin">FTP/WWW Mirror Site Coordinators</a>
     &lt;<a href="mailto:mirror-admin@FreeBSD.org">mirror-admin@FreeBSD.org</a>&gt;</h3>
 
@@ -402,11 +445,12 @@
     themselves when major updates are in progress, and making it easy for
     the general public to find their closest FTP/WWW mirror.</p>
 
+  <p>E-mail to the Mirror Site Coordinators is currently forwarded to
+    the <a href="#t-clusteradm">Cluster Administration</a> team with the
+    addition of:</p>
+    
   <ul>
     <li>&a.kuriyama.email;</li>
-    <li>&a.simon.email;</li>
-    <li>&a.kensmith.email;</li>
-    <li>&a.bz.email;</li>
   </ul>
 
   <h3><a name="t-perforce-admin">Perforce Repository Administrators</a>
@@ -420,12 +464,28 @@
 
   <ul>
     <li>&a.gibbs.email;</li>
-    <li>&a.kensmith.email;</li>
     <li>&a.gordon.email;</li>
     <li>&a.rwatson.email;</li>
     <li>&a.peter.email;</li>
   </ul>
 
+  <h3><a name="t-phabric-admin">Phabricator Code Review Application
+    Administrators</a> &lt;<a href="mailto:phabric-admin@FreeBSD.org"
+    >phabric-admin@FreeBSD.org</a>;&gt;</h3>
+
+  <p>The Phabricator Administrators are responsible for maintaining the &os;'s
+    instance of the Phabricator on-line code review tool located at
+    <a href="https://reviews.freebsd.org/">https://reviews.freebsd.org/</a></p>
+
+  <ul>
+    <li>&a.eadler.email;</li>
+    <li>&a.emaste.email;</li>
+    <li>&a.lwhsu.email;</li>
+    <li>&a.mat.email;</li>
+    <li>&a.robak.email;</li>
+    <li>&a.rpaulo.email;</li>
+  </ul>
+
   <h3><a name="t-postmaster">Postmaster Team</a>
     &lt;<a href="mailto:postmaster@FreeBSD.org">postmaster@FreeBSD.org</a>&gt;</h3>
 
@@ -439,18 +499,16 @@
     <li>&a.sahil.email;</li>
     <li>&a.dhw.email;</li>
     <li>&a.jadawin.email;</li>
+    <li>&a.brd.email;</li>
   </ul>
 
   <h3><a name="t-subversion">Subversion Administrators</a> &lt;svnadm@&gt;</h3>
 
   <p>The FreeBSD Subversion team is responsible for maintaining the health of
-	the Subversion Repositories.</p>
+    the Subversion Repositories.</p>
 
-  <ul>
-    <li>&a.bz.email;</li>
-    <li>&a.peter.email;</li>
-    <li>&a.simon.email;</li>
-  </ul>
+  <p>Email to the Subversion Administration team is currently
+    forwarded to <a href="#t-clusteradm">Cluster Administration</a>.</p>
 
   <h3><a name="t-webmaster">Webmaster Team</a>
     &lt;<a href="mailto:webmaster@FreeBSD.org">webmaster@FreeBSD.org</a>&gt;</h3>
@@ -462,12 +520,11 @@
     belongs to the scope of the Webmaster Team, excluding bugs in the
     documentation.</p>
 
+  <p>Email to the Webmaster Team is currently forwarded to the <a
+    href="#t-doceng">Documentation Engineering</a> team with the
+    addition of:</p>
+
   <ul>
-    <li>&a.gjb.email;</li>
-    <li>&a.wblock.email;</li>
-    <li>&a.blackend.email;</li>
-    <li>&a.gabor.email;</li>
-    <li>&a.hrs.email;</li>
     <li>&a.wosch.email;</li>
   </ul>