- Add myself to authors.ent

- Add myself to contrib.committers.sgml
- Remove myself from contrib.additional.sgml
- Add my GnuPG key
- Add myself to pgpkeys.ent
- Add myself to pgpkeys-developers.sgml

Approved by: makc (mentor)

6 files changed, 53 insertions, 5 deletions

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
index 4039fec906..54de0a9a01 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
@@ -1167,11 +1167,6 @@
     </listitem>
 
     <listitem>
-      <para>bf
-	<email>bf2006a@yahoo.com</email></para>
-    </listitem>
-
-    <listitem>
       <para>Bill Cadwallader
 	<email>hurbold@yahoo.com</email></para>
     </listitem>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
index a0173d979c..0ce7d8d9a5 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
@@ -403,6 +403,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.bf;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.rafan;</para>
     </listitem>
 
diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent
index 55b2ef2ece..32eedd81f4 100644
--- a/en_US.ISO8859-1/share/sgml/authors.ent
+++ b/en_US.ISO8859-1/share/sgml/authors.ent
@@ -132,6 +132,8 @@
 
 <!ENTITY a.benno "Benno Rice <email>benno@FreeBSD.org</email>">
 
+<!ENTITY a.bf "Brendan Fabeny <email>bf@FreeBSD.org</email>">
+
 <!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.org</email>">
 
 <!ENTITY a.blackend "Marc Fonvieille <email>blackend@FreeBSD.org</email>">
diff --git a/share/pgpkeys/bf.key b/share/pgpkeys/bf.key
new file mode 100644
index 0000000000..b643b08a03
--- /dev/null
+++ b/share/pgpkeys/bf.key
@@ -0,0 +1,41 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh bf 9806EBC1;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   2048R/9806EBC1 2010-06-08 [expires: 2012-06-07]
+      Key fingerprint = 2075 ADD3 7634 A4F9 5357  D934 08E7 06D9 9806 EBC1
+uid                  b. f. <bf@freebsd.org>
+sub   2048R/1CD0AD79 2010-06-08 [expires: 2012-06-07]
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBEwNjXUBCACWeNjUFZ8rzqxrEIdL3wVrvkWVwaf5HW0YwoIMq7ba3hRcPWuv
+yr3frrdvqJv9rHJYA8f6uE5dCkb7OSI3YXHC5QN/H9xB1bvRuSUyD1MwmuihUX/A
+7yk7HzUE3sXy1U3QIMJWgpvnN242OZtH2XlanuSoDdBL4Qh2Fw7ywQaZvzNlZKUa
+hPF0Ty7wci/5xuKB7T72Qk4vAYYqxUxYJR/5ox8vM/xiAh5XxPbOuAF0p/wQiiRi
+NjF/f6tluQu6Q6VFwHXGcZvJK39nNNpadsDCegdRCUUFJsHm8dSjlIyi5CTyUsXf
+btdlagPTlhiBtOYgtcfRZoPBLFjVafjqqL57ABEBAAG0FmIuIGYuIDxiZkBmcmVl
+YnNkLm9yZz6JAT4EEwECACgFAkwNjXUCGwMFCQPCZwAGCwkIBwMCBhUIAgkKCwQW
+AgMBAh4BAheAAAoJEAjnBtmYBuvBVG4H/Rc/AqfFfQi+qph0HKggVJyzEKvhVWhR
+8RZ+8zS4t72b4kIJT8FUOiHMpq/+qC+Lt5MFPCtxmOETDgpD9GM1EkgJ1rSDrN8m
+kbXuQ9Z95KztU0tGsv87JT0xSpxeMnYaQ1NWx5bkKG5AOf6ZZaUVas0XH8/9QCFH
+gqy7Xe2eGsLO52ZH/4AI8cFc0FPF17hSWTIAwIyuxcRLas+KdV1j74xaBu6parX3
+2FoquEFRAPoEcuey2aSWoo4OCBCoGYqh4mhWbEuLOac0NP3oLDFjEDJhE7UT+0gx
+W5LLwPr0FARkAbRZp84vt9rD5MrhNcZy0X3PBpykium4OrEIp5l9OM65AQ0ETA2N
+dQEIAK1D1POvE2tRnTeNRW6lw/bu9zx8d4PS2R7GepQkbUWQxpgcwSEoB1JGN8jw
+0iKD8KRoFLwQx+TizzRShRsOeYj7beK6rY5H1C0DbrQX6T7eMumOVV2RklVFqYiZ
+HcJh8LGjJN/tKt4k7OnDs40lHOFHxvKW+PiKogfiWDKpc/wns9mAhcXrbT0SZ4Be
+qbQOsZMfUbvOZUek4+lOZuaCb0M3QU47bsFrJonPn7VEHw7mkhTNL9a6KKc4ZqQw
+52ECVq4dKjNIkvaQZyosA7tRCr+CBYUumE6fssk72SdT0RD/tgHgKfgWZ9mxB3R0
+l7CCm8v4c24tZQuuGQG26WWeD8sAEQEAAYkBJQQYAQIADwUCTA2NdQIbDAUJA8Jn
+AAAKCRAI5wbZmAbrwabXB/9ggUz/04tDZdX4pDsfDoBKtnJ9r1yNWrniBBNlcVLZ
+G+3BwF5EfZAA/q3lSJmC4BVzaDUwrrL/zbPb0WhE5cGG/byLiByXsEDVSId4Kv/Z
+bLaPyox8RIYUL/wCjt/57FIORwGVhUr8oDDRLeSoIsazXWhvWfx9qCdzcZTabSkN
+74Q0WxQuOagvpl4Kcf3eQEQuB+BvxDQx9JvEXUZanurRP018uTdXficJ5MS+SwXq
+gJUSSPybwVjK/ll1G33185jnSQSFNwGq1udet7vkDjQKNmkcev1SJY1g0S9iFKRz
+e6dmnydHGtQ0508cCusMPNCQ4HRhQHEW7w5yu1J4t3UY
+=bgLz
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml
index 90d856d2c2..d36b6a079e 100644
--- a/share/pgpkeys/pgpkeys-developers.sgml
+++ b/share/pgpkeys/pgpkeys-developers.sgml
@@ -366,6 +366,11 @@
       &pgpkey.le;
     </sect2>
 
+    <sect2 id="pgpkey-bf">
+      <title>&a.bf;</title>
+      &pgpkey.bf;
+    </sect2>
+
     <sect2 id="pgpkey-rafan">
       <title>&a.rafan;</title>
       &pgpkey.rafan;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 49d751b113..06e1904e57 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -35,6 +35,7 @@
 <!ENTITY pgpkey.ben SYSTEM "ben.key">
 <!ENTITY pgpkey.benjsc SYSTEM "benjsc.key">
 <!ENTITY pgpkey.benno SYSTEM "benno.key">
+<!ENTITY pgpkey.bf SYSTEM "bf.key">
 <!ENTITY pgpkey.billf SYSTEM "billf.key">
 <!ENTITY pgpkey.blackend SYSTEM "blackend.key">
 <!ENTITY pgpkey.bland SYSTEM "bland.key">