From owner-svn-doc-projects@FreeBSD.ORG  Fri Nov 30 12:42:41 2012
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 975692B1;
 Fri, 30 Nov 2012 12:42:41 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7A82A8FC14;
 Fri, 30 Nov 2012 12:42:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAUCgfWR084691;
 Fri, 30 Nov 2012 12:42:41 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAUCgfkl084687;
 Fri, 30 Nov 2012 12:42:41 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201211301242.qAUCgfkl084687@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Fri, 30 Nov 2012 12:42:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r40197 - projects/entities/share/pgpkeys
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Nov 2012 12:42:41 -0000

Author: rene
Date: Fri Nov 30 12:42:41 2012
New Revision: 40197
URL: http://svnweb.freebsd.org/changeset/doc/40197

Log:
  PGP key definitions shall now reference &a.committer.email; instead
  of &a.committer; .

Modified:
  projects/entities/share/pgpkeys/README
  projects/entities/share/pgpkeys/addkey.sh
  projects/entities/share/pgpkeys/pgpkeys-core.xml
  projects/entities/share/pgpkeys/pgpkeys-developers.xml

Modified: projects/entities/share/pgpkeys/README
==============================================================================
--- projects/entities/share/pgpkeys/README	Fri Nov 30 12:26:25 2012	(r40196)
+++ projects/entities/share/pgpkeys/README	Fri Nov 30 12:42:41 2012	(r40197)
@@ -31,7 +31,7 @@ address.  For instance, in my case:
 | or pgpkeys-core.sgml). Remember to keep the list sorted by last name!
 | 
 |     <sect2 id="pgpkey-des">
-|       <title>&a.des;</title>
+|       <title>&a.des.email;</title>
 |       &pgpkey.des;
 |     </sect2>
 | 

Modified: projects/entities/share/pgpkeys/addkey.sh
==============================================================================
--- projects/entities/share/pgpkeys/addkey.sh	Fri Nov 30 12:26:25 2012	(r40196)
+++ projects/entities/share/pgpkeys/addkey.sh	Fri Nov 30 12:42:41 2012	(r40197)
@@ -78,7 +78,7 @@ echo "pgpkeys-officers.sgml or pgpkeys-c
 echo "Remember to keep the list sorted by last name!"
 echo
 echo "    <sect2 id=\"pgpkey-${me}\">"
-echo "      <title>&a.${me};</title>"
+echo "      <title>&a.${me}.email;</title>"
 echo "      &pgpkey.${me};"
 echo "    </sect2>"
 echo

Modified: projects/entities/share/pgpkeys/pgpkeys-core.xml
==============================================================================
--- projects/entities/share/pgpkeys/pgpkeys-core.xml	Fri Nov 30 12:26:25 2012	(r40196)
+++ projects/entities/share/pgpkeys/pgpkeys-core.xml	Fri Nov 30 12:42:41 2012	(r40197)
@@ -5,49 +5,49 @@
 -->
 
     <sect2 id="pgpkey-core-tabthorpe">
-      <title>&a.tabthorpe;</title>
+      <title>&a.tabthorpe.email;</title>
       &pgpkey.tabthorpe;
     </sect2>
 
     <sect2 id="pgpkey-core-gavin">
-      <title>&a.gavin;</title>
+      <title>&a.gavin.email;</title>
       &pgpkey.gavin;
     </sect2>
 
     <sect2 id="pgpkey-core-jhb">
-      <title>&a.jhb;</title>
+      <title>&a.jhb.email;</title>
       &pgpkey.jhb;
     </sect2>
 
     <sect2 id="pgpkey-core-kib">
-      <title>&a.kib;</title>
+      <title>&a.kib.email;</title>
       &pgpkey.kib;
     </sect2>
 
     <sect2 id="pgpkey-core-theraven">
-      <title>&a.theraven;</title>
+      <title>&a.theraven.email;</title>
       &pgpkey.theraven;
     </sect2>
 
 <!--
 attilio has no PGP key in the handbook yet
     <sect2 id="pgpkey-core-attilio">
-      <title>&a.attilio;</title>
+      <title>&a.attilio.email;</title>
       &pgpkey.attilio;
     </sect2>
 -->
 
     <sect2 id="pgpkey-core-hrs">
