diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml index b46e0a767c..52b9907ce4 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml +++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml @@ -466,6 +466,10 @@ <para>&a.mnag;</para> </listitem> + <listitem> + <para>&a.jamie;</para> + </listitem> + <listitem> <para>&a.edwin;</para> </listitem> diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent index ce83e6f1e5..7bcc8262a4 100644 --- a/en_US.ISO8859-1/share/sgml/authors.ent +++ b/en_US.ISO8859-1/share/sgml/authors.ent @@ -448,6 +448,8 @@ <!ENTITY a.jake "Jake Burkholder <email>jake@FreeBSD.org</email>"> +<!ENTITY a.jamie "Jamie Gritton <email>jamie@FreeBSD.org</email>"> + <!ENTITY a.jasone "Jason Evans <email>jasone@FreeBSD.org</email>"> <!ENTITY a.jayanth "Jayanth Vijayaraghavan <email>jayanth@FreeBSD.org</email>"> diff --git a/share/pgpkeys/jamie.key b/share/pgpkeys/jamie.key new file mode 100644 index 0000000000..1f20f558b1 --- /dev/null +++ b/share/pgpkeys/jamie.key @@ -0,0 +1,41 @@ +<!-- $FreeBSD$ --> +<!-- +sh addkey.sh jamie 8832CB7F; +--> +<programlisting role="pgpfingerprint"><![CDATA[ +pub 1024D/8832CB7F 2009-01-29 + Key fingerprint = 34F8 1E62 C7A5 7CB9 A91F 7864 8C5A F85E 8832 CB7F +uid James Gritton <jamie@FreeBSD.org> +sub 2048g/94E3594D 2009-01-29 +]]></programlisting> +<programlisting role="pgpkey"><![CDATA[ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBEmCOzURBACOSQ8S2bwRYqXrfV9/pT8BmnGl7GYrkbDtJqL0IaTV1Bmdw7ed +qcDjMT55c2LEQlO7w2EG5z7JfaBnP+jV3X/gtH37gcqClcJRxJ2uhT7fShzmRR/U +5iTbAt0BwDF/W5LFmxajhZvw8NJKeMk8j0kUwdTzSKalN+iAhXEhqx/uWwCgz2qg +9utCYdwfeSmRwebBIQhPq4MD/2bWpo3/Vw3PZzNsja1l/s8jQjxkMoXJ8LlYFoYW +vc5lMBeR0nb1lZrnBvQGkEJVSPLXLvTBYireyqai8pt+Uk7D1oRevpsD/rIsSZBV +MVSa8jUqPF0HC0vWrDd98HDq/RJ3SD4HHhiWJ2wA8YrftyeHzZ0kiJYzggQ3UPM6 ++x52A/0U2kBqBq+HqA7YWTEo4pn2W3adZCT8mwmsDdEnC/uTvA0BHBN1HfgCxwee +TSqOwssFioHCVu+N/lxKjqy9ftHI4ljSuYOPpC3q+LwFdVjbCQ6ynILNKp89QiK6 +B5TphmOTQJ4ytVxr/tcvzDOCxbtyG6t7eCJBlfEgGjZLQu7uYrQhSmFtZXMgR3Jp +dHRvbiA8amFtaWVARnJlZUJTRC5vcmc+iGAEExECACAFAkmCOzUCGwMGCwkIBwMC +BBUCCAMEFgIDAQIeAQIXgAAKCRCMWvheiDLLfwhyAKCP4JGKCayDfY1f7sBXhYSa +6Zr5KwCfSy1evNxNmp5TwB7RBpEZpL2R2C+5Ag0ESYI7NRAIANiluE6e3GNLyLTc +cc/SQ5NdW4/B89yDQkZi/f7mUAMiS73iKoe555EVI/JIFsHUduHeYMB/ERDHNSUj +RmWVkb4r8eVSlMVvoU8sBYGqihoYtFXYT7rj8vvq6ufkF9RtBJLTLzikEg07jfQk +EzKr1eFOl0v76UGnmqrYiTXOAJoXQIH4+Kt3pWd8jz0Lsc3Kd4+eMW2A+eXSpShb +yuQhvtIkSdOLDa9PV03Y/GweSCbTKa5+oTmCoKvXJYjDHwkuj7n2dog8vo64Oy1h +z8mPPFyDXr1OitDdA78Vvpu8afz3Uev9DMaKd6WIEtVUprLOXyuSixn0x0rvImes +t6lHX3MAAwUIANKigPUT7boxzc93BdWUOKrZEnjN7zVnIqUMizVgi0K9nLM+lSpm +exPfoEZqCIBmAmDRYO50Y5Lwb2R6V0qHFBmIvZZ9Ih4YosXuu6oFhKHjamRK6JXI +hh5mMrOZnfDRn5YGEr3ZCEOGzdW0pY1t8THd6mtXmK7iIKKy+3u/WHf0tCJDRXk6 +7ETBWwqFTE3XpZz09aHRV2470GKESSbs1Q4Cobc8ZIifNzr8kfnWPm/EH2UCNpnZ +K2UvAxi6SRYVWIY11SRS/am+DRGweKfm9+NZpHEk2yJknHd95Q3IVw+fX+2yKVQe +L+X9H5BR1y6XxKbxqrlWF5I2FDJo4BzOA1eISQQYEQIACQUCSYI7NQIbDAAKCRCM +WvheiDLLf1rdAJ976PPYVcvK8Q/zKQrMv7pff09z2QCgut3uY8LEhlK39qZCF9Cl +2+bu5gU= +=Uux7 +-----END PGP PUBLIC KEY BLOCK----- +]]></programlisting> diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml index e9141e2627..266da8e873 100644 --- a/share/pgpkeys/pgpkeys-developers.sgml +++ b/share/pgpkeys/pgpkeys-developers.sgml @@ -411,6 +411,11 @@ &pgpkey.grehan; </sect2> + <sect2 id="pgpkey-jamie"> + <title>&a.jamie;</title> + &pgpkey.jamie; + </sect2> + <sect2 id="pgpkey-jmg"> <title>&a.jmg;</title> &pgpkey.jmg; diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent index 2059c7716c..9af8eab436 100644 --- a/share/pgpkeys/pgpkeys.ent +++ b/share/pgpkeys/pgpkeys.ent @@ -113,6 +113,7 @@ <!ENTITY pgpkey.itetcu SYSTEM "itetcu.key"> <!ENTITY pgpkey.ivoras SYSTEM "ivoras.key"> <!ENTITY pgpkey.jadawin SYSTEM "jadawin.key"> +<!ENTITY pgpkey.jamie SYSTEM "jamie.key"> <!ENTITY pgpkey.jcamou SYSTEM "jcamou.key"> <!ENTITY pgpkey.jdp SYSTEM "jdp.key"> <!ENTITY pgpkey.jedgar SYSTEM "jedgar.key">