From c57930b5faab6bd44c70b29beb4921a733cc20a0 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 26 Jun 2013 02:18:58 +0000
Subject: [PATCH] Hello, World! My first commit to FreeBSD :) - Remove myself
 as a contributer - Add myself as a committer - Add my PGP public key - Add my
 author entity - Add a news entry

Approved by: swills (mentor)
---
 .../contributors/contrib.additional.xml       |  5 ---
 .../contributors/contrib.committers.xml       |  4 ++
 share/pgpkeys/feld.key                        | 41 +++++++++++++++++++
 share/pgpkeys/pgpkeys-developers.xml          |  5 +++
 share/pgpkeys/pgpkeys.ent                     |  1 +
 share/xml/developers.ent                      |  1 +
 share/xml/news.xml                            |  9 ++++
 7 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 share/pgpkeys/feld.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
index 1a71adcd46..f16e19054b 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
@@ -6191,11 +6191,6 @@
 	<email>markd@grizzly.com</email></para>
     </listitem>
 
-    <listitem>
-      <para>Mark Felder
-	<email>feld@feld.me</email></para>
-    </listitem>
-
     <listitem>
       <para>Mark Foster
 	<email>mark@foster.cc</email></para>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index 8d645c0197..b46c0bf44b 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -403,6 +403,10 @@
       <para>&a.scf;</para>
     </listitem>
 
+    <listitem>
+      <para>&a.feld;</para>
+    </listitem>
+
     <listitem>
       <para>&a.green;</para>
     </listitem>
diff --git a/share/pgpkeys/feld.key b/share/pgpkeys/feld.key
new file mode 100644
index 0000000000..fcb8112461
--- /dev/null
+++ b/share/pgpkeys/feld.key
@@ -0,0 +1,41 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh feld E64C94FE;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   2048R/E64C94FE 2013-06-25
+      Key fingerprint = 71ED 6A7F F4D7 430A BDF3  A180 BF01 619F E64C 94FE
+uid                  Mark Felder <feld@freebsd.org>
+sub   2048R/FDC20CA9 2013-06-25
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFHJv/kBCADVITLtFPQSb11xYJ+Lot6h2KrJCg8EhuY3CwrvxTYKimQFBSA7
+tLmxrsLngQohwfy1mtN/wiyj6qWPGiYnQulHV1sda7GQU+oJywCk9mstGSQjZ9fF
+4XEK6W63X3qVP7A0Dvq5yPGuceTdCxz2M41DTACiLYPYXU12319cJNcgWDDWPRyS
+PU1Ljuh/jKoBp3alHVLT8tVplB8dqoQQVtxAZCo+CXVfhawHUFcT6x/esl7WYbYl
+wCuGYr0j5bpdorDlOJRoOcp6XTkP1RZbctspESsjlQGCblk9gG/7thYUkXO/GTVS
+KSRCcDZrZPOYIGdthB1jjs5K06auJ0wwvb3ZABEBAAG0Hk1hcmsgRmVsZGVyIDxm
+ZWxkQGZyZWVic2Qub3JnPokBOAQTAQIAIgUCUcm/+QIbAwYLCQgHAwIGFQgCCQoL
+BBYCAwECHgECF4AACgkQvwFhn+ZMlP4QpAgAmIAMBq+9qkgxXdYn5op70wBZjKOM
+RL1axKZCdLUmfKhydASvFQ5SW9LRr1dDLQDlcL2oJ3WGkqtjWbUm9NCNSwiJ/BGe
+JYCpezSHuazsW8ZO5kO4IMLxlUSxw8bKqXlHL4YI/sBs7G9mp5dRqRWKTnDSm97u
+nXVmPgbdgqlMPMZDt6Nhfo7jSqBhjeFmUi6rjbKUDq391WqpzTUbbf5IF2uKNM2H
+yANJDQ56Ncfjy28SBZr5crf8Na/v/7L1+KqeOhf9jsyALsDZ5H0R9skSseM83Mdj
+6VGGNHm/ZCJsKA/y4pJxdT4lbjGsorjr79GS4xu1uZOFNK4X+um6vakpqbkBDQRR
+yb/5AQgA0YBpsQICxBU7cyktmXAmC204cOvTjHnyeAusA9REltj8uEe91+E2udaY
+f0KBoqdea0DotvbiZqHmmULvt2HHANpeLa/2Dz3d37PLbQUj0hZO+/WJlR9i0ASm
+YC32l9pbj9BXP3Zgmp5YzWrfu6eEF4WfLjzzwmRmkWsrOIyB3jNkQjjKh1zzuMxv
+qLYVnS/cLnE/7upcepS6hqIV1EQs2G/m/3do0OcNHn2y8QXIup/oeYp1ceGxTmOY
+bL13T1bCDeR7P8cLISg9urOK0vMVcbLYv6CvloBVZQ59FYYHaqoPnop54edXgvwV
+yWJ9mckEoq4puIOaUkl7ygq3w/72KwARAQABiQEfBBgBAgAJBQJRyb/5AhsMAAoJ
+EL8BYZ/mTJT+2S0H/2CZoRibxN75bbSRP26ECjfFAMAEYl9+Vh+xxfgmvZfIfP1l
+Wh3FoQMBlG00pJejCePBpgeM0YcsIcIC61+Wx/EpjbN/96Sy1J17I5/pHsbwyDRX
+B0Vow56tpPuP6eC8IUteogdGLJ10AgXYeYytg22pNMyjcUg4Vx5Dl9ccufvEbdXf
+G+Or9L+LyQHLzi3Txjlsc6p8OrUMX8FS/eRYRjPPgGakdA/+EOmEqu8dVDao4noR
+PKuRIBVyR0iNScoD6+qzRd+G6CHvdNc7PGL9H8eUVpVaGkbtOrAfaOxO52g+2g26
+12JI6CW8+6DrikVGZHh7OnPTROpTIi/qkSs67DA=
+=05Sq
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index 88878c55a3..ed042732f8 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -491,6 +491,11 @@
       &pgpkey.jedgar;
     </sect2>
 
