From a6fa97e6f13a741b6c6829c8f3c2fd7111ba3186 Mon Sep 17 00:00:00 2001
From: Marcus von Appen <mva@FreeBSD.org>
Date: Thu, 19 Feb 2009 22:04:29 +0000
Subject: [PATCH] Added my GPG key. Removed myself from the additional
 contributors list and added myself to the contributors list.

Approved by:	miwi (co-mentor)
---
 .../contributors/contrib.additional.sgml      |  5 ---
 .../contributors/contrib.committers.sgml      |  4 ++
 en_US.ISO8859-1/share/sgml/authors.ent        |  2 +
 share/pgpkeys/mva.key                         | 45 +++++++++++++++++++
 share/pgpkeys/pgpkeys-developers.sgml         |  5 +++
 share/pgpkeys/pgpkeys.ent                     |  1 +
 6 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 share/pgpkeys/mva.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
index c8671ac37c..f6c7bd03d3 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
@@ -5716,11 +5716,6 @@
 	<email>marcov@stack.nl</email></para>
     </listitem>
 
-    <listitem>
-      <para>Marcus vA
-	<email>mva121@gmx.net</email></para>
-    </listitem>
-
     <listitem>
       <para>Marin Atanasov
 	<email>dnaeon@gmail.com</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 6ba298a07a..7bebfd5ec1 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
@@ -42,6 +42,10 @@
       <para>&a.anholt;</para>
     </listitem>
 
+    <listitem>
+      <para>&a.mva;</para>
+    </listitem>
+
     <listitem>
       <para>&a.araujo;</para>
     </listitem>
diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent
index 910614b558..50c1b9f4ae 100644
--- a/en_US.ISO8859-1/share/sgml/authors.ent
+++ b/en_US.ISO8859-1/share/sgml/authors.ent
@@ -750,6 +750,8 @@
 
 <!ENTITY a.mux "Maxime Henrion <email>mux@FreeBSD.org</email>">
 
+<!ENTITY a.mva "Marcus von Appen <email>mva@FreeBSD.org</email>">
+
 <!ENTITY a.mwlucas "Michael W. Lucas <email>mwlucas@FreeBSD.org</email>">
 
 <!ENTITY a.naddy "Christian Weisgerber <email>naddy@FreeBSD.org</email>">