-      <title>&a.hrs;</title>
+      <title>&a.hrs.email;</title>
       &pgpkey.hrs;
     </sect2>
 
     <sect2 id="pgpkey-core-peter">
-      <title>&a.peter;</title>
+      <title>&a.peter.email;</title>
       &pgpkey.peter;
     </sect2>
 
     <sect2 id="pgpkey-core-miwi">
-      <title>&a.miwi;</title>
+      <title>&a.miwi.email;</title>
       &pgpkey.miwi;
     </sect2>

Modified: projects/entities/share/pgpkeys/pgpkeys-developers.xml
==============================================================================
--- projects/entities/share/pgpkeys/pgpkeys-developers.xml	Fri Nov 30 12:26:25 2012	(r40196)
+++ projects/entities/share/pgpkeys/pgpkeys-developers.xml	Fri Nov 30 12:42:41 2012	(r40197)
@@ -5,1899 +5,1899 @@
 -->
 
     <sect2 id="pgpkey-ariff">
-      <title>&a.ariff;</title>
+      <title>&a.ariff.email;</title>
       &pgpkey.ariff;
     </sect2>
 
     <sect2 id="pgpkey-tabthorpe">
-      <title>&a.tabthorpe;</title>
+      <title>&a.tabthorpe.email;</title>
       &pgpkey.tabthorpe;
     </sect2>
 
     <sect2 id="pgpkey-eadler">
-      <title>&a.eadler;</title>
+      <title>&a.eadler.email;</title>
       &pgpkey.eadler;
     </sect2>
 
     <sect2 id="pgpkey-shaun">
-      <title>&a.shaun;</title>
+      <title>&a.shaun.email;</title>
       &pgpkey.shaun;
     </sect2>
 
     <sect2 id="pgpkey-brix">
-      <title>&a.brix;</title>
+      <title>&a.brix.email;</title>
       &pgpkey.brix;
     </sect2>
 
     <sect2 id="pgpkey-mandree">
-      <title>&a.mandree;</title>
+      <title>&a.mandree.email;</title>
       &pgpkey.mandree;
     </sect2>
 
     <sect2 id="pgpkey-will">
-      <title>&a.will;</title>
+      <title>&a.will.email;</title>
       &pgpkey.will;
     </sect2>
 
     <sect2 id="pgpkey-dim">
-      <title>&a.dim;</title>
+      <title>&a.dim.email;</title>
       &pgpkey.dim;
     </sect2>
 
     <sect2 id="pgpkey-anholt">
-      <title>&a.anholt;</title>
+      <title>&a.anholt.email;</title>
       &pgpkey.anholt;
     </sect2>
 
     <sect2 id="pgpkey-mva">
-      <title>&a.mva;</title>
+      <title>&a.mva.email;</title>
       &pgpkey.mva;
     </sect2>
 
     <sect2 id="pgpkey-araujo">
-      <title>&a.araujo;</title>
+      <title>&a.araujo.email;</title>
       &pgpkey.araujo;
     </sect2>
 
     <sect2 id="pgpkey-mat">
-      <title>&a.mat;</title>
+      <title>&a.mat.email;</title>
       &pgpkey.mat;
     </sect2>
 
     <sect2 id="pgpkey-asami">
-      <title>&a.asami;</title>
+      <title>&a.asami.email;</title>
       &pgpkey.asami;
     </sect2>
 
     <sect2 id="pgpkey-gavin">
-      <title>&a.gavin;</title>
+      <title>&a.gavin.email;</title>
       &pgpkey.gavin;
     </sect2>
 
     <sect2 id="pgpkey-jsa">
-      <title>&a.jsa;</title>
+      <title>&a.jsa.email;</title>
       &pgpkey.jsa;
     </sect2>
 
     <sect2 id="pgpkey-jadawin">
-      <title>&a.jadawin;</title>
+      <title>&a.jadawin.email;</title>
       &pgpkey.jadawin;
     </sect2>
 
     <sect2 id="pgpkey-timur">
-      <title>&a.timur;</title>
+      <title>&a.timur.email;</title>
       &pgpkey.timur;
     </sect2>
 
     <sect2 id="pgpkey-gjb">
