diff --git a/en/docproj/who.sgml b/en/docproj/who.sgml
index 60e7a6877b..2e15ff7d42 100644
--- a/en/docproj/who.sgml
+++ b/en/docproj/who.sgml
@@ -1,6 +1,6 @@
-
+
]>
@@ -17,7 +17,7 @@
href="../doc/en_US.ISO8859-1/articles/contributors/staff-committers.html">
all FreeBSD developers with commit privileges, as well as a
list of the
+ href="../administration.html#t-doceng">
principal committers for the FreeBSD Documentation Project.
Others do not have commit privileges, but they write and submit
diff --git a/en/internal/internal.sgml b/en/internal/internal.sgml
index 5cf3eaaffb..5a13e35b81 100644
--- a/en/internal/internal.sgml
+++ b/en/internal/internal.sgml
@@ -1,6 +1,6 @@
-
+
]>
@@ -38,11 +38,12 @@ the globe, there have to be some
People
-The
-FreeBSD Project Staff
-consists of the FreeBSD Core Team and the FreeBSD Developers; this document
-contains a list of them, as well as explanations of who is responsible
-for what.
+The &os; Project Staff consists of teams, groups and individuals
+ with designated project roles and areas of responsibility and the developers.
+ By following the links, one will find a list of them, as well as
+ explanations of who is responsible for what.
Here are some
personal homepages
diff --git a/en/news/status/report-2004-07-2004-12.xml b/en/news/status/report-2004-07-2004-12.xml
index 95ecc402f0..d706e6dbf3 100644
--- a/en/news/status/report-2004-07-2004-12.xml
+++ b/en/news/status/report-2004-07-2004-12.xml
@@ -1615,7 +1615,7 @@
Security Officer Charter
+ href="http://www.freebsd.org/administration.html#t-secteam">
FreeBSD Security Team members
FreeBSD VuXML web site
diff --git a/en/news/status/report-2005-01-2005-03.xml b/en/news/status/report-2005-01-2005-03.xml
index b9b43ada34..86e3a63a41 100644
--- a/en/news/status/report-2005-01-2005-03.xml
+++ b/en/news/status/report-2005-01-2005-03.xml
@@ -1967,7 +1967,7 @@
+ href="http://www.freebsd.org/administration.html#t-secteam" />
diff --git a/en/news/status/report-2005-03-2005-06.xml b/en/news/status/report-2005-03-2005-06.xml
index 23b8f9d715..2a4360a2b5 100644
--- a/en/news/status/report-2005-03-2005-06.xml
+++ b/en/news/status/report-2005-03-2005-06.xml
@@ -556,7 +556,7 @@
+ href="http://www.freebsd.org/administration.html#t-secteam" />
diff --git a/en/news/status/report-2005-10-2005-12.xml b/en/news/status/report-2005-10-2005-12.xml
index 500e0d3494..19b6df3e01 100644
--- a/en/news/status/report-2005-10-2005-12.xml
+++ b/en/news/status/report-2005-10-2005-12.xml
@@ -622,7 +622,7 @@
+ href="http://www.freebsd.org/administration.html#t-secteam" />
diff --git a/en/news/status/report-2006-01-2006-03.xml b/en/news/status/report-2006-01-2006-03.xml
index d3456e359e..4c979838da 100644
--- a/en/news/status/report-2006-01-2006-03.xml
+++ b/en/news/status/report-2006-01-2006-03.xml
@@ -125,7 +125,7 @@
+ href="http://www.freebsd.org/administration.html#t-secteam" />
diff --git a/en/news/status/report-2006-04-2006-06.xml b/en/news/status/report-2006-04-2006-06.xml
index e79a4897e2..babfce535b 100644
--- a/en/news/status/report-2006-04-2006-06.xml
+++ b/en/news/status/report-2006-04-2006-06.xml
@@ -2,7 +2,7 @@
-
+
April-June
@@ -1802,7 +1802,7 @@
+ href="http://www.freebsd.org/administration.html#t-secteam" />
diff --git a/en/news/status/report-2006-06-2006-10.xml b/en/news/status/report-2006-06-2006-10.xml
index d062993f59..07c217bf1c 100644
--- a/en/news/status/report-2006-06-2006-10.xml
+++ b/en/news/status/report-2006-06-2006-10.xml
@@ -2,7 +2,7 @@
-
+
July-September
@@ -1042,7 +1042,7 @@ Report//EN"
+ href="http://www.freebsd.org/administration.html#t-secteam" />
diff --git a/en/news/status/report-2006-10-2006-12.xml b/en/news/status/report-2006-10-2006-12.xml
index 798635b59b..68547a2c00 100644
--- a/en/news/status/report-2006-10-2006-12.xml
+++ b/en/news/status/report-2006-10-2006-12.xml
@@ -2,7 +2,7 @@
-
+
October-December
@@ -1908,7 +1908,7 @@ Report//EN"
+ href="http://www.FreeBSD.org/administration.html#t-secteam" />
diff --git a/en/news/status/report-2007-01-2007-03.xml b/en/news/status/report-2007-01-2007-03.xml
index d67c96b5f1..3e3115d35a 100644
--- a/en/news/status/report-2007-01-2007-03.xml
+++ b/en/news/status/report-2007-01-2007-03.xml
@@ -2,7 +2,7 @@
-
+
January-March
@@ -739,7 +739,7 @@ Report//EN"
+ href="http://www.freebsd.org/administration.html#t-secteam" />
diff --git a/en/news/status/report-2007-04-2007-06.xml b/en/news/status/report-2007-04-2007-06.xml
index 6c6dcb13a8..1155f062de 100644
--- a/en/news/status/report-2007-04-2007-06.xml
+++ b/en/news/status/report-2007-04-2007-06.xml
@@ -2,7 +2,7 @@
-
+
April-June
@@ -2185,7 +2185,7 @@ Status Report//EN"
+ href="http://www.freebsd.org/administration.html#t-secteam" />
diff --git a/en/search/web.atoz b/en/search/web.atoz
index 3fd2a1e292..b8d4077d36 100644
--- a/en/search/web.atoz
+++ b/en/search/web.atoz
@@ -4,7 +4,7 @@
# With the format `|'.
# Empty lines or comments are ignored.
#
-# $FreeBSD: www/en/search/web.atoz,v 1.89 2007/07/21 11:28:24 danger Exp $
+# $FreeBSD: www/en/search/web.atoz,v 1.90 2008/03/12 11:14:50 remko Exp $
#
# NOTE: the entries should be sorted alphabetically by their relative
# path to www/en. E.g. docs/man.sgml comes after docs/books.sgml,
@@ -520,7 +520,7 @@ Italian web pages|&base;/it/index.html
Japanese web pages|&base;/ja/index.html
# Who's Who
-Project Staff|&base;/doc/en_US.ISO8859-1/articles/contributors/staff-who.html
-Staff, Project|&base;/doc/en_US.ISO8859-1/articles/contributors/staff-who.html
-Who's Who|&base;/doc/en_US.ISO8859-1/articles/contributors/staff-who.html
-Officers, Project|&base;/doc/en_US.ISO8859-1/articles/contributors/staff-who.html
+Project Staff|&base;/administration.html
+Staff, Project|&base;/administration.html
+Who's Who|&base;/administration.html
+Officers, Project|&base;/administration.html