From 42e56428dda048175c52b3b44675f5a6f99b5e3a Mon Sep 17 00:00:00 2001
From: Sean Chittenden <seanc@FreeBSD.org>
Date: Sat, 13 Apr 2019 16:53:13 +0000
Subject: [PATCH] Additoinal cleanup from r52910

Approved by: doceng (core)
Differential Revision:	https://reviews.freebsd.org/D19901
---
 .../contributors/contrib.committers.xml       |  4 --
 en_US.ISO8859-1/htdocs/administration.xml     |  1 -
 share/pgpkeys/dexter.key                      | 43 -------------------
 share/pgpkeys/pgpkeys-developers.xml          |  5 ---
 share/pgpkeys/pgpkeys.ent                     |  1 -
 share/xml/authors.ent                         |  3 --
 6 files changed, 57 deletions(-)
 delete mode 100644 share/pgpkeys/dexter.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index 201fdede85..2426ab3c6e 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -284,10 +284,6 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <para>&a.jwd.email;</para>
   </listitem>
 
-  <listitem>
-    <para>&a.dexter.email;</para>
-  </listitem>
-
   <listitem>
     <para>&a.jmd.email;</para>
   </listitem>
diff --git a/en_US.ISO8859-1/htdocs/administration.xml b/en_US.ISO8859-1/htdocs/administration.xml
index 0a9b756346..3444ffbdb4 100644
--- a/en_US.ISO8859-1/htdocs/administration.xml
+++ b/en_US.ISO8859-1/htdocs/administration.xml
@@ -231,7 +231,6 @@
     <li>&a.gahr.email;</li>
     <li>&a.bhughes.email;</li>
     <li>&a.adridg.email;</li>
-    <li>&a.dexter.email;</li>
   </ul>
 
   <!--