-      <title>&a.gjb;</title>
+      <title>&a.gjb.email;</title>
       &pgpkey.gjb;
     </sect2>
 
     <sect2 id="pgpkey-snb">
-      <title>&a.snb;</title>
+      <title>&a.snb.email;</title>
       &pgpkey.snb;
     </sect2>
 
     <sect2 id="pgpkey-barner">
-      <title>&a.barner;</title>
+      <title>&a.barner.email;</title>
       &pgpkey.barner;
     </sect2>
 
     <sect2 id="pgpkey-art">
-      <title>&a.art;</title>
+      <title>&a.art.email;</title>
       &pgpkey.art;
     </sect2>
 
     <sect2 id="pgpkey-tobez">
-      <title>&a.tobez;</title>
+      <title>&a.tobez.email;</title>
       &pgpkey.tobez;
     </sect2>
 
     <sect2 id="pgpkey-damien">
-      <title>&a.damien;</title>
+      <title>&a.damien.email;</title>
       &pgpkey.damien;
     </sect2>
 
     <sect2 id="pgpkey-tdb">
-      <title>&a.tdb;</title>
+      <title>&a.tdb.email;</title>
       &pgpkey.tdb;
     </sect2>
 
     <sect2 id="pgpkey-gblach">
-      <title>&a.gblach;</title>
+      <title>&a.gblach.email;</title>
       &pgpkey.gblach;
     </sect2>
 
     <sect2 id="pgpkey-mbr">
-      <title>&a.mbr;</title>
+      <title>&a.mbr.email;</title>
       &pgpkey.mbr;
     </sect2>
 
     <sect2 id="pgpkey-wblock">
-      <title>&a.wblock;</title>
+      <title>&a.wblock.email;</title>
       &pgpkey.wblock;
     </sect2>
 
     <sect2 id="pgpkey-bvs">
-      <title>&a.bvs;</title>
+      <title>&a.bvs.email;</title>
       &pgpkey.bvs;
     </sect2>
 
     <sect2 id="pgpkey-novel">
-      <title>&a.novel;</title>
+      <title>&a.novel.email;</title>
       &pgpkey.novel;
     </sect2>
 
     <sect2 id="pgpkey-garga">
-      <title>&a.garga;</title>
+      <title>&a.garga.email;</title>
       &pgpkey.garga;
     </sect2>
 
     <sect2 id="pgpkey-alexbl">
-      <title>&a.alexbl;</title>
+      <title>&a.alexbl.email;</title>
       &pgpkey.alexbl;
     </sect2>
 
     <sect2 id="pgpkey-sbz">
-      <title>&a.sbz;</title>
+      <title>&a.sbz.email;</title>
       &pgpkey.sbz;
     </sect2>
 
     <sect2 id="pgpkey-ebrandi">
-      <title>&a.ebrandi;</title>
+      <title>&a.ebrandi.email;</title>
       &pgpkey.ebrandi;
     </sect2>
 
     <sect2 id="pgpkey-harti">
-      <title>&a.harti;</title>
+      <title>&a.harti.email;</title>
       &pgpkey.harti;
     </sect2>
 
     <sect2 id="pgpkey-obraun">
-      <title>&a.obraun;</title>
+      <title>&a.obraun.email;</title>
       &pgpkey.obraun;
     </sect2>
 
     <sect2 id="pgpkey-makc">
-      <title>&a.makc;</title>
+      <title>&a.makc.email;</title>
       &pgpkey.makc;
     </sect2>
 
     <sect2 id="pgpkey-jmb">
-      <title>&a.jmb;</title>
+      <title>&a.jmb.email;</title>
       &pgpkey.jmb;
     </sect2>
 
     <sect2 id="pgpkey-antoine">
-      <title>&a.antoine;</title>
+      <title>&a.antoine.email;</title>
       &pgpkey.antoine;
     </sect2>
 
     <sect2 id="pgpkey-db">
-      <title>&a.db;</title>
+      <title>&a.db.email;</title>
       &pgpkey.db;
     </sect2>
 
     <sect2 id="pgpkey-brueffer">
-      <title>&a.brueffer;</title>
+      <title>&a.brueffer.email;</title>
       &pgpkey.brueffer;
     </sect2>
 
     <sect2 id="pgpkey-markus">
