diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml index 0c93c1bce6..4804cb0d2c 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml @@ -573,6 +573,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> &a.markj.email; + + &a.thj.email; + + &a.mjoras.email; diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml index 64dd0d2e47..b9699303f4 100644 --- a/share/pgpkeys/pgpkeys-developers.xml +++ b/share/pgpkeys/pgpkeys-developers.xml @@ -1001,6 +1001,11 @@ &pgpkey.trevor; + + &a.thj.email; + &pgpkey.thj; + + &a.mjoras.email; &pgpkey.mjoras; diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent index 339c2f2a32..a1e776ca74 100644 --- a/share/pgpkeys/pgpkeys.ent +++ b/share/pgpkeys/pgpkeys.ent @@ -499,6 +499,7 @@ + diff --git a/share/pgpkeys/thj.key b/share/pgpkeys/thj.key new file mode 100644 index 0000000000..df64e67972 --- /dev/null +++ b/share/pgpkeys/thj.key @@ -0,0 +1,226 @@ + + + +uid Tom Jones +uid Tom Jones +uid Tom Jones +sub rsa4096/2C283C90C65B3DC2 2018-04-04 [S] [expires: 2021-04-07] +sub rsa4096/45D8110A5EF36A69 2018-04-04 [E] [expires: 2021-04-07] +sub rsa4096/74C5F04C84C07FEA 2018-04-04 [A] [expires: 2021-04-07] + +]]> + diff --git a/share/xml/authors.ent b/share/xml/authors.ent index 53d701cd45..3411977e4f 100644 --- a/share/xml/authors.ent +++ b/share/xml/authors.ent @@ -2280,6 +2280,9 @@ thierry@FreeBSD.org"> + +thj@FreeBSD.org"> + thomas@FreeBSD.org"> diff --git a/share/xml/news.xml b/share/xml/news.xml index 9ca54185fc..91b849ea3b 100644 --- a/share/xml/news.xml +++ b/share/xml/news.xml @@ -34,6 +34,16 @@ 4 + + 7 + + +

New committer: + Tom Jones + (src)

+
+
+ 4