diff --git a/share/pgpkeys/dexter.key b/share/pgpkeys/dexter.key
deleted file mode 100644
index 2bcfe615cb..0000000000
--- a/share/pgpkeys/dexter.key
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- $FreeBSD$ -->
-<!--
-sh addkey.sh dexter E9D624D03BC59EFB ;
--->
-<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   rsa2048/E9D624D03BC59EFB 2017-03-12 [SC] [expires: 2020-03-11]
-      Key fingerprint = 94AC FB62 A0E7 B0A5 3EC3  6889 E9D6 24D0 3BC5 9EFB
-uid                            Michael Dexter <dexter@freebsd.org>
-sub   rsa2048/A0D7E1D81B0122FC 2017-03-12 [E] [expires: 2020-03-11]
-
-]]></programlisting>
-<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFjEzU8BCADDiQEoJUHhluKsmw6C6Rny1og3/asn+f/gNMDnrR7C+uNk7w6g
-9JKze+u3gxyroD6ziAV/bioyPh//xAHm08KQwxkxMx3ikHGAY1UBfBGwZKutyGWA
-noHDaBFcpeDgV2uFdLY7YY98ZbVNtFrQmi80eozbvofy1vIQdoma2T1aBrMtBJVG
-rDQVclh9T1U6snfefSdZ1HXiz5ZGdTgV1OQZJEzn4yLc2D2LKfATSCfZBWXc7Qdd
-NWZ7KQ3nojKrHmhjE1ybfp2nt8wuYd1eAHaCZVelKRJHxvENabs1WNdSwomT7Lbx
-dtLNWDtPZ30ITcDAPJ1o8ukbWa9yXpGWg7ZZABEBAAG0I01pY2hhZWwgRGV4dGVy
-IDxkZXh0ZXJAZnJlZWJzZC5vcmc+iQFUBBMBCAA+FiEElKz7YqDnsKU+w2iJ6dYk
-0DvFnvsFAljEzU8CGwMFCQWjmoAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQ
-6dYk0DvFnvvHfwgAoIgg55CVr0Y6qnyNpG47My/TS5gxbtz3LA0tOd2l+k0nSARS
-JL0M/0VH9nPoAMbUS490ChxVbxw9sMqNC6KS7jWifMvdGsLRnhObmDC4IISwP47V
-/4Yd2y/ze8iaoj1Qa32ddI3Ko6OmQ599dsZLGFu7BKhCUTGCeq7zRzWaYVvYy0uC
-TEn4JuA8krJnOH8tBb3eODcfKEMx7INp7+ZGsUpvFDVyI+rHyXkgF8dHz1zsZQgq
-YXHCgUbZAjqYi7DOJMryOCwOsUxQyN2SSAifU/7DPkug5+FG5Mp6SB4Yq770zwt5
-8mzhA87lwSq8EIv9hAaPQJM/GeC5+x0NR9SPObkBDQRYxM1PAQgA3jMnWUdh+Rwa
-yxREfsYWhuumBxrFBWRa5kB9UMo9O7gbgXw3ylV6gnqdC8ky/V2XeH6cMFacaYq7
-5EE9cbLBJ3cVhwEZ1plZBGs1s2SAdrx1zKebxEz2SML/IroSqlTliKbvBa7g7eo+
-SbtprHZ6d4k3JwwNpqYpJXlt981a1kKDGZoFjuAGHZkvXPOtlU5j39HdjbhQWeZG
-GtCscSjsCufwtV0oaIgk/6Rb1LsvhdqT22eK9MLhKVSnBgdgLbup4ahIcIsva20m
-15KyBfypsGPiFVBImRUyIFFLrSQ1Nj1d3VyGqjqfrUWnOR0vaqui+7TlEtG/7ebe
-2+zQYELJJQARAQABiQE8BBgBCAAmFiEElKz7YqDnsKU+w2iJ6dYk0DvFnvsFAljE
-zU8CGwwFCQWjmoAACgkQ6dYk0DvFnvt3FwgAndcyQpxrG5QzpIXP+PhUuSp4nK85
-JyGsoBTy//BBt+NU0fsITlBPkcU1nyGJcZCtMI9sfv0oGcmidVyXcge/dobqAAeW
-bVuj8S3zdsWqwOabb7Hwu8X80vSP7ECZeLcDJpgIONkBdtnJKQ4S66ew2zgYjt8Q
-i3KTKCOdK4x3UDdDdR9XF4CWx968okJcUkp2Ao6zmShWgswobRN5mumeVxaIqyUw
-mdC1vsIl9pOaMBEz/vsG7RDD2QRT5UguOrmfz7URcQ5E+6/4ooeGtLV3EmPv7Qkn
-Ohfd3MjFTebSl80VtYxdeluGAhLkSdJoHpcqNldl5YRUd1gb8+UaDZzPFw==
-=AWUe
------END PGP PUBLIC KEY BLOCK-----
-]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index f9142c40c0..3fe5aeebff 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -496,11 +496,6 @@
       &pgpkey.carl;
     </sect2>
 
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-dexter">
-      <title>&a.dexter.email;</title>
-      &pgpkey.dexter;
-    </sect2>
-
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-jmd">
       <title>&a.jmd.email;</title>
       &pgpkey.jmd;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index d622337a01..9ed84c0b26 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -135,7 +135,6 @@
 <!ENTITY pgpkey.demon SYSTEM "demon.key">
 <!ENTITY pgpkey.den SYSTEM "den.key">
 <!ENTITY pgpkey.des SYSTEM "des.key">
-<!ENTITY pgpkey.dexter SYSTEM "dexter.key">
 <!ENTITY pgpkey.dfr SYSTEM "dfr.key">
 <!ENTITY pgpkey.dhartmei SYSTEM "dhartmei.key">
 <!ENTITY pgpkey.dhn SYSTEM "dhn.key">
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index 58335d3cba..5369e77a46 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -606,9 +606,6 @@
 <!ENTITY a.des "Dag-Erling Sm&oslash;rgrav">
 <!ENTITY a.des.email "&a.des; <email xmlns='http://docbook.org/ns/docbook'>des@FreeBSD.org</email>">
 
-<!ENTITY a.dexter "Michael Dexter">
-<!ENTITY a.dexter.email "&a.dexter; <email xmlns='http://docbook.org/ns/docbook'>dexter@FreeBSD.org</email>">
-
 <!ENTITY a.dfr "Doug Rabson">
 <!ENTITY a.dfr.email "&a.dfr; <email xmlns='http://docbook.org/ns/docbook'>dfr@FreeBSD.org</email>">