-      <title>&a.markus;</title>
+      <title>&a.markus.email;</title>
       &pgpkey.markus;
     </sect2>
 
     <sect2 id="pgpkey-sbruno">
-      <title>&a.sbruno;</title>
+      <title>&a.sbruno.email;</title>
       &pgpkey.sbruno;
     </sect2>
 
     <sect2 id="pgpkey-oleg">
-      <title>&a.oleg;</title>
+      <title>&a.oleg.email;</title>
       &pgpkey.oleg;
     </sect2>
 
     <sect2 id="pgpkey-bushman">
-      <title>&a.bushman;</title>
+      <title>&a.bushman.email;</title>
       &pgpkey.bushman;
     </sect2>
 
     <sect2 id="pgpkey-jchandra">
-      <title>&a.jchandra;</title>
+      <title>&a.jchandra.email;</title>
       &pgpkey.jchandra;
     </sect2>
 
     <sect2 id="pgpkey-jcamou">
-      <title>&a.jcamou;</title>
+      <title>&a.jcamou.email;</title>
       &pgpkey.jcamou;
     </sect2>
 
     <sect2 id="pgpkey-acm">
-      <title>&a.acm;</title>
+      <title>&a.acm.email;</title>
       &pgpkey.acm;
     </sect2>
 
     <sect2 id="pgpkey-gahr">
-      <title>&a.gahr;</title>
+      <title>&a.gahr.email;</title>
       &pgpkey.gahr;
     </sect2>
 
 <!--
     <sect2 id="pgpkey-koitsu">
-      <title>&a.koitsu;</title>
+      <title>&a.koitsu.email;</title>
       &pgpkey.koitsu;
     </sect2>
 -->
 
     <sect2 id="pgpkey-dchagin">
-      <title>&a.dchagin;</title>
+      <title>&a.dchagin.email;</title>
       &pgpkey.dchagin;
     </sect2>
 
     <sect2 id="pgpkey-perky">
-      <title>&a.perky;</title>
+      <title>&a.perky.email;</title>
       &pgpkey.perky;
     </sect2>
 
     <sect2 id="pgpkey-jon">
-      <title>&a.jon;</title>
+      <title>&a.jon.email;</title>
       &pgpkey.jon;
     </sect2>
 
     <sect2 id="pgpkey-jonathan">
-      <title>&a.jonathan;</title>
+      <title>&a.jonathan.email;</title>
       &pgpkey.jonathan;
     </sect2>
 
     <sect2 id="pgpkey-loader">
-      <title>&a.loader;</title>
+      <title>&a.loader.email;</title>
       &pgpkey.loader;
     </sect2>
 
     <sect2 id="pgpkey-luoqi">
-      <title>&a.luoqi;</title>
+      <title>&a.luoqi.email;</title>
       &pgpkey.luoqi;
     </sect2>
 
     <sect2 id="pgpkey-ache">
-      <title>&a.ache;</title>
+      <title>&a.ache.email;</title>
       &pgpkey.ache;
     </sect2>
 
     <sect2 id="pgpkey-melifaro">
-      <title>&a.melifaro;</title>
+      <title>&a.melifaro.email;</title>
       &pgpkey.melifaro;
     </sect2>
 
     <sect2 id="pgpkey-seanc">
-      <title>&a.seanc;</title>
+      <title>&a.seanc.email;</title>
       &pgpkey.seanc;
     </sect2>
 
     <sect2 id="pgpkey-cjh">
-      <title>&a.cjh;</title>
+      <title>&a.cjh.email;</title>
       &pgpkey.cjh;
     </sect2>
 
     <sect2 id="pgpkey-cjc">
-      <title>&a.cjc;</title>
+      <title>&a.cjc.email;</title>
       &pgpkey.cjc;
     </sect2>
 
     <sect2 id="pgpkey-marcus">
-      <title>&a.marcus;</title>
+      <title>&a.marcus.email;</title>
       &pgpkey.marcus;
     </sect2>
 
     <sect2 id="pgpkey-nik">
-      <title>&a.nik;</title>
+      <title>&a.nik.email;</title>
       &pgpkey.nik;
     </sect2>
 
     <sect2 id="pgpkey-benjsc">
