From f2ce7240fc2939c2b30359550284f9b2247572a2 Mon Sep 17 00:00:00 2001
From: Jeremy Chadwick <koitsu@FreeBSD.org>
Date: Sun, 12 Nov 2006 12:55:30 +0000
Subject: [PATCH] Per Committer's Guide, Section 4.
Approved by: philip
---
.../contributors/contrib.additional.sgml | 5 --
.../contributors/contrib.committers.sgml | 4 ++
share/pgpkeys/koitsu.key | 48 +++++++++++++++++++
share/pgpkeys/pgpkeys-developers.sgml | 5 ++
share/pgpkeys/pgpkeys.ent | 1 +
5 files changed, 58 insertions(+), 5 deletions(-)
create mode 100644 share/pgpkeys/koitsu.key
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
index 405c57e924..70f97b6427 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
@@ -4037,11 +4037,6 @@
<email>reed@pugetsoundtechnology.com</email></para>
</listitem>
- <listitem>
- <para>Jeremy Chadwick
- <email>freebsd@jdc.parodius.com</email></para>
- </listitem>
-
<listitem>
<para>Jeremy Chatfield
<email>jdc@xinside.com</email></para>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
index 8ed232ae00..411869aa01 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
@@ -138,6 +138,10 @@
<para>&a.carvay;</para>
</listitem>
+ <listitem>
+ <para>&a.koitsu;</para>
+ </listitem>
+
<listitem>
<para>&a.perky;</para>
</listitem>
diff --git a/share/pgpkeys/koitsu.key b/share/pgpkeys/koitsu.key
new file mode 100644
index 0000000000..0c0e81ce75
--- /dev/null
+++ b/share/pgpkeys/koitsu.key
@@ -0,0 +1,48 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh koitsu 4BD6C0CB;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub 1024D/4BD6C0CB 2006-01-23
+ Key fingerprint = 0EAA 5E65 44B4 43CA 3016 48B5 4534 937B 4BD6 C0CB
+uid Jeremy Chadwick <koitsu@FreeBSD.org>
+uid Jeremy Chadwick <freebsd@jdc.parodius.com>
+uid Jeremy Chadwick <jdc@parodius.com>
+sub 2048g/1D3235AF 2006-01-23
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEPU2YIRBADrQbBypNoLNbEqDQO2r4vwOX4+R9Hpz0wHT5g/mCme7K7ml55O
+p1s/fzVEqCqyqaNlyiEJvezST1EF2e6/YDpxW3r8hYf6phg6z24ZhaA7MdwUzmkW
+tHuCXIsC8REvD7U85qgf2+wJM/X0svi8/1xucL7IOTGVj/MDy2K6Sfq7iwCgl8gk
+UyFvGLKlsHyLv1J5EhfkWksD/Rh/AaO7JF8f+mKMwENb4BWdJcY1cNnxgo8PK87N
+RdmLjjJan9cw/VLGXGnI0GFDVKxSG0WcHgIZ1B0bvyU/KNFcHKibLg9/NiR6QZhb
+vXoCtBqHMHevil62fc5ZCkuRkEUqRChiMGHOdDr+xCqCYiiF5pA4OrKvWHhE6Oxn
+kn4CA/9zcokFQZprp/fHhivF6PUExYLWLH3t2IM4MNa2PGiTBwf5pLIITfisD7vO
+zfIc699ndGGw9bJyPp0/gN96nXLyTs3GdTqJOE/0WTriCQ/xhNLUZKDBKbVElwoj
+dbgjutch3pAjbPx9R4+hrBvcycPQmIBM7q0xZFST3kRwHRk0GLQqSmVyZW15IENo
+YWR3aWNrIDxmcmVlYnNkQGpkYy5wYXJvZGl1cy5jb20+iGAEExECACAFAkRbCq0C
+GwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRBFNJN7S9bAy4uTAJwLME4QTJHn
+gE//AWqZBfhV+Le+HwCcDu/DxXKh14/9/POabQv3OKGQPQq0IkplcmVteSBDaGFk
+d2ljayA8amRjQHBhcm9kaXVzLmNvbT6IYAQTEQIAIAUCQ9TZggIbAwYLCQgHAwIE
+FQIIAwQWAgMBAh4BAheAAAoJEEU0k3tL1sDLSjEAoI4OUjvpOrRzXrDP6XnU7mfP
+7keIAJ0f4GFTXAToTLj4kf0Ai03ItkWTZrQkSmVyZW15IENoYWR3aWNrIDxrb2l0
+c3VARnJlZUJTRC5vcmc+iGAEExECACAFAkVW+y0CGwMGCwkIBwMCBBUCCAMEFgID
+AQIeAQIXgAAKCRBFNJN7S9bAy0t0AJ9KblrW+FBhNephh5QX6H/C7u5UNwCbBJqE
+FZMAp4B76dZwxF5lGuzNmH65Ag0EQ9TZnhAIAMCHbTZHDt2QvPyQFg9hGYh+WO/8
+3wz3yiKjhldi85NDygwsZ5QP6wvH6PEA6IdBW11eeK7swo3k0ZzT1HhfIF5S8VJI
+XFrJ4u100/NHuIHTlSsAg9vqpmqMnfALlLd6Uc4BF6vMAOpWpJPeVDnGTHETcLA4
+gt055u/oTEDkgZPlS6oKsUbtExhn+4TBU+gj50Ac4V4qS4j+gyxlH10hx2dgg0c2
+WzQA/USBEoMKWrXGrb9YhgTYwI0wLwh1W92V+EAcbFYOWRMWlU25mlyTE1U7Q+gO
+9mpchILpf7ndgxiYV3L6m3Ha+DxIXfcRznli8b1aWk+VRvXcb68nRiRcKLMAAwUH
+/jPvFNL3I3XPmOTF8qz6XZbEe5jcPC7d/5G9y3bbPYfS3rSKLdrhf+Vo8AbpFkF4
+c9fnbUVehXwKjdWRxe/RoEj2V4AuNmFwcrHU4Wqj+yWln5ceNCm0WUVtTStq8nS8
+HjTWx59RtQKi4sXPk+MyyM1STzaZ+XfE0jJAnuLgBSciQz2sXuTiHRiVbdnYR5Cb
+Y+xrmGrT7vifsW6Zr+dw5ioSRkJJSId9zZdh3RSSWdBWl86XW+SQlj+c3T1wyKhw
+UGsph3hhClNRr7osNS2pOK3PhUlJEDiKCIOCZODfh6k2lfyAhI+us/GJ7dG3/5BT
+OzARiS2j89nB9ybRsNHeFR2ISQQYEQIACQUCQ9TZngIbDAAKCRBFNJN7S9bAy8VR
+AJwIN6fqIGekk5E2SwEz5eIHUHJVSwCaA9w4hDEr91A+bhJPh+sarsOV9ms=
+=7o1B
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml
index 5e325dd6c4..3b70d0c19c 100644
--- a/share/pgpkeys/pgpkeys-developers.sgml
+++ b/share/pgpkeys/pgpkeys-developers.sgml
@@ -134,6 +134,11 @@
&pgpkey.acm;
</sect2>
+ <sect2 id="pgpkey-koitsu">
+ <title>&a.koitsu;</title>
+ &pgpkey.koitsu;
+ </sect2>
+
<sect2 id="pgpkey-perky">
<title>&a.perky;</title>
&pgpkey.perky;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 01d1b4d47e..100764ca5b 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -120,6 +120,7 @@
<!ENTITY pgpkey.keramida SYSTEM "keramida.key">
<!ENTITY pgpkey.kib SYSTEM "kib.key">
<!ENTITY pgpkey.knu SYSTEM "knu.key">
+<!ENTITY pgpkey.koitsu SYSTEM "koitsu.key">
<!ENTITY pgpkey.krion SYSTEM "krion.key">
<!ENTITY pgpkey.kris SYSTEM "kris.key">
<!ENTITY pgpkey.kuriyama SYSTEM "kuriyama.key">