From d4ad2dab43fe12a86c49ad1164f42536e145fb61 Mon Sep 17 00:00:00 2001
From: Thomas Abthorpe <tabthorpe@FreeBSD.org>
Date: Fri, 19 Oct 2012 17:07:33 +0000
Subject: [PATCH] - Add news flash about decke@ joining portmgr@ - Add pav@ to
 portmgralumni page - Update admin and entities for portmgr changes

Approved by:	gjb
---
 .../articles/contributors/contrib.portmgralumni.xml       | 4 ++++
 en_US.ISO8859-1/htdocs/administration.xml                 | 2 +-
 share/xml/developers.ent                                  | 2 +-
 share/xml/news.xml                                        | 8 ++++++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
index 418f3e058e..f9cb424f6c 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
@@ -2,6 +2,10 @@
 <!-- $FreeBSD$ -->
 
   <itemizedlist>
+    <listitem>
+      <para>&a.pav; (2006 - 2012)</para>
+    </listitem>
+
     <listitem>
       <para>&a.flz; (2008 - 2012)</para>
     </listitem>
diff --git a/en_US.ISO8859-1/htdocs/administration.xml b/en_US.ISO8859-1/htdocs/administration.xml
index 19c1a5503a..8d97622690 100644
--- a/en_US.ISO8859-1/htdocs/administration.xml
+++ b/en_US.ISO8859-1/htdocs/administration.xml
@@ -127,10 +127,10 @@
     <li>&a.tabthorpe; &lt;<a href="mailto:tabthorpe@FreeBSD.org">tabthorpe@FreeBSD.org</a>&gt;</li>
     <li>&a.marcus; &lt;<a href="mailto:marcus@FreeBSD.org">marcus@FreeBSD.org</a>&gt;</li>
     <li>&a.bapt; &lt;<a href="mailto:bapt@FreeBSD.org">bapt@FreeBSD.org</a>&gt;</li>
+    <li>&a.decke; &lt;<a href="mailto:decke@FreeBSD.org">decke@FreeBSD.org</a>&gt;</li>
     <li>&a.beat; &lt;<a href="mailto:beat@FreeBSD.org">beat@FreeBSD.org</a>&gt;</li>
     <li>&a.erwin; &lt;<a href="mailto:erwin@FreeBSD.org">erwin@FreeBSD.org</a>&gt;</li>
     <li>&a.linimon; &lt;<a href="mailto:linimon@FreeBSD.org">linimon@FreeBSD.org</a>&gt;</li>
-    <li>&a.pav; &lt;<a href="mailto:pav@FreeBSD.org">pav@FreeBSD.org</a>&gt;</li>
     <li>&a.itetcu; &lt;<a href="mailto:itetcu@FreeBSD.org">itetcu@FreeBSD.org</a>&gt;</li>
     <li>&a.miwi; &lt;<a href="mailto:miwi@FreeBSD.org">miwi@FreeBSD.org</a>&gt;</li>
   </ul>
diff --git a/share/xml/developers.ent b/share/xml/developers.ent
index 23b17949b0..84fee501c3 100644
--- a/share/xml/developers.ent
+++ b/share/xml/developers.ent
@@ -708,7 +708,7 @@ $FreeBSD$
 <!ENTITY a.donations '&a.gjb;, &a.wilko;, &a.gahr;, &a.pgollucci;, &a.skreuzer;, &a.obrien;, &a.trhodes;, Daniel Seuffert, &a.rwatson;'>
 
 <!-- FreeBSD Ports Manager Team -->
-<!ENTITY a.portmgr '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.beat;, &a.erwin;, &a.linimon;, &a.pav;, &a.itetcu;, &a.miwi;'>
+<!ENTITY a.portmgr '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.decke;, &a.beat;, &a.erwin;, &a.linimon;, &a.itetcu;, &a.miwi;'>
 
 <!-- FreeBSD Release Engineering Teams -->
 <!ENTITY a.re.members '&a.kib;, &a.blackend;, &a.jpaetzel;, &a.hrs;, &a.kensmith;, &a.rwatson;, &a.bz;'>
diff --git a/share/xml/news.xml b/share/xml/news.xml
index 655a2d19ee..3d04bbe864 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -33,6 +33,14 @@
     <month>
       <name>10</name>
 
+      <day>
+	<name>19</name>
+	<event>
+	  <p>New member for the Ports Management team:
+	    <a href="mailto:decke@FreeBSD.org">Bernhard Fr&ouml;lich</a>.</p>
+	</event>
+      </day>
+
       <day>
 	<name>10</name>
 	<event>