diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml index af6d9a19bc..c0973ae509 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml +++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml @@ -1374,6 +1374,10 @@ <para>&a.zarzycki;</para> </listitem> + <listitem> + <para>&a.bz;</para> + </listitem> + <listitem> <para>&a.phantom;</para> </listitem> diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml index 85b8adb313..83f5f92869 100644 --- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml @@ -811,6 +811,11 @@ &pgpkey.joerg; </sect2> + <sect2 id="pgpkey-bz"> + <title>&a.bz;</title> + &pgpkey.bz; + </sect2> + <sect2 id="pgpkey-phantom"> <title>&a.phantom;</title> &pgpkey.phantom; diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent index 35eed4fdc1..5b079dc3bd 100644 --- a/en_US.ISO8859-1/share/sgml/authors.ent +++ b/en_US.ISO8859-1/share/sgml/authors.ent @@ -108,6 +108,8 @@ <!ENTITY a.bsd "Brian S. Dean <email>bsd@FreeBSD.org</email>"> +<!ENTITY a.bz "Bjoern A. Zeeb <email>bz@FreeBSD.org</email>"> + <!ENTITY a.cawimm "Charles A. Wimmer <email>cawimm@FreeBSD.org</email>"> <!ENTITY a.ceri "Ceri Davies <email>ceri@FreeBSD.org</email>"> diff --git a/share/pgpkeys/bz.key b/share/pgpkeys/bz.key new file mode 100644 index 0000000000..10bd498fee --- /dev/null +++ b/share/pgpkeys/bz.key @@ -0,0 +1,47 @@ +<!-- $FreeBSD$ --> +<!-- +sh addkey.sh bz 0E4A7875; +--> +<programlisting role="pgpfingerprint"><![CDATA[ +pub 1024D/0E4A7875 2000-02-04 Bjoern A. Zeeb <bz@FreeBSD.org> + Key fingerprint = 5E31 F886 E2EE BA7E 2AA5 DDD4 21C5 0916 0E4A 7875 +uid Bjoern A. Zeeb <bz@zabbadoz.net> +uid Bjoern A. Zeeb <bzeeb@zabbadoz.net> +uid Bjoern A. Zeeb <bzeeb-lists@lists.zabbadoz.net> +sub 1024g/6139751B 2000-02-04 +]]></programlisting> +<programlisting role="pgpkey"><![CDATA[ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBDibVJ8RBACD4GHc4Ptsvx9fzbshr9KKwRDEhreLAYhVk31aaI2q1/k7X0Jy +lSBsoi67YeoYpGFl9N26vReq1mHufTfbXjBzYkodcbTe5sZlP50HlHvXrnB458k9 +xVsrqphq1C7oXPjoTsv+WS3zgR6kb74fjCCyIY3iKFnuBoNmhBwwGqr6SwCgspas +IibQSFclUc3xF1gwrTPhHeUD/3BVc061ZP1lbJEB19j3CGdreqxF/2dR5EpeT/ck +tc2vc9pNRVikzY7DDG3d8xJKqSIcGjhaEmDx+BXBp7a5BvTx8utOzaT8SkzWcCtm +kGVYnfXb3AxppFJ0b8s4feUX3sGw6RJhuJ5o0mD+YsffGx7BGhAPUQg8opLqb8VA +SzjgA/0desJLuSbrJ3emIAOtOHjXhcge+FHzjemM5e/b7W+to32EdsjDtmLU3Ozd +OC5KRAKc+bIANb29FlCEerGIxnrZkI7InWP2lceCJVrvGVBS7ZSrPudtansupSde +9xVQEK9/fAbhRjZAFxPQld/h2niM9a7DKsk/5jj9iBeH37RxoLQgQmpvZXJuIEEu +IFplZWIgPGJ6QHphYmJhZG96Lm5ldD6IVgQTEQIAFgUCOJtUnwQLCgQDAxUDAgMW +AgECF4AACgkQIcUJFg5KeHWLNwCeMqLNZ9qGaTMevi8XD3aX29kF0f4An1vLf13t +Tixyfdavnf7yR1Vzr8SciEYEEBECAAYFAjicHKsACgkQ8ZparKdkcvLXkACfaQVR +7DFM0uYOBRvPdXHEbioYysQAn1rF2T+2Kw9hNFIDecPc7DSY3KWUtCNCam9lcm4g +QS4gWmVlYiA8YnplZWJAemFiYmFkb3oubmV0PohcBBMRAgAcBQJAmUDkAhsDBAsH +AwIDFQIDAxYCAQIeAQIXgAAKCRAhxQkWDkp4dcldAJ9wYabXnkHowzLuDNhOE5Kc +vKNZmQCffOLEN2vwaWXGUMvOopweeHTRvQu0L0Jqb2VybiBBLiBaZWViIDxiemVl +Yi1saXN0c0BsaXN0cy56YWJiYWRvei5uZXQ+iFwEExECABwFAkCZQQYCGwMECwcD +AgMVAgMDFgIBAh4BAheAAAoJECHFCRYOSnh1WSsAn2p0jqshOQAJRMV5k6KX0ZOS +24fHAJ0WNoHJc7NunSYF8psmgnq6vyQf7LQfQmpvZXJuIEEuIFplZWIgPGJ6QEZy +ZWVCU0Qub3JnPohcBBMRAgAcBQJBBsEjAhsDBAsHAwIDFQIDAxYCAQIeAQIXgAAK +CRAhxQkWDkp4dUzOAJ9sIESTxIqvcbNn7IJym3QS3yvi6wCgrgQlEbTAinEmw5vI +YnAcZ2slxG65AQ0EOJti3BAEAN7GWKRvB1lJ3KsV+AiBLk5eCXlgV/NySuE849bZ +3KHi1aUjrmY6+I6Ux1dThT3vKXWpyswToxPwPjM0zUHfn1MTi+yxfZPaii8XEb0J +xIFh954WKeqvw0OfdJPlQF5i3rRNVaCBmFGU76f5Iy7uADFvCXQ/dyGzZczIKv1j +dfiLAAMGBAC0PA7svDq2S5GNjbUoZHvR06ukh1IRzkbfY0aX4OyhwOWzN0s3BazY +8K0PxynCv5fGMqWjm85vew0E4Qe7GYZrzupzX8M3eiyHRYzHSgfgLWyokRjgL6R/ +lyDLyVm10VANoGID8V3tgseXC/coNhgyATwKXIETsXBq9oG0hGwSdIhGBBgRAgAG +BQI4m2LcAAoJECHFCRYOSnh1U/EAn3CxttXeYdVQnnuIl5OWefQjeiQUAJwKaSgq +Aw/UmkgmwF5uPEs7MyhC8g== +=RhVh +-----END PGP PUBLIC KEY BLOCK----- +]]></programlisting> diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent index d18a02902d..f7685b47a4 100644 --- a/share/pgpkeys/pgpkeys.ent +++ b/share/pgpkeys/pgpkeys.ent @@ -19,6 +19,7 @@ <!ENTITY pgpkey.brooks SYSTEM "brooks.key"> <!ENTITY pgpkey.brueffer SYSTEM "brueffer.key"> <!ENTITY pgpkey.bsd SYSTEM "bsd.key"> +<!ENTITY pgpkey.bz SYSTEM "bz.key"> <!ENTITY pgpkey.ceri SYSTEM "ceri.key"> <!ENTITY pgpkey.cjc SYSTEM "cjc.key"> <!ENTITY pgpkey.cjh SYSTEM "cjh.key">