From 92f3e26baf2f3ab1cf29b70203d16be287fe0e5c Mon Sep 17 00:00:00 2001
From: Wojciech Macek <wma@FreeBSD.org>
Date: Wed, 20 Jan 2016 11:19:35 +0000
Subject: [PATCH] Adding info about myself to docs

Approved by:           cognet (mentor)
Differential revision: https://reviews.freebsd.org/D5000
---
 .../contributors/contrib.committers.xml       |  4 ++
 share/pgpkeys/pgpkeys-developers.xml          |  5 +++
 share/pgpkeys/pgpkeys.ent                     |  1 +
 share/pgpkeys/wma.key                         | 42 +++++++++++++++++++
 share/xml/authors.ent                         |  3 ++
 share/xml/news.xml                            |  9 ++++
 6 files changed, 64 insertions(+)
 create mode 100644 share/pgpkeys/wma.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index 8a64efa112..4000601ea3 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -844,6 +844,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <para>&a.eri.email;</para>
   </listitem>
 
+  <listitem>
+    <para>&a.wma.email;</para>
+  </listitem>
+
   <listitem>
     <para>&a.rmacklem.email;</para>
   </listitem>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index 5c666102de..8e34465341 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -1291,6 +1291,11 @@
       &pgpkey.jtl;
     </sect2>
 
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-wma">
+      <title>&a.wma.email;</title>
+      &pgpkey.wma;
+    </sect2>
+
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-rmacklem">
       <title>&a.rmacklem.email;</title>
       &pgpkey.rmacklem;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 43322e53af..2ec8cb1a1f 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -483,6 +483,7 @@
 <!ENTITY pgpkey.wilko SYSTEM "wilko.key">
 <!ENTITY pgpkey.will SYSTEM "will.key">
 <!ENTITY pgpkey.wkoszek SYSTEM "wkoszek.key">
+<!ENTITY pgpkey.wma SYSTEM "wma.key">
 <!ENTITY pgpkey.wollman SYSTEM "wollman.key">
 <!ENTITY pgpkey.wosch SYSTEM "wosch.key">
 <!ENTITY pgpkey.wxs SYSTEM "wxs.key">
