From 88083ec15cbc97aa32842b552d9cc26634c4e36d Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@ebb.org>
Date: Fri, 16 Mar 2012 14:13:04 -0400
Subject: [PATCH] Ian and Tom have moved on from the Board, but remain
 Directors Emeritus

---
 www/conservancy/static/about/board/index.html | 20 --------------
 .../static/about/outside/index.html           | 26 +++++++++++++++++++
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/www/conservancy/static/about/board/index.html b/www/conservancy/static/about/board/index.html
index 00aa3ddb..3248d617 100644
--- a/www/conservancy/static/about/board/index.html
+++ b/www/conservancy/static/about/board/index.html
@@ -106,24 +106,4 @@ director. Previously, she worked at OpenLogic where she set up their
 OpenLogic Expert Community. Stormy graduated from Rice University with
 a B.A. in Computer Science.</p>
 
-
-<h2>Ian Lance Taylor</h2>
-
-<p>Ian Lance Taylor began working with free software in 1990.  He wrote
-the popular free Taylor UUCP package and has contributed to a wide
-range of free software projects, particularly the GNU compiler and
-binary utilities.  He worked with free software at Cygnus Solutions,
-Zembu Labs, Wasabi Systems, and C2 Microsystems, and currently does
-GNU compiler and tools development at Google.  He received a B.S. in
-Computer Science from Yale University.</p>
-
-<h2>Tom Tromey</h2>
-
-<p>Tom Tromey started working on free software in 1991.
-He was the primary author of GNU Automake, and has also
-worked on a wide range of other free software projects.
-He is currently a maintainer of GNU gcj and works at
-Red Hat.  He received a B.S. in mathematics from the
-California Institute of Technology.</p>
-
 {% endblock %}
diff --git a/www/conservancy/static/about/outside/index.html b/www/conservancy/static/about/outside/index.html
index b79c38b4..56b9a504 100644
--- a/www/conservancy/static/about/outside/index.html
+++ b/www/conservancy/static/about/outside/index.html
@@ -84,4 +84,30 @@ local GNU/Linux user group, as well various local programming groups.  He
 is a former Chief Webmaster and a former volunteer system administrator
 for the GNU project.</p>
 
+<h1>Directors Emeritus</h1>
+
+<p><em>Directors Emeritus of the Software Freedom Conservancy are former
+    members of Conservancy's <a href="/about/board/">Board of
+    Directors</a> who continue to support Conservancy's mission and
+    occasionally advise Conservancy.</em</p>
+
+
+<h2>Ian Lance Taylor - Director Emeritus</h2>
+
+<p>Ian Lance Taylor began working with free software in 1990.  He wrote
+the popular free Taylor UUCP package and has contributed to a wide range
+of free software projects, particularly the GNU compiler and binary
+utilities.  He worked with free software at Cygnus Solutions, Zembu Labs,
+Wasabi Systems, and C2 Microsystems, and currently does GNU compiler and
+tools development at Google.  He received a B.S. in Computer Science from
+Yale University.</p>
+
+<h2>Tom Tromey - Director Emeritus</h2>
+
+<p>Tom Tromey started working on free software in 1991.  He was the
+primary author of GNU Automake, and has also worked on a wide range of
+other free software projects.  He is currently a maintainer of GNU gcj and
+works at Red Hat.  He received a B.S. in mathematics from the California
+Institute of Technology.</p>
+
 {% endblock %}