From b923d6aa38a049f11023be7232aa989ac80f7dc6 Mon Sep 17 00:00:00 2001
From: Eric van Gyzen <vangyzen@FreeBSD.org>
Date: Tue, 10 Mar 2015 17:53:17 +0000
Subject: [PATCH] Add myself as a src/ committer, per the Committer's Guide.
Approved by: kib (mentor)
---
.../contributors/contrib.additional.xml | 10 ----
.../contributors/contrib.committers.xml | 4 ++
share/pgpkeys/pgpkeys-developers.xml | 5 ++
share/pgpkeys/pgpkeys.ent | 1 +
share/pgpkeys/vangyzen.key | 51 +++++++++++++++++++
share/xml/authors.ent | 3 ++
share/xml/news.xml | 13 +++++
7 files changed, 77 insertions(+), 10 deletions(-)
create mode 100644 share/pgpkeys/vangyzen.key
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
index a4d54adb5c..6d46fde4ed 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
@@ -2966,11 +2966,6 @@
<email>eps@sirius.com</email></para>
</listitem>
- <listitem>
- <para>Eric S. Van Gyzen
- <email>esv@vangyzen.net</email></para>
- </listitem>
-
<listitem>
<para>Eric Schnoebelen
<email>eric@cirr.com</email></para>
@@ -2996,11 +2991,6 @@
<email>ericyu@mail2000.com.tw</email></para>
</listitem>
- <listitem>
- <para>Eric van Gyzen
- <email>vangyzen@stat.duke.edu</email></para>
- </listitem>
-
<listitem>
<para>Erich Stefan Boleyn
<email>erich@uruk.org</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 450fa6641d..f0024c644e 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -1454,6 +1454,10 @@
<para>&a.ups.email;</para>
</listitem>
+ <listitem>
+ <para>&a.vangyzen.email;</para>
+ </listitem>
+
<listitem>
<para>&a.vanhu.email;</para>
</listitem>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index ef56a14e7e..0afebacab4 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -2091,6 +2091,11 @@
&pgpkey.ups;
</sect2>
+ <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-vangyzen">
+ <title>&a.vangyzen.email;</title>
+ &pgpkey.vangyzen;
+ </sect2>
+
<sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-bryanv">
<title>&a.bryanv.email;</title>
&pgpkey.bryanv;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 9f7a3441e4..74ea547618 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -446,6 +446,7 @@
<!ENTITY pgpkey.ume SYSTEM "ume.key">
<!ENTITY pgpkey.ups SYSTEM "ups.key">
<!ENTITY pgpkey.uqs SYSTEM "uqs.key">
+<!ENTITY pgpkey.vangyzen SYSTEM "vangyzen.key">
<!ENTITY pgpkey.vanilla SYSTEM "vanilla.key">
<!ENTITY pgpkey.vd SYSTEM "vd.key">
<!ENTITY pgpkey.versus SYSTEM "versus.key">
diff --git a/share/pgpkeys/vangyzen.key b/share/pgpkeys/vangyzen.key
new file mode 100644
index 0000000000..01682f494f
--- /dev/null
+++ b/share/pgpkeys/vangyzen.key
@@ -0,0 +1,51 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh vangyzen AFC12A13EC20DAB8 ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub rsa2048/AFC12A13EC20DAB8 2015-01-28 [expires: 2018-01-27]
+ Key fingerprint = 3E70 4F4A 0D13 41E8 BCE4 D73D AFC1 2A13 EC20 DAB8
+uid Eric van Gyzen <vangyzen@FreeBSD.org>
+uid Eric van Gyzen <eric@vangyzen.net>
+sub rsa2048/AEDFC8E4E2244266 2015-01-28 [expires: 2018-01-27]
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+ob6Utc0PmSTUY427+T7PxPNCjvx0
+=I0Ly
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index 9c28c42b9c..bd119f73fb 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -2190,6 +2190,9 @@
<!ENTITY a.uqs "Ulrich Spörlein">
<!ENTITY a.uqs.email "&a.uqs; <email xmlns='http://docbook.org/ns/docbook'>uqs@FreeBSD.org</email>">
+<!ENTITY a.vangyzen "Eric van Gyzen">
+<!ENTITY a.vangyzen.email "&a.vangyzen; <email xmlns='http://docbook.org/ns/docbook'>vangyzen@FreeBSD.org</email>">
+
<!ENTITY a.vanhu "Yvan Vanhullebus">
<!ENTITY a.vanhu.email "&a.vanhu; <email xmlns='http://docbook.org/ns/docbook'>vanhu@FreeBSD.org</email>">
diff --git a/share/xml/news.xml b/share/xml/news.xml
index 66f0434c38..bf3efeeeb7 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -31,6 +31,19 @@
<year>
<name>2015</name>
+ <month>
+ <name>3</name>
+
+ <day>
+ <name>8</name>
+
+ <event>
+ <p>New committer:
+ <a href="mailto:vangyzen@FreeBSD.org">Eric van Gyzen</a> (src)</p>
+ </event>
+ </day>
+ </month>
+
<month>
<name>2</name>