diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml index 43a987b89f..986e1339b6 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml @@ -335,11 +335,6 @@ rousskov@measurement-factory.com - - Alex Samorukov - samm@os2.kiev.ua - - Alex Semenyaka alex@rinet.ru diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml index e8169b3b57..58c27ff0b3 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml @@ -1592,4 +1592,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> &a.az.email; + + + &a.samm.email; + diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml index c2b476f326..b34c26d469 100644 --- a/share/pgpkeys/pgpkeys-developers.xml +++ b/share/pgpkeys/pgpkeys-developers.xml @@ -2750,3 +2750,8 @@ &a.kaktus.email; &pgpkey.kaktus; + + + &a.samm.email; + &pgpkey.samm; + diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent index 1147ad897d..dd31b18187 100644 --- a/share/pgpkeys/pgpkeys.ent +++ b/share/pgpkeys/pgpkeys.ent @@ -473,6 +473,7 @@ + diff --git a/share/pgpkeys/samm.key b/share/pgpkeys/samm.key new file mode 100644 index 0000000000..6ab80c39c1 --- /dev/null +++ b/share/pgpkeys/samm.key @@ -0,0 +1,53 @@ + + + +uid Samorukov,Alexey +sub rsa2048/F8FB02487C50A175 2019-10-08 [E] [expires: 2022-10-08] + +]]> + diff --git a/share/xml/authors.ent b/share/xml/authors.ent index 973703fda1..c74e61173f 100644 --- a/share/xml/authors.ent +++ b/share/xml/authors.ent @@ -66,6 +66,9 @@ ak@FreeBSD.org"> + +samm@FreeBSD.org"> + akiyama@FreeBSD.org"> diff --git a/share/xml/news.xml b/share/xml/news.xml index b92ffb7671..58975e5889 100644 --- a/share/xml/news.xml +++ b/share/xml/news.xml @@ -34,6 +34,16 @@ 10 + + 11 + + + New committer: + Alex Samorukov + (ports) + + + 4
New committer: + Alex Samorukov + (ports)