From 63ff94aaec3810ca057bfbe5b3f3662d4c700639 Mon Sep 17 00:00:00 2001
From: Chris Rees <crees@FreeBSD.org>
Date: Sat, 11 Jun 2011 20:24:51 +0000
Subject: [PATCH] - Add self to Developers - Remove self from Additional
Contributors - Add own gpg key
Approved by: rene (mentor)
---
.../contributors/contrib.additional.sgml | 5 ---
.../contributors/contrib.committers.sgml | 4 ++
share/pgpkeys/crees.key | 41 +++++++++++++++++++
share/pgpkeys/pgpkeys-developers.sgml | 5 +++
share/pgpkeys/pgpkeys.ent | 1 +
5 files changed, 51 insertions(+), 5 deletions(-)
create mode 100644 share/pgpkeys/crees.key
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
index 0e29f67d72..a344bf8242 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
@@ -1651,11 +1651,6 @@
<email>chris_pressey@yahoo.ca</email></para>
</listitem>
- <listitem>
- <para>Chris Rees
- <email>chris@amnesiac.bayofrum.net</email></para>
- </listitem>
-
<listitem>
<para>Chris Shenton
<email>cshenton@angst.it.hq.nasa.gov</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 fb455868c5..61fed42ba1 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
@@ -1314,6 +1314,10 @@
<para>&a.darrenr;</para>
</listitem>
+ <listitem>
+ <para>&a.crees;</para>
+ </listitem>
+
<listitem>
<para>&a.rees;</para>
</listitem>
diff --git a/share/pgpkeys/crees.key b/share/pgpkeys/crees.key
new file mode 100644
index 0000000000..a4c1764e48
--- /dev/null
+++ b/share/pgpkeys/crees.key
@@ -0,0 +1,41 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh crees E1EBCAC4;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub 2048R/E1EBCAC4 2011-06-11 [expires: 2012-06-10]
+ Key fingerprint = 2066 B855 E4B1 226A 8B4C B6E6 B084 92D1 E1EB CAC4
+uid Chris Rees <crees@freebsd.org>
+sub 2048R/FA45D5D6 2011-06-11 [expires: 2012-06-10]
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE3zP7YBCADI9977L+dBZPFBuI436OF4Q4MtVao5W1AflipqTpvt3PwUvNlZ
+1abmJFjglvOP8ilYEPyPjW7+E+r5/rGP6hce695AwrnU4fip5lCFyMUKKCQuSqDB
+n9gbKPiZKY9oI8dqJEn8zehvkdujgzy7dC2WB+nL/sOe9dagMvEiIM60cR4JTnNu
+pBePulRWX2p+GlSLbtrovOFChNGdwUhVIl869FOBWMrfMYRXIHwF88lBhzjm0zrL
+pjZUIKbBzbJ+jN11A/MC2UaI2jEHgoFn35g6s8AmVKfYp3bv3t05Yuy/najRaoa7
+qz7IZVnmqBbZlFL34ANIzNVlvyGYX6A01cAVABEBAAG0HkNocmlzIFJlZXMgPGNy
+ZWVzQGZyZWVic2Qub3JnPokBPgQTAQIAKAUCTfM/tgIbAwUJAeEzgAYLCQgHAwIG
+FQgCCQoLBBYCAwECHgECF4AACgkQsISS0eHrysRkgAf/QhvWrXPbdghpxWFJkO/E
+L8A3CbJCyEUvTLs8JRM+I7g0kdDQH03uw23GMHSNvnn3loncFGavSx7035BeJ22b
+oBmcVkjAKOoa0JPjGvrJiXlnCE8vxi0ed6O14WR7rZwN4WQftOY/pX+SOMgSU3wS
+rnm1YNp49H0f5H24qXRrpAjrvdPgnzEkyFWv/VzADsruA+8N68ut3DLP2GKaYBus
+GRvlGHMkt+rXgR1yNvQgwGikQ4wX+PhwqL58dz6Sp0SRikQnNba8ExSBWbd3Z3PD
+WGDzJUj3h/TdEvlRsGecFviGdBms0EO9RlJVPa+EYYx8GOlj/NkKLwHVGKbC0PmC
+V7kBDQRN8z+2AQgA2ItQ76DHBjDTfygxQcofK7jfI9JIe4zLHiQZSDs5452KTgp3
+A1apSyI40HpujPPR7cbAwXdwrFy6lkCY1u+dqh/jkpcqKEmUoPbOBQEBylfTn3Ca
+UZdilthppduRaHag5zJJiMOLBR38tM1enszIVU18BYttBVf/DEMEOyWAcSUDLk2R
+ioZqRLQGSjSwAbCuHaOhPoVl14EOgPesk3SSAQm8h5eHsiBOMejuyuMi/qFkvbXT
+ynUCNXYuw8i7xgWrP8YEn3GJFwLlZMwt+GYaCretXgL7Fp2Ytg9hLyfjK/ceiW7Y
+oTuTCRgb85RuwWsofEhsS+nPQMX1G4UJmjzXqQARAQABiQElBBgBAgAPBQJN8z+2
+AhsMBQkB4TOAAAoJELCEktHh68rEBugIALqhzu8BfqNxIVIROJSY1PcqFgMfDJac
+Oax9dOTkCjZL+Yim/EprUY4YwuRt3RX2CcXBa9QQ/p4e40P63IyX6r3jSU0QRu7h
+kLxSTn6l1tSYacskfumTQ8X8usByBIgpn/oRCTgM0Hl3QGZqR5EPGV4E1rzYsmie
+LbGNsxX0BH6xe7uJz2DLe6bhqCxasiW0mz/WQMcPWRMAD63fcchkdelRi3AcmTkp
+yeNUyIzr8jApA1SG5H6Z/xc+p5/vPj6uxbhCqXGXD5nKdMpX2zpmro2paM7oZNUJ
+LB0OcxVcma6qTL8orNQz9fs0mT9XITzjC7P5CbCJ5mEgORR9XTFz658=
+=7XI/
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml
index bac09479bd..940b21d284 100644
--- a/share/pgpkeys/pgpkeys-developers.sgml
+++ b/share/pgpkeys/pgpkeys-developers.sgml
@@ -1201,6 +1201,11 @@
&pgpkey.lbr;
</sect2>
+ <sect2 id="pgpkey-crees">
+ <title>&a.crees;</title>
+ &pgpkey.crees;
+ </sect2>
+
<sect2 id="pgpkey-rees">
<title>&a.rees;</title>
&pgpkey.rees;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index d88b9efff6..fc14d78f39 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -69,6 +69,7 @@
<!ENTITY pgpkey.cokane SYSTEM "cokane.key">
<!ENTITY pgpkey.core-secretary SYSTEM "core-secretary.key">
<!ENTITY pgpkey.cperciva SYSTEM "cperciva.key">
+<!ENTITY pgpkey.crees SYSTEM "crees.key">
<!ENTITY pgpkey.cshumway SYSTEM "cshumway.key">
<!ENTITY pgpkey.csjp SYSTEM "csjp.key">
<!ENTITY pgpkey.culot SYSTEM "culot.key">