From 78f42009cfdb741e533306413bf643148e7a6c6d Mon Sep 17 00:00:00 2001
From: Torsten Zuehlsdorff <tz@FreeBSD.org>
Date: Fri, 10 Jun 2016 08:57:45 +0000
Subject: [PATCH] Add myself (tz / Torsten Zuehlsdorff) to ports committers   -
 Add authors.ent entry   - Add tz@FreeBSD.org to contrib.committers.xml   -
 Add news item to news.xml   - Add my PGP key

Approved by:	junovitch (mentor)
---
 .../contributors/contrib.committers.xml       |  4 ++
 share/pgpkeys/pgpkeys-developers.xml          |  5 ++
 share/pgpkeys/pgpkeys.ent                     |  1 +
 share/pgpkeys/tz.key                          | 64 +++++++++++++++++++
 share/xml/authors.ent                         |  3 +
 share/xml/news.xml                            | 15 +++++
 6 files changed, 92 insertions(+)
 create mode 100644 share/pgpkeys/tz.key

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index f2b213a83e..e4174a9cb3 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -1648,6 +1648,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <para>&a.zont.email;</para>
   </listitem>
 
+  <listitem>
+    <para>&a.tz.email;</para>
+  </listitem>
+
   <listitem>
     <para>&a.az.email;</para>
   </listitem>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index 59071b1001..2acbd3495d 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -2365,3 +2365,8 @@
       <title>&a.zont.email;</title>
       &pgpkey.zont;
     </sect2>
+
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-tz">
+      <title>&a.tz.email;</title>
+      &pgpkey.tz;
+    </sect2>
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index dd87c558a8..aeea678b73 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -469,6 +469,7 @@
 <!ENTITY pgpkey.truckman SYSTEM "truckman.key">
 <!ENTITY pgpkey.tuexen SYSTEM "tuexen.key">
 <!ENTITY pgpkey.twinterg SYSTEM "twinterg.key">
+<!ENTITY pgpkey.tz SYSTEM "tz.key">
 <!ENTITY pgpkey.ue SYSTEM "ue.key">
 <!ENTITY pgpkey.ume SYSTEM "ume.key">
 <!ENTITY pgpkey.ups SYSTEM "ups.key">
diff --git a/share/pgpkeys/tz.key b/share/pgpkeys/tz.key
new file mode 100644
index 0000000000..b1fce32162
--- /dev/null
+++ b/share/pgpkeys/tz.key
@@ -0,0 +1,64 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh tz 585FAB7CBF9243D0 ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa4096/585FAB7CBF9243D0 2016-06-08 [SC] [verfällt: 2019-06-08]
+  Schl.-Fingerabdruck = 8400 53D2 0180 F22E 46F9  12AF 585F AB7C BF92 43D0
+uid                            Torsten Zuehlsdorff <tz@FreeBSD.org>
+sub   rsa4096/BF74DAF15D5EAF18 2016-06-08 [E] [verfällt: 2019-06-08]
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+/Ya9xvWuioYozJ3Lpjc=
+=X6Ho
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index ab4ce84381..43b75df6db 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -2229,6 +2229,9 @@
 <!ENTITY a.tychon "Tycho Nightingale">
 <!ENTITY a.tychon.email "&a.tychon; <email xmlns='http://docbook.org/ns/docbook'>tychon@FreeBSD.org</email>">
 
+<!ENTITY a.tz "Torsten Zuehlsdorff">
+<!ENTITY a.tz.email "&a.tz; <email xmlns='http://docbook.org/ns/docbook'>tz@FreeBSD.org</email>">
+  
 <!ENTITY a.uch "Yasushi UCHIYAMA">
 <!ENTITY a.uch.email "&a.uch; <email xmlns='http://docbook.org/ns/docbook'>uch@FreeBSD.org</email>">
 
diff --git a/share/xml/news.xml b/share/xml/news.xml
index 58e57b2743..f5eca7e23f 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -31,6 +31,21 @@
   <year>
     <name>2016</name>
 
+    <month>
+      <name>6</name>
+
+      <day>
+        <name>4</name>
+
+        <event>
+          <p>New committer:
+            <a href="mailto:tz@FreeBSD.org">Torsten Zuehlsdorff</a>
+            (ports)</p>
+        </event>
+      </day>
+
+    </month>
+
     <month>
       <name>5</name>