diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml index 82b6b4e000..15f7aaab5c 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml +++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml @@ -7830,11 +7830,6 @@ <email>olivier@cochard.me</email></para> </listitem> - <listitem> - <para>Olivier Duchateau - <email>duchateau.olivier@gmail.com</email></para> - </listitem> - <listitem> <para>Olivier Tharan <email>olive@oban.frmug.org</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 62e4efd6a7..285001a272 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml +++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml @@ -314,6 +314,10 @@ <para>&a.gad;</para> </listitem> + <listitem> + <para>&a.olivierd;</para> + </listitem> + <listitem> <para>&a.bruno;</para> </listitem> diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent index ef2adec224..de4af9449f 100644 --- a/en_US.ISO8859-1/share/sgml/authors.ent +++ b/en_US.ISO8859-1/share/sgml/authors.ent @@ -968,6 +968,8 @@ <!ENTITY a.oliver "Oliver Lehmann <email>oliver@FreeBSD.org</email>"> +<!ENTITY a.olivierd "Olivier Duchateau <email>olivierd@FreeBSD.org</email>"> + <!ENTITY a.olli "Oliver Fromme <email>olli@FreeBSD.org</email>"> <!ENTITY a.onoe "Atsushi Onoe <email>onoe@FreeBSD.org</email>"> diff --git a/share/pgpkeys/olivierd.key b/share/pgpkeys/olivierd.key new file mode 100644 index 0000000000..5bb8e3c77a --- /dev/null +++ b/share/pgpkeys/olivierd.key @@ -0,0 +1,42 @@ +<!-- $FreeBSD$ --> +<!-- +sh addkey.sh olivierd 22431859; +--> +<programlisting role="pgpfingerprint"><![CDATA[ +pub 2048R/22431859 2012-05-28 [expires: 2017-05-27] + Key fingerprint = C057 112A 4A27 B5F2 CD8F 6C9A FC5A 0167 2243 1859 +uid Olivier Duchateau <duchateau.olivier@gmail.com> +sub 2048R/63A85BDF 2012-05-28 [expires: 2017-05-27] +]]></programlisting> +<programlisting role="pgpkey"><![CDATA[ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBE/DXkcBCADjybF75g/rvQ3dC+D7Obg8QQu8Ab4yHE4cL+wvuEh1vGxRYOYr +4HPpN9Qyyai8Vlj3LnFMw5kt3OTF6Z3OS5IUWJgSplFxZfOIj5ESzs9qvy8qOU1F +cE0dAOX6Q69ZPD78zngWNFv5XkrxOP2sA241/YLpXO73sYnT0ydtSZhKd0QI58Bm +xlarUGJa4d4JTYMaeuTQ1vo54aB9NL0KMZK6GfRvnX8CuNlwGaJy9Jt4oSJ0JopK +Yn0bpCaRGd5T2uZJ2hx1d3jtWNzhFMBl2JaG1jXXLd29q8WvaSRlP0/j/+R8ppk/ +2DAQe6gT0XEjP+np5BsYF9HoCYJ+vFtvZqgRABEBAAG0L09saXZpZXIgRHVjaGF0 +ZWF1IDxkdWNoYXRlYXUub2xpdmllckBnbWFpbC5jb20+iQE+BBMBAgAoBQJPw15H +AhsjBQkJZgGABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRD8WgFnIkMYWT6u +B/4slussVLNLn7CbB7VMmo6ppCxx4BM1Mhk4stoUl5/3ENCMIG5anIMwfyG+NFK5 +Jr640U0yZcW7jX+Mg+IrGn2eWKfrPf/kyzbeMPeyDFF833EDNnliAALgni6+ZhXl +Pct74exlzQoKkLkkDd131Cd7HUlA8XrUroibH2QyTR6upA61VMSdUXBHHdp4xD4P +opu0Cz1kGoe99St19oFLvZPl28DUZeSLd1lAw1o3vl7RYAmI/OBz+/6lSpvHG9Zc +aco/QNRQO38lTg9sMh5kmhIOMRBgZcGR7TFlgKcLJJbmCp+kb/jIYizKnkN8SHSt +ab3E8ug7yaCXyvQFPHoLH1jnuQENBE/DXkcBCAC11rT2hrSvpEj9OVRwucUmKnqa +LYcqeLNUIqy8Z76TpSSXVLXt5DH2kI7IizaQmBfkH9S6iFlJLkbOAHZ6XcjaIcBX +VLMpBz5Mi8HUvTO+6vMFs9x/8R4+fryDNCn5wa63ktwvUZky1JFdbfZVhoV2M0AZ +KZnvV5o8pZrzYv05TOf8H0+sYD7bNKSNa7g8dBfdBt/wVLcF7Q5aTeal/xyWhf8d +kIZdwK4jbsYBL53cwLNNameDXAdMthKjCMndgofv6dYaHDMDh+nEwye8I7IHINxg +t20j/eTRQB3b3gs/UWDgUHtLjEaWgLNpQx7mQQhZTcCwtZtWZOXsh6M0K40bABEB +AAGJASUEGAECAA8FAk/DXkcCGwwFCQlmAYAACgkQ/FoBZyJDGFkJVAf/Rk/Vvs9X +duEst9LL46h2PS078Bbk2eGH+/kigVF6tPHSWKggmB0RVzoiG0GXxv51Jta2PHZM +Twuw7oNqsu5UZjTC1UQ77ZY42W25dkaMgDalPYNU+kd55//YIzuj9l9po+Xr2o8j +aAWKh/nIjeAze8AMxRxHud7HWE1pE8mDG7VS5Hreu/Wxu9IA7h2UalXD3psLoVuJ +EoZEgaQlTEJIAkcHLi51qojn1DDQ2L3JS+w4YfnPfnPtzQWu2GX3TGMAaLKqmNIF +01Xi8q/GmlFbmBPrgIqZQS6SUb/CKLYKWyelw7dxmSkhNoXed9uqHHvHI2zMG76t +PKHyAijtO5HocA== +=kXkO +-----END PGP PUBLIC KEY BLOCK----- +]]></programlisting> diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml index 2f451c8c09..29315c122d 100644 --- a/share/pgpkeys/pgpkeys-developers.sgml +++ b/share/pgpkeys/pgpkeys-developers.sgml @@ -386,6 +386,11 @@ &pgpkey.dd; </sect2> + <sect2 id="pgpkey-olivierd"> + <title>&a.olivierd;</title> + &pgpkey.olivierd; + </sect2> + <sect2 id="pgpkey-bruno"> <title>&a.bruno;</title> &pgpkey.bruno; diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent index cef2a13648..103a3ae827 100644 --- a/share/pgpkeys/pgpkeys.ent +++ b/share/pgpkeys/pgpkeys.ent @@ -264,6 +264,7 @@ <!ENTITY pgpkey.obrien SYSTEM "obrien.key"> <!ENTITY pgpkey.ohauer SYSTEM "ohauer.key"> <!ENTITY pgpkey.oleg SYSTEM "oleg.key"> +<!ENTITY pgpkey.olivierd SYSTEM "olivierd.key"> <!ENTITY pgpkey.patrick SYSTEM "patrick.key"> <!ENTITY pgpkey.paul SYSTEM "paul.key"> <!ENTITY pgpkey.pav SYSTEM "pav.key"> diff --git a/share/sgml/developers.ent b/share/sgml/developers.ent index a3a3cd1b6a..b2315ca09a 100644 --- a/share/sgml/developers.ent +++ b/share/sgml/developers.ent @@ -467,6 +467,7 @@ $FreeBSD$ <!ENTITY a.oleg "Oleg Bulyzhin"> <!ENTITY a.olgeni "Jimmy Olgeni"> <!ENTITY a.oliver "Oliver Lehmann"> +<!ENTITY a.olivierd "Olivier Duchateau"> <!ENTITY a.olli "Oliver Fromme"> <!ENTITY a.onoe "Atsushi Onoe"> <!ENTITY a.orion "Orion Hodson"> diff --git a/share/sgml/news.xml b/share/sgml/news.xml index 5be4a9f477..02120e6a24 100644 --- a/share/sgml/news.xml +++ b/share/sgml/news.xml @@ -34,6 +34,15 @@ <month> <name>5</name> + <day> + <name>29</name> + + <event> + <p>New committer: + <a href="mailto:olivierd@FreeBSD.org">Olivier Duchateau</a> (ports)</p> + </event> + </day> + <day> <name>28</name>