From e96ff4629a1d45a3eb840c5d77db2aa884a6d494 Mon Sep 17 00:00:00 2001
From: Colin Percival <cperciva@FreeBSD.org>
Date: Mon, 21 May 2012 12:19:21 +0000
Subject: [PATCH] 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
---
 en_US.ISO8859-1/htdocs/security/security.sgml | 10 +++++-----
 share/sgml/developers.ent                     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/en_US.ISO8859-1/htdocs/security/security.sgml b/en_US.ISO8859-1/htdocs/security/security.sgml
index 6d1ed78990..13265d2575 100644
--- a/en_US.ISO8859-1/htdocs/security/security.sgml
+++ b/en_US.ISO8859-1/htdocs/security/security.sgml
@@ -82,14 +82,14 @@
 
   <table>
     <tr valign="top">
-      <td>&a.cperciva; <a
-        href="mailto:cperciva@FreeBSD.org">&lt;cperciva@FreeBSD.org&gt;</a></td>
+      <td>&a.simon; <a
+        href="mailto:simon@FreeBSD.org">&lt;simon@FreeBSD.org&gt;</a></td>
       <td>Security Officer</td>
     </tr>
     <tr valign="top">
-      <td>&a.simon; <a
-        href="mailto:simon@FreeBSD.org">&lt;simon@FreeBSD.org&gt;</a></td>
-      <td>Deputy Security Officer</td>
+      <td>&a.cperciva; <a
+        href="mailto:cperciva@FreeBSD.org">&lt;cperciva@FreeBSD.org&gt;</a></td>
+      <td>Security Officer Emeritus</td>
     </tr>
     <tr valign="top">
       <td>&a.rwatson; <a
diff --git a/share/sgml/developers.ent b/share/sgml/developers.ent
index 081231ac09..3b3aa0014f 100644
--- a/share/sgml/developers.ent
+++ b/share/sgml/developers.ent
@@ -705,6 +705,6 @@ so that we may keep a list of hat owners and modify only this file. -->
 <!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;'>