Page MenuHomeFreeBSD
Files F144795086

D16425.1776514634.diff
No OneTemporary
Actions

Size
10 KB
Referenced Files
None
Subscribers
None

D16425.1776514634.diff
View Options

Index: en_US.ISO8859-1/articles/contributors/contrib.additional.xml
===================================================================
--- en_US.ISO8859-1/articles/contributors/contrib.additional.xml
+++ en_US.ISO8859-1/articles/contributors/contrib.additional.xml
@@ -5155,11 +5155,6 @@
</listitem>
<listitem>
- <para>John Hixson
- <email>jhixson@gmail.com</email></para>
- </listitem>
-
- <listitem>
<para>John Hood
<email>cgull@owl.org</email></para>
</listitem>
Index: en_US.ISO8859-1/articles/contributors/contrib.committers.xml
===================================================================
--- en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -513,6 +513,10 @@
</listitem>
<listitem>
+ <para>&a.jhixson.email;</para>
+ </listitem>
+
+ <listitem>
<para>&a.pho.email;</para>
</listitem>
Index: share/pgpkeys/jhixson.key
===================================================================
--- /dev/null
+++ share/pgpkeys/jhixson.key
@@ -0,0 +1,121 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh jhixson 46A96305BFE23D40 ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub rsa4096/46A96305BFE23D40 2018-07-23 [SC] [expires: 2023-07-22]
+ Key fingerprint = 25A0 2CC1 0650 31F9 4274 203A 46A9 6305 BFE2 3D40
+uid John Hixson <john@ixsystems.com>
+uid John Hixson <jhixson@FreeBSD.org>
+uid John Hixson <jhixson@gmail.com>
+uid John Hixson <john@freenas.org>
+uid John Hixson <john@trueos.org>
+sub rsa4096/BA881F39D4C7DB9F 2018-07-23 [E] [expires: 2023-07-22]
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=k3o9
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
Index: share/pgpkeys/pgpkeys-developers.xml
===================================================================
--- share/pgpkeys/pgpkeys-developers.xml
+++ share/pgpkeys/pgpkeys-developers.xml
@@ -901,6 +901,11 @@
&pgpkey.jhibbits;
</sect2>
+ <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-jhixson">
+ <title>&a.jhixson.email;</title>
+ &pgpkey.jhixson;
+ </sect2>
+
<sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-pho">
<title>&a.pho.email;</title>
&pgpkey.pho;
Index: share/pgpkeys/pgpkeys.ent
===================================================================
--- share/pgpkeys/pgpkeys.ent
+++ share/pgpkeys/pgpkeys.ent
@@ -228,6 +228,7 @@
<!ENTITY pgpkey.jhay SYSTEM "jhay.key">
<!ENTITY pgpkey.jhb SYSTEM "jhb.key">
<!ENTITY pgpkey.jhibbits SYSTEM "jhibbits.key">
+<!ENTITY pgpkey.jhixson SYSTEM "jhixson.key">
<!ENTITY pgpkey.jilles SYSTEM "jilles.key">
<!ENTITY pgpkey.jim SYSTEM "jim.key">
<!ENTITY pgpkey.jinmei SYSTEM "jinmei.key">
Index: share/xml/authors.ent
===================================================================
--- share/xml/authors.ent
+++ share/xml/authors.ent
@@ -1083,6 +1083,9 @@
<!ENTITY a.jhibbits "Justin Hibbits">
<!ENTITY a.jhibbits.email "&a.jhibbits; <email xmlns='http://docbook.org/ns/docbook'>jhibbits@FreeBSD.org</email>">
+<!ENTITY a.jhixson "John Hixson">
+<!ENTITY a.jhixson.email "&a.jhixson; <email xmlns='http://docbook.org/ns/docbook'>jhixson@FreeBSD.org</email>">
+
<!ENTITY a.jhs "Julian Stacey">
<!ENTITY a.jhs.email "&a.jhs; <email xmlns='http://docbook.org/ns/docbook'>jhs@FreeBSD.org</email>">
Index: share/xml/news.xml
===================================================================
--- share/xml/news.xml
+++ share/xml/news.xml
@@ -35,6 +35,16 @@
<name>7</name>
<day>
+ <name>16</name>
+
+ <event>
+ <p>New committer:
+ <a href="mailto:jhixson@FreeBSD.org">John Hixson</a>
+ (ports)</p>
+ </event>
+ </day>
+
+ <day>
<name>4</name>
<event>

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 18, 12:17 PM (11 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28375911
Default Alt Text
D16425.1776514634.diff (10 KB)

Event Timeline