- Update changes to portmgr@, welcome mat@ and antoine@

- Bid farewell to marcus@

Approved by:	gjb@

en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 <itemizedlist xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+    <listitem>
+      <para>&a.marcus.email; (2004 - 2014)</para>
+    </listitem>
+
     <listitem>
       <para>&a.beat.email; (2011 - 2013)</para>
     </listitem>

en_US.ISO8859-1/htdocs/administration.xml

@@ -127,7 +127,8 @@
 
   <ul>
     <li>&a.tabthorpe.email; (Core Team Liaison)</li>
-    <li>&a.marcus.email;</li>
+    <li>&a.mat.email;</li>
+    <li>&a.antoine.email;</li>
     <li>&a.bapt.email;</li>
     <li>&a.bdrewery.email; (Release Engineering Team Liaison)</li>
     <li>&a.decke.email;</li>

share/xml/authors.ent

@@ -2287,7 +2287,7 @@
 <!ENTITY a.donations.members '&a.tabthorpe;, &a.gjb;, &a.gahr;, &a.pgollucci;, &a.skreuzer;, &a.obrien;, &a.trhodes;, &a.ds;, &a.rwatson;'>
 
 <!-- FreeBSD Ports Manager Team -->
-<!ENTITY a.portmgr.members '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.bdrewery;, &a.decke;, &a.erwin;, &a.itetcu;, &a.miwi;'>
+<!ENTITY a.portmgr.members '&a.tabthorpe;, &a.mat;, &a.antoine;, &a.bapt;, &a.bdrewery;, &a.decke;, &a.erwin;, &a.itetcu;, &a.miwi;'>
 
 <!-- FreeBSD Release Engineering Teams -->
 <!ENTITY a.re "re@FreeBSD.org">