From 3a224ca78edf2efeda116887b638053fa4c6ae3a Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@ebb.org>
Date: Fri, 28 Oct 2011 10:43:29 +0200
Subject: [PATCH] Correct URLs for /about that reference long-since
 non-existent "team" directory (patch from Martin Michlmayr <tbm@hp.com>)

---
 www/conservancy/apps/staff/models.py             | 2 +-
 www/conservancy/static/about/board/index.html    | 2 +-
 www/conservancy/static/about/officers/index.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/conservancy/apps/staff/models.py b/www/conservancy/apps/staff/models.py
index cba5b18e..10116de9 100644
--- a/www/conservancy/apps/staff/models.py
+++ b/www/conservancy/apps/staff/models.py
@@ -26,5 +26,5 @@ class Person(models.Model):
         return self.username
 
     def biography_url(self):
-        return u"/about/team/#%s" % self.username
+        return u"/about/#%s" % self.username
 
diff --git a/www/conservancy/static/about/board/index.html b/www/conservancy/static/about/board/index.html
index 5a24e48a..9c3728bd 100644
--- a/www/conservancy/static/about/board/index.html
+++ b/www/conservancy/static/about/board/index.html
@@ -7,7 +7,7 @@
 
 <p>Like many non-profits, Conservancy is directed by a
 self-perpetuating Board of Directors, who
-appoint <a href="/about/team/officers/">Officers</a> to carry out the
+appoint <a href="/about/officers/">Officers</a> to carry out the
 day-to-day operations of the organization.  The Directorship of the
 Conservancy includes both talented non-profit managers and experienced
 FLOSS project leaders who can both guide the administrative operations of
diff --git a/www/conservancy/static/about/officers/index.html b/www/conservancy/static/about/officers/index.html
index 1d63d009..031dd743 100644
--- a/www/conservancy/static/about/officers/index.html
+++ b/www/conservancy/static/about/officers/index.html
@@ -5,7 +5,7 @@
 
 <h1>Officers</h1>
 
-<p>The <a href="/about/team/board/">Board of Directors</a> of the Conservancy
+<p>The <a href="/about/board/">Board of Directors</a> of the Conservancy
 elects its officers.  The current officers are:</p>
 
 <h2>Bradley M. Kuhn - President and Board Chairperson</h2>