diff --git a/share/pgpkeys/wma.key b/share/pgpkeys/wma.key
new file mode 100644
index 0000000000..a3da16c41e
--- /dev/null
+++ b/share/pgpkeys/wma.key
@@ -0,0 +1,42 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh wma BA2FD88965AA1A7F ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa2048/BA2FD88965AA1A7F 2016-01-20 [expires: 2019-01-19]
+      Key fingerprint = 09F2 3360 D512 C987 B4D8  1AE8 BA2F D889 65AA 1A7F
+uid                          Wojciech Macek <wma@FreeBSD.org>
+sub   rsa2048/F074ACB7E5B3B33A 2016-01-20 [expires: 2019-01-19]
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFafOAsBCACx3x71eZ8W5sSonSWQYdo92/WdaKTxOOFbq64Y96eSBfW9b/aG
+lquhYeqny+rKNZ3RGDNVtcoXVXQ6WVk6Ogh9DLzUZBM18qUHhOD/caxOF/qbbbJc
+p76+75JN3flB7vQcYGOyHfnXuVZLztsDzx+5R3KERP17THHZxeku5qL/MXY1ruBd
+yxAVWHdqClUjToBGSj4ov9COZWBxs7vNigy/d7CrHQc3AIbu4X4FBYgKtZEbrzz0
+P9Y3+mI+Rg5R0Ith71YAp+RweX4b/qC00d3yUoq10VM1vWNYMuRBEPRoV9uS/7bL
+JEF5Fgu3CJrgIlPeTq/RRq1kczsq4DRse6rLABEBAAG0IFdvamNpZWNoIE1hY2Vr
+IDx3bWFARnJlZUJTRC5vcmc+iQE9BBMBCgAnBQJWnzgLAhsDBQkFo5qABQsJCAcD
+BRUKCQgLBRYDAgEAAh4BAheAAAoJELov2Illqhp/jcgH/i5cs6bBNpaJIOHGmrBb
+caJ9blKVbHJhI1y14IFTiV/tZnakbr6/Zra89OBU5IvTBA3AOJv0qCuEM8WdVh5g
+5+KovkuyG5ZdCUihd0f5J3yTSWWfEE0PT7n0a2llZOTW6YnfYzD7LbK0sAuZwrOD
+NZ6mg/xSG5TT/JOYgwgtLD90LPR/XX47FX7aviT0u4/sCPf9RyKL2VoRe9OqEZDh
+yVXW7mK47MR6sMGXeKCQGT5J/FgYhABjmzi4bJ3MbBd0AW5MJFFJW+UyF6+dAD6l
+UBeCFfRC0Y+MrHTBbKJk8hOq46/LhFlazfCr78ho7E2vkA9b3b2W5qmjf6L+oS2/
+TLi5AQ0EVp84CwEIAMeHwAiwth49I/nLNwKxK0oUbTWFU2DH5POx6ntIIG8c1Y7R
+ovqqJKKI0Jv/POZEkGgZfTsBwJIzi6nP24G747FSuKTfG17DWevnuTjy39UGYylP
+2SWXLxWFzg84GTUOEh7/Z/OoAnjI9OatI4XCUHLD3kPb/V6bUSEuoa2ofasVwRnb
+FNGExHNvoTE3yL6sAfCDPWmOZmoqrzWItHXJQxoNZJrp9v75Q1fT2l5ek30pBLa0
+pVsQ7pLr9ffbBeSgFLfJ+ApZTa/shSa6WNvAi9SOYz2poUV6OWp6uTc5BYkBjw4+
+zxQ/n+p9aAJg0S54+Mp5DOBqEKOqj89AqzBs1isAEQEAAYkBJQQYAQoADwUCVp84
+CwIbDAUJBaOagAAKCRC6L9iJZaoaf7R+B/9XutbuQGHh+wHczpBZPKRGjN8LWV+Q
+ElivV46+kN/SImfbto41tdIrB4lDtW31r8PUpNnDOZJh0aHnLkDrNLB2bnpbFBuN
+0wFb9I5mdeGHeW0XANKlK0EMEQ5EONJMcL6FveWnDH45a5SPJs6olt7H3l69vI3i
+//mgzNGUzDqMLwR9V6aGTGLkXTAg4stuUYkGzzWdwK5ntVUoc9b38OeljG1P1Zjw
+mQSFm1erj0zYO5d5lvA2vDzjzq+y4hX1b+7HyMhxMmOMZuZPJx9hTSImibzrNGHm
+NiVXwq0jWuLll3REkYQS/9rUEXwOi6pkkyEabvYXBlAW11E/XtT9n+kA
+=apD9
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index ea97c22cf3..598095cf84 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -2298,6 +2298,9 @@
 <!ENTITY a.wkoszek "Wojciech A. Koszek">
 <!ENTITY a.wkoszek.email "&a.wkoszek; <email xmlns='http://docbook.org/ns/docbook'>wkoszek@FreeBSD.org</email>">
 
+<!ENTITY a.wma "Wojciech Macek">
+<!ENTITY a.wma.email "&a.wma; <email xmlns='http://docbook.org/ns/docbook'>wma@FreeBSD.org</email>">
+
 <!ENTITY a.wolf "Wolfgang Stanglmeier">
 <!ENTITY a.wolf.email "&a.wolf; <email xmlns='http://docbook.org/ns/docbook'>wolf@FreeBSD.org</email>">
 
diff --git a/share/xml/news.xml b/share/xml/news.xml
index e21db7b7f9..2bbbb2649e 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -57,6 +57,15 @@
 	      Statement</a> about harassment in the &os; Community</p>
 	</event>
       </day>
+
+      <day>
+	<name>18</name>
+
+	<event>
+	  <p>New committer:
+	    <a href="mailto:wma@FreeBSD.org">Wojciech Macek</a> (src)</p>
+	</event>
+      </day>
     </month>
   </year>