svn commit: r41397 - in head/en_US.ISO8859-1/htdocs: . security

[Xin LI]

Author: delphij
Date: Wed Apr 10 19:48:21 2013
New Revision: 41397
URL: http://svnweb.freebsd.org/changeset/doc/41397

Log:
  Reflect recent changes to security team:
  
   - des@ is now Security Officer;
   - gnn@ is now Security Team Secretary;
   - simon@ is now Security Officer Emeritus;
  
  Reviewed by:	gnn

Modified:
  head/en_US.ISO8859-1/htdocs/administration.xml
  head/en_US.ISO8859-1/htdocs/security/security.xml

Modified: head/en_US.ISO8859-1/htdocs/administration.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/administration.xml	Tue Apr  9 20:50:21 2013	(r41396)
+++ head/en_US.ISO8859-1/htdocs/administration.xml	Wed Apr 10 19:48:21 2013	(r41397)
@@ -238,14 +238,15 @@
     <li>&a.cperciva; <<a href="mailto:cperciva at FreeBSD.org">cperciva at FreeBSD.org</a>> (Officer Emeritus)</li>
     <li>&a.csjp; <<a href="mailto:csjp at FreeBSD.org">csjp at FreeBSD.org</a>></li>
     <li>&a.delphij; <<a href="mailto:delphij at FreeBSD.org">delphij at FreeBSD.org</a>> (Officer Deputy)</li>
-    <li>&a.des; <<a href="mailto:des at FreeBSD.org">des at FreeBSD.org</a>></li>
+    <li>&a.des; <<a href="mailto:des at FreeBSD.org">des at FreeBSD.org</a>> (Officer)</li>
     <li>&a.gavin; <<a href="mailto:gavin at FreeBSD.org">gavin at FreeBSD.org</a>> (Core Team Liaison)</li>
+    <li>&a.gnn; <<a href="mailto:gnn at FreeBSD.org">gavin at FreeBSD.org</a>> (Secretary)</li>
     <li>&a.jonathan; <<a href="mailto:jonathan at FreeBSD.org">jonathan at FreeBSD.org</a>></li>
     <li>&a.philip; <<a href="mailto:philip at FreeBSD.org">philip at FreeBSD.org</a>></li>
     <li>&a.remko; <<a href="mailto:remko at FreeBSD.org">remko at FreeBSD.org</a>></li>
     <li>&a.rwatson; <<a href="mailto:rwatson at FreeBSD.org">rwatson at FreeBSD.org</a>></li>
     <li>&a.simon; <<a href="mailto:simon at FreeBSD.org">simon at FreeBSD.org</a>>
-      (Officer)</li>
+      (Officer Emeritus)</li>
     <li>&a.stas; <<a href="mailto:stas at FreeBSD.org">stas at FreeBSD.org</a>></li>
     <li>&a.trasz; <<a href="mailto:trasz at FreeBSD.org">trasz at FreeBSD.org</a>></li>
   </ul>

Modified: head/en_US.ISO8859-1/htdocs/security/security.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/security/security.xml	Tue Apr  9 20:50:21 2013	(r41396)
+++ head/en_US.ISO8859-1/htdocs/security/security.xml	Wed Apr 10 19:48:21 2013	(r41397)
@@ -86,9 +86,19 @@
 
   <table>
     <tr valign="top">
+      <td>&a.des; <a
+        href="mailto:des at FreeBSD.org"><des at FreeBSD.org></a></td>
+      <td>Security Officer</td>
+    </tr>
+    <tr valign="top">
+      <td>&a.delphij; <a
+        href="mailto:delphij at FreeBSD.org"><delphij at FreeBSD.org></a></td>
+      <td>Deputy Security Officer</td>
+    </tr>
+    <tr valign="top">
       <td>&a.simon; <a
         href="mailto:simon at FreeBSD.org"><simon at FreeBSD.org></a></td>
-      <td>Security Officer</td>
+      <td>Security Officer Emeritus</td>
     </tr>
     <tr valign="top">
       <td>&a.cperciva; <a
@@ -101,11 +111,6 @@
       <td>Release Engineering liaison,<br/>
           TrustedBSD Project liaison, system security architecture expert</td>
     </tr>
-    <tr valign="top">
-      <td>&a.delphij; <a
-        href="mailto:delphij at FreeBSD.org"><delphij at FreeBSD.org></a></td>
-      <td>Deputy Security Officer</td>
-    </tr>
   </table>
 
   <p>The Security Officer is supported by the <a