-      <title>&a.benjsc;</title>
+      <title>&a.benjsc.email;</title>
       &pgpkey.benjsc;
     </sect2>
 
     <sect2 id="pgpkey-tijl">
-      <title>&a.tijl;</title>
+      <title>&a.tijl.email;</title>
       &pgpkey.tijl;
     </sect2>
 
     <sect2 id="pgpkey-rakuco">
-      <title>&a.rakuco;</title>
+      <title>&a.rakuco.email;</title>
       &pgpkey.rakuco;
     </sect2>
 
     <sect2 id="pgpkey-brucec">
-      <title>&a.brucec;</title>
+      <title>&a.brucec.email;</title>
       &pgpkey.brucec;
     </sect2>
 
     <sect2 id="pgpkey-culot">
-      <title>&a.culot;</title>
+      <title>&a.culot.email;</title>
       &pgpkey.culot;
     </sect2>
 
     <sect2 id="pgpkey-aaron">
-      <title>&a.aaron;</title>
+      <title>&a.aaron.email;</title>
       &pgpkey.aaron;
     </sect2>
 
     <sect2 id="pgpkey-bapt">
-      <title>&a.bapt;</title>
+      <title>&a.bapt.email;</title>
       &pgpkey.bapt;
     </sect2>
 
     <sect2 id="pgpkey-ceri">
-      <title>&a.ceri;</title>
+      <title>&a.ceri.email;</title>
       &pgpkey.ceri;
     </sect2>
 
     <sect2 id="pgpkey-brd">
-      <title>&a.brd;</title>
+      <title>&a.brd.email;</title>
       &pgpkey.brd;
     </sect2>
 
     <sect2 id="pgpkey-pjd">
-      <title>&a.pjd;</title>
+      <title>&a.pjd.email;</title>
       &pgpkey.pjd;
     </sect2>
 
     <sect2 id="pgpkey-bsd">
-      <title>&a.bsd;</title>
+      <title>&a.bsd.email;</title>
       &pgpkey.bsd;
     </sect2>
 
     <sect2 id="pgpkey-vd">
-      <title>&a.vd;</title>
+      <title>&a.vd.email;</title>
       &pgpkey.vd;
     </sect2>
 
     <sect2 id="pgpkey-rdivacky">
-      <title>&a.rdivacky;</title>
+      <title>&a.rdivacky.email;</title>
       &pgpkey.rdivacky;
     </sect2>
 
     <sect2 id="pgpkey-danfe">
-      <title>&a.danfe;</title>
+      <title>&a.danfe.email;</title>
       &pgpkey.danfe;
     </sect2>
 
     <sect2 id="pgpkey-dd">
-      <title>&a.dd;</title>
+      <title>&a.dd.email;</title>
       &pgpkey.dd;
     </sect2>
 
     <sect2 id="pgpkey-bdrewery">
-      <title>&a.bdrewery;</title>
+      <title>&a.bdrewery.email;</title>
       &pgpkey.bdrewery;
     </sect2>
 
     <sect2 id="pgpkey-olivierd">
-      <title>&a.olivierd;</title>
+      <title>&a.olivierd.email;</title>
       &pgpkey.olivierd;
     </sect2>
 
     <sect2 id="pgpkey-bruno">
-      <title>&a.bruno;</title>
+      <title>&a.bruno.email;</title>
       &pgpkey.bruno;
     </sect2>
 
     <sect2 id="pgpkey-ale">
-      <title>&a.ale;</title>
+      <title>&a.ale.email;</title>
       &pgpkey.ale;
     </sect2>
 
     <sect2 id="pgpkey-peadar">
-      <title>&a.peadar;</title>
+      <title>&a.peadar.email;</title>
       &pgpkey.peadar;
     </sect2>
 
     <sect2 id="pgpkey-deischen">
-      <title>&a.deischen;</title>
+      <title>&a.deischen.email;</title>
       &pgpkey.deischen;
     </sect2>
 
     <sect2 id="pgpkey-josef">
-      <title>&a.josef;</title>
+      <title>&a.josef.email;</title>
       &pgpkey.josef;
     </sect2>
 
     <sect2 id="pgpkey-lme">
-      <title>&a.lme;</title>
+      <title>&a.lme.email;</title>
       &pgpkey.lme;
     </sect2>
 
     <sect2 id="pgpkey-ue">
