From 0a10fd32556e222b6ffe00fb158a2407a98fb500 Mon Sep 17 00:00:00 2001
From: Wei Hu <whu@FreeBSD.org>
Date: Sat, 28 Feb 2015 09:56:44 +0000
Subject: [PATCH] Add Wei Hu (whu) and GPG key to doc/ according to committer's
guide.
Approved by: royger (mentor)
---
.../contributors/contrib.committers.xml | 4 ++
share/pgpkeys/pgpkeys-developers.xml | 5 +++
share/pgpkeys/pgpkeys.ent | 2 +-
share/pgpkeys/whu.key | 42 +++++++++++++++++++
share/xml/authors.ent | 3 ++
share/xml/news.xml | 13 ++++++
6 files changed, 68 insertions(+), 1 deletion(-)
create mode 100644 share/pgpkeys/whu.key
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index c025019106..450fa6641d 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -538,6 +538,10 @@
<para>&a.lwhsu.email;</para>
</listitem>
+ <listitem>
+ <para>&a.whu.email;</para>
+ </listitem>
+
<listitem>
<para>&a.chinsan.email;</para>
</listitem>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index 04d0276340..ef56a14e7e 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -806,6 +806,11 @@
&pgpkey.foxfair;
</sect2>
+ <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-whu">
+ <title>&a.whu.email;</title>
+ &pgpkey.whu;
+ </sect2>
+
<sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-chinsan">
<title>&a.chinsan.email;</title>
&pgpkey.chinsan;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 0706d22f89..9f7a3441e4 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -61,7 +61,6 @@
<!ENTITY pgpkey.bmah SYSTEM "bmah.key">
<!ENTITY pgpkey.bms SYSTEM "bms.key">
<!ENTITY pgpkey.bofh SYSTEM "bofh.key">
-<!ENTITY pgpkey.bofh SYSTEM "bofh.key">
<!ENTITY pgpkey.br SYSTEM "br.key">
<!ENTITY pgpkey.brd SYSTEM "brd.key">
<!ENTITY pgpkey.brian SYSTEM "brian.key">
@@ -460,6 +459,7 @@
<!ENTITY pgpkey.weongyo SYSTEM "weongyo.key">
<!ENTITY pgpkey.wes SYSTEM "wes.key">
<!ENTITY pgpkey.wg SYSTEM "wg.key">
+<!ENTITY pgpkey.whu SYSTEM "whu.key">
<!ENTITY pgpkey.wilko SYSTEM "wilko.key">
<!ENTITY pgpkey.will SYSTEM "will.key">
<!ENTITY pgpkey.wkoszek SYSTEM "wkoszek.key">
diff --git a/share/pgpkeys/whu.key b/share/pgpkeys/whu.key
new file mode 100644
index 0000000000..cc8cff6fe7
--- /dev/null
+++ b/share/pgpkeys/whu.key
@@ -0,0 +1,42 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh whu E6001C673CCD08F7 ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub rsa2048/E6001C673CCD08F7 2015-02-27
+ Key fingerprint = 351D AC21 7E16 BC06 7CA0 7705 E600 1C67 3CCD 08F7
+uid Wei Hu <whu@FreeBSD.org>
+sub rsa2048/0C7F6F103AAA0465 2015-02-27
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFTwOCIBCACjw43RBjeX+4OOLB7qRHyoSEr5oC/u8Nk6n4MeFFKRgcpqYXe6
+ckoQ4jGg8rMTbnsiLUu0OcMUpp4mB/47zc0FXOVSsU8FsBapjxXRsgqLDUZl96Tm
+3xgvgIp6GoIoOvC0m9x6dB5NywKrAvl5pVA0/g2QsinRqaHLrfIYhZpMqwLzGhwf
+m8DdRJ5D95vzG7bJBZyg6phmK5cgXnH2pLtDqo4NPp5weWl+BsvyoblPDocy0Hwx
+StHJbRGqstseDy0UASu9btje5DVlQ4bq897WbOi1yzwA/vbgaL+2B8QGBC+l+cjJ
++S2pEdyDKSWCkeKJaMa34Mp4xs5/W1ZjZlt9ABEBAAG0GFdlaSBIdSA8d2h1QEZy
+ZWVCU0Qub3JnPokBNwQTAQoAIQUCVPA4IgIbAwULCQgHAwUVCgkICwUWAwIBAAIe
+AQIXgAAKCRDmABxnPM0I93WWB/4ojEVo+8zhVm5aM2gHNebIlVOFnOjQcMshX/dT
+7NwNRpZEYV0HqJMJeO7ZMkJoirZrvQQm6WrLS91lh2Aw3Sp0mo9S+pIOJf6cOMRk
+GwzOQBhxPiLEPUIb4oqMeq8pEWT42iiOxEqUnKOBrBJJWQs9rnCkghzYyDVpe3NB
+g1pbD3Yhma5NK9aUCcC75heaXft6lwe0Dd8ddONEHK7ZMlBgem/Uf85SprFMBoRS
+NSQIC2gvJj7O1gGKcWxXudzFSaHKrN6iBUkTT1BqWSRwDvlwcnJbw83/lnSutodU
+B6UCIVST8jgrDNmb/7UQLguG0BLSk0UE2dKjPAf/ICWJu/QFuQENBFTwOCIBCACd
+axrZrShlEwTZFfsJM7uH7XusUJrjGEKPLnTikLcRXcCP1whXbhTinw6ehgm+PooQ
+rWzLIlh+Ogren/QgmKCGEA7WePQJd5DEVH11CnD32LligoRdN2P1ItHDwUdPg0zZ
+R4tR6xe05iUuTiErM9OZKipeFXNqjnr6ki0+hA0ZQEqcZO8rLaLoIBf5EdvNIy1V
+bjBSSuAIdYE0foZlCl+r7VLxFWnhB110n8vIvqmVBaKRkZx8lZ91LVVDBVJ3yuZE
+pEmmfbnJEdi9IPDKcTsfn0eqTDmc/dEiSrLJkKbAfvKMmlIu/cnhQdWCUC+Giyt9
+kZakqi/ksgz6tSBZfY35ABEBAAGJAR8EGAEKAAkFAlTwOCICGwwACgkQ5gAcZzzN
+CPegVQf/WDja2xcoDFN45UCBDubdTi9XWshskymcY2WSRusp9bwo2DPTeZ9yJGn+
+l2NBidZC4ppM2IDxhBCaaEtBZIbqztliVaW0mScssc3M49t26qzEHwIoVAGr7H0n
+RJIC1Nm4DNn1PUwMq8e82lBfRv/5hUdAKg0H9uksFr7jgDYnul3cAITujQWl51kP
+S7E+CS6hOok/IniQIj9Cjp1gcQ2qIP8jKRrNBNojtvQUuqUjv6605EmEQXaNkLrZ
+dm5daJ+me05fokmbkXgDRXyGhmcigPQzqz2ymROzHk1dSyY6L4SjF8/JL1u8fdCb
+G2ii6BtiESfaHof1AMVdYADgnJQL0A==
+=jnKf
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index ce4e83b3b7..9c28c42b9c 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -2238,6 +2238,9 @@
<!ENTITY a.whiteside "Don Whiteside">
<!ENTITY a.whiteside.email "&a.whiteside; <email xmlns='http://docbook.org/ns/docbook'>whiteside@acm.org</email>">
+<!ENTITY a.whu "Wei Hu">
+<!ENTITY a.whu.email "&a.whu; <email xmlns='http://docbook.org/ns/docbook'>whu@FreeBSD.org</email>">
+
<!ENTITY a.wilko "Wilko Bulte">
<!ENTITY a.wilko.email "&a.wilko; <email xmlns='http://docbook.org/ns/docbook'>wilko@FreeBSD.org</email>">
diff --git a/share/xml/news.xml b/share/xml/news.xml
index 5e4de6dea0..66f0434c38 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -31,6 +31,19 @@
<year>
<name>2015</name>
+ <month>
+ <name>2</name>
+
+ <day>
+ <name>11</name>
+
+ <event>
+ <p>New committer:
+ <a href="mailto:whu@FreeBSD.org">Wei Hu</a> (src)</p>
+ </event>
+ </day>
+ </month>
+
<month>
<name>1</name>