From da8a4640f2fa7b9f7ec4b5ce567fd675766c9c73 Mon Sep 17 00:00:00 2001
From: Doug Moore <dougm@FreeBSD.org>
Date: Thu, 2 May 2019 16:26:48 +0000
Subject: [PATCH] Enroll new committer Doug Moore (dougm@freebsd.org).

Approved by: kib (mentor)
Differential Revision: https://reviews.freebsd.org/D20136
---
 .../contributors/contrib.committers.xml       |  4 +
 share/pgpkeys/dougm.key                       | 74 +++++++++++++++++++
 share/pgpkeys/pgpkeys-developers.xml          |  5 ++
 share/pgpkeys/pgpkeys.ent                     |  1 +
 share/xml/authors.ent                         |  3 +
 share/xml/news.xml                            | 10 +++
 6 files changed, 97 insertions(+)
 create mode 100644 share/pgpkeys/dougm.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index 2ca3831bed..9e6110a99b 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -941,6 +941,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <para>&a.marcel.email;</para>
   </listitem>
 
+  <listitem>
+    <para>&a.dougm.email;</para>
+  </listitem>
+
   <listitem>
     <para>&a.kmoore.email;</para>
   </listitem>
diff --git a/share/pgpkeys/dougm.key b/share/pgpkeys/dougm.key
new file mode 100644
index 0000000000..ef1d83cd00
--- /dev/null
+++ b/share/pgpkeys/dougm.key
@@ -0,0 +1,74 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh dougm E88F2153D3B9D56E ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa2048/E88F2153D3B9D56E 2019-04-19 [SC] [expires: 2022-04-18]
+      Key fingerprint = 795E 3531 9256 03AE 4297  DE83 E88F 2153 D3B9 D56E
+uid                            Doug Moore (www.freebsd.org) <dougm@freebsd.org>
+uid                            Douglas W Moore <dougm@rice.edu>
+sub   rsa2048/929C16F5708028AC 2019-04-19 [E] [expires: 2022-04-18]
+sub   rsa2048/A3B47B563FA14BAC 2019-04-20 [S] [expires: 2022-04-19]
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+s29VAfg9CW/ezgIqo/rNI3eEx0uUu2+B3pQx3K5YrFGTTLRaEZrhtnygo8KjkOvq
+jXY5IS/H5R7ZAFDrudVjkfpKgKiikceiZ5EAEQEAAYkC0gQYAQoAJhYhBHleNTGS
+VgOuQpfeg+iPIVPTudVuBQJcusvzAhsCBQkFo5qAAaAJEOiPIVPTudVuwNQgBBkB
+CgB9FiEEfpB20ACiBQP75GtQo7R7Vj+hS6wFAly6y/NfFIAAAAAALgAoaXNzdWVy
+LWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDdFOTA3NkQw
+MDBBMjA1MDNGQkU0NkI1MEEzQjQ3QjU2M0ZBMTRCQUMACgkQo7R7Vj+hS6yn8Af/
+SSYblvKWCHoKuDfTuNegJCBm+1OFoH0saZ/nvKlS+d+vC3WfQTHtwpxCe9ID7Xbz
+T0rXZCZHkPrUB1TwcFpB2gsWPSsOLfitrGABjnnj5iIa6P1dqA8Qox5v6K6+q+F6
+0Lq/srx5eqlpYijMikUkKYSXEYxKeACP9Xqc6ebpcNLJ+Bo4KaeM5BGp7j25T7pH
+ruBvtQHgn5ckeA9aVr3UFOqy/c0tzBcg2o/6KIe2AwuasfWPR42HE6T35Es1/Rht
+lwZkd/t5aNwltZwHXd7SAXqZHRFxDEKWbz0RW/an4I8hOldMAushvX8Rf07hvP06
+7N1mTkWtYBQ0dK0ETr4xwnP1B/0ez5m8OLO6/w05fZhl4pF0GlZKwpEvfYOQ+u6n
+q8wNUvUsh+3dIlctz6ha/LzZ8CbQe4Yxcerjtlxu+YdQl+dKt2GMdIHflHcHDNhn
+j+Ug0NH3RaArD40k0SuaIg/eg/OVU20uxCYBdeMB3KwW6rpVJbRNyUlUiIGMuCcq
++HRfNqTPF1nmlWmAIfMqCA77neVGESRAiAtNFTRtVv8FCSpryIbBSEF0Z3hKDL2z
+KQ7z/ULwCliuxPnWIbv3nphYbXg04G4degGx3KcJMBVjBJHv7t/d6c0rMSlQq2AA
+sb+2mNfOnyCw60FKUKia+NCNkd9Z7358vLbAn3zCLyrSffEc
+=keMx
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index 31af3848d2..8a90570240 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -1666,6 +1666,11 @@
       &pgpkey.marcel;
     </sect2>
 
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-dougm">
+      <title>&a.dougm.email;</title>
+      &pgpkey.dougm;
+    </sect2>
+
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-kmoore">
       <title>&a.kmoore.email;</title>
       &pgpkey.kmoore;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 21f2f078f3..dd50f7902a 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -141,6 +141,7 @@
 <!ENTITY pgpkey.dhw SYSTEM "dhw.key">
 <!ENTITY pgpkey.dim SYSTEM "dim.key">
 <!ENTITY pgpkey.dinoex SYSTEM "dinoex.key">
+<!ENTITY pgpkey.dougm SYSTEM "dougm.key">
 <!ENTITY pgpkey.dru SYSTEM "dru.key">
 <!ENTITY pgpkey.dryice SYSTEM "dryice.key">
 <!ENTITY pgpkey.dteske SYSTEM "dteske.key">
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index fbbbcf131b..70415301ac 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -654,6 +654,9 @@
 <!ENTITY a.dougb "Doug Barton">
 <!ENTITY a.dougb.email "&a.dougb; <email xmlns='http://docbook.org/ns/docbook'>dougb@FreeBSD.org</email>">
 
+<!ENTITY a.dougm "Doug Moore">
+<!ENTITY a.dougm.email "&a.dougm; <email xmlns='http://docbook.org/ns/docbook'>dougm@FreeBSD.org</email>">
+
 <!ENTITY a.dru "Dru Lavigne">
 <!ENTITY a.dru.email "&a.dru; <email xmlns='http://docbook.org/ns/docbook'>dru@FreeBSD.org</email>">
 
diff --git a/share/xml/news.xml b/share/xml/news.xml
index 93e866d524..90f6fe6d3b 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -34,6 +34,16 @@
     <month>
       <name>4</name>
 
+      <day>
+	<name>30</name>
+
+	<event>
+	  <p>New committer:
+	    <a href="mailto:dougm@FreeBSD.org">Doug Moore</a>
+	    (src)</p>
+	</event>
+      </day>
+
       <day>
         <name>28</name>