From ad5abfc5d91af6d535fa6e1f0e68a6b62d614839 Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 21 Jul 2010 21:05:51 +0000
Subject: [PATCH] - 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:	imp (mentor)
---
 .../contributors/contrib.additional.sgml      |  5 --
 .../contributors/contrib.committers.sgml      |  4 ++
 en_US.ISO8859-1/share/sgml/authors.ent        |  2 +
 share/pgpkeys/andrew.key                      | 50 +++++++++++++++++++
 share/pgpkeys/pgpkeys-developers.sgml         |  5 ++
 share/pgpkeys/pgpkeys.ent                     |  1 +
 6 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 share/pgpkeys/andrew.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
index 7a42cb5afb..647179da7b 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
@@ -817,11 +817,6 @@
 	<email>tim@pool1.convey.ru</email></para>
     </listitem>
 
-    <listitem>
-      <para>Andrew Turner
-	<email>andrew+ports@fubar.geek.nz</email></para>
-    </listitem>
-
     <listitem>
       <para>Andrew V. Stesin
 	<email>stesin@elvisti.kiev.ua</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 57f7b8f06e..c11ac58d6c 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
@@ -1594,6 +1594,10 @@
       <para>&a.tuexen;</para>
     </listitem>
 
+    <listitem>
+      <para>&a.andrew;</para>
+    </listitem>
+
     <listitem>
       <para>&a.gonzo;</para>
     </listitem>
diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent
index 656597d754..cf9712c35b 100644
--- a/en_US.ISO8859-1/share/sgml/authors.ent
+++ b/en_US.ISO8859-1/share/sgml/authors.ent
@@ -68,6 +68,8 @@
 
 <!ENTITY a.andreas "Andreas Klemm <email>andreas@FreeBSD.org</email>">
 
+<!ENTITY a.andrew "Andrew Turner <email>andrew@FreeBSD.org</email>">
+
 <!ENTITY a.andy "Andrey Zakhvatov <email>andy@FreeBSD.org</email>">
 
 <!ENTITY a.anholt "Eric Anholt <email>anholt@FreeBSD.org</email>">
diff --git a/share/pgpkeys/andrew.key b/share/pgpkeys/andrew.key
new file mode 100644
index 0000000000..e34e84c444
--- /dev/null
+++ b/share/pgpkeys/andrew.key
@@ -0,0 +1,50 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh andrew 31B31614;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   2048R/31B31614 2010-07-01
+      Key fingerprint = 08AC 2C57 F14F FDD1 2232  B5CD AA16 EFB8 31B3 1614
+uid                  Andrew Turner <andrew@freebsd.org>
+uid                  Andrew Turner <andrew@fubar.geek.nz>
+sub   2048R/9ACBF138 2010-07-01
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+BuY=
+=WLSs
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml
index c77ff478d3..591506c33c 100644
--- a/share/pgpkeys/pgpkeys-developers.sgml
+++ b/share/pgpkeys/pgpkeys-developers.sgml
@@ -1501,6 +1501,11 @@
       &pgpkey.tuexen;
     </sect2>
 
+    <sect2 id="pgpkey-andrew">
+      <title>&a.andrew;</title>
+      &pgpkey.andrew;
+    </sect2>
+
     <sect2 id="pgpkey-ume">
       <title>&a.ume;</title>
       &pgpkey.ume;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index bb5d2a3914..afce08c69e 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -15,6 +15,7 @@
 <!ENTITY pgpkey.anchie SYSTEM "anchie.key">
 <!ENTITY pgpkey.anders SYSTEM "anders.key">
 <!ENTITY pgpkey.andreas SYSTEM "andreas.key">
+<!ENTITY pgpkey.andrew SYSTEM "andrew.key">
 <!ENTITY pgpkey.anholt SYSTEM "anholt.key">
 <!ENTITY pgpkey.anray SYSTEM "anray.key">
 <!ENTITY pgpkey.antoine SYSTEM "antoine.key">