From e7ce4d15f3627d70288ccfe40b1b7e24d2bb4a77 Mon Sep 17 00:00:00 2001
From: Joel Dahl <joel@FreeBSD.org>
Date: Sat, 29 Jul 2006 08:28:38 +0000
Subject: [PATCH] We have a new core team, so update the PGP keys list.

Noticed by:     jhb
---
 share/pgpkeys/pgpkeys-core.sgml       | 32 +++++++++++++--------
 share/pgpkeys/pgpkeys-developers.sgml | 40 ++++++++++-----------------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/share/pgpkeys/pgpkeys-core.sgml b/share/pgpkeys/pgpkeys-core.sgml
index 09a61d55bd..59627c863e 100644
--- a/share/pgpkeys/pgpkeys-core.sgml
+++ b/share/pgpkeys/pgpkeys-core.sgml
@@ -4,14 +4,19 @@
      $FreeBSD$
 -->
 
-    <sect2 id="pgpkey-jhb">
-      <title>&a.jhb;</title>
-      &pgpkey.jhb;
+    <sect2 id="pgpkey-wilko">
+      <title>&a.wilko;</title>
+      &pgpkey.wilko;
     </sect2>
 
-    <sect2 id="pgpkey-kuriyama">
-      <title>&a.kuriyama;</title>
-      &pgpkey.kuriyama;
+    <sect2 id="pgpkey-brooks">
+      <title>&a.brooks;</title>
+      &pgpkey.brooks;
+    </sect2>
+
+    <sect2 id="pgpkey-keramida">
+      <title>&a.keramida;</title>
+      &pgpkey.keramida;
     </sect2>
 
     <sect2 id="pgpkey-imp">
@@ -19,17 +24,22 @@
       &pgpkey.imp;
     </sect2>
 
+    <sect2 id="pgpkey-gnn">
+      <title>&a.gnn;</title>
+      &pgpkey.gnn;
+    </sect2>
+
     <sect2 id="pgpkey-wes">
       <title>&a.wes;</title>
       &pgpkey.wes;
     </sect2>
 
+    <sect2 id="pgpkey-hrs">
+      <title>&a.hrs;</title>
+      &pgpkey.hrs;
+    </sect2>
+
     <sect2 id="pgpkey-murray">
       <title>&a.murray;</title>
       &pgpkey.murray;
     </sect2>
-
-    <sect2 id="pgpkey-peter">
-      <title>&a.peter;</title>
-      &pgpkey.peter;
-    </sect2>
diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml
index 09f5f62f05..05972a68f0 100644
--- a/share/pgpkeys/pgpkeys-developers.sgml
+++ b/share/pgpkeys/pgpkeys-developers.sgml
@@ -34,6 +34,11 @@
       &pgpkey.asami;
     </sect2>
 
+    <sect2 id="pgpkey-jhb">
+      <title>&a.jhb;</title>
+      &pgpkey.jhb;
+    </sect2>
+
     <sect2 id="pgpkey-barner">
       <title>&a.barner;</title>
       &pgpkey.barner;
@@ -109,11 +114,6 @@
       &pgpkey.markus;
     </sect2>
 
-    <sect2 id="pgpkey-wilko">
-      <title>&a.wilko;</title>
-      &pgpkey.wilko;
-    </sect2>
-
     <sect2 id="pgpkey-oleg">
       <title>&a.oleg;</title>
       &pgpkey.oleg;
@@ -189,16 +189,6 @@
       &pgpkey.brd;
     </sect2>
 
-    <sect2 id="pgpkey-brooks">
-      <title>&a.brooks;</title>
-      &pgpkey.brooks;
-    </sect2>
-
-    <sect2 id="pgpkey-gnn">
-      <title>&a.gnn;</title>
-      &pgpkey.gnn;
-    </sect2>
-
     <sect2 id="pgpkey-pjd">
       <title>&a.pjd;</title>
       &pgpkey.pjd;
@@ -409,11 +399,6 @@
       &pgpkey.kris;
     </sect2>
 
-    <sect2 id="pgpkey-keramida">
-      <title>&a.keramida;</title>
-      &pgpkey.keramida;
-    </sect2>
-
     <sect2 id="pgpkey-fjoe">
       <title>&a.fjoe;</title>
       &pgpkey.fjoe;
@@ -464,6 +449,11 @@
       &pgpkey.rushani;
     </sect2>
 
+    <sect2 id="pgpkey-kuriyama">
+      <title>&a.kuriyama;</title>
+      &pgpkey.kuriyama;
+    </sect2>
+
     <sect2 id="pgpkey-clement">
       <title>&a.clement;</title>
       &pgpkey.clement;
@@ -809,11 +799,6 @@
       &pgpkey.marks;
     </sect2>
 
-    <sect2 id="pgpkey-hrs">
-      <title>&a.hrs;</title>
-      &pgpkey.hrs;
-    </sect2>
-
     <sect2 id="pgpkey-wosch">
       <title>&a.wosch;</title>
       &pgpkey.wosch;
@@ -1019,6 +1004,11 @@
       &pgpkey.adamw;
     </sect2>
 
+    <sect2 id="pgpkey-peter">
+      <title>&a.peter;</title>
+      &pgpkey.peter;
+    </sect2>
+
     <sect2 id="pgpkey-nate">
       <title>&a.nate;</title>
       &pgpkey.nate;