-      <title>&a.ue;</title>
+      <title>&a.ue.email;</title>
       &pgpkey.ue;
     </sect2>
 
     <sect2 id="pgpkey-ru">
-      <title>&a.ru;</title>
+      <title>&a.ru.email;</title>
       &pgpkey.ru;
     </sect2>
 
     <sect2 id="pgpkey-le">
-      <title>&a.le;</title>
+      <title>&a.le.email;</title>
       &pgpkey.le;
     </sect2>
 
     <sect2 id="pgpkey-bf">
-      <title>&a.bf;</title>
+      <title>&a.bf.email;</title>
       &pgpkey.bf;
     </sect2>
 
     <sect2 id="pgpkey-madpilot">
-      <title>&a.madpilot;</title>
+      <title>&a.madpilot.email;</title>
       &pgpkey.madpilot;
     </sect2>
 
     <sect2 id="pgpkey-rafan">
-      <title>&a.rafan;</title>
+      <title>&a.rafan.email;</title>
       &pgpkey.rafan;
     </sect2>
 
     <sect2 id="pgpkey-stefanf">
-      <title>&a.stefanf;</title>
+      <title>&a.stefanf.email;</title>
       &pgpkey.stefanf;
     </sect2>
 
     <sect2 id="pgpkey-farrokhi">
-      <title>&a.farrokhi;</title>
+      <title>&a.farrokhi.email;</title>
       &pgpkey.farrokhi;
     </sect2>
 
     <sect2 id="pgpkey-jedgar">
-      <title>&a.jedgar;</title>
+      <title>&a.jedgar.email;</title>
       &pgpkey.jedgar;
     </sect2>
 
     <sect2 id="pgpkey-green">
-      <title>&a.green;</title>
+      <title>&a.green.email;</title>
       &pgpkey.green;
     </sect2>
 
     <sect2 id="pgpkey-lioux">
-      <title>&a.lioux;</title>
+      <title>&a.lioux.email;</title>
       &pgpkey.lioux;
     </sect2>
 
     <sect2 id="pgpkey-fanf">
-      <title>&a.fanf;</title>
+      <title>&a.fanf.email;</title>
       &pgpkey.fanf;
     </sect2>
 
     <sect2 id="pgpkey-blackend">
-      <title>&a.blackend;</title>
+      <title>&a.blackend.email;</title>
       &pgpkey.blackend;
     </sect2>
 
     <sect2 id="pgpkey-petef">
-      <title>&a.petef;</title>
+      <title>&a.petef.email;</title>
       &pgpkey.petef;
     </sect2>
 
     <sect2 id="pgpkey-decke">
-      <title>&a.decke;</title>
+      <title>&a.decke.email;</title>
       &pgpkey.decke;
     </sect2>
 
     <sect2 id="pgpkey-billf">
-      <title>&a.billf;</title>
+      <title>&a.billf.email;</title>
       &pgpkey.billf;
     </sect2>
 
     <sect2 id="pgpkey-avg">
-      <title>&a.avg;</title>
+      <title>&a.avg.email;</title>
       &pgpkey.avg;
     </sect2>
 
     <sect2 id="pgpkey-beat">
-      <title>&a.beat;</title>
+      <title>&a.beat.email;</title>
       &pgpkey.beat;
     </sect2>
 
     <sect2 id="pgpkey-danger">
-      <title>&a.danger;</title>
+      <title>&a.danger.email;</title>
       &pgpkey.danger;
     </sect2>
 
     <sect2 id="pgpkey-sjg">
-      <title>&a.sjg;</title>
+      <title>&a.sjg.email;</title>
       &pgpkey.sjg;
     </sect2>
 
     <sect2 id="pgpkey-gibbs">
-      <title>&a.gibbs;</title>
+      <title>&a.gibbs.email;</title>
       &pgpkey.gibbs;
     </sect2>
 
     <sect2 id="pgpkey-pfg">
-      <title>&a.pfg;</title>
+      <title>&a.pfg.email;</title>
       &pgpkey.pfg;
     </sect2>
 
     <sect2 id="pgpkey-pgollucci">
