From af2381eab932e76af63b1c00a1399c8bd661f34c Mon Sep 17 00:00:00 2001
From: Chuck Tuffli <chuck@FreeBSD.org>
Date: Mon, 25 Sep 2017 00:33:22 +0000
Subject: [PATCH] Introduce information about new committer (chuck@FreeBSD.org)

- Add myself as a committer
- Add my PGP public key
- Add my author entity
- Add a news entry

Reviewed by:	imp (mentor), ken (mentor)
Approved by:	imp (mentor), ken (mentor)
Differential Revision:	https://reviews.freebsd.org/D12357
---
 .../contributors/contrib.committers.xml       |  4 ++
 share/pgpkeys/chuck.key                       | 44 +++++++++++++++++++
 share/pgpkeys/pgpkeys.ent                     |  1 +
 share/xml/authors.ent                         |  3 ++
 share/xml/news.xml                            | 10 +++++
 5 files changed, 62 insertions(+)
 create mode 100644 share/pgpkeys/chuck.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index 3c632718ad..d1ea5d7702 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -1360,6 +1360,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <para>&a.tuexen.email;</para>
   </listitem>
 
+  <listitem>
+    <para>&a.chuck.email;</para>
+  </listitem>
+
   <listitem>
     <para>&a.andrew.email;</para>
   </listitem>
diff --git a/share/pgpkeys/chuck.key b/share/pgpkeys/chuck.key
new file mode 100644
index 0000000000..84d918dbfd
--- /dev/null
+++ b/share/pgpkeys/chuck.key
@@ -0,0 +1,44 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh chuck A8F63E31F4952EA1 ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa2048/A8F63E31F4952EA1 2017-09-10 [SC] [expires: 2020-09-09]
+      Key fingerprint = F25C 210A 31CA 4148 55DD  06F2 A8F6 3E31 F495 2EA1
+uid                            Charles F. Tuffli (a.k.a Chuck Tuffli <chuck@freebsd.org>) <chuck@tuffli.net>
+sub   rsa2048/949D7FF9FC1B6418 2017-09-10 [E] [expires: 2020-09-09]
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFm1TEoBCACjepzrwG6VTGbGikK8+vy+OWfMy3J6ecWyYAp7yiuX3i+X5KUM
+JZwGLzLZm1al3uaSq/lLnLM11LTiGRSu2HLjLHyV+La3OTUJfbdP4HF3Iz2i/3Fq
+iY662f23AH9kCBGqorEHyg0c+1xgHnLz0vrh7On2hoxqIYFP2MIdyddZU20mAtxI
+AKeeoyOG3JQtm9MhhA2kbrJ0IfxDvdBpxqcV8wpliDPf00dlcnzBpe+jdBgRO9Pz
+gH+9hu7PaNCYGiL1CKkbMy2UHE22w8uOEc13jXpcYNEzUKWT7hHWawzGM7PvOhe8
+C6TPwIxIHKt487uVETa5Npp38tzNiJaXw2VHABEBAAG0TUNoYXJsZXMgRi4gVHVm
+ZmxpIChhLmsuYSBDaHVjayBUdWZmbGkgPGNodWNrQGZyZWVic2Qub3JnPikgPGNo
+dWNrQHR1ZmZsaS5uZXQ+iQFUBBMBCgA+FiEE8lwhCjHKQUhV3QbyqPY+MfSVLqEF
+Alm1TEoCGwMFCQWjmoAFCwkIBwMFFQoJCAsFFgMCAQACHgECF4AACgkQqPY+MfSV
+LqGflQf/aWjSbk0sV79MARwPeZ1Mzw4+eJUC0r/4fMZY6dz6ktaThR8kzL8RxkYL
+o09WTYf9MPvhqvCWXZK71SwkTaHq5r7XatMJaS3hmwX5EqDH/srlhOtrof73CDpg
+4HFOPZRHljge8ZDM9NifA1qHawIMDWHOa6u0G8LGOXzUsICDtQg83adO/vywjhjj
+DlxEogQ2q4nvelRVUdi9IfvKGJUhKXIH3XHujlQgVeBlsAPHwgiNUpM9JlhXVspL
+ldYrc3PX8u1zKmxsd58dFHFycnkpcm1JKisHrs5xyarI5n3J8uJJwrf7NXGEwgox
+IUyqVvrfga+kd2uxWuXsSkXG2r2n6rkBDQRZtUxKAQgAwL4F+mAN3MTtKpuKBwTQ
+26eyPXRcRSobNelxY9HAwVh6WdK34AkotbyNZFFeUi4miI5QU9IzfF9yk9OIvfEh
++uKzFmp5yIyzgrPx341EuH+DiwdZVQx476/BRaCdfRCHToZTStBlMHPGds2Qyupr
+YgzVHMuTix1dTFpUhyCXPTslJPc2/J5A+9jgvKPtocQbIi7UzhuEgMw7eRMLhsWa
+7q93GcDN8e3u/44jJpifFxTn863tjb7YJfytLnv6h6dseVtbTkh1ypJR3FARcCDI
+yO/U2LzNCPga7CgbvYvLQ/8GRwpKyf5SDiFeYDMFT6ifnOvIVgp7s9xfkPUFoqx6
+zQARAQABiQE8BBgBCgAmFiEE8lwhCjHKQUhV3QbyqPY+MfSVLqEFAlm1TEoCGwwF
+CQWjmoAACgkQqPY+MfSVLqH3wgf/eUTPlanp9JEl923h1HLmRix/d1+AwGHZ2iJr
+kajbfq5KLRUsNZhaq7hMDd5XlPY6batT+wjSmD0HqHDnyr38NNVTsheh88V7Vdey
+uuaiXXF8Q9tWJ3/pdT8j1IDM5u82FWKK+HOI6iKszuMz61Tz+wafl4HS1OCwdRZ9
+Gs475eywJCc4h2Rc6ZB09UWQVACmpKfGhSj6r/mwK02BKYitdHpJxmz56aiH+15K
+ib7fdAhIgha5Bo2eZOs55K5zohY3LOmrbARM7/onOweRk7HD6EUsbH4vcymJ8dkk
+cYyGTe1c56bXFATsUCmbAXNXHw4g3bc0ajoEYAHvYWxKmkeHIA==
+=X/bC
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index b0014aaa2e..379041bb6d 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -88,6 +88,7 @@
 <!ENTITY pgpkey.ceri SYSTEM "ceri.key">
 <!ENTITY pgpkey.cherry SYSTEM "cherry.key">
 <!ENTITY pgpkey.chinsan SYSTEM "chinsan.key">
