diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml index 0440aa90c5..7d53625c47 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml @@ -5253,11 +5253,6 @@ tuximus@tcsn.net - - Joseph Mingrone - jrm@ftfl.ca - - Joseph Scott joseph@randomnetworks.com diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml index 04c2b98970..5a0e39f8d4 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml @@ -1000,6 +1000,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> &a.rmh.email; + + &a.jrm.email; + + &a.mmoll.email; diff --git a/share/pgpkeys/jrm.key b/share/pgpkeys/jrm.key new file mode 100644 index 0000000000..caca23390f --- /dev/null +++ b/share/pgpkeys/jrm.key @@ -0,0 +1,691 @@ +svn:keywords=FreeBSD=%H + + + +uid Joseph R. Mingrone +uid Joseph R. Mingrone +uid Joseph R. Mingrone +sub 4096R/0xD9F31F5F75F9B14D 2015-03-23 [expires: 2018-08-01] + +]]> + diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml index fc5b72a909..0530ba6d53 100644 --- a/share/pgpkeys/pgpkeys-developers.xml +++ b/share/pgpkeys/pgpkeys-developers.xml @@ -1486,6 +1486,11 @@ &pgpkey.rmh; + + &a.jrm.email; + &pgpkey.jrm; + + &a.mmoll.email; &pgpkey.mmoll; diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent index f07d7b6eb6..66b9bb500a 100644 --- a/share/pgpkeys/pgpkeys.ent +++ b/share/pgpkeys/pgpkeys.ent @@ -234,6 +234,7 @@ + diff --git a/share/xml/authors.ent b/share/xml/authors.ent index c3e1bb5b77..8b097fcb6d 100644 --- a/share/xml/authors.ent +++ b/share/xml/authors.ent @@ -1143,6 +1143,9 @@ jraynard@FreeBSD.org"> + +jrm@FreeBSD.org"> + jsa@FreeBSD.org"> diff --git a/share/xml/news.xml b/share/xml/news.xml index 6afd9627ae..2fc860a583 100644 --- a/share/xml/news.xml +++ b/share/xml/news.xml @@ -37,6 +37,12 @@ 17 + + New committer: + Joseph Mingronee + (ports) + + &os; 11.0-RC3 Available
New committer: + Joseph Mingronee + (ports)