-      <title>&a.pgollucci;</title>
+      <title>&a.pgollucci.email;</title>
       &pgpkey.pgollucci;
     </sect2>
 
     <sect2 id="pgpkey-daichi">
-      <title>&a.daichi;</title>
+      <title>&a.daichi.email;</title>
       &pgpkey.daichi;
     </sect2>
 
     <sect2 id="pgpkey-mnag">
-      <title>&a.mnag;</title>
+      <title>&a.mnag.email;</title>
       &pgpkey.mnag;
     </sect2>
 
     <sect2 id="pgpkey-grehan">
-      <title>&a.grehan;</title>
+      <title>&a.grehan.email;</title>
       &pgpkey.grehan;
     </sect2>
 
     <sect2 id="pgpkey-jamie">
-      <title>&a.jamie;</title>
+      <title>&a.jamie.email;</title>
       &pgpkey.jamie;
     </sect2>
 
     <sect2 id="pgpkey-bar">
-      <title>&a.bar;</title>
+      <title>&a.bar.email;</title>
       &pgpkey.bar;
     </sect2>
 
     <sect2 id="pgpkey-jmg">
-      <title>&a.jmg;</title>
+      <title>&a.jmg.email;</title>
       &pgpkey.jmg;
     </sect2>
 
     <sect2 id="pgpkey-mjg">
-      <title>&a.mjg;</title>
+      <title>&a.mjg.email;</title>
       &pgpkey.mjg;
     </sect2>
 
     <sect2 id="pgpkey-jhale">
-      <title>&a.jhale;</title>
+      <title>&a.jhale.email;</title>
       &pgpkey.jhale;
     </sect2>
 
     <sect2 id="pgpkey-dannyboy">
-      <title>&a.dannyboy;</title>
+      <title>&a.dannyboy.email;</title>
       &pgpkey.dannyboy;
     </sect2>
 
     <sect2 id="pgpkey-dhartmei">
-      <title>&a.dhartmei;</title>
+      <title>&a.dhartmei.email;</title>
       &pgpkey.dhartmei;
     </sect2>
 
     <sect2 id="pgpkey-ohauer">
-      <title>&a.ohauer;</title>
+      <title>&a.ohauer.email;</title>
       &pgpkey.ohauer;
     </sect2>
 
     <sect2 id="pgpkey-ehaupt">
-      <title>&a.ehaupt;</title>
+      <title>&a.ehaupt.email;</title>
       &pgpkey.ehaupt;
     </sect2>
 
     <sect2 id="pgpkey-jhay">
-      <title>&a.jhay;</title>
+      <title>&a.jhay.email;</title>
       &pgpkey.jhay;
     </sect2>
 
     <sect2 id="pgpkey-sheldonh">
-      <title>&a.sheldonh;</title>
+      <title>&a.sheldonh.email;</title>
       &pgpkey.sheldonh;
     </sect2>
 
     <sect2 id="pgpkey-mikeh">
-      <title>&a.mikeh;</title>
+      <title>&a.mikeh.email;</title>
       &pgpkey.mikeh;
     </sect2>
 
     <sect2 id="pgpkey-mheinen">
-      <title>&a.mheinen;</title>
+      <title>&a.mheinen.email;</title>
       &pgpkey.mheinen;
     </sect2>
 
     <sect2 id="pgpkey-niels">
-      <title>&a.niels;</title>
+      <title>&a.niels.email;</title>
       &pgpkey.niels;
     </sect2>
 
     <sect2 id="pgpkey-jh">
-      <title>&a.jh;</title>
+      <title>&a.jh.email;</title>
       &pgpkey.jh;
     </sect2>
 
     <sect2 id="pgpkey-jgh">
-      <title>&a.jgh;</title>
+      <title>&a.jgh.email;</title>
       &pgpkey.jgh;
     </sect2>
 
     <sect2 id="pgpkey-ghelmer">
-      <title>&a.ghelmer;</title>
+      <title>&a.ghelmer.email;</title>
       &pgpkey.ghelmer;
     </sect2>
 
     <sect2 id="pgpkey-mux">
-      <title>&a.mux;</title>
+      <title>&a.mux.email;</title>
       &pgpkey.mux;
     </sect2>
 
     <sect2 id="pgpkey-dhn">
