From owner-svn-doc-all@FreeBSD.ORG  Mon May 21 12:19:22 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C8A87106566C;
	Mon, 21 May 2012 12:19:22 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9072E8FC0C;
	Mon, 21 May 2012 12:19:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4LCJM40057974;
	Mon, 21 May 2012 12:19:22 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4LCJMpB057971;
	Mon, 21 May 2012 12:19:22 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <201205211219.q4LCJMpB057971@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Mon, 21 May 2012 12:19:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r38865 - in head: en_US.ISO8859-1/htdocs/security
	share/sgml
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 May 2012 12:19:22 -0000

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@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

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;'>