- Add my author entity

- Move myself to committers from contributors
- Add my news entry
- Add my PGP public key

Approved by:    marcel (mentor)

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

@@ -9346,11 +9346,6 @@
 	<email>simond@irrelevant.org</email></para>
     </listitem>
 
-    <listitem>
-      <para>Simon J Gerraty
-	<email>sjg@juniper.net</email></para>
-    </listitem>
-
     <listitem>
       <para>Simon Lang
 	<email>simon@lang-clan.de</email></para>

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

@@ -447,6 +447,10 @@
       <para>&a.danger;</para>
     </listitem>
 
+    <listitem>
+      <para>&a.sjg;</para>
+    </listitem>
+
     <listitem>
       <para>&a.gibbs;</para>
     </listitem>

share/pgpkeys/pgpkeys-developers.xml

@@ -516,6 +516,11 @@
       &pgpkey.danger;
     </sect2>
 
+    <sect2 id="pgpkey-sjg">
+      <title>&a.sjg;</title>
+      &pgpkey.sjg;
+    </sect2>
+
     <sect2 id="pgpkey-gibbs">
       <title>&a.gibbs;</title>
       &pgpkey.gibbs;

share/pgpkeys/pgpkeys.ent

@@ -333,6 +333,7 @@
 <!ENTITY pgpkey.shaun SYSTEM "shaun.key">
 <!ENTITY pgpkey.sheldonh SYSTEM "sheldonh.key">
 <!ENTITY pgpkey.simon SYSTEM "simon.key">
+<!ENTITY pgpkey.sjg SYSTEM "sjg.key">
 <!ENTITY pgpkey.skreuzer SYSTEM "skreuzer.key">
 <!ENTITY pgpkey.snb SYSTEM "snb.key">
 <!ENTITY pgpkey.sobomax SYSTEM "sobomax.key">

share/pgpkeys/sjg.key

@@ -0,0 +1,70 @@
+<!-- $FreeBSD$ -->
+<!--
+sh ./addkey.sh sjg B6CC76BF;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   1024D/B6CC76BF 2002-06-12
+      Key fingerprint = F3BA D6CB E1F8 02EA 705F  BCAD 6125 F840 B6CC 76BF
+uid                  Simon J. Gerraty <sjg@crufty.net>
+uid                  Simon J. Gerraty <sjg@juniper.net>
+uid                  Simon J. Gerraty <sjg@NetBSD.org>
+uid                  Simon J. Gerraty <sjg@FreeBSD.org>
+sub   1024g/D94B72B9 2002-06-12
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+U4BS88b/Bo4u
+=onBO
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

share/xml/authors.ent

@@ -1190,6 +1190,8 @@
 
 <!ENTITY a.simon "Simon L. Nielsen <email>simon@FreeBSD.org</email>">
 
+<!ENTITY a.sjg "Simon J. Gerraty <email>sjg@FreeBSD.org</email>">
+
 <!ENTITY a.skreuzer "Steven Kreuzer <email>skreuzer@FreeBSD.org</email>">
 
 <!ENTITY a.skv "Sergey Skvortsov <email>skv@FreeBSD.org</email>">

share/xml/developers.ent

@@ -577,6 +577,7 @@ $FreeBSD$
 <!ENTITY a.silby "Mike Silbersack">
 <!ENTITY a.simokawa "Hidetoshi Shimokawa">
 <!ENTITY a.simon "Simon L. B. Nielsen">
+<!ENTITY a.sjg "Simon J. Gerraty">
 <!ENTITY a.skreuzer "Steven Kreuzer">
 <!ENTITY a.skv "Sergey Skvortsov">
 <!ENTITY a.smace "Scott Mace">

share/xml/news.xml

@@ -33,6 +33,15 @@
     <month>
       <name>10</name>
 
+      <day>
+	<name>23</name>
+
+	<event>
+	  <p>New committer:
+	    <a href="mailto:sjg@FreeBSD.org">Simon J. Gerraty</a> (src)</p>
+	</event>
+      </day>
+
       <day>
 	<name>20</name>