Update core roster for core.x

Approved by:	bcr matthew
Differential Revision:	https://reviews.freebsd.org/D16122
			https://reviews.freebsd.org/D16096

en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml

@@ -3,6 +3,18 @@
 <itemizedlist xmlns="http://docbook.org/ns/docbook"
 xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
 
+  <listitem>
+    <para>&a.bapt.email; (2016 - 2018)</para>
+  </listitem>
+
+  <listitem>
+    <para>&a.benno.email; (2016 - 2018)</para>
+  </listitem>
+
+  <listitem>
+    <para>&a.emaste.email; (2016 - 2018)</para>
+  </listitem>
+
   <listitem>
     <para>&a.tabthorpe.email; (2012 - 2014)</para>
   </listitem>
@@ -39,11 +51,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <para>&a.cperciva.email; (2010 - 2012)</para>
   </listitem>
 
-  <!--
   <listitem>
     <para>&a.rwatson.email; (2000 - 2012)</para>
   </listitem>
-  -->
 
   <listitem>
     <para>&a.keramida.email; (2006 - 2010)</para>
@@ -53,11 +63,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <para>&a.kris.email; (2008 - 2010)</para>
   </listitem>
 
-  <!--
   <listitem>
-    <para>&a.gnn.email; (2006 - 2010)</para>
+    <para>&a.gnn.email; (2006 - 2010, 2016 - 2018)</para>
   </listitem>
-  -->
 
   <listitem>
     <para>&a.murray.email; (2002 - 2010)</para>
@@ -67,11 +75,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <para>&a.wes.email; (2002 - 2008)</para>
   </listitem>
 
-  <!--
   <listitem>
     <para>&a.peter.email; (1995 - 2006, 2008 - 2010)</para>
   </listitem>
-  -->
 
   <listitem>
     <para>&a.imp.email; (2000 - 2008, 2010 - 2012)</para>
@@ -85,11 +91,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <para>&a.kuriyama.email; (2002 - 2006)</para>
   </listitem>
 
-  <!--
   <listitem>
     <para>&a.jhb.email; (2002 - 2006)</para>
   </listitem>
-  -->
 
   <listitem>
     <para>&a.scottl.email; (2004 - 2005)</para>

en_US.ISO8859-1/htdocs/administration.xml

@@ -90,14 +90,14 @@
 
   <ul>
     <li>&a.allanjude.email; (Clusteradm Liaison)</li>
-    <li>&a.bapt.email; (Portmgr and CI-team Liaison)</li>
+    <li>&a.bcr.email; (Foundation Liaison)</li>
-    <li>&a.bcr.email;</li>
+    <li>&a.brooks.email; (Security Team Liaison)</li>
-    <li>&a.benno.email; (Code-of-Conduct Committee and Security Team Liaison)</li>
+    <li>&a.hrs.email; (Doceng Team Liaison)</li>
-    <li>&a.emaste.email;</li>
+    <li>&a.imp.email; (Code-of-Conduct Committee Liaison)</li>
-    <li>&a.gnn.email;</li>
+    <li>&a.jeff.email;</li>
-    <li>&a.hrs.email; (Doceng and Release Engineering Team Liaison)</li>
+    <li>&a.jhb.email; (Bugmeister and Release Engineering Team Liaison)</li>
-    <li>&a.jhb.email; (Bugmeister Liaison)</li>
     <li>&a.kmoore.email;</li>
+    <li>&a.seanc.email; (CI and Portmgr Team Liaison)</li>
   </ul>
 
   <h3><a name="t-doceng">FreeBSD Documentation Engineering Team</a>
@@ -131,14 +131,14 @@
     Team in greater detail.</p>
 
   <ul>
-    <li>&a.mat.email; (Cluster Administration Team Liaison)</li>
+    <li>&a.adamw.email;</li>
     <li>&a.antoine.email;</li>
     <li>&a.bapt.email; (Core Team Liaison)</li>
     <li>&a.bdrewery.email; (Release Engineering Team Liaison)</li>
     <li>&a.feld.email;</li>
+    <li>&a.mat.email; (Cluster Administration Team Liaison)</li>
     <li>&a.rene.email; (Secretary)</li>
     <li>&a.swills.email;</li>
-    <li>&a.adamw.email;</li>
   </ul>
 
   <hr/>
