From 4887ac715e565bdefbcd9f28e9771e656e0c3fb2 Mon Sep 17 00:00:00 2001
From: David Bright <dab@FreeBSD.org>
Date: Tue, 22 Nov 2016 18:30:40 +0000
Subject: [PATCH] Add new committer information for myself (dab)

- Add information to committers list
- Add PGP key and an entity for the key
- Add author entity
- Add news item

Approved by:	vangyzen (mentor)
---
 .../contributors/contrib.committers.xml       |  4 ++
 share/pgpkeys/dab.key                         | 43 +++++++++++++++++++
 share/pgpkeys/pgpkeys-developers.xml          |  5 +++
 share/pgpkeys/pgpkeys.ent                     |  1 +
 share/xml/authors.ent                         |  3 ++
 share/xml/news.xml                            | 10 +++++
 6 files changed, 66 insertions(+)
 create mode 100644 share/pgpkeys/dab.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index 887ce77d7f..676e39f231 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -156,6 +156,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <para>&a.makc.email;</para>
   </listitem>
 
+  <listitem>
+    <para>&a.dab.email;</para>
+  </listitem>
+
   <listitem>
     <para>&a.antoine.email;</para>
   </listitem>
diff --git a/share/pgpkeys/dab.key b/share/pgpkeys/dab.key
new file mode 100644
index 0000000000..f4a5433a83
--- /dev/null
+++ b/share/pgpkeys/dab.key
@@ -0,0 +1,43 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh dab 3378CB31A103BE6A ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa2048/3378CB31A103BE6A 2016-11-14 [SC] [expires: 2019-11-14]
+      Key fingerprint = B1F2 B348 577C 057B 0317  600F 3378 CB31 A103 BE6A
+uid                            David Bright <dab@freebsd.org>
+sub   rsa2048/2DCA963E5192E094 2016-11-14 [E] [expires: 2019-11-14]
+      Key fingerprint = DC65 16EB 9202 5574 EA10  AB7E 2DCA 963E 5192 E094
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFgqQsIBCADfDUZ79qW2MKVRQl9l9zMYzppdHn+eS7KGjUP9hjmYUuX3vM0S
+c5DlJ9Py59Byucg8zo6eow1iv6NdiEPuUEYB2ujDP/kbmC397zEt6p9ldlL4PXXS
+JumpdZCzwz4ACYB5ke7OCljNqbigzoZgX5DXjyjx87NfG6eWkbnEweDPmae7DGj5
+bwQmJPoTqvJR7Ot/R/73ix8lhph1vdl83Iqu+IDVdlXTI2Afz4UaCRdfDiXgMQIo
+/HABXJ90+TXG/vH37Jb0kBflql9sEaUsCcTvMrye0Wjgv3VSPZm3ZEgmR7UKR71p
+2MJVlVVZUH3FHQ2jDqKpCMi7F3ERlvRDktm/ABEBAAG0HkRhdmlkIEJyaWdodCA8
+ZGFiQGZyZWVic2Qub3JnPokBPQQTAQoAJwUCWCpCwgIbAwUJBaOagAULCQgHAwUV
+CgkICwUWAwIBAAIeAQIXgAAKCRAzeMsxoQO+aqagCADDt4FbZBz3VFevTEtAjuyz
+CDPmPom1MBwsh6KB2J84wKOsXPmZ7vqaZ2G70fCPNowqmHq56cAbp0BD1Lf6gD+3
+imeacKc/E6n+L49LOhOtQ8EUyHs/nAUmlE1PrOS1w5wmCgRjPXa5k+zxj/YMsAEF
+dMn6UzOl5MIJN/zhBB5tU2bkP5hF4rVvpQ1zlnSldoBLfPlG/w1RzvOSJfunZUTS
+NVrKYlSjEQ7q56udxKoLPEdr+X8kqwZilh5WBiTt7mMw7lrP6dMV/GGmDg893J6c
+onQ1l2RN6Un1gKlc3rgdz3shncr786WF3cV2dFSIrO/Pn3iNRR3uJouRLdLhU0kM
+uQENBFgqQsIBCAC5ABwcVerpyp5NzHBDFSbxEyPab6HFH1E4zksEGyeypU8UW5ac
+c2ko5Ovz7CE0n21uhBtIt/Lz5Koxz0LSqqnk9jIQL/4XVvne+8YnT+Tf9DZv9We5
+K0tFit/DFgCzIpxacoxLGBRNSkSzFrAepvVinTk905igdYZYfxtHrAREU4BdqBMQ
+tbgGaewHtOLlRRr+N4wkAZlJLa7RaLn5s/EakpmCM1eR8z0fOBNJSXlWOzqh1cvw
+WZ00qj0rYXwXu0fgzpREmJFS01GByFuB4xDyqfAoynxKNBJH/qAcJTp7jST8PLWe
+3Tblm4acsIAPHUcABgMnZYdMQnSwwa9/W1DlABEBAAGJASUEGAEKAA8FAlgqQsIC
+GwwFCQWjmoAACgkQM3jLMaEDvmp8hQgAzKTYmU2cf35NdrtT9C7jBDWSVSDdyKHY
+SAKoP+vAkC3A1HH6wohE5JvOZ6245vgBQwFHvzh2v7jDUWmB3CrcSSMUoUIwl15m
+WlCdCy/C3SAknxQx+zHYmx9vuHPS1yF2l0KPS30Kc1le1GqVYi5wxnWPo+gE3MH4
+DDh5LdDExYveMuBgybdNxV8Qvr25UghJHrQCT+FCISo0FActO1Z5HzdOKxQe6KTn
++zKr4yKCOe4kb7GUaAX3Pt82J7bMtwRzAKLyjMJVQueL/cr+geerKKrd8FyVAgQM
+hdBYD3lyjK6nGssgr4Og9+QtsE2RAVH9qqhcF3kI7nxJ7EDb/d3xag==
+=b3va
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index b9652b5620..520c11eeb7 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -204,6 +204,11 @@
       &pgpkey.ebrandi;
     </sect2>
 
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-dab">
+      <title>&a.dab.email;</title>
+      &pgpkey.dab;
+    </sect2>
+
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-harti">
       <title>&a.harti.email;</title>
       &pgpkey.harti;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index c6be45c997..15ffb06b82 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -102,6 +102,7 @@
 <!ENTITY pgpkey.csjp SYSTEM "csjp.key">
 <!ENTITY pgpkey.culot SYSTEM "culot.key">
 <!ENTITY pgpkey.cy SYSTEM "cy.key">
