- move from contributor to developer section

- add my gnupg key
- add an author entity

Approved by:	trhodes, markm (mentor)

en_US.ISO8859-1/articles/contributors/article.sgml

@@ -1110,6 +1110,10 @@
 	<para>&a.bmah;</para>
       </listitem>
 
+      <listitem>
+	<para>&a.mtm;</para>
+      </listitem>
+
       <listitem>
 	<para>&a.jmallett;</para>
       </listitem>
@@ -5430,10 +5434,6 @@
 	<para>Mike Karels <email>unknown</email></para>
       </listitem>
 
-      <listitem>
-        <para>Mike Makonnen <email>makonnen@pacbell.net</email></para>
-      </listitem>
-
       <listitem>
 	<para>Mike McGaughey <email>mmcg@cs.monash.edu.au</email></para>
       </listitem>

en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml

@@ -326,6 +326,11 @@
       &pgpkey.bmah;
     </sect2>
 
+    <sect2>
+      <title>&a.mtm;</title>
+      &pgpkey.mtm;
+    </sect2>
+
     <sect2>
       <title>&a.dwmalone;</title>
       &pgpkey.dwmalone;

en_US.ISO8859-1/books/handbook/pgpkeys/mtm.key

@@ -0,0 +1,45 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh mtm DBCC68B9;
+-->
+<programlisting><![CDATA[
+pub  1024D/DBCC68B9 2002-11-23 Mike Makonnen <mtm@FreeBSD.org>
+     Key fingerprint = D228 1A6F C64E 120A A1C9  A3AA DAE1 E2AF DBCC 68B9
+uid                            Mike Makonnen <mtm@identd.net>
+sub  2048g/9AEE33B8 2002-11-23
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.1 (FreeBSD)
+
+mQGiBD3fRBQRBACTeC/ac7IDcv4v+oB1EB0K0+soiCMsRx4uNL5+VI0IffKPwIQQ
+dZOam8/GuYtzQMCZOCPTWc/teVvi4Go0gat4mYITqt1n5+OSMv7w4yK8o1yNOona
+wo2i4TzJg+fRDbU8hUb2i1q38WYcwok/Gulfp0Ioxq6pPzl28CdgdlQGlwCg8Ebf
+y8oAInL7nGa0AxzgNSJoZgED/A3iaUHdICb647+43W8L6OtAD0xOsTmE7Qpvs9gz
+aaW7fTPZfRL1XERgEv2AWzLHjGAbnkg619REuiOreUFBc5TAvd50//ylh2DgNvlx
+4WOpT9X/LkrbfPRteWhczZOkC9qe3Ib6gU5rFbqGb5KaP5k3QEwTOyu6PolOzYj6
+0mhUBACGRbVBD8t9tkBmSKYdW4HIFKRa+rxbIo17RvOFtMxrZUqeEIts5g3AdDkk
+TRHS3TXYGPCcf6VNscGgtJ+PUDWUIJTwSUL67E+i3VApXvgUeQ4ghCVJZ8bkcxjG
+x0n3JgKs7sSZ7s3HOEPRnCxPQ8F5Pf122ANMkm1EU7sK2zKgkbQeTWlrZSBNYWtv
+bm5lbiA8bXRtQGlkZW50ZC5uZXQ+iFkEExECABkFAj3fRBQECwcDAgMVAgMDFgIB
+Ah4BAheAAAoJENrh4q/bzGi569UAoObhwwmRyFvv2bilTfywRYrSr8ADAKDuHMdv
+rwAL4H+OiwuKHeq6/TgGeohGBBMRAgAGBQI+E7wEAAoJEIf5oyUW2nJ6xBQAnRXv
+3F5F4Lv45odLjCRTBOyEP8KsAKCFar/HOOxTbGjdnLhrotNbywVsXbQfTWlrZSBN
+YWtvbm5lbiA8bXRtQEZyZWVCU0Qub3JnPohcBBMRAgAcBQI+GIM0AhsDBAsHAwID
+FQIDAxYCAQIeAQIXgAAKCRDa4eKv28xouQeyAJkBJHNiVu9/0xPJ7rcmqX7tjPSf
+jwCg6kwp7it5O9K+/AlDbFUDpAZzzQa5Ag0EPd9EKRAIAJEEwVSqL41B5+19CtU+
+Tp4EbdVoVhc9l1Fb2jWLoT8g3/GggJFD08VxSZnqmAzJQTnQ8WjcoKO9IUYDAV31
+17vNxr8RfXM5uqdDX0owsHju562koNTv1/bce+IUchbx9IYGGMr4dKph7Y2uEQE+
+K0SSbX1rJOZ4ZdIu+FBW0jUvX4RjW/HuJ42lyUL7m1E0HQ8psDyGfS+NccPvT+HY
+QWPuoq9FlwmcHEJPUlYT4/f1qV3SOD6JEeVx+7xSPe5GXDYQRdDaA+dl+Vk6xEaU
+GR3aROu1Ce5vqkOT5u+0nL+cQtHYxSfK15H71EE7zf08ZZvJ/lAQ3xQ811r+pbRp
+Dj8AAwUH/it0Q7pS4TCGcM180jXGxBURYhXIj5J5bCk7v4mMVT07Wbwm9EohtPR1
+0kNleHa3GCKmkVSIwiz9uXGaoin0uArzYa4oAMGlIvzGfdEl9CtZkLMEmn7qlDSL
+RyRrvGzQedrbrW/1JuaN00I1hxCLKHzkTqGl4L+Cq/V3YLkfMT5tDaac44fLGUAF
+CxkgdTsoYTvjrw3fsUSwvSIFvdEv8zfmV51vKLgFsU5tGyDfVGtbLk5Eo4noHidK
+KpdW696sLjTZczzLLpJ8yybK+IroJTifY4wgi4bN0ZooObEYDPeYf86KBJQBZLeC
+ea9ZV3SM4TO/1OKHpWbOcxDadVkTpkSIRgQYEQIABgUCPd9EKQAKCRDa4eKv28xo
+uTqtAJ0RBqUFaqqFrp6K7Gzkfvyv6yAr5QCeNhdFijTm7IVP06J97BvfSt3YYwE=
+=Mwcu
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent

@@ -71,6 +71,7 @@
 <!ENTITY pgpkey.mi SYSTEM "mi.key">
 <!ENTITY pgpkey.mikeh SYSTEM "mikeh.key">
 <!ENTITY pgpkey.mp SYSTEM "mp.key">
+<!ENTITY pgpkey.mtm SYSTEM "mtm.key">
 <!ENTITY pgpkey.murray SYSTEM "murray.key">
 <!ENTITY pgpkey.mux SYSTEM "mux.key">
 <!ENTITY pgpkey.nate SYSTEM "nate.key">

en_US.ISO8859-1/share/sgml/authors.ent

@@ -480,6 +480,8 @@
 
 <!ENTITY a.mtaylor "Mark J. Taylor <email>mtaylor@FreeBSD.org</email>">
 
+<!ENTITY a.mtm "Mike Makonnen <email>mtm@FreeBSD.org</email>">
+
 <!ENTITY a.murray "Murray Stokely <email>murray@FreeBSD.org</email>">
 
 <!ENTITY a.mux "Maxime Henrion <email>mux@FreeBSD.org</email>">