@@ -265,16 +265,15 @@
     &lt;<a href="mailto:core-secretary@FreeBSD.org">core-secretary@FreeBSD.org</a>&gt;</h3>
 
   <p>The &os; Core Team Secretary is a non-voting member of the Core Team,
-    responsible for documenting the work done by core, keeping track of the
+    responsible for documenting the work done by core, keeping track of the core
-    core agenda, direct contact with non-core members sending mail to core
+    agenda, contacting non-core members on behalf of core, sending mail to core,
-    and to be an the interface to the admin team for
+    and interfacing with the admin team for committer/account approval.  The Core
-    committer/account approval.  The Core Team Secretary is also responsible
+    Team Secretary is also responsible for writing and sending out monthly status
-    for writing and sending out monthly status reports to the &os;
+    reports to the &os; Developer community, containing a summary of core's latest
-    Developer community, containing a summary of core's latest decisions and
+    decisions and actions.</p>
-    actions.</p>
 
   <ul>
-    <li>&a.matthew.email;</li>
+    <li>&a.jrm.email;</li>
   </ul>
 
   <h3><a name="t-portmgr-secretary">Port Management Team Secretary</a>

share/pgpkeys/pgpkeys-core.xml

@@ -4,29 +4,19 @@
      $FreeBSD$
 -->
 
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-gavin">
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-allanjude">
-      <title>&a.gavin.email;</title>
+      <title>&a.allanjude.email;</title>
-      &pgpkey.gavin;
+      &pgpkey.allanjude;
     </sect2>
 
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-theraven">
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-bcr">
-      <title>&a.theraven.email;</title>
+      <title>&a.bcr.email;</title>
-      &pgpkey.theraven;
+      &pgpkey.bcr;
     </sect2>
 
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-bapt">
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-brooks">
-      <title>&a.bapt.email;</title>
+      <title>&a.brooks.email;</title>
-      &pgpkey.bapt;
+      &pgpkey.brooks;
-    </sect2>
-
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-emaste">
-      <title>&a.emaste.email;</title>
-      &pgpkey.emaste;
-    </sect2>
-
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-gnn">
-      <title>&a.gnn.email;</title>
-      &pgpkey.gnn;
     </sect2>
 
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-hrs">
@@ -34,19 +24,27 @@
       &pgpkey.hrs;
     </sect2>
 
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-glebius">
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-imp">
-      <title>&a.glebius.email;</title>
+      <title>&a.imp.email;</title>
-      &pgpkey.glebius;
+      &pgpkey.imp;
     </sect2>
 
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-peter">
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-jeff">
-      <title>&a.peter.email;</title>
+      <title>&a.jeff.email;</title>
-      &pgpkey.peter;
+      &pgpkey.jeff;
     </sect2>
 
-    <!-- XXX: rwatson does not have a PGP key in the repository
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-jhb">
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-rwatson">
+      <title>&a.jhb.email;</title>
-      <title>&a.rwatson.email;</title>
+      &pgpkey.jhb;
-      &pgpkey.rwatson;
+    </sect2>
+
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-kmoore">
+      <title>&a.kmoore.email;</title>
+      &pgpkey.kmoore;
+    </sect2>
+
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-seanc">
+      <title>&a.seanc.email;</title>
+      &pgpkey.seanc;
     </sect2>
-    -->

share/xml/authors.ent

@@ -2587,7 +2587,7 @@
 <!ENTITY a.bugmeister '&a.eadler;, &a.gavin;, &a.mva;, &a.koobs;, &a.gonzo;'>
 
 <!-- FreeBSD Core Team -->
-<!ENTITY a.core.members '&a.allanjude;, &a.bapt;, &a.bcr;, &a.benno;, &a.emaste;, &a.gnn;, &a.hrs;, &a.jhb;, &a.kmoore;'>
+<!ENTITY a.core.members '&a.allanjude;, &a.bcr;, &a.brooks;, &a.imp;, &a.hrs;, &a.jeff;, &a.jhb;, &a.kmoore;, @a.seanc;'>
 
 <!-- FreeBSD Doc Engineering Team -->
 <!ENTITY a.doceng.members '&a.gjb;, &a.wblock;, &a.blackend;, &a.gabor;, &a.hrs;'>