+<!ENTITY pgpkey.chuck SYSTEM "chuck.key">
 <!ENTITY pgpkey.cjc SYSTEM "cjc.key">
 <!ENTITY pgpkey.cjh SYSTEM "cjh.key">
 <!ENTITY pgpkey.clement SYSTEM "clement.key">
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index 9738a1f0ca..22ffc153a9 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -414,6 +414,9 @@
 <!ENTITY a.chris "Chris Costello">
 <!ENTITY a.chris.email "&a.chris; <email xmlns='http://docbook.org/ns/docbook'>chris@FreeBSD.org</email>">
 
+<!ENTITY a.chuck "Chuck Tuffli">
+<!ENTITY a.chuck.email "&a.chuck; <email xmlns='http://docbook.org/ns/docbook'>chuck@FreeBSD.org</email>">
+
 <!ENTITY a.chuckr "Chuck Robey">
 <!ENTITY a.chuckr.email "&a.chuckr; <email xmlns='http://docbook.org/ns/docbook'>chuckr@FreeBSD.org</email>">
 
diff --git a/share/xml/news.xml b/share/xml/news.xml
index 335dcb1573..18bec3280e 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -128,6 +128,16 @@
 	</event>
       </day>
 
+      <day>
+	<name>6</name>
+
+	<event>
+	  <p>New committer:
+	  <a href="mailto:chuck@FreeBSD.org">Chuck Tuffli</a>
+	  (src)</p>
+	</event>
+      </day>
+
       <day>
 	<name>2</name>