diff --git a/share/pgpkeys/mva.key b/share/pgpkeys/mva.key
new file mode 100644
index 0000000000..b82f2ce020
--- /dev/null
+++ b/share/pgpkeys/mva.key
@@ -0,0 +1,45 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh mva B267A647;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   1024D/B267A647 2009-02-14
+      Key fingerprint = C7CC 1853 D8C5 E580 7795  B654 8BAF 3F12 B267 A647
+uid                  Marcus von Appen <freebsd@sysfault.org>
+uid                  Marcus von Appen <mva@freebsd.org>
+sub   2048g/D34A3BAF 2009-02-14
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEmWjSoRBACy4CsdR35YB6pGzU1aa1mbTkLuF44VBjV8O9qji80zo/VJs3JL
+El0wIhM9pg6zObKkzOU5HJFU/6uazzzDnc+A8y3NJL3u+HoX/7c03e3yUZ6xl7PC
+ua8tO3IAQiB/cg/Ltb6iJa8FflfmCKGE0I2DXeR2vN9PpgQVkJW+/NSDbwCg2Nxm
+mfeO83a7C28G/MV70z5CTg0EAKdHCkACr+iB1WpOIKEmFkZRD0NXHEXYa6L2kPdY
+XPNJ893yu5YUmHMFNUdVxoIKaUKpIGPa+V4q6ojAilWJiaEB74W+teqNBzwhzyNv
+xfp/W6fNJtvC1DJkrxkag0penU9ZROkVEnZajIclFh5la3muxX07Qf2HjGZM3Cqb
+nz6PA/9gdPecNwo1N+9aX/CGrCw0DC1QVFc1HJqcL3pe2qQkMVDO7sfQkewtQOW9
+H2ZrDWlVxIohQ9/+vbKV1uOcJr5+egSGNTCNNuimh9Kp4LYMc1vNouQe1D9fsCXW
+2kcgO8FozH0O3uJ60gCak2K06iA+mGziNYLQH3IvjVswivxOyLQiTWFyY3VzIHZv
+biBBcHBlbiA8bXZhQGZyZWVic2Qub3JnPohgBBMRAgAgBQJJlo0qAhsDBgsJCAcD
+AgQVAggDBBYCAwECHgECF4AACgkQi68/ErJnpkfulACeI1WVnhrKTq/+O2Djbpuu
+Nyj/MYMAn0BMDpy4frZjlIMfhazixfk4cbjNtCdNYXJjdXMgdm9uIEFwcGVuIDxm
+cmVlYnNkQHN5c2ZhdWx0Lm9yZz6IYAQTEQIAIAUCSZwX8QIbAwYLCQgHAwIEFQII
+AwQWAgMBAh4BAheAAAoJEIuvPxKyZ6ZH48AAnRraNz0aFuSHUFaw8LXjROOTwld/
+AKCvawhTgwYKX3YjLzu9Jcc1t3UNj7kCDQRJlo0qEAgA2acv4O4JFQCzgJXhCQqn
+KHFeEqOcgpKlvIGlgfP4/hVOCms2LK3qk10JpcbDbkBn0cBW7usxvA3mDiF2ZnrY
+wIwAROI7SNSY60PydR6DXc6I21VAd7hmmcpqkJFXaSMvKkQcq7sAJGlSYVpPuBqZ
+1kCIu2vlPBdpT4W1hHxf7l4Q+h2ge4+C2beRv9V9vRVdlXeSqJT1o5EgE5CjZ6sV
+Eh+9/TQdkRAoGgQG4LZvDuhWfsSkDU6x/soFKOPCdTF/LytW8YZ6asN1EpVJihAe
+GseQdkwP8iK9Co90Ab27+5WVVrP+xkY+rULOngW2vIwJrWic6nk/a0/0MrPjFn3k
+IwADBQf/dMsSQncKSSn8Tg9KeeBLftirddz+Mos1j+1PYOc88vrMrHVodBfNtJlG
+zxAGwFyLtk/yA8/MuW219t57O3W49VYh+I8NenzlRmZr/ahn8t79UD7+SWmy8L5e
+3XD2+w9WTj9Lx1V41wFKvxVLItNAik58Oi9MHa/wR1LMRIeGFAVHWAZcxYLLKfGR
+lYcMmMTY4906sjJ6Z+ZVYILnTR360JdeiZbFdaCFGf2yUoM+HeA2+975CaRagu+N
+/HZKW4JSsiu15fvaLTPwFG6YXKcHL2zI0Vc5UF5nd9GGZdX9Y4ffBi3aPXgIOJm5
+eAf29A6Ne3/llt3RG3TduGacd1WghYhJBBgRAgAJBQJJlo0qAhsMAAoJEIuvPxKy
+Z6ZHPMYAn1s6Sdc/4Kkv8KQ0KaJNwmkQYkcSAKDLkzy/Ph4mOMm8jO6ZL+Orpo21
+CQ==
+=HKIb
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml
index 7efc5c9ed7..ef2a149d7a 100644
--- a/share/pgpkeys/pgpkeys-developers.sgml
+++ b/share/pgpkeys/pgpkeys-developers.sgml
@@ -1406,3 +1406,8 @@
       &pgpkey.sson;
     </sect2>
 
+    <sect2 id="pgpkey-mva">
+      <title>&a.mva;</title>
+      &pgpkey.mva;
+    </sect2>
+
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index e7faedd258..8ea0a89d45 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -195,6 +195,7 @@
 <!ENTITY pgpkey.mtm SYSTEM "mtm.key">
 <!ENTITY pgpkey.murray SYSTEM "murray.key">
 <!ENTITY pgpkey.mux SYSTEM "mux.key">
+<!ENTITY pgpkey.mva SYSTEM "mva.key">
 <!ENTITY pgpkey.nate SYSTEM "nate.key">
 <!ENTITY pgpkey.nectar SYSTEM "nectar.key">
 <!ENTITY pgpkey.nemoliu SYSTEM "nemoliu.key">