-      <title>&a.dhn;</title>
+      <title>&a.dhn.email;</title>
       &pgpkey.dhn;
     </sect2>
 
     <sect2 id="pgpkey-jhibbits">
-      <title>&a.jhibbits;</title>
+      <title>&a.jhibbits.email;</title>
       &pgpkey.jhibbits;
     </sect2>
 
     <sect2 id="pgpkey-pho">
-      <title>&a.pho;</title>
+      <title>&a.pho.email;</title>
       &pgpkey.pho;
     </sect2>
 
     <sect2 id="pgpkey-mich">
-      <title>&a.mich;</title>
+      <title>&a.mich.email;</title>
       &pgpkey.mich;
     </sect2>
 
     <sect2 id="pgpkey-sunpoet">
-      <title>&a.sunpoet;</title>
+      <title>&a.sunpoet.email;</title>
       &pgpkey.sunpoet;
     </sect2>
 
     <sect2 id="pgpkey-lwhsu">
-      <title>&a.lwhsu;</title>
+      <title>&a.lwhsu.email;</title>
       &pgpkey.lwhsu;
     </sect2>
 
     <sect2 id="pgpkey-foxfair">
-      <title>&a.foxfair;</title>
+      <title>&a.foxfair.email;</title>
       &pgpkey.foxfair;
     </sect2>
 
     <sect2 id="pgpkey-chinsan">
-      <title>&a.chinsan;</title>
+      <title>&a.chinsan.email;</title>
       &pgpkey.chinsan;
     </sect2>
 
     <sect2 id="pgpkey-davide">
-      <title>&a.davide;</title>
+      <title>&a.davide.email;</title>
       &pgpkey.davide;
     </sect2>
 
     <sect2 id="pgpkey-jkh">
-      <title>&a.jkh;</title>
+      <title>&a.jkh.email;</title>
       &pgpkey.jkh;
     </sect2>
 
     <sect2 id="pgpkey-versus">
-      <title>&a.versus;</title>
+      <title>&a.versus.email;</title>
       &pgpkey.versus;
     </sect2>
 
     <sect2 id="pgpkey-weongyo">
-      <title>&a.weongyo;</title>
+      <title>&a.weongyo.email;</title>
       &pgpkey.weongyo;
     </sect2>
 
     <sect2 id="pgpkey-peterj">
-      <title>&a.peterj;</title>
+      <title>&a.peterj.email;</title>
       &pgpkey.peterj;
     </sect2>
 
     <sect2 id="pgpkey-jinmei">
-      <title>&a.jinmei;</title>
+      <title>&a.jinmei.email;</title>
       &pgpkey.jinmei;
     </sect2>
 
     <sect2 id="pgpkey-ahze">
-      <title>&a.ahze;</title>
+      <title>&a.ahze.email;</title>
       &pgpkey.ahze;
     </sect2>
 
     <sect2 id="pgpkey-trevor">
-      <title>&a.trevor;</title>
+      <title>&a.trevor.email;</title>
       &pgpkey.trevor;
     </sect2>
 
     <sect2 id="pgpkey-tj">
-      <title>&a.tj;</title>
+      <title>&a.tj.email;</title>
       &pgpkey.tj;
     </sect2>
 
     <sect2 id="pgpkey-kan">
-      <title>&a.kan;</title>
+      <title>&a.kan.email;</title>
       &pgpkey.kan;
     </sect2>
 
     <sect2 id="pgpkey-bjk">
-      <title>&a.bjk;</title>
+      <title>&a.bjk.email;</title>
       &pgpkey.bjk;
     </sect2>
 
     <sect2 id="pgpkey-phk">
-      <title>&a.phk;</title>
+      <title>&a.phk.email;</title>
       &pgpkey.phk;
     </sect2>
 
     <sect2 id="pgpkey-pluknet">
-      <title>&a.pluknet;</title>
+      <title>&a.pluknet.email;</title>
       &pgpkey.pluknet;
     </sect2>
 
     <sect2 id="pgpkey-cokane">
-      <title>&a.cokane;</title>
+      <title>&a.cokane.email;</title>
       &pgpkey.cokane;
     </sect2>
 
     <sect2 id="pgpkey-kato">
-      <title>&a.kato;</title>
+      <title>&a.kato.email;</title>
       &pgpkey.kato;

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***