+    <sect2 id="pgpkey-feld">
+      <title>&a.feld;</title>
+      &pgpkey.feld;
+    </sect2>
+
     <sect2 id="pgpkey-green">
       <title>&a.green;</title>
       &pgpkey.green;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index a781b47992..24b8a392e9 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -126,6 +126,7 @@
 <!ENTITY pgpkey.fabient SYSTEM "fabient.key">
 <!ENTITY pgpkey.fanf SYSTEM "fanf.key">
 <!ENTITY pgpkey.farrokhi SYSTEM "farrokhi.key">
+<!ENTITY pgpkey.feld SYSTEM "feld.key">
 <!ENTITY pgpkey.fjoe SYSTEM "fjoe.key">
 <!ENTITY pgpkey.flo SYSTEM "flo.key">
 <!ENTITY pgpkey.fluffy SYSTEM "fluffy.key">
diff --git a/share/xml/developers.ent b/share/xml/developers.ent
index 74d92239ff..9dfaf6873e 100644
--- a/share/xml/developers.ent
+++ b/share/xml/developers.ent
@@ -207,6 +207,7 @@ $FreeBSD$
 <!ENTITY a.fabient "Fabien Thomas">
 <!ENTITY a.fanf "Tony Finch">
 <!ENTITY a.farrokhi "Babak Farrokhi">
+<!ENTITY a.feld "Mark Felder">
 <!ENTITY a.fenner "Bill Fenner">
 <!ENTITY a.fjoe "Max Khon">
 <!ENTITY a.flathill "Seiichirou Hiraoka">
diff --git a/share/xml/news.xml b/share/xml/news.xml
index 851bf53259..b890927cd2 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -33,6 +33,15 @@
     <month>
       <name>6</name>
 
+      <day>
+	<name>25</name>
+
+	<event>
+	  <p>New committer:
+	      <a href="mailto:feld@FreeBSD.org">Mark Felder</a> (ports)</p>
+	</event>
+      </day>
+
       <day>
 	<name>19</name>