From b82e724568b5fe831116c886bfa4eca8c87a6a94 Mon Sep 17 00:00:00 2001
From: Mitchell Horne <mhorne@FreeBSD.org>
Date: Fri, 22 Mar 2019 17:30:56 +0000
Subject: [PATCH] Add myself (mhorne) as a new committer

Update author/committer files and add my GPG key.

Approved by:	markj
Differential Revision:	https://reviews.freebsd.org/D19679
---
 .../contributors/contrib.committers.xml       |  6 ++-
 share/pgpkeys/mhorne.key                      | 43 +++++++++++++++++++
 share/pgpkeys/pgpkeys-developers.xml          |  5 +++
 share/pgpkeys/pgpkeys.ent                     |  1 +
 share/xml/authors.ent                         |  3 ++
 share/xml/news.xml                            | 14 ++++++
 6 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 share/pgpkeys/mhorne.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index 9ecc16a390..d24804ce97 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -533,7 +533,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   </listitem>
 
   <listitem>
-    <para>&a.mich.email;</para>
+    <para>&a.mhorne.email;</para>
   </listitem>
 
   <listitem>
@@ -721,6 +721,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <para>&a.jlaffaye.email;</para>
   </listitem>
 
+  <listitem>
+    <para>&a.mich.email;</para>
+  </listitem>
+
   <listitem>
     <para>&a.dvl.email;</para>
   </listitem>
diff --git a/share/pgpkeys/mhorne.key b/share/pgpkeys/mhorne.key
new file mode 100644
index 0000000000..a072d26efd
--- /dev/null
+++ b/share/pgpkeys/mhorne.key
@@ -0,0 +1,43 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh mhorne 8BF8274CE75489DF ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa2048/8BF8274CE75489DF 2019-03-21 [SC] [expires: 2022-03-20]
+      Key fingerprint = 929F DC60 F71F 69B0 2242  F002 8BF8 274C E754 89DF
+uid                            Mitchell Horne <mhorne@FreeBSD.org>
+sub   rsa2048/3B7575001B0E97C1 2019-03-21 [E] [expires: 2022-03-20]
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFyS2dQBCADdiXBG8hBVLmYbxu7aSzbwLwUf3HkGFz3rooS1kwyy+SfmjZ4U
+KNnl9WMxWKrJ7OAZpiNH6bLQ5nsqfx09OnpWL8c/QuPbhNdUywQoqqYpRI0K8GEn
+//nS9Gs0KTYwVpWbXlrzP+jf3Uh/9L5mcQmStLIH4zaaqMYHW+pMuPrvBmLIHTvL
+j2QjOkxslrcUdord9uvxe5HtLU8RuTpQpHOKz705Z9/v7twFdi2HtKzpLwO6SzVy
+u351di1J+GihsVpcT5josQV5cHbIP3Unx+kmtKBEEc/jl/zBglF7ruWUtwgbryID
++2ZPEaO1Mj+RResX4LFVMusq3uUpWRb5WJXxABEBAAG0I01pdGNoZWxsIEhvcm5l
+IDxtaG9ybmVARnJlZUJTRC5vcmc+iQFUBBMBCAA+FiEEkp/cYPcfabAiQvACi/gn
+TOdUid8FAlyS2dQCGwMFCQWjmoAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQ
+i/gnTOdUid97Pwf/XjlGXIKnx60crC79646sKwU5aPLXIzNqDVy0+szyPTuAfrPI
+cwt4HB3huWpx+x/RAYCRp9yh24wYB+hayo6bA731zdsTcHi52KTrwusVf7PS92w2
+mSx+m0pQZyS0ixfrojA66wx0vhZdXVzM3uRQdggZ5tLWA62wdT/7l0GRYTFMRTuK
+nVL7wu7YmBFVIje89szt4KNhCESXnL6g3PKPQq5PNIYxFa+eoHkdYEN10zbdUpde
+x9FEKUwtuLonipXxBrdV5UYhGN9lshyDJL8jiQ0ZZEY6nVe33reGrZlUXfwXis+1
+z4PwJfh6TP6eCK3Giukg8c8UNwpf8lKg3AgNpLkBDQRcktnUAQgA3zt4M4ecoQqf
+xpjliNLujt9klDqvmkJvWmzMuMXdzlPgGRJ0doio9YIeEdkOt6xN0pPTK/ReCZ8W
+qFQ8zo23u1pwGuo0CnR58XF19wyxyUuKu/PHbt+56mC8tNHmAXsMyXQmlDqWvn/W
+zLY7euNRtNS4QQIwtxfM5EC4GGa5KQwxn0kM7dkUSOE/cxr+/kNbHHzbgagZR4cn
+NUqtPPr3dYXcibCTzgz96Lyt3/qMLXX9RTBRzu+O6E+byxWOe8ar/ZlwY2b4wTQG
+mhgNttkSxKtxMpZnd8+DGV/bI1P5Ct/K2GeCwNyupQGON5ymn6o7jTch+qmFX0It
+kBWO4zn49QARAQABiQE8BBgBCAAmFiEEkp/cYPcfabAiQvACi/gnTOdUid8FAlyS
+2dQCGwwFCQWjmoAACgkQi/gnTOdUid+6OAgA3COOS4qZRB79Q721Pq+8++ZQVURM
+u844w3RoGP0AnpMTaD82Da4hQR6oY1d4rzhcPDYNlgoYYQi+3iozkdZnYO53rAzI
+Bp53re/HdjLxsacWGyYj0FEbqtjp3jCLoCjwsLmbxMqEryetHmboxisZuSpB4o8V
+zR0+PQyXtPIvPzRfzaJBW/41QIUdjaD6ZecHe39I06LMYymPdnwGvgeGBBTmGT7y
+Z+8I6loAfeXujdb8yiq3aCIIe/elc++cbz6dI65D7BJP68z1SOqX0/5eMh5nYPJZ
+FOoOIYB4N6VDBuHtWRf1Bf/GPygk1xkNQGH0+acYHvutdkUys2ghS5Krpg==
+=pFAV
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index e5b5b754a4..f9142c40c0 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -921,6 +921,11 @@
       &pgpkey.pho;
     </sect2>
 
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-mhorne">
+      <title>&a.mhorne.email;</title>
+      &pgpkey.mhorne;
+    </sect2>
+
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-bhughes">
       <title>&a.bhughes.email;</title>
       &pgpkey.bhughes;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 0c5072ad35..d622337a01 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -348,6 +348,7 @@
 <!ENTITY pgpkey.metal SYSTEM "metal.key">
 <!ENTITY pgpkey.mfechner SYSTEM "mfechner.key">
 <!ENTITY pgpkey.mheinen SYSTEM "mheinen.key">