+<!ENTITY pgpkey.dab SYSTEM "dab.key">
 <!ENTITY pgpkey.daichi SYSTEM "daichi.key">
 <!ENTITY pgpkey.damien SYSTEM "damien.key">
 <!ENTITY pgpkey.danfe SYSTEM "danfe.key">
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index 2287786de4..b27761183d 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -477,6 +477,9 @@
 <!ENTITY a.cy "Cy Schubert">
 <!ENTITY a.cy.email "&a.cy; <email xmlns='http://docbook.org/ns/docbook'>cy@FreeBSD.org</email>">
 
+<!ENTITY a.dab "David Bright">
+<!ENTITY a.dab.email "&a.dab; <email xmlns='http://docbook.org/ns/docbook'>dab@FreeBSD.org</email>">
+
 <!ENTITY a.daichi "Daichi GOTO">
 <!ENTITY a.daichi.email "&a.daichi; <email xmlns='http://docbook.org/ns/docbook'>daichi@FreeBSD.org</email>">
 
diff --git a/share/xml/news.xml b/share/xml/news.xml
index 9b21b2b4cd..6a3898123b 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -59,6 +59,16 @@
     <month>
       <name>10</name>
 
+      <day>
+	<name>22</name>
+
+	<event>
+	  <p>New committer:
+	    <a href="mailto:dab@FreeBSD.org">David Bright</a>
+	    (src)</p>
+	</event>
+      </day>
+
       <day>
 	<name>10</name>