diff --git a/en_US.ISO8859-1/articles/contributors/article.sgml b/en_US.ISO8859-1/articles/contributors/article.sgml
index e108c9b1ed..d199521d27 100644
--- a/en_US.ISO8859-1/articles/contributors/article.sgml
+++ b/en_US.ISO8859-1/articles/contributors/article.sgml
@@ -530,7 +530,7 @@
Officers
- &a.security-officer; headed by &a.nectar;
+ &a.security-officer; headed by &a.cperciva;
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml b/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml
index 960304355b..f136b26f72 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml
@@ -8,17 +8,13 @@
- &a.murray;
+ &a.nik;
&a.ru;
-
- &a.nik;
-
-
&a.blackend;
@@ -26,6 +22,10 @@
&a.hrs;
+
+
+ &a.murray;
+
@@ -37,7 +37,7 @@
- &a.kris;
+ &a.marcus;
@@ -45,7 +45,7 @@
- &a.marcus;
+ &a.erwin;
@@ -53,9 +53,12 @@
- &a.krion;
+ &a.kris;
+
+ &a.krion;
+
@@ -63,16 +66,16 @@
The &os; Donations Team
- The &os; Donations Liaison Team consists of the
+ The &os; donations liaison team consists of the
following designated individuals:
- &a.mwlucas;
+ &a.brueffer;
- &a.nsayer;
+ &a.mwlucas;
@@ -84,7 +87,7 @@
- &a.brueffer;
+ &a.nsayer;
@@ -96,13 +99,10 @@
The &os; Security Team:
- The current security team in &os; consists of:
+ The &os; security team consists of the following
+ designated individuals:
-
- &a.csjp;
-
-
&a.remko;
@@ -115,16 +115,20 @@
&a.cperciva;
+
+ &a.csjp;
+
+
&a.trhodes;
- &a.des;
+ &a.guido;
- &a.guido;
+ &a.des;
@@ -165,7 +169,7 @@
- Current &os; security officer deputy
+ Current &os; security officer deputy:
@@ -189,10 +193,22 @@
Primary &os; Release Engineering Team
- The delegated individuals make up the primary &os; release
- engineering team:
+ The primary release engineering team is made up of the
+ following delegated individuals:
+
+ &a.scottl;
+
+
+
+ &a.hrs;
+
+
+
+ &a.kensmith;
+
+
&a.murray;
@@ -201,28 +217,16 @@
&a.rwatson;
-
- &a.scottl;
-
-
&a.dwhite;
-
-
- &a.kensmith;
-
-
-
- &a.hrs;
-
Alpha Release Engineering
- The &os; Alpha release engineering team is made up of the
+ The Alpha release engineering team is made up of the
following delegated individuals:
@@ -231,11 +235,7 @@
- &a.murray;
-
-
-
- &a.rwatson;
+ &a.wilko;
@@ -243,7 +243,11 @@
- &a.wilko;
+ &a.murray;
+
+
+
+ &a.rwatson;
@@ -276,14 +280,6 @@
&a.jhb;
-
- &a.murray;
-
-
-
- &a.rwatson;
-
-
&a.scottl;
@@ -291,6 +287,14 @@
&a.hrs;
+
+
+ &a.murray;
+
+
+
+ &a.rwatson;
+
@@ -314,20 +318,12 @@
of the following delegated individuals:
-
- &a.jake;
-
-
-
- &a.murray;
-
-
&a.jhb;
- &a.scottl;
+ &a.jake;
@@ -335,15 +331,23 @@
- &a.tmm;
+ &a.scottl;
- &a.rwatson;
+ &a.tmm;
&a.kensmith;
+
+
+ &a.murray;
+
+
+
+ &a.rwatson;
+