+<!ENTITY pgpkey.mhorne SYSTEM "mhorne.key">
 <!ENTITY pgpkey.mi SYSTEM "mi.key">
 <!ENTITY pgpkey.mich SYSTEM "mich.key">
 <!ENTITY pgpkey.mikeh SYSTEM "mikeh.key">
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index edd9e2b6a8..58335d3cba 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -1581,6 +1581,9 @@
 <!ENTITY a.mheinen "Martin Heinen">
 <!ENTITY a.mheinen.email "&a.mheinen; <email xmlns='http://docbook.org/ns/docbook'>mheinen@FreeBSD.org</email>">
 
+<!ENTITY a.mhorne "Mitchell Horne">
+<!ENTITY a.mhorne.email "&a.mhorne; <email xmlns='http://docbook.org/ns/docbook'>mhorne@FreeBSD.org</email>">
+
 <!ENTITY a.mi "Mikhail Teterin">
 <!ENTITY a.mi.email "&a.mi; <email xmlns='http://docbook.org/ns/docbook'>mi@FreeBSD.org</email>">
 
diff --git a/share/xml/news.xml b/share/xml/news.xml
index 1e918e2d71..840d2a691a 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -31,6 +31,20 @@
   <year>
     <name>2019</name>
 
+    <month>
+      <name>3</name>
+
+      <day>
+	<name>20</name>
+
+	<event>
+	  <p>New committer:
+	    <a href="mailto:mhorne@FreeBSD.org">Mitchell Horne</a>
+	    (src)</p>
+	</event>
+      </day>
+    </month>
+
     <month>
       <name>2</name>