Add myself as doc/www committer.

Remove my entry from additional contributors.
Add my PGP key.

Approved by: gjb

en_US.ISO8859-1/articles/contributors/contrib.additional.sgml

@@ -10381,11 +10381,6 @@
 	<email>weaseal@hotmail.com</email></para>
     </listitem>
 
-    <listitem>
-      <para>Warren Block
-	<email>wblock@wonkity.com</email></para>
-    </listitem>
-
     <listitem>
       <para>Warren Toomey
 	<email>wkt@csadfa.cs.adfa.oz.au</email></para>

en_US.ISO8859-1/articles/contributors/contrib.committers.sgml

@@ -142,6 +142,10 @@
       <para>&a.mbr;</para>
     </listitem>
 
+    <listitem>
+      <para>&a.wblock;</para>
+    </listitem>
+
     <listitem>
       <para>&a.bvs;</para>
     </listitem>

share/pgpkeys/pgpkeys-developers.sgml

@@ -134,6 +134,11 @@
       &pgpkey.mbr;
     </sect2>
 
+    <sect2 id="pgpkey-wblock">
+      <title>&a.wblock;</title>
+      &pgpkey.wblock;
+    </sect2>
+
     <sect2 id="pgpkey-bvs">
       <title>&a.bvs;</title>
       &pgpkey.bvs;

share/pgpkeys/pgpkeys.ent

@@ -349,6 +349,7 @@
 <!ENTITY pgpkey.vkashyap SYSTEM "vkashyap.key">
 <!ENTITY pgpkey.vs SYSTEM "vs.key">
 <!ENTITY pgpkey.vsevolod SYSTEM "vsevolod.key">
+<!ENTITY pgpkey.wblock SYSTEM "wblock.key">
 <!ENTITY pgpkey.weongyo SYSTEM "weongyo.key">
 <!ENTITY pgpkey.wes SYSTEM "wes.key">
 <!ENTITY pgpkey.wilko SYSTEM "wilko.key">

share/pgpkeys/wblock.key

@@ -0,0 +1,49 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh wblock A1F360A3;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   2048R/A1F360A3 2011-09-14
+      Key fingerprint = 3A44 4DEC B304 5191 8A41  C317 5117 4BB6 A1F3 60A3
+uid                  Warren Block <wblock@FreeBSD.org>
+uid                  Warren Block <wblock@wonkity.com>
+sub   2048R/51F483F3 2011-09-14
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=Hoyp
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>