svn commit: r38865 - in head: en_US.ISO8859-1/htdocs/security share/sgml

[Colin Percival]

Author: cperciva (src,ports committer)
Date: Mon May 21 12:19:21 2012
New Revision: 38865
URL: http://svn.freebsd.org/changeset/doc/38865

Log:
  Commit to the right tree this time.
  
  It's time to hand off the Security Officer hat.  Please welcome simon@ to
  his new role!
  
  I'll be sticking around as Security Officer Emeritus for the forseeable
  future.
  
  Approved by:	core

Modified:
  head/en_US.ISO8859-1/htdocs/security/security.sgml
  head/share/sgml/developers.ent

Modified: head/en_US.ISO8859-1/htdocs/security/security.sgml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/security/security.sgml	Mon May 21 02:31:22 2012	(r38864)
+++ head/en_US.ISO8859-1/htdocs/security/security.sgml	Mon May 21 12:19:21 2012	(r38865)
@@ -82,14 +82,14 @@
 
   <table>
     <tr valign="top">
-      <td>&a.cperciva; <a
-        href="mailto:cperciva at FreeBSD.org">&lt;cperciva at FreeBSD.org&gt;</a></td>
+      <td>&a.simon; <a
+        href="mailto:simon at FreeBSD.org">&lt;simon at FreeBSD.org&gt;</a></td>
       <td>Security Officer</td>
     </tr>
     <tr valign="top">
-      <td>&a.simon; <a
-        href="mailto:simon at FreeBSD.org">&lt;simon at FreeBSD.org&gt;</a></td>
-      <td>Deputy Security Officer</td>
+      <td>&a.cperciva; <a
+        href="mailto:cperciva at FreeBSD.org">&lt;cperciva at FreeBSD.org&gt;</a></td>
+      <td>Security Officer Emeritus</td>
     </tr>
     <tr valign="top">
       <td>&a.rwatson; <a

Modified: head/share/sgml/developers.ent
==============================================================================
--- head/share/sgml/developers.ent	Mon May 21 02:31:22 2012	(r38864)
+++ head/share/sgml/developers.ent	Mon May 21 12:19:21 2012	(r38865)
@@ -705,6 +705,6 @@ so that we may keep a list of hat owners
 <!ENTITY a.re-builders '&a.marcel;, &a.nyan;'>
 
 <!-- FreeBSD Security Officer -->
-<!ENTITY a.so '&a.cperciva;'>
+<!ENTITY a.so '&a.simon;'>
 
 <!ENTITY a.so-team '&a.mnag;, &a.remko;, &a.gnn;, &a.simon;, &a.philip;, &a.cperciva;, &a.csjp;, &a.des;, &a.rwatson;, &a.bz;'>