aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Moinur Rahman <bofh@FreeBSD.org>2020-07-01 15:38:01 +0000
committerMuhammad Moinur Rahman <bofh@FreeBSD.org>2020-07-01 15:38:01 +0000
commit80a28d6ffe04d9f1afaae02d40c9a6650ec418dd (patch)
tree92a333629096e2712cfd96de8e5d7a77be45dd0b
parentd4fad5c01e0cbb0d303f8bb1149025c1d9ebbb2e (diff)
downloaddoc-80a28d6ffe.tar.gz
doc-80a28d6ffe.zip
Update with the members of the 11th core team, core.xi
- Update en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml to reflect outgoing CORE.10 members - Update en_US.ISO8859-1/books/dev-model/book.xml to reflect changes in core-secretary@ - Update en_US.ISO8859-1/books/handbook/introduction/chapter.xml to reflect changes on latest Election Date - Update en_US.ISO8859-1/htdocs/administration.xml to reflect latest CORE.11 team and respective Liason - Update share/pgpkeys/pgpkeys-core.xml to reflect CORE.11 members - Update share/pgpkeys/core-secretary.key signed by outgoing core-secretary@ and jrm@ # gpg --list-key --fingerprint core-secretary@freebsd.org pub rsa4096 2020-06-26 [SC] [expires: 2022-06-30] 4B64 E9E0 BDE9 B3EC C06B 5C66 D8C8 C83B 49F2 6F17 uid [ultimate] FreeBSD Core Team Secretary <core-secretary@freebsd.org> sig 3 D8C8C83B49F26F17 2020-06-26 FreeBSD Core Team Secretary <core-secretary@freebsd.org> sig 36A40C83B0D6EF9E 2020-06-26 Joseph R. Mingrone <jrm@ftfl.ca> sig 0CB403E4E95B96EC 2020-06-26 [User ID not found] sub rsa4096 2020-06-26 [E] [expires: 2022-06-30] sig D8C8C83B49F26F17 2020-06-26 FreeBSD Core Team Secretary <core-secretary@freebsd.org> Submitted by: bofh (with core-secretary@ hat on) Approved by: bcr, jrm Differential Revision: https://reviews.freebsd.org/D25527
Notes
Notes: svn path=/head/; revision=54306
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml32
-rw-r--r--en_US.ISO8859-1/books/dev-model/book.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/introduction/chapter.xml2
-rw-r--r--en_US.ISO8859-1/htdocs/administration.xml20
-rw-r--r--share/pgpkeys/core-secretary.key127
-rw-r--r--share/pgpkeys/pgpkeys-core.xml39
6 files changed, 125 insertions, 97 deletions
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
index a85e8b0c01..af5272d428 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
@@ -4,6 +4,30 @@
xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
<listitem>
+ <para>&a.kmoore.email; (2016 - 2020)</para>
+ </listitem>
+
+ <listitem>
+ <para>&a.jhb.email; (2002 - 2006, 2010 - 2014, 2016 - 2020)</para>
+ </listitem>
+
+ <listitem>
+ <para>&a.jeff.email; (2018 - 2020)</para>
+ </listitem>
+
+ <listitem>
+ <para>&a.brooks.email; (2006 - 2012, 2018 - 2020)</para>
+ </listitem>
+
+ <listitem>
+ <para>&a.bcr.email; (2016 - 2020)</para>
+ </listitem>
+
+ <listitem>
+ <para>&a.allanjude.email; (2016 - 2020)</para>
+ </listitem>
+
+ <listitem>
<para>&a.bapt.email; (2016 - 2018)</para>
</listitem>
@@ -24,10 +48,6 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
</listitem>
<listitem>
- <para>&a.jhb.email; (2002 - 2006, 2010 - 2014)</para>
- </listitem>
-
- <listitem>
<para>&a.kib.email; (2010 - 2014)</para>
</listitem>
@@ -44,10 +64,6 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
</listitem>
<listitem>
- <para>&a.brooks.email; (2006 - 2012)</para>
- </listitem>
-
- <listitem>
<para>&a.imp.email; (2000 - 2008, 2010 - 2012)</para>
</listitem>
diff --git a/en_US.ISO8859-1/books/dev-model/book.xml b/en_US.ISO8859-1/books/dev-model/book.xml
index c64e3925ee..3d5b08a61d 100644
--- a/en_US.ISO8859-1/books/dev-model/book.xml
+++ b/en_US.ISO8859-1/books/dev-model/book.xml
@@ -1301,7 +1301,7 @@
unresolved.
</para>
<para>
- Hat currently held by: &a.jrm.email;.
+ Hat currently held by: &a.bofh.email;.
</para>
</section>
diff --git a/en_US.ISO8859-1/books/handbook/introduction/chapter.xml b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
index 1133edc7aa..34fec5a301 100644
--- a/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1035,7 +1035,7 @@
is one of the functions of the core team, as is the
recruitment of new core team members as others move on.
The current core team was elected from a pool of
- committer candidates in July 2018. Elections are held
+ committer candidates in June 2020. Elections are held
every 2 years.</para>
<note>
diff --git a/en_US.ISO8859-1/htdocs/administration.xml b/en_US.ISO8859-1/htdocs/administration.xml
index f142f272fc..079b50b825 100644
--- a/en_US.ISO8859-1/htdocs/administration.xml
+++ b/en_US.ISO8859-1/htdocs/administration.xml
@@ -92,15 +92,15 @@
Core Team is elected by the active developers in the project.</p>
<ul>
- <li>&a.allanjude.email; (Clusteradm Liaison)</li>
- <li>&a.bcr.email; (Foundation Liaison)</li>
- <li>&a.brooks.email; (Security Team Liaison)</li>
- <li>&a.hrs.email; (Doceng Team Liaison)</li>
- <li>&a.jeff.email;</li>
- <li>&a.jhb.email; (Bugmeister and Release Engineering Team Liaison)</li>
- <li>&a.kmoore.email;</li>
- <li>&a.seanc.email; (CI and Portmgr Team Liaison)</li>
- <li>&a.imp.email; (Code-of-Conduct Committee Liaison)</li>
+ <li>&a.bapt.email; (Clusteradm Liaison)</li>
+ <li>&a.emaste.email; (GIT Transition WG and Security Team Liason)</li>
+ <li>&a.gnn.email; (Foundation Liaison)</li>
+ <li>&a.hrs.email; (Code-of-Conduct Committee Liaison)</li>
+ <li>&a.kevans.email; (Portmgr Team Liaison)</li>
+ <li>&a.markj.email; (Bugmeister and CI Team Liaison)</li>
+ <li>&a.scottl.email; (Release Engineering Team Liaison)</li>
+ <li>&a.seanc.email; (Doceng Team Liaison)</li>
+ <li>&a.imp.email; (GIT Transition WG Liaison)</li>
</ul>
<h3><a name="t-doceng">FreeBSD Documentation Engineering Team</a>
@@ -305,7 +305,7 @@
decisions and actions.</p>
<ul>
- <li>&a.jrm.email;</li>
+ <li>&a.bofh.email;</li>
</ul>
<h3><a name="t-doceng-secretary">Documentation Engineering Team Secretary</a>
diff --git a/share/pgpkeys/core-secretary.key b/share/pgpkeys/core-secretary.key
index 13fc7fa3b4..f9afb57260 100644
--- a/share/pgpkeys/core-secretary.key
+++ b/share/pgpkeys/core-secretary.key
@@ -1,68 +1,83 @@
<!-- $FreeBSD$ -->
<!--
-sh addkey.sh core-secretary 0CB403E4E95B96EC ;
+sh addkey.sh core-secretary D8C8C83B49F26F17 ;
-->
<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub rsa2048/0CB403E4E95B96EC 2018-06-30 [SC] [expires: 2020-06-29]
- Key fingerprint = 9F02 836F 50D3 AD5A B75A C588 0CB4 03E4 E95B 96EC
+pub rsa4096/D8C8C83B49F26F17 2020-06-26 [SC] [expires: 2022-06-30]
+ Key fingerprint = 4B64 E9E0 BDE9 B3EC C06B 5C66 D8C8 C83B 49F2 6F17
uid FreeBSD Core Team Secretary <core-secretary@freebsd.org>
-sub rsa2048/133C3338A5B95A60 2018-06-30 [E] [expires: 2020-06-29]
- Key fingerprint = FA37 B8AA C667 C3AA D310 751D 133C 3338 A5B9 5A60
+sub rsa4096/377C937536E4821B 2020-06-26 [E] [expires: 2022-06-30]
]]></programlisting>
<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
-----BEGIN PGP PUBLIC KEY BLOCK-----
-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
-=5VKx
+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
+=3AI7
-----END PGP PUBLIC KEY BLOCK-----
]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-core.xml b/share/pgpkeys/pgpkeys-core.xml
index 5f618de4bc..b7d4c04289 100644
--- a/share/pgpkeys/pgpkeys-core.xml
+++ b/share/pgpkeys/pgpkeys-core.xml
@@ -4,19 +4,19 @@
$FreeBSD$
-->
- <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-allanjude">
- <title>&a.allanjude.email;</title>
- &pgpkey.allanjude;
+ <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-bapt">
+ <title>&a.bapt.email;</title>
+ &pgpkey.bapt;
</sect2>
- <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-bcr">
- <title>&a.bcr.email;</title>
- &pgpkey.bcr;
+ <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-brooks">
- <title>&a.brooks.email;</title>
- &pgpkey.brooks;
+ <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">
@@ -29,22 +29,19 @@
&pgpkey.imp;
</sect2>
-<!--
- Jeff does not (yet) have a key.
- <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-jeff">
- <title>&a.jeff.email;</title>
- &pgpkey.jeff;
+ <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-kevans">
+ <title>&a.kevans.email;</title>
+ &pgpkey.kevans;
</sect2>
--->
- <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-jhb">
- <title>&a.jhb.email;</title>
- &pgpkey.jhb;
+ <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-markj">
+ <title>&a.markj.email;</title>
+ &pgpkey.markj;
</sect2>
- <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-kmoore">
- <title>&a.kmoore.email;</title>
- &pgpkey.kmoore;
+ <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-scottl">
+ <title>&a.scottl.email;</title>
+ &pgpkey.scottl;
</sect2>
<sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-core-seanc">