diff --git a/documentation/content/en/articles/contributors/contrib-committers.adoc b/documentation/content/en/articles/contributors/contrib-committers.adoc --- a/documentation/content/en/articles/contributors/contrib-committers.adoc +++ b/documentation/content/en/articles/contributors/contrib-committers.adoc @@ -198,6 +198,7 @@ * {achim} * {truckman} * {glewis} +* {vishwin} * {qingli} * {delphij} * {avatar} diff --git a/documentation/content/en/articles/pgpkeys/_index.adoc b/documentation/content/en/articles/pgpkeys/_index.adoc --- a/documentation/content/en/articles/pgpkeys/_index.adoc +++ b/documentation/content/en/articles/pgpkeys/_index.adoc @@ -920,6 +920,9 @@ === `{glewis}` include::static/pgpkeys/glewis.key[] +=== `{vishwin}` +include::static/pgpkeys/vishwin.key[] + === `{qingli}` include::static/pgpkeys/qingli.key[] diff --git a/documentation/static/pgpkeys/vishwin.key b/documentation/static/pgpkeys/vishwin.key new file mode 100644 --- /dev/null +++ b/documentation/static/pgpkeys/vishwin.key @@ -0,0 +1,66 @@ +// sh addkey.sh vishwin FEB7852BE29B3E87 ; + +[.literal-block-margin] +.... +pub rsa4096/FEB7852BE29B3E87 2021-05-02 [SC] [expires: 2023-05-16] + Key fingerprint = 2577 79BA D34D 8697 8770 1331 FEB7 852B E29B 3E87 +uid Charlie Li (FreeBSD Project) +sub rsa4096/2F452088A7FB535E 2021-05-02 [E] [expires: 2023-05-02] + +.... + +[.literal-block-margin] +.... +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +7ChTGV5tKqPdWMTfdWjLks8d7C4782boDbQ= +=UfX2 +-----END PGP PUBLIC KEY BLOCK----- +.... diff --git a/shared/authors.adoc b/shared/authors.adoc --- a/shared/authors.adoc +++ b/shared/authors.adoc @@ -3419,6 +3419,10 @@ :viny-email: viny@FreeBSD.org :viny: {viny-name} <{viny-email}> +:vishwin-name: Charlie Li +:vishwin-email: vishwin@FreeBSD.org +:vishwin: {vishwin-name} <{vishwin-email}> + :vkashyap-name: Vinod Kashyap :vkashyap-email: vkashyap@FreeBSD.org :vkashyap: {vkashyap-name} <{vkashyap-email}> diff --git a/website/data/en/news/news.toml b/website/data/en/news/news.toml --- a/website/data/en/news/news.toml +++ b/website/data/en/news/news.toml @@ -1,4 +1,7 @@ # Sort news by year, month and day +[[news]] +date = "2021-04-29" +description = "New committer: Charlie Li (ports)" [[news]] date = "2021-04-21" diff --git a/website/data/zh-cn/news/news.toml b/website/data/zh-cn/news/news.toml --- a/website/data/zh-cn/news/news.toml +++ b/website/data/zh-cn/news/news.toml @@ -1,6 +1,10 @@ # Sort news by year, month and day # $FreeBSD$ +[[news]] +date = "2021-04-29" +description = "新增 committer: 李呈 (ports)" + [[news]] date = "2018-12-11" title = "FreeBSD 12.0-RELEASE 发布了"