diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml index 647179da7b..d8b721d343 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml +++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml @@ -1077,11 +1077,6 @@ <email>js@iksz.hu</email></para> </listitem> - <listitem> - <para>Baptiste Daroussin - <email>baptiste.daroussin@gmail.com</email></para> - </listitem> - <listitem> <para>Barry Bierbauch <email>pivrnec@vszbr.cz</email></para> diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml index c11ac58d6c..ab5bc59133 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml +++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml @@ -286,6 +286,10 @@ <para>&a.aaron;</para> </listitem> + <listitem> + <para>&a.bapt;</para> + </listitem> + <listitem> <para>&a.davidc;</para> </listitem> diff --git a/share/pgpkeys/bapt.key b/share/pgpkeys/bapt.key new file mode 100644 index 0000000000..dcd42bafc1 --- /dev/null +++ b/share/pgpkeys/bapt.key @@ -0,0 +1,49 @@ +<!-- $FreeBSD$ --> +<!-- +sh addkey.sh bapt 49A4E84C; +--> +<programlisting role="pgpfingerprint"><![CDATA[ +pub 1024D/49A4E84C 2008-11-19 + Key fingerprint = A14B A5FC B860 86DE 73E2 B24C F244 ED31 49A4 E84C +uid Baptiste Daroussin <bapt@etoilebsd.net> +uid Baptiste Daroussin <baptiste.daroussin@gmail.com> +uid Baptiste Daroussin <bapt@FreeBSD.org> +sub 2048g/54AB46B4 2008-11-19 +]]></programlisting> +<programlisting role="pgpkey"><![CDATA[ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBEkkLyARBACYi5Qr3qvyrpp0rgqK4cAwteOZbhB3Jt2uxuzrKnKeTw3y4DrG +lD+7wAwKmLapXFobxCmndhXNnWw1Viy+hiBN5id8c6TmLF+I4lbxL1Nmzl++ifVr +OdOTqXH/L6kbKF80bY3zhgzR6EtH/0UjL6aXNWyLv/2l88+vx+Qrc5NhJwCgwzkS +RbUjFKhyAxh7APNTUqV/ZfUD/3nnu/ti17KqQhiRgm6qup2ZPOOpOtlJ8J4dDFtd +crmhH/ViE5ze8hPVTymufvLj3dWJXB3gA4CJbMmD9qQMaNJ1q7tEIe1MVNUEVop3 +4BEl0oRJyeUlT9QuVqM2GzsBeIiTikZMMpRlZOuuYwm5sbx3nrDHaiBKAkthZF0z +l9dlA/9QdSfmViz/x7B9Oa7WfkvmAH4/nMIxaBsliNAtK6peaPFo9M03wgfh0eo0 +3JjLAVFbembVkYkA9HqqMFx7Z1W0i1WJAr5SC7gX6Pf3pQPmKIKJKJykXzIRmL6M +boUYksuTrtZIDiz/luiEg3wVUONLe6iX18v4RzvS03F3T4HAULQxQmFwdGlzdGUg +RGFyb3Vzc2luIDxiYXB0aXN0ZS5kYXJvdXNzaW5AZ21haWwuY29tPohgBBMRAgAg +BQJJJC8gAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ8kTtMUmk6EwjzQCg +u6livnP3Mpb8zzzAvfNloYFVW6AAnRwemMVD3FRe1Rn+Ci3lfgySMDmltCVCYXB0 +aXN0ZSBEYXJvdXNzaW4gPGJhcHRARnJlZUJTRC5vcmc+iGIEExECACIFAkxO2FcC +GwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPJE7TFJpOhMb0YAnjOkFOYw +8gjML7yPL7w3WNukE/XzAJ94L1XFYK7seJA4zHkMI1nTG3SZjLQnQmFwdGlzdGUg +RGFyb3Vzc2luIDxiYXB0QGV0b2lsZWJzZC5uZXQ+iGIEExECACIFAkxO2G4CGwMG +CwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPJE7TFJpOhMSlsAnj1fB+Mtca/J +umANnc/GL7iWGjStAKCkEJmZyABghRDR8HxMzJEgfGYZ97kCDQRJJC8gEAgA3nSj +7ISAocQ76ew5bSc+aW/cLqnAvWnEFOtwneahbOOrwpLRt1CtCC7bFsWnkqsFJT6N +UFcc1dJl0D0+JMql1+uvyiBK4kLGhw/kayWqGhWVYAwul375lLxyj+Er3zGAMdLv +vbGtg4+8vt6jpF1CvKLQzGQ3UJDlCKz3XST/tRUUFoq/5lD58wqJBOyjKgv+nU5g +nmVJbmsNtRH8gArX1b1Mld4pnfYdMcRVpbna7Ct78GJDbvsRZnR+YlMMc7De0zd1 +/oeYo7TBc8isPRxFvdd6d6GIuDPuiK6EXZphrwzQSqG3/hp9SHgC6of9yVzP3wFi +mrVRyyUQKVHYX21u0wADBQgAvbwssU0S6THyBaPr6S+tbTKS8is81SZ87kiUmu1J +/qyKHXkl/aiC39DBX+a2nr9hUbtUsdYlEmWf4LMACm4jt0mPKrL2EbAUSRCVqJ0M +c9TliU7X+ULExN7DNa7B93ux4TaGr04CjEuQxfdg3Ob1YDeJ6bzKIK8f64eB51as +31mUaWC5Jwsj8O1XgP/yNvKi0vnJb4bBava0h2U75oU9GzeWr644KRnh2FGKwpnX +HSqFq3opG/PR4PbSYkf2R2Eeo7Ox46iCWRrNjjgHXK/GjH8skjXoWWmD9S0h73b9 +KNDXRPD49G0P4yvNV6p08laVUl3G6A63aA1/cBqVGFsyg4hJBBgRAgAJBQJJJC8g +AhsMAAoJEPJE7TFJpOhMLooAoI1+f30zI1xxIXjy08NLxCQv+9nbAKChzUNzc5OI +D2+VxC1zkCRqhNa+rg== +=NqtT +-----END PGP PUBLIC KEY BLOCK----- +]]></programlisting> diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml index 591506c33c..19d5a3138b 100644 --- a/share/pgpkeys/pgpkeys-developers.sgml +++ b/share/pgpkeys/pgpkeys-developers.sgml @@ -286,6 +286,11 @@ &pgpkey.aaron; </sect2> + <sect2 id="pgpkey-bapt"> + <title>&a.bapt;</title> + &pgpkey.bapt; + </sect2> + <sect2 id="pgpkey-ceri"> <title>&a.ceri;</title> &pgpkey.ceri; diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent index afce08c69e..22676ade27 100644 --- a/share/pgpkeys/pgpkeys.ent +++ b/share/pgpkeys/pgpkeys.ent @@ -30,6 +30,7 @@ <!ENTITY pgpkey.avilla SYSTEM "avilla.key"> <!ENTITY pgpkey.avl SYSTEM "avl.key"> <!ENTITY pgpkey.bakul SYSTEM "bakul.key"> +<!ENTITY pgpkey.bapt SYSTEM "bapt.key"> <!ENTITY pgpkey.barner SYSTEM "barner.key"> <!ENTITY pgpkey.bcr SYSTEM "bcr.key"> <!ENTITY pgpkey.beat SYSTEM "beat.key">