diff options
| -rw-r--r-- | en_US.ISO8859-1/articles/contributors/contrib.additional.xml | 5 | ||||
| -rw-r--r-- | en_US.ISO8859-1/articles/contributors/contrib.committers.xml | 4 | ||||
| -rw-r--r-- | share/pgpkeys/nc.key | 51 | ||||
| -rw-r--r-- | share/pgpkeys/pgpkeys-developers.xml | 5 | ||||
| -rw-r--r-- | share/pgpkeys/pgpkeys.ent | 1 | ||||
| -rw-r--r-- | share/xml/authors.ent | 3 | ||||
| -rw-r--r-- | share/xml/news.xml | 18 |
7 files changed, 82 insertions, 5 deletions
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml index b9c0b04aba..1d0fa5c30c 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml @@ -7820,11 +7820,6 @@ </listitem> <listitem> - <para>Neel Chauhan - <email>neel@neelc.org</email></para> - </listitem> - - <listitem> <para>Neil Booth <email>kyuupichan@gmail.com</email></para> </listitem> diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml index e51250bc61..6034ce8f13 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml @@ -205,6 +205,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> </listitem> <listitem> + <para>&a.nc.email;</para> + </listitem> + + <listitem> <para>&a.loader.email;</para> </listitem> diff --git a/share/pgpkeys/nc.key b/share/pgpkeys/nc.key new file mode 100644 index 0000000000..1d4c8c1613 --- /dev/null +++ b/share/pgpkeys/nc.key @@ -0,0 +1,51 @@ +<!-- +sh addkey.sh nc BF34910513DF617D ; +--> +<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[ +pub rsa2048/BF34910513DF617D 2021-01-04 [SC] [expires: 2024-01-04] + Key fingerprint = 1697 948F EB03 22DA 0D22 5CBD BF34 9105 13DF 617D +uid Neel Chauhan <nc@FreeBSD.org> +uid Neel Chauhan <neel@neelc.org> +sub rsa2048/A9CB5A77D5E182C0 2021-01-04 [E] [expires: 2024-01-04] + +]]></programlisting> +<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +1TYsoJ0J5coKoIjdGiTGJU+a1gxPIPNBIafz +=89C8 +-----END PGP PUBLIC KEY BLOCK----- +]]></programlisting> diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml index 4543830d8d..74c2a0ce6d 100644 --- a/share/pgpkeys/pgpkeys-developers.xml +++ b/share/pgpkeys/pgpkeys-developers.xml @@ -314,6 +314,11 @@ &pgpkey.jch; </sect2> + <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-nc"> + <title>&a.nc.email;</title> + &pgpkey.nc; + </sect2> + <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-jchandra"> <title>&a.jchandra.email;</title> &pgpkey.jchandra; diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent index c8fa339108..aec06cdcf5 100644 --- a/share/pgpkeys/pgpkeys.ent +++ b/share/pgpkeys/pgpkeys.ent @@ -388,6 +388,7 @@ <!ENTITY pgpkey.mwlucas SYSTEM "mwlucas.key"> <!ENTITY pgpkey.naddy SYSTEM "naddy.key"> <!ENTITY pgpkey.nate SYSTEM "nate.key"> +<!ENTITY pgpkey.nc SYSTEM "nc.key"> <!ENTITY pgpkey.nectar SYSTEM "nectar.key"> <!ENTITY pgpkey.neel SYSTEM "neel.key"> <!ENTITY pgpkey.nemoliu SYSTEM "nemoliu.key"> diff --git a/share/xml/authors.ent b/share/xml/authors.ent index e41b5017bb..b4f1d8e813 100644 --- a/share/xml/authors.ent +++ b/share/xml/authors.ent @@ -1746,6 +1746,9 @@ <!ENTITY a.nbm "Neil Blakey-Milner"> <!ENTITY a.nbm.email "&a.nbm; <email xmlns='http://docbook.org/ns/docbook'>nbm@FreeBSD.org</email>"> +<!ENTITY a.nc "Neel Chauhan"> +<!ENTITY a.nc.email "&a.nc; <email xmlns='http://docbook.org/ns/docbook'>nc@FreeBSD.org</email>"> + <!ENTITY a.nectar "Jacques Vidrine"> <!ENTITY a.nectar.email "&a.nectar; <email xmlns='http://docbook.org/ns/docbook'>nectar@FreeBSD.org</email>"> diff --git a/share/xml/news.xml b/share/xml/news.xml index 9703985aae..e3f6ebd734 100644 --- a/share/xml/news.xml +++ b/share/xml/news.xml @@ -31,6 +31,24 @@ <name>2020</name> <month> + <name>1</name> + + <day> + <name>2</name> + <event> + <p>New committer: + <a href="mailto:nc@FreeBSD.org">Neel Chauhan</a> + (ports)</p> + </event> + </day> + </month> + + </year> + + <year> + <name>2020</name> + + <month> <name>12</name> <day> |