From e8151363c403be2228109bbe8379bf9b7c0326af Mon Sep 17 00:00:00 2001
From: Dominic Fandrey <kami@FreeBSD.org>
Date: Sat, 6 Dec 2014 21:26:07 +0000
Subject: [PATCH] Add new ports commiter, kami a.k.a. me.

Add all the info according to the Committer's Guide.

Differential Revision:	https://reviews.freebsd.org/D975
Reviewed by:	cs
Approved by:	cs
---
 .../contributors/contrib.additional.xml       |  5 --
 .../contributors/contrib.committers.xml       |  4 ++
 share/pgpkeys/kami.key                        | 54 +++++++++++++++++++
 share/pgpkeys/pgpkeys-developers.xml          |  5 ++
 share/pgpkeys/pgpkeys.ent                     |  1 +
 share/xml/authors.ent                         |  3 ++
 share/xml/news.xml                            |  9 ++++
 7 files changed, 76 insertions(+), 5 deletions(-)
 create mode 100644 share/pgpkeys/kami.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
index 7574d672b7..8ae53d1973 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
@@ -2663,11 +2663,6 @@
 	<email>midom@dammit.lt</email></para>
     </listitem>
 
-    <listitem>
-      <para>Dominic Fandrey
-	<email>lon_kamikaze@gmx.de</email></para>
-    </listitem>
-
     <listitem>
       <para>Dominic Marks
 	<email>dominic_marks@btinternet.com</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 6e8c521d20..7ed03caeb0 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -346,6 +346,10 @@
       <para>&a.rafan.email;</para>
     </listitem>
 
+    <listitem>
+      <para>&a.kami.email;</para>
+    </listitem>
+
     <listitem>
       <para>&a.stefanf.email;</para>
     </listitem>
diff --git a/share/pgpkeys/kami.key b/share/pgpkeys/kami.key
new file mode 100644
index 0000000000..5880784b0e
--- /dev/null
+++ b/share/pgpkeys/kami.key
@@ -0,0 +1,54 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh kami 6FF05D69A92A59DB ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   2048R/6FF05D69A92A59DB 2014-09-18 [expires: 2017-09-17]
+      Key fingerprint = 7D88 4610 FFBB BA86 F17B  C037 6FF0 5D69 A92A 59DB
+uid                          Dominic Fandrey <kami@freebsd.org>
+sub   2048R/B4EC9D5FBC909F27 2014-09-18 [expires: 2017-09-17]
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+JJ30lBBrsT/EB48=
+=/44p
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index 83beec4fd2..5e5836a602 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -526,6 +526,11 @@
       &pgpkey.rafan;
     </sect2>
 
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-kami">
+      <title>&a.kami.email;</title>
+      &pgpkey.kami;
+    </sect2>
+
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-stefanf">
       <title>&a.stefanf.email;</title>
       &pgpkey.stefanf;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index e7bbe50c04..be0040d179 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -221,6 +221,7 @@
 <!ENTITY pgpkey.jylefort SYSTEM "jylefort.key">
 <!ENTITY pgpkey.kadesai SYSTEM "kadesai.key">
 <!ENTITY pgpkey.kaiw SYSTEM "kaiw.key">
+<!ENTITY pgpkey.kami SYSTEM "kami.key">
 <!ENTITY pgpkey.kan SYSTEM "kan.key">
 <!ENTITY pgpkey.kato SYSTEM "kato.key">
 <!ENTITY pgpkey.ken SYSTEM "ken.key">
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index 26be347aa7..7ca928fc7c 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -2307,6 +2307,9 @@
 <!ENTITY a.zont "Andrey Zonov">
 <!ENTITY a.zont.email "&a.zont; <email xmlns='http://docbook.org/ns/docbook'>zont@FreeBSD.org</email>">
 
+<!ENTITY a.kami "Dominic Fandrey">
+<!ENTITY a.kami.email "&a.kami; <email xmlns='http://docbook.org/ns/docbook'>kami@FreeBSD.org</email>">
+
 <!-- Additional contributors, no email address -->
 
 <!ENTITY a.mkm "Kyle Martin">
diff --git a/share/xml/news.xml b/share/xml/news.xml
index e9ee7ced5d..57d9fe6fbb 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -201,6 +201,15 @@
 	      mirror sites</a>.</p>
 	</event>
       </day>
+
+      <day>
+	<name>9</name>
+
+	<event>
+	    <p>New committer:
+	      <a href="mailto:kami@FreeBSD.org">Dominic Fandrey</a> (ports)</p>
+	</event>
+      </day>
     </month>
 
     <month>