docs/91192: [PATCH] take static part of pgpkeys out of localised handbooks

Siebrand Mazeland s.mazeland at xs4all.nl
Mon Jan 2 00:00:36 UTC 2006


>Number:         91192
>Category:       docs
>Synopsis:       [PATCH] take static part of pgpkeys out of localised handbooks
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 02 00:00:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Siebrand Mazeland
>Release:        FreeBSD 5.4-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD nfishbone.nitro.dk 5.4-RELEASE-p8 FreeBSD 5.4-RELEASE-p8 #8: Sun Oct 23 12:51:06 CEST 2005 simon at nfishbone.nitro.dk:/usr/obj/usr/src/sys/FISHBONE i386


	
>Description:
Currently pgpkeys/chapter.sgml contains a lot of 'static' content that is copied
in each and every localised version of the handbook.  As changes are often made
to this chapter, keeping up to date for non English translations is a time
consuming and uninspirational task.  As the blocks of entities should be exactly
the same in every localised version, I suggest to take the static parts out of
the handbook and place them in share/.  Thus the pgp keyblocks can be included
in the localised versions without having to sacrifice the parts of the chapter
that should be translated.  See below for patches and what was changed where.
>How-To-Repeat:
Check contents of handbook/pgpkeys/chapter.sgml for two languages and observe
the overlap:
http://www.freebsd.org/cgi/cvsweb.cgi/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml?rev=1.285&content-type=text/x-cvsweb-markup
http://www.freebsd.org/cgi/cvsweb.cgi/doc/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.sgml?rev=1.10&content-type=text/x-cvsweb-markup
>Fix:
1. take the static parts out of chapter.sgml and create 3 seperate files in
   /doc/share/pgpkeys/ called pgpkeys-core.sgml, pgpkeys-developers.sgml, and
   pgpkeys-officers.sgml
2. create 3 new entities in /doc/share/pgpkeys/pgpkeys.ent pointing to the
   newly created files
3. add the entities to the localised version of handbook/pgpkeys/chapter.sgml
   (done for en_US.ISO8859-1 in the patch)
4. patch /doc/share/pgpkeys/addkey.sh to conform to the new structure.

This change should not affect building other other localisations, although
this was not tested.

Thanks to: bvs@ for suggesting the change, simon@ and hrs@ for helping a bit.


Index: en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml,v
retrieving revision 1.285
diff -u -d -r1.285 chapter.sgml
--- en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml	17 Dec 2005 21:01:14 -0000	1.285
+++ en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml	1 Jan 2006 23:40:07 -0000
@@ -22,1000 +22,19 @@
   <sect1 id="pgpkeys-officers">
     <title>Officers</title>
 
-    <sect2 id="pgpkey-security-officer">
-      <title>&a.security-officer;</title>
-      &pgpkey.security-officer;
-    </sect2>
-
-    <sect2 id="pgpkey-core-secretary">
-      <title>&a.core-secretary;</title>
-      &pgpkey.core-secretary;
-    </sect2>
-
-    <sect2 id="pgpkey-portmgr-secretary">
-      <title>&a.portmgr-secretary;</title>
-      &pgpkey.portmgr-secretary;
-    </sect2>
-
+    &section.pgpkeys-officers;
   </sect1>
 
   <sect1 id="pgpkeys-core">
     <title>Core Team Members</title>
 
-    <sect2 id="pgpkey-jhb">
-      <title>&a.jhb;</title>
-      &pgpkey.jhb;
-    </sect2>
-
-    <sect2 id="pgpkey-kuriyama">
-      <title>&a.kuriyama;</title>
-      &pgpkey.kuriyama;
-    </sect2>
-
-    <sect2 id="pgpkey-imp">
-      <title>&a.imp;</title>
-      &pgpkey.imp;
-    </sect2>
-
-    <sect2 id="pgpkey-wes">
-      <title>&a.wes;</title>
-      &pgpkey.wes;
-    </sect2>
-
-    <sect2 id="pgpkey-murray">
-      <title>&a.murray;</title>
-      &pgpkey.murray;
-    </sect2>
-
-    <sect2 id="pgpkey-peter">
-      <title>&a.peter;</title>
-      &pgpkey.peter;
-    </sect2>
+    &section.pgpkeys-core;
   </sect1>
 
   <sect1 id="pgpkeys-developers">
     <title>Developers</title>
 
-    <sect2 id="pgpkey-ariff">
-      <title>&a.ariff;</title>
-      &pgpkey.ariff;
-    </sect2>
-
-    <sect2 id="pgpkey-will">
-      <title>&a.will;</title>
-      &pgpkey.will;
-    </sect2>
-
-    <sect2 id="pgpkey-anholt">
-      <title>&a.anholt;</title>
-      &pgpkey.anholt;
-    </sect2>
-
-    <sect2 id="pgpkey-mat">
-      <title>&a.mat;</title>
-      &pgpkey.mat;
-    </sect2>
-
-    <sect2 id="pgpkey-asami">
-      <title>&a.asami;</title>
-      &pgpkey.asami;
-    </sect2>
-
-    <sect2 id="pgpkey-barner">
-      <title>&a.barner;</title>
-      &pgpkey.barner;
-    </sect2>
-
-    <sect2 id="pgpkey-dougb">
-      <title>&a.dougb;</title>
-      &pgpkey.dougb;
-    </sect2>
-
-    <sect2 id="pgpkey-bvs">
-      <title>&a.bvs;</title>
-      &pgpkey.bvs;
-    </sect2>
-
-    <sect2 id="pgpkey-tobez">
-      <title>&a.tobez;</title>
-      &pgpkey.tobez;
-    </sect2>
-
-    <sect2 id="pgpkey-damien">
-      <title>&a.damien;</title>
-      &pgpkey.damien;
-    </sect2>
-
-    <sect2 id="pgpkey-tdb">
-      <title>&a.tdb;</title>
-      &pgpkey.tdb;
-    </sect2>
-
-    <sect2 id="pgpkey-mbr">
-      <title>&a.mbr;</title>
-      &pgpkey.mbr;
-    </sect2>
-
-    <sect2 id="pgpkey-novel">
-      <title>&a.novel;</title>
-      &pgpkey.novel;
-    </sect2>
-
-    <sect2 id="pgpkey-hart">
-      <title>&a.harti;</title>
-      &pgpkey.harti;
-    </sect2>
-
-    <sect2 id="pgpkey-obraun">
-      <title>&a.obraun;</title>
-      &pgpkey.obraun;
-    </sect2>
-
-    <sect2 id="pgpkey-jmb">
-      <title>&a.jmb;</title>
-      &pgpkey.jmb;
-    </sect2>
-
-    <sect2 id="pgpkey-brueffer">
-      <title>&a.brueffer;</title>
-      &pgpkey.brueffer;
-    </sect2>
-
-    <sect2 id="pgpkey-markus">
-      <title>&a.markus;</title>
-      &pgpkey.markus;
-    </sect2>
-
-    <sect2 id="pgpkey-wilko">
-      <title>&a.wilko;</title>
-      &pgpkey.wilko;
-    </sect2>
-
-    <sect2 id="pgpkey-oleg">
-      <title>&a.oleg;</title>
-      &pgpkey.oleg;
-    </sect2>
-
-    <sect2 id="pgpkey-jcamou">
-      <title>&a.jcamou;</title>
-      &pgpkey.jcamou;
-    </sect2>
-
-    <sect2 id="pgpkey-perky">
-      <title>&a.perky;</title>
-      &pgpkey.perky;
-    </sect2>
-
-    <sect2 id="pgpkey-jon">
-      <title>&a.jon;</title>
-      &pgpkey.jon;
-    </sect2>
-
-    <sect2 id="pgpkey-luoqi">
-      <title>&a.luoqi;</title>
-      &pgpkey.luoqi;
-    </sect2>
-
-    <sect2 id="pgpkey-ache">
-      <title>&a.ache;</title>
-      &pgpkey.ache;
-    </sect2>
-
-    <sect2 id="pgpkey-seanc">
-      <title>&a.seanc;</title>
-      &pgpkey.seanc;
-    </sect2>
-
-    <sect2 id="pgpkey-cjh">
-      <title>&a.cjh;</title>
-      &pgpkey.cjh;
-    </sect2>
-
-    <sect2 id="pgpkey-cjc">
-      <title>&a.cjc;</title>
-      &pgpkey.cjc;
-    </sect2>
-
-    <sect2 id="pgpkey-marcus">
-      <title>&a.marcus;</title>
-      &pgpkey.marcus;
-    </sect2>
-
-    <sect2 id="pgpkey-nik">
-      <title>&a.nik;</title>
-      &pgpkey.nik;
-    </sect2>
-
-    <sect2 id="pgpkey-aaron">
-      <title>&a.aaron;</title>
-      &pgpkey.aaron;
-    </sect2>
-
-    <sect2 id="pgpkey-ceri">
-      <title>&a.ceri;</title>
-      &pgpkey.ceri;
-    </sect2>
-
-    <sect2 id="pgpkey-brd">
-      <title>&a.brd;</title>
-      &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;
-    </sect2>
-
-    <sect2 id="pgpkey-bsd">
-      <title>&a.bsd;</title>
-      &pgpkey.bsd;
-    </sect2>
-
-    <sect2 id="pgpkey-danfe">
-      <title>&a.danfe;</title>
-      &pgpkey.danfe;
-    </sect2>
-
-    <sect2 id="pgpkey-dd">
-      <title>&a.dd;</title>
-      &pgpkey.dd;
-    </sect2>
-
-    <sect2 id="pgpkey-bruno">
-      <title>&a.bruno;</title>
-      &pgpkey.bruno;
-    </sect2>
-
-    <sect2 id="pgpkey-ale">
-      <title>&a.ale;</title>
-      &pgpkey.ale;
-    </sect2>
-
-    <sect2 id="pgpkey-peadar">
-      <title>&a.peadar;</title>
-      &pgpkey.peadar;
-    </sect2>
-
-    <sect2 id="pgpkey-josef">
-      <title>&a.josef;</title>
-      &pgpkey.josef;
-    </sect2>
-
-    <sect2 id="pgpkey-ue">
-      <title>&a.ue;</title>
-      &pgpkey.ue;
-    </sect2>
-
-    <sect2 id="pgpkey-ru">
-      <title>&a.ru;</title>
-      &pgpkey.ru;
-    </sect2>
-
-    <sect2 id="pgpkey-le">
-      <title>&a.le;</title>
-      &pgpkey.le;
-    </sect2>
-
-    <sect2 id="pgpkey-stefanf">
-      <title>&a.stefanf;</title>
-      &pgpkey.stefanf;
-    </sect2>
-
-    <sect2 id="pgpkey-jedgar">
-      <title>&a.jedgar;</title>
-      &pgpkey.jedgar;
-    </sect2>
-
-    <sect2 id="pgpkey-green">
-      <title>&a.green;</title>
-      &pgpkey.green;
-    </sect2>
-
-    <sect2 id="pgpkey-lioux">
-      <title>&a.lioux;</title>
-      &pgpkey.lioux;
-    </sect2>
-
-    <sect2 id="pgpkey-fanf">
-      <title>&a.fanf;</title>
-      &pgpkey.fanf;
-    </sect2>
-
-    <sect2 id="pgpkey-blackend">
-      <title>&a.blackend;</title>
-      &pgpkey.blackend;
-    </sect2>
-
-    <sect2 id="pgpkey-petef">
-      <title>&a.petef;</title>
-      &pgpkey.petef;
-    </sect2>
-
-    <sect2 id="pgpkey-billf">
-      <title>&a.billf;</title>
-      &pgpkey.billf;
-    </sect2>
-
-    <sect2 id="pgpkey-gioria">
-      <title>&a.gioria;</title>
-      &pgpkey.gioria;
-    </sect2>
-
-    <sect2 id="pgpkey-mnag">
-      <title>&a.mnag;</title>
-      &pgpkey.mnag;
-    </sect2>
-
-    <sect2 id="pgpkey-jmg">
-      <title>&a.jmg;</title>
-      &pgpkey.jmg;
-    </sect2>
-
-    <sect2 id="pgpkey-dannyboy">
-      <title>&a.dannyboy;</title>
-      &pgpkey.dannyboy;
-    </sect2>
-
-    <sect2 id="pgpkey-dhartmei">
-      <title>&a.dhartmei;</title>
-      &pgpkey.dhartmei;
-    </sect2>
-
-    <sect2 id="pgpkey-jhay">
-      <title>&a.jhay;</title>
-      &pgpkey.jhay;
-    </sect2>
-
-    <sect2 id="pgpkey-sheldonh">
-      <title>&a.sheldonh;</title>
-      &pgpkey.sheldonh;
-    </sect2>
-
-    <sect2 id="pgpkey-mikeh">
-      <title>&a.mikeh;</title>
-      &pgpkey.mikeh;
-    </sect2>
-
-    <sect2 id="pgpkey-mheinen">
-      <title>&a.mheinen;</title>
-      &pgpkey.mheinen;
-    </sect2>
-
-    <sect2 id="pgpkey-niels">
-      <title>&a.niels;</title>
-      &pgpkey.niels;
-    </sect2>
-
-    <sect2 id="pgpkey-ghelmer">
-      <title>&a.ghelmer;</title>
-      &pgpkey.ghelmer;
-    </sect2>
-
-    <sect2 id="pgpkey-mux">
-      <title>&a.mux;</title>
-      &pgpkey.mux;
-    </sect2>
-
-    <sect2 id="pgpkey-mich">
-      <title>&a.mich;</title>
-      &pgpkey.mich;
-    </sect2>
-
-    <sect2 id="pgpkey-foxfair">
-      <title>&a.foxfair;</title>
-      &pgpkey.foxfair;
-    </sect2>
-
-    <sect2 id="pgpkey-jkh">
-      <title>&a.jkh;</title>
-      &pgpkey.jkh;
-    </sect2>
-
-    <sect2 id="pgpkey-ahze">
-      <title>&a.ahze;</title>
-      &pgpkey.ahze;
-    </sect2>
-
-    <sect2 id="pgpkey-trevor">
-      <title>&a.trevor;</title>
-      &pgpkey.trevor;
-    </sect2>
-
-    <sect2 id="pgpkey-phk">
-      <title>&a.phk;</title>
-      &pgpkey.phk;
-    </sect2>
-
-    <sect2 id="pgpkey-joe">
-      <title>&a.joe;</title>
-      &pgpkey.joe;
-    </sect2>
-
-    <sect2 id="pgpkey-vkashyap">
-      <title>&a.vkashyap;</title>
-      &pgpkey.vkashyap;
-    </sect2>
-
-    <sect2 id="pgpkey-kris">
-      <title>&a.kris;</title>
-      &pgpkey.kris;
-    </sect2>
-
-    <sect2 id="pgpkey-keramida">
-      <title>&a.keramida;</title>
-      &pgpkey.keramida;
-    </sect2>
-
-    <sect2 id="pgpkey-fjoe">
-      <title>&a.fjoe;</title>
-      &pgpkey.fjoe;
-    </sect2>
-
-    <sect2 id="pgpkey-jkim">
-      <title>&a.jkim;</title>
-      &pgpkey.jkim;
-    </sect2>
-
-    <sect2 id="pgpkey-andreas">
-      <title>&a.andreas;</title>
-      &pgpkey.andreas;
-    </sect2>
-
-    <sect2 id="pgpkey-jkois">
-      <title>&a.jkois;</title>
-      &pgpkey.jkois;
-    </sect2>
-
-    <sect2 id="pgpkey-sergei">
-      <title>&a.sergei;</title>
-      &pgpkey.sergei;
-    </sect2>
-
-    <sect2 id="pgpkey-maxim">
-       <title>&a.maxim;</title>
-       &pgpkey.maxim;
-    </sect2>
-
-    <sect2 id="pgpkey-jkoshy">
-      <title>&a.jkoshy;</title>
-      &pgpkey.jkoshy;
-    </sect2>
-
-    <sect2 id="pgpkey-rik">
-      <title>&a.rik;</title>
-      &pgpkey.rik;
-    </sect2>
-
-    <sect2 id="pgpkey-rushani">
-      <title>&a.rushani;</title>
-      &pgpkey.rushani;
-    </sect2>
-
-    <sect2 id="pgpkey-clement">
-      <title>&a.clement;</title>
-      &pgpkey.clement;
-    </sect2>
-
-    <sect2 id="pgpkey-mlaier">
-      <title>&a.mlaier;</title>
-      &pgpkey.mlaier;
-    </sect2>
-
-    <sect2 id="pgpkey-erwin">
-      <title>&a.erwin;</title>
-      &pgpkey.erwin;
-    </sect2>
-
-    <sect2 id="pgpkey-lawrance">
-      <title>&a.lawrance;</title>
-      &pgpkey.lawrance;
-    </sect2>
-
-    <sect2 id="pgpkey-leeym">
-      <title>&a.leeym;</title>
-      &pgpkey.leeym;
-    </sect2>
-
-    <sect2 id="pgpkey-sam">
-      <title>&a.sam;</title>
-      &pgpkey.sam;
-    </sect2>
-
-    <sect2 id="pgpkey-jylefort">
-      <title>&a.jylefort;</title>
-      &pgpkey.jylefort;
-    </sect2>
-
-    <sect2 id="pgpkey-netchild">
-      <title>&a.netchild;</title>
-      &pgpkey.netchild;
-    </sect2>
-
-    <sect2 id="pgpkey-lesi">
-      <title>&a.lesi;</title>
-      &pgpkey.lesi;
-    </sect2>
-
-    <sect2 id="pgpkey-glewis">
-      <title>&a.glewis;</title>
-      &pgpkey.glewis;
-    </sect2>
-
-    <sect2 id="pgpkey-delphij">
-      <title>&a.delphij;</title>
-      &pgpkey.delphij;
-    </sect2>
-
-    <sect2 id="pgpkey-avatar">
-      <title>&a.avatar;</title>
-      &pgpkey.avatar;
-    </sect2>
-
-    <sect2 id="pgpkey-ijliao">
-      <title>&a.ijliao;</title>
-      &pgpkey.ijliao;
-    </sect2>
-
-    <sect2 id="pgpkey-clive">
-      <title>&a.clive;</title>
-      &pgpkey.clive;
-    </sect2>
-
-    <sect2 id="pgpkey-clsung">
-      <title>&a.clsung;</title>
-      &pgpkey.clsung;
-    </sect2>
-
-    <sect2 id="pgpkey-arved">
-      <title>&a.arved;</title>
-      &pgpkey.arved;
-    </sect2>
-
-    <sect2 id="pgpkey-remko">
-      <title>&a.remko;</title>
-      &pgpkey.remko;
-    </sect2>
-
-    <sect2 id="pgpkey-scottl">
-      <title>&a.scottl;</title>
-      &pgpkey.scottl;
-    </sect2>
-
-    <sect2 id="pgpkey-pav">
-      <title>&a.pav;</title>
-      &pgpkey.pav;
-    </sect2>
-
-    <sect2 id="pgpkey-bmah">
-      <title>&a.bmah;</title>
-      &pgpkey.bmah;
-    </sect2>
-
-    <sect2 id="pgpkey-mtm">
-      <title>&a.mtm;</title>
-      &pgpkey.mtm;
-    </sect2>
-
-    <sect2 id="pgpkey-dwmalone">
-      <title>&a.dwmalone;</title>
-      &pgpkey.dwmalone;
-    </sect2>
-
-    <sect2 id="pgpkey-sem">
-      <title>&a.sem;</title>
-      &pgpkey.sem;
-    </sect2>
-
-    <sect2 id="pgpkey-ehaupt">
-      <title>&a.ehaupt;</title>
-      &pgpkey.ehaupt;
-    </sect2>
-
-    <sect2 id="pgpkey-kwm">
-      <title>&a.kwm;</title>
-      &pgpkey.kwm;
-    </sect2>
-
-    <sect2 id="pgpkey-matusita">
-      <title>&a.matusita;</title>
-      &pgpkey.matusita;
-    </sect2>
-
-    <sect2 id="pgpkey-tmclaugh">
-      <title>&a.tmclaugh;</title>
-      &pgpkey.tmclaugh;
-    </sect2>
-
-    <sect2 id="pgpkey-ken">
-      <title>&a.ken;</title>
-      &pgpkey.ken;
-    </sect2>
-
-    <sect2 id="pgpkey-dinoex">
-      <title>&a.dinoex;</title>
-      &pgpkey.dinoex;
-    </sect2>
-
-    <sect2 id="pgpkey-sanpei">
-      <title>&a.sanpei;</title>
-      &pgpkey.sanpei;
-    </sect2>
-
-    <sect2 id="pgpkey-marcel">
-      <title>&a.marcel;</title>
-      &pgpkey.marcel;
-    </sect2>
-
-    <sect2 id="pgpkey-marck">
-      <title>&a.marck;</title>
-      &pgpkey.marck;
-    </sect2>
-
-    <sect2 id="pgpkey-tmm">
-      <title>&a.tmm;</title>
-      &pgpkey.tmm;
-    </sect2>
-
-    <sect2 id="pgpkey-rich">
-      <title>&a.rich;</title>
-      &pgpkey.rich;
-    </sect2>
-
-    <sect2 id="pgpkey-knu">
-      <title>&a.knu;</title>
-      &pgpkey.knu;
-    </sect2>
-
-    <sect2 id="pgpkey-max">
-      <title>&a.max;</title>
-      &pgpkey.max;
-    </sect2>
-
-    <sect2 id="pgpkey-yoichi">
-      <title>&a.yoichi;</title>
-      &pgpkey.yoichi;
-    </sect2>
-
-    <sect2 id="pgpkey-bland">
-      <title>&a.bland;</title>
-      &pgpkey.bland;
-    </sect2>
-
-    <sect2 id="pgpkey-simon">
-      <title>&a.simon;</title>
-      &pgpkey.simon;
-    </sect2>
-
-    <sect2 id="pgpkey-anders">
-      <title>&a.anders;</title>
-      &pgpkey.anders;
-    </sect2>
-
-    <sect2 id="pgpkey-obrien">
-      <title>&a.obrien;</title>
-      &pgpkey.obrien;
-    </sect2>
-
-    <sect2 id="pgpkey-philip">
-      <title>&a.philip;</title>
-      &pgpkey.philip;
-    </sect2>
-
-    <sect2 id="pgpkey-hmp">
-      <title>&a.hmp;</title>
-      &pgpkey.hmp;
-    </sect2>
-		    
-    <sect2 id="pgpkey-mp">
-      <title>&a.mp;</title>
-      &pgpkey.mp;
-    </sect2>
-
-    <sect2 id="pgpkey-roam">
-      <title>&a.roam;</title>
-      &pgpkey.roam;
-    </sect2>
-
-    <sect2 id="pgpkey-den">
-      <title>&a.den;</title>
-      &pgpkey.den;
-    </sect2>
-
-    <sect2 id="pgpkey-gerald">
-      <title>&a.gerald;</title>
-      &pgpkey.gerald;
-    </sect2>
-
-    <sect2 id="pgpkey-jdp">
-      <title>&a.jdp;</title>
-      &pgpkey.jdp;
-    </sect2>
-
-    <sect2 id="pgpkey-krion">
-      <title>&a.krion;</title>
-      &pgpkey.krion;
-    </sect2>
-
-    <sect2 id="pgpkey-markp">
-      <title>&a.markp;</title>
-      &pgpkey.markp;
-    </sect2>
-
-    <sect2 id="pgpkey-thomas">
-      <title>&a.thomas;</title>
-      &pgpkey.thomas;
-    </sect2>
-
-    <sect2 id="pgpkey-hq">
-      <title>&a.hq;</title>
-      &pgpkey.hq;
-    </sect2>
-
-    <sect2 id="pgpkey-dfr">
-      <title>&a.dfr;</title>
-      &pgpkey.dfr;
-    </sect2>
-
-    <sect2 id="pgpkey-rees">
-      <title>&a.rees;</title>
-      &pgpkey.rees;
-    </sect2>
-
-    <sect2 id="pgpkey-trhodes">
-      <title>&a.trhodes;</title>
-      &pgpkey.trhodes;
-    </sect2>
-
-    <sect2 id="pgpkey-benno">
-      <title>&a.benno;</title>
-      &pgpkey.benno;
-    </sect2>
-
-    <sect2 id="pgpkey-roberto">
-      <title>&a.roberto;</title>
-      &pgpkey.roberto;
-    </sect2>
-
-    <sect2 id="pgpkey-rodrigc">
-      <title>&a.rodrigc;</title>
-      &pgpkey.rodrigc;
-    </sect2>
-
-    <sect2 id="pgpkey-guido">
-      <title>&a.guido;</title>
-      &pgpkey.guido;
-    </sect2>
-
-    <sect2 id="pgpkey-niklas">
-      <title>&a.niklas;</title>
-      &pgpkey.niklas;
-    </sect2>
-
-    <sect2 id="pgpkey-marks">
-      <title>&a.marks;</title>
-      &pgpkey.marks;
-    </sect2>
-
-    <sect2 id="pgpkey-hrs">
-      <title>&a.hrs;</title>
-      &pgpkey.hrs;
-    </sect2>
-
-    <sect2 id="pgpkey-wosch">
-      <title>&a.wosch;</title>
-      &pgpkey.wosch;
-    </sect2>
-
-    <sect2 id="pgpkey-das">
-      <title>&a.das;</title>
-      &pgpkey.das;
-    </sect2>
-
-    <sect2 id="pgpkey-schweikh">
-      <title>&a.schweikh;</title>
-      &pgpkey.schweikh;
-    </sect2>
-
-    <sect2 id="pgpkey-gshapiro">
-      <title>&a.gshapiro;</title>
-      &pgpkey.gshapiro;
-    </sect2>
-
-    <sect2 id="pgpkey-arun">
-      <title>&a.arun;</title>
-      &pgpkey.arun;
-    </sect2>
-
-    <sect2 id="pgpkey-nork">
-      <title>&a.nork;</title>
-      &pgpkey.nork;
-    </sect2>
-
-    <sect2 id="pgpkey-vanilla">
-      <title>&a.vanilla;</title>
-      &pgpkey.vanilla;
-    </sect2>
-
-    <sect2 id="pgpkey-demon">
-      <title>&a.demon;</title>
-      &pgpkey.demon;
-    </sect2>
-
-    <sect2 id="pgpkey-jesper">
-      <title>&a.jesper;</title>
-      &pgpkey.jesper;
-    </sect2>
-
-    <sect2 id="pgpkey-scop">
-      <title>&a.scop;</title>
-      &pgpkey.scop;
-    </sect2>
-
-    <sect2 id="pgpkey-anray">
-      <title>&a.anray;</title>
-      &pgpkey.anray;
-    </sect2>
-
-    <sect2 id="pgpkey-glebius">
-      <title>&a.glebius;</title>
-      &pgpkey.glebius;
-    </sect2>
-
-    <sect2 id="pgpkey-kensmith">
-      <title>&a.kensmith;</title>
-      &pgpkey.kensmith;
-    </sect2>
-
-    <sect2 id="pgpkey-ben">
-      <title>&a.ben;</title>
-      &pgpkey.ben;
-    </sect2>
-
-    <sect2 id="pgpkey-des">
-      <title>&a.des;</title>
-      &pgpkey.des;
-    </sect2>
-
-    <sect2 id="pgpkey-sobomax">
-      <title>&a.sobomax;</title>
-      &pgpkey.sobomax;
-    </sect2>
-
-    <sect2 id="pgpkey-brian">
-      <title>&a.brian;</title>
-      &pgpkey.brian;
-    </sect2>
-
-    <sect2 id="pgpkey-nsouch">
-      <title>&a.nsouch;</title>
-      &pgpkey.nsouch;
-    </sect2>
-
-    <sect2 id="pgpkey-ssouhlal">
-      <title>&a.ssouhlal;</title>
-      &pgpkey.ssouhlal;
-    </sect2>
-    
-    <sect2 id="pgpkey-vsevolod">
-      <title>&a.vsevolod;</title>
-      &pgpkey.vsevolod;
-    </sect2>
-
-    <sect2 id="pgpkey-vs">
-      <title>&a.vs;</title>
-      &pgpkey.vs;
-    </sect2>
-
-    <sect2 id="pgpkey-gsutter">
-      <title>&a.gsutter;</title>
-      &pgpkey.gsutter;
-    </sect2>
-
-    <sect2 id="pgpkey-metal">
-      <title>&a.metal;</title>
-      &pgpkey.metal;
-    </sect2>
-
-    <sect2 id="pgpkey-garys">
-      <title>&a.garys;</title>
-      &pgpkey.garys;
-    </sect2>
-
-    <sect2 id="pgpkey-nyan">
-      <title>&a.nyan;</title>
-      &pgpkey.nyan;
-    </sect2>
-
-    <sect2 id="pgpkey-mi">
-      <title>&a.mi;</title>
-      &pgpkey.mi;
-    </sect2>
-
-    <sect2 id="pgpkey-gordon">
-      <title>&a.gordon;</title>
-      &pgpkey.gordon;
-    </sect2>
-
-    <sect2 id="pgpkey-lth">
-      <title>&a.lth;</title>
-      &pgpkey.lth;
-    </sect2>
-
-    <sect2 id="pgpkey-thierry">
-      <title>&a.thierry;</title>
-      &pgpkey.thierry;
-    </sect2>
-
-    <sect2 id="pgpkey-thompsa">
-      <title>&a.thompsa;</title>
-      &pgpkey.thompsa;
-    </sect2>
-
-    <sect2 id="pgpkey-flz">
-      <title>&a.flz;</title>
-      &pgpkey.flz;
-    </sect2>
-
-    <sect2 id="pgpkey-ume">
-      <title>&a.ume;</title>
-      &pgpkey.ume;
-    </sect2>
-
-    <sect2 id="pgpkey-ups">
-      <title>&a.ups;</title>
-      &pgpkey.ups;
-    </sect2>
-
-    <sect2 id="pgpkey-nectar">
-      <title>&a.nectar;</title>
-      &pgpkey.nectar;
-    </sect2>
-
-    <sect2 id="pgpkey-adamw">
-      <title>&a.adamw;</title>
-      &pgpkey.adamw;
-    </sect2>
-
-    <sect2 id="pgpkey-nate">
-      <title>&a.nate;</title>
-      &pgpkey.nate;
-    </sect2>
-
-    <sect2 id="pgpkey-wollman">
-      <title>&a.wollman;</title>
-      &pgpkey.wollman;
-    </sect2>
-
-    <sect2 id="pgpkey-joerg">
-      <title>&a.joerg;</title>
-      &pgpkey.joerg;
-    </sect2>
-
-    <sect2 id="pgpkey-emax">
-      <title>&a.emax;</title>
-      &pgpkey.emax;
-    </sect2>
-
-    <sect2 id="pgpkey-bz">
-      <title>&a.bz;</title>
-      &pgpkey.bz;
-    </sect2>
-
-    <sect2 id="pgpkey-phantom">
-      <title>&a.phantom;</title>
-      &pgpkey.phantom;
-    </sect2>
-
+    &section.pgpkeys-developers;
   </sect1>
 </appendix>
 
Index: share/pgpkeys/addkey.sh
===================================================================
RCS file: /home/ncvs/doc/share/pgpkeys/addkey.sh,v
retrieving revision 1.4
diff -u -d -r1.4 addkey.sh
--- share/pgpkeys/addkey.sh	21 May 2005 09:47:42 -0000	1.4
+++ share/pgpkeys/addkey.sh	1 Jan 2006 23:35:33 -0000
@@ -72,10 +72,9 @@
 
 echo
 echo "Unless you are already listed there, you should now add the"
-echo "following text to"
-echo "doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml"
-echo "in the appropriate position of the developer section (unless"
-echo "this is a role key or you are a core member)."
+echo "following text to pgpkeys-developers.sgml (unless this is a"
+echo "role key or you are a core member. In that case add to"
+echo "pgpkeys-officers.sgml or pgpkeys-core.sgml)."
 echo "Remember to keep the list sorted by last name!"
 echo
 echo "    <sect2 id=\"pgpkey-${me}\">"
@@ -85,4 +84,5 @@
 echo
 echo "If this is a new entry, don't forget to 'cvs add ${keyfile}',"
 echo "and to commit each of ${keyfile}, pgpkeys.ent and"
-echo "doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml."
+echo "pgpkeys-developers.sgml, pgpkeys-officers.sgml, or"
+echo "pgpkeys-core.sgml."
Index: share/pgpkeys/pgpkeys-core.sgml
===================================================================
RCS file: share/pgpkeys/pgpkeys-core.sgml
diff -N share/pgpkeys/pgpkeys-core.sgml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ share/pgpkeys/pgpkeys-core.sgml	1 Jan 2006 23:34:45 -0000
@@ -0,0 +1,35 @@
+<!--
+     The FreeBSD Documentation Project
+
+     $FreeBSD$
+-->
+
+    <sect2 id="pgpkey-jhb">
+      <title>&a.jhb;</title>
+      &pgpkey.jhb;
+    </sect2>
+
+    <sect2 id="pgpkey-kuriyama">
+      <title>&a.kuriyama;</title>
+      &pgpkey.kuriyama;
+    </sect2>
+
+    <sect2 id="pgpkey-imp">
+      <title>&a.imp;</title>
+      &pgpkey.imp;
+    </sect2>
+
+    <sect2 id="pgpkey-wes">
+      <title>&a.wes;</title>
+      &pgpkey.wes;
+    </sect2>
+
+    <sect2 id="pgpkey-murray">
+      <title>&a.murray;</title>
+      &pgpkey.murray;
+    </sect2>
+
+    <sect2 id="pgpkey-peter">
+      <title>&a.peter;</title>
+      &pgpkey.peter;
+    </sect2>
Index: share/pgpkeys/pgpkeys-developers.sgml
===================================================================
RCS file: share/pgpkeys/pgpkeys-developers.sgml
diff -N share/pgpkeys/pgpkeys-developers.sgml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ share/pgpkeys/pgpkeys-developers.sgml	1 Jan 2006 23:34:45 -0000
@@ -0,0 +1,945 @@
+<!--
+     The FreeBSD Documentation Project
+
+     $FreeBSD$
+-->
+
+    <sect2 id="pgpkey-ariff">
+      <title>&a.ariff;</title>
+      &pgpkey.ariff;
+    </sect2>
+
+    <sect2 id="pgpkey-will">
+      <title>&a.will;</title>
+      &pgpkey.will;
+    </sect2>
+
+    <sect2 id="pgpkey-anholt">
+      <title>&a.anholt;</title>
+      &pgpkey.anholt;
+    </sect2>
+
+    <sect2 id="pgpkey-mat">
+      <title>&a.mat;</title>
+      &pgpkey.mat;
+    </sect2>
+
+    <sect2 id="pgpkey-asami">
+      <title>&a.asami;</title>
+      &pgpkey.asami;
+    </sect2>
+
+    <sect2 id="pgpkey-barner">
+      <title>&a.barner;</title>
+      &pgpkey.barner;
+    </sect2>
+
+    <sect2 id="pgpkey-dougb">
+      <title>&a.dougb;</title>
+      &pgpkey.dougb;
+    </sect2>
+
+    <sect2 id="pgpkey-bvs">
+      <title>&a.bvs;</title>
+      &pgpkey.bvs;
+    </sect2>
+
+    <sect2 id="pgpkey-tobez">
+      <title>&a.tobez;</title>
+      &pgpkey.tobez;
+    </sect2>
+
+    <sect2 id="pgpkey-damien">
+      <title>&a.damien;</title>
+      &pgpkey.damien;
+    </sect2>
+
+    <sect2 id="pgpkey-tdb">
+      <title>&a.tdb;</title>
+      &pgpkey.tdb;
+    </sect2>
+
+    <sect2 id="pgpkey-mbr">
+      <title>&a.mbr;</title>
+      &pgpkey.mbr;
+    </sect2>
+
+    <sect2 id="pgpkey-novel">
+      <title>&a.novel;</title>
+      &pgpkey.novel;
+    </sect2>
+
+    <sect2 id="pgpkey-hart">
+      <title>&a.harti;</title>
+      &pgpkey.harti;
+    </sect2>
+
+    <sect2 id="pgpkey-obraun">
+      <title>&a.obraun;</title>
+      &pgpkey.obraun;
+    </sect2>
+
+    <sect2 id="pgpkey-jmb">
+      <title>&a.jmb;</title>
+      &pgpkey.jmb;
+    </sect2>
+
+    <sect2 id="pgpkey-brueffer">
+      <title>&a.brueffer;</title>
+      &pgpkey.brueffer;
+    </sect2>
+
+    <sect2 id="pgpkey-markus">
+      <title>&a.markus;</title>
+      &pgpkey.markus;
+    </sect2>
+
+    <sect2 id="pgpkey-wilko">
+      <title>&a.wilko;</title>
+      &pgpkey.wilko;
+    </sect2>
+
+    <sect2 id="pgpkey-oleg">
+      <title>&a.oleg;</title>
+      &pgpkey.oleg;
+    </sect2>
+
+    <sect2 id="pgpkey-jcamou">
+      <title>&a.jcamou;</title>
+      &pgpkey.jcamou;
+    </sect2>
+
+    <sect2 id="pgpkey-perky">
+      <title>&a.perky;</title>
+      &pgpkey.perky;
+    </sect2>
+
+    <sect2 id="pgpkey-jon">
+      <title>&a.jon;</title>
+      &pgpkey.jon;
+    </sect2>
+
+    <sect2 id="pgpkey-luoqi">
+      <title>&a.luoqi;</title>
+      &pgpkey.luoqi;
+    </sect2>
+
+    <sect2 id="pgpkey-ache">
+      <title>&a.ache;</title>
+      &pgpkey.ache;
+    </sect2>
+
+    <sect2 id="pgpkey-seanc">
+      <title>&a.seanc;</title>
+      &pgpkey.seanc;
+    </sect2>
+
+    <sect2 id="pgpkey-cjh">
+      <title>&a.cjh;</title>
+      &pgpkey.cjh;
+    </sect2>
+
+    <sect2 id="pgpkey-cjc">
+      <title>&a.cjc;</title>
+      &pgpkey.cjc;
+    </sect2>
+
+    <sect2 id="pgpkey-marcus">
+      <title>&a.marcus;</title>
+      &pgpkey.marcus;
+    </sect2>
+
+    <sect2 id="pgpkey-nik">
+      <title>&a.nik;</title>
+      &pgpkey.nik;
+    </sect2>
+
+    <sect2 id="pgpkey-aaron">
+      <title>&a.aaron;</title>
+      &pgpkey.aaron;
+    </sect2>
+
+    <sect2 id="pgpkey-ceri">
+      <title>&a.ceri;</title>
+      &pgpkey.ceri;
+    </sect2>
+
+    <sect2 id="pgpkey-brd">
+      <title>&a.brd;</title>
+      &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;
+    </sect2>
+
+    <sect2 id="pgpkey-bsd">
+      <title>&a.bsd;</title>
+      &pgpkey.bsd;
+    </sect2>
+
+    <sect2 id="pgpkey-danfe">
+      <title>&a.danfe;</title>
+      &pgpkey.danfe;
+    </sect2>
+
+    <sect2 id="pgpkey-dd">
+      <title>&a.dd;</title>
+      &pgpkey.dd;
+    </sect2>
+
+    <sect2 id="pgpkey-bruno">
+      <title>&a.bruno;</title>
+      &pgpkey.bruno;
+    </sect2>
+
+    <sect2 id="pgpkey-ale">
+      <title>&a.ale;</title>
+      &pgpkey.ale;
+    </sect2>
+
+    <sect2 id="pgpkey-peadar">
+      <title>&a.peadar;</title>
+      &pgpkey.peadar;
+    </sect2>
+
+    <sect2 id="pgpkey-josef">
+      <title>&a.josef;</title>
+      &pgpkey.josef;
+    </sect2>
+
+    <sect2 id="pgpkey-ue">
+      <title>&a.ue;</title>
+      &pgpkey.ue;
+    </sect2>
+
+    <sect2 id="pgpkey-ru">
+      <title>&a.ru;</title>
+      &pgpkey.ru;
+    </sect2>
+
+    <sect2 id="pgpkey-le">
+      <title>&a.le;</title>
+      &pgpkey.le;
+    </sect2>
+
+    <sect2 id="pgpkey-stefanf">
+      <title>&a.stefanf;</title>
+      &pgpkey.stefanf;
+    </sect2>
+
+    <sect2 id="pgpkey-jedgar">
+      <title>&a.jedgar;</title>
+      &pgpkey.jedgar;
+    </sect2>
+
+    <sect2 id="pgpkey-green">
+      <title>&a.green;</title>
+      &pgpkey.green;
+    </sect2>
+
+    <sect2 id="pgpkey-lioux">
+      <title>&a.lioux;</title>
+      &pgpkey.lioux;
+    </sect2>
+
+    <sect2 id="pgpkey-fanf">
+      <title>&a.fanf;</title>
+      &pgpkey.fanf;
+    </sect2>
+
+    <sect2 id="pgpkey-blackend">
+      <title>&a.blackend;</title>
+      &pgpkey.blackend;
+    </sect2>
+
+    <sect2 id="pgpkey-petef">
+      <title>&a.petef;</title>
+      &pgpkey.petef;
+    </sect2>
+
+    <sect2 id="pgpkey-billf">
+      <title>&a.billf;</title>
+      &pgpkey.billf;
+    </sect2>
+
+    <sect2 id="pgpkey-gioria">
+      <title>&a.gioria;</title>
+      &pgpkey.gioria;
+    </sect2>
+
+    <sect2 id="pgpkey-mnag">
+      <title>&a.mnag;</title>
+      &pgpkey.mnag;
+    </sect2>
+
+    <sect2 id="pgpkey-jmg">
+      <title>&a.jmg;</title>
+      &pgpkey.jmg;
+    </sect2>
+
+    <sect2 id="pgpkey-dannyboy">
+      <title>&a.dannyboy;</title>
+      &pgpkey.dannyboy;
+    </sect2>
+
+    <sect2 id="pgpkey-dhartmei">
+      <title>&a.dhartmei;</title>
+      &pgpkey.dhartmei;
+    </sect2>
+
+    <sect2 id="pgpkey-jhay">
+      <title>&a.jhay;</title>
+      &pgpkey.jhay;
+    </sect2>
+
+    <sect2 id="pgpkey-sheldonh">
+      <title>&a.sheldonh;</title>
+      &pgpkey.sheldonh;
+    </sect2>
+
+    <sect2 id="pgpkey-mikeh">
+      <title>&a.mikeh;</title>
+      &pgpkey.mikeh;
+    </sect2>
+
+    <sect2 id="pgpkey-mheinen">
+      <title>&a.mheinen;</title>
+      &pgpkey.mheinen;
+    </sect2>
+
+    <sect2 id="pgpkey-niels">
+      <title>&a.niels;</title>
+      &pgpkey.niels;
+    </sect2>
+
+    <sect2 id="pgpkey-ghelmer">
+      <title>&a.ghelmer;</title>
+      &pgpkey.ghelmer;
+    </sect2>
+
+    <sect2 id="pgpkey-mux">
+      <title>&a.mux;</title>
+      &pgpkey.mux;
+    </sect2>
+
+    <sect2 id="pgpkey-mich">
+      <title>&a.mich;</title>
+      &pgpkey.mich;
+    </sect2>
+
+    <sect2 id="pgpkey-foxfair">
+      <title>&a.foxfair;</title>
+      &pgpkey.foxfair;
+    </sect2>
+
+    <sect2 id="pgpkey-jkh">
+      <title>&a.jkh;</title>
+      &pgpkey.jkh;
+    </sect2>
+
+    <sect2 id="pgpkey-ahze">
+      <title>&a.ahze;</title>
+      &pgpkey.ahze;
+    </sect2>
+
+    <sect2 id="pgpkey-trevor">
+      <title>&a.trevor;</title>
+      &pgpkey.trevor;
+    </sect2>
+
+    <sect2 id="pgpkey-phk">
+      <title>&a.phk;</title>
+      &pgpkey.phk;
+    </sect2>
+
+    <sect2 id="pgpkey-joe">
+      <title>&a.joe;</title>
+      &pgpkey.joe;
+    </sect2>
+
+    <sect2 id="pgpkey-vkashyap">
+      <title>&a.vkashyap;</title>
+      &pgpkey.vkashyap;
+    </sect2>
+
+    <sect2 id="pgpkey-kris">
+      <title>&a.kris;</title>
+      &pgpkey.kris;
+    </sect2>
+
+    <sect2 id="pgpkey-keramida">
+      <title>&a.keramida;</title>
+      &pgpkey.keramida;
+    </sect2>
+
+    <sect2 id="pgpkey-fjoe">
+      <title>&a.fjoe;</title>
+      &pgpkey.fjoe;
+    </sect2>
+
+    <sect2 id="pgpkey-jkim">
+      <title>&a.jkim;</title>
+      &pgpkey.jkim;
+    </sect2>
+
+    <sect2 id="pgpkey-andreas">
+      <title>&a.andreas;</title>
+      &pgpkey.andreas;
+    </sect2>
+
+    <sect2 id="pgpkey-jkois">
+      <title>&a.jkois;</title>
+      &pgpkey.jkois;
+    </sect2>
+
+    <sect2 id="pgpkey-sergei">
+      <title>&a.sergei;</title>
+      &pgpkey.sergei;
+    </sect2>
+
+    <sect2 id="pgpkey-maxim">
+       <title>&a.maxim;</title>
+       &pgpkey.maxim;
+    </sect2>
+
+    <sect2 id="pgpkey-jkoshy">
+      <title>&a.jkoshy;</title>
+      &pgpkey.jkoshy;
+    </sect2>
+
+    <sect2 id="pgpkey-rik">
+      <title>&a.rik;</title>
+      &pgpkey.rik;
+    </sect2>
+
+    <sect2 id="pgpkey-rushani">
+      <title>&a.rushani;</title>
+      &pgpkey.rushani;
+    </sect2>
+
+    <sect2 id="pgpkey-clement">
+      <title>&a.clement;</title>
+      &pgpkey.clement;
+    </sect2>
+
+    <sect2 id="pgpkey-mlaier">
+      <title>&a.mlaier;</title>
+      &pgpkey.mlaier;
+    </sect2>
+
+    <sect2 id="pgpkey-erwin">
+      <title>&a.erwin;</title>
+      &pgpkey.erwin;
+    </sect2>
+
+    <sect2 id="pgpkey-lawrance">
+      <title>&a.lawrance;</title>
+      &pgpkey.lawrance;
+    </sect2>
+
+    <sect2 id="pgpkey-leeym">
+      <title>&a.leeym;</title>
+      &pgpkey.leeym;
+    </sect2>
+
+    <sect2 id="pgpkey-sam">
+      <title>&a.sam;</title>
+      &pgpkey.sam;
+    </sect2>
+
+    <sect2 id="pgpkey-jylefort">
+      <title>&a.jylefort;</title>
+      &pgpkey.jylefort;
+    </sect2>
+
+    <sect2 id="pgpkey-netchild">
+      <title>&a.netchild;</title>
+      &pgpkey.netchild;
+    </sect2>
+
+    <sect2 id="pgpkey-lesi">
+      <title>&a.lesi;</title>
+      &pgpkey.lesi;
+    </sect2>
+
+    <sect2 id="pgpkey-glewis">
+      <title>&a.glewis;</title>
+      &pgpkey.glewis;
+    </sect2>
+
+    <sect2 id="pgpkey-delphij">
+      <title>&a.delphij;</title>
+      &pgpkey.delphij;
+    </sect2>
+
+    <sect2 id="pgpkey-avatar">
+      <title>&a.avatar;</title>
+      &pgpkey.avatar;
+    </sect2>
+
+    <sect2 id="pgpkey-ijliao">
+      <title>&a.ijliao;</title>
+      &pgpkey.ijliao;
+    </sect2>
+
+    <sect2 id="pgpkey-clive">
+      <title>&a.clive;</title>
+      &pgpkey.clive;
+    </sect2>
+
+    <sect2 id="pgpkey-clsung">
+      <title>&a.clsung;</title>
+      &pgpkey.clsung;
+    </sect2>
+
+    <sect2 id="pgpkey-arved">
+      <title>&a.arved;</title>
+      &pgpkey.arved;
+    </sect2>
+
+    <sect2 id="pgpkey-remko">
+      <title>&a.remko;</title>
+      &pgpkey.remko;
+    </sect2>
+
+    <sect2 id="pgpkey-scottl">
+      <title>&a.scottl;</title>
+      &pgpkey.scottl;
+    </sect2>
+
+    <sect2 id="pgpkey-pav">
+      <title>&a.pav;</title>
+      &pgpkey.pav;
+    </sect2>
+
+    <sect2 id="pgpkey-bmah">
+      <title>&a.bmah;</title>
+      &pgpkey.bmah;
+    </sect2>
+
+    <sect2 id="pgpkey-mtm">
+      <title>&a.mtm;</title>
+      &pgpkey.mtm;
+    </sect2>
+
+    <sect2 id="pgpkey-dwmalone">
+      <title>&a.dwmalone;</title>
+      &pgpkey.dwmalone;
+    </sect2>
+
+    <sect2 id="pgpkey-sem">
+      <title>&a.sem;</title>
+      &pgpkey.sem;
+    </sect2>
+
+    <sect2 id="pgpkey-ehaupt">
+      <title>&a.ehaupt;</title>
+      &pgpkey.ehaupt;
+    </sect2>
+
+    <sect2 id="pgpkey-kwm">
+      <title>&a.kwm;</title>
+      &pgpkey.kwm;
+    </sect2>
+
+    <sect2 id="pgpkey-matusita">
+      <title>&a.matusita;</title>
+      &pgpkey.matusita;
+    </sect2>
+
+    <sect2 id="pgpkey-tmclaugh">
+      <title>&a.tmclaugh;</title>
+      &pgpkey.tmclaugh;
+    </sect2>
+
+    <sect2 id="pgpkey-ken">
+      <title>&a.ken;</title>
+      &pgpkey.ken;
+    </sect2>
+
+    <sect2 id="pgpkey-dinoex">
+      <title>&a.dinoex;</title>
+      &pgpkey.dinoex;
+    </sect2>
+
+    <sect2 id="pgpkey-sanpei">
+      <title>&a.sanpei;</title>
+      &pgpkey.sanpei;
+    </sect2>
+
+    <sect2 id="pgpkey-marcel">
+      <title>&a.marcel;</title>
+      &pgpkey.marcel;
+    </sect2>
+
+    <sect2 id="pgpkey-marck">
+      <title>&a.marck;</title>
+      &pgpkey.marck;
+    </sect2>
+
+    <sect2 id="pgpkey-tmm">
+      <title>&a.tmm;</title>
+      &pgpkey.tmm;
+    </sect2>
+
+    <sect2 id="pgpkey-rich">
+      <title>&a.rich;</title>
+      &pgpkey.rich;
+    </sect2>
+
+    <sect2 id="pgpkey-knu">
+      <title>&a.knu;</title>
+      &pgpkey.knu;
+    </sect2>
+
+    <sect2 id="pgpkey-max">
+      <title>&a.max;</title>
+      &pgpkey.max;
+    </sect2>
+
+    <sect2 id="pgpkey-yoichi">
+      <title>&a.yoichi;</title>
+      &pgpkey.yoichi;
+    </sect2>
+
+    <sect2 id="pgpkey-bland">
+      <title>&a.bland;</title>
+      &pgpkey.bland;
+    </sect2>
+
+    <sect2 id="pgpkey-simon">
+      <title>&a.simon;</title>
+      &pgpkey.simon;
+    </sect2>
+
+    <sect2 id="pgpkey-anders">
+      <title>&a.anders;</title>
+      &pgpkey.anders;
+    </sect2>
+
+    <sect2 id="pgpkey-obrien">
+      <title>&a.obrien;</title>
+      &pgpkey.obrien;
+    </sect2>
+
+    <sect2 id="pgpkey-philip">
+      <title>&a.philip;</title>
+      &pgpkey.philip;
+    </sect2>
+
+    <sect2 id="pgpkey-hmp">
+      <title>&a.hmp;</title>
+      &pgpkey.hmp;
+    </sect2>
+		    
+    <sect2 id="pgpkey-mp">
+      <title>&a.mp;</title>
+      &pgpkey.mp;
+    </sect2>
+
+    <sect2 id="pgpkey-roam">
+      <title>&a.roam;</title>
+      &pgpkey.roam;
+    </sect2>
+
+    <sect2 id="pgpkey-den">
+      <title>&a.den;</title>
+      &pgpkey.den;
+    </sect2>
+
+    <sect2 id="pgpkey-gerald">
+      <title>&a.gerald;</title>
+      &pgpkey.gerald;
+    </sect2>
+
+    <sect2 id="pgpkey-jdp">
+      <title>&a.jdp;</title>
+      &pgpkey.jdp;
+    </sect2>
+
+    <sect2 id="pgpkey-krion">
+      <title>&a.krion;</title>
+      &pgpkey.krion;
+    </sect2>
+
+    <sect2 id="pgpkey-markp">
+      <title>&a.markp;</title>
+      &pgpkey.markp;
+    </sect2>
+
+    <sect2 id="pgpkey-thomas">
+      <title>&a.thomas;</title>
+      &pgpkey.thomas;
+    </sect2>
+
+    <sect2 id="pgpkey-hq">
+      <title>&a.hq;</title>
+      &pgpkey.hq;
+    </sect2>
+
+    <sect2 id="pgpkey-dfr">
+      <title>&a.dfr;</title>
+      &pgpkey.dfr;
+    </sect2>
+
+    <sect2 id="pgpkey-rees">
+      <title>&a.rees;</title>
+      &pgpkey.rees;
+    </sect2>
+
+    <sect2 id="pgpkey-trhodes">
+      <title>&a.trhodes;</title>
+      &pgpkey.trhodes;
+    </sect2>
+
+    <sect2 id="pgpkey-benno">
+      <title>&a.benno;</title>
+      &pgpkey.benno;
+    </sect2>
+
+    <sect2 id="pgpkey-roberto">
+      <title>&a.roberto;</title>
+      &pgpkey.roberto;
+    </sect2>
+
+    <sect2 id="pgpkey-rodrigc">
+      <title>&a.rodrigc;</title>
+      &pgpkey.rodrigc;
+    </sect2>
+
+    <sect2 id="pgpkey-guido">
+      <title>&a.guido;</title>
+      &pgpkey.guido;
+    </sect2>
+
+    <sect2 id="pgpkey-niklas">
+      <title>&a.niklas;</title>
+      &pgpkey.niklas;
+    </sect2>
+
+    <sect2 id="pgpkey-marks">
+      <title>&a.marks;</title>
+      &pgpkey.marks;
+    </sect2>
+
+    <sect2 id="pgpkey-hrs">
+      <title>&a.hrs;</title>
+      &pgpkey.hrs;
+    </sect2>
+
+    <sect2 id="pgpkey-wosch">
+      <title>&a.wosch;</title>
+      &pgpkey.wosch;
+    </sect2>
+
+    <sect2 id="pgpkey-das">
+      <title>&a.das;</title>
+      &pgpkey.das;
+    </sect2>
+
+    <sect2 id="pgpkey-schweikh">
+      <title>&a.schweikh;</title>
+      &pgpkey.schweikh;
+    </sect2>
+
+    <sect2 id="pgpkey-gshapiro">
+      <title>&a.gshapiro;</title>
+      &pgpkey.gshapiro;
+    </sect2>
+
+    <sect2 id="pgpkey-arun">
+      <title>&a.arun;</title>
+      &pgpkey.arun;
+    </sect2>
+
+    <sect2 id="pgpkey-nork">
+      <title>&a.nork;</title>
+      &pgpkey.nork;
+    </sect2>
+
+    <sect2 id="pgpkey-vanilla">
+      <title>&a.vanilla;</title>
+      &pgpkey.vanilla;
+    </sect2>
+
+    <sect2 id="pgpkey-demon">
+      <title>&a.demon;</title>
+      &pgpkey.demon;
+    </sect2>
+
+    <sect2 id="pgpkey-jesper">
+      <title>&a.jesper;</title>
+      &pgpkey.jesper;
+    </sect2>
+
+    <sect2 id="pgpkey-scop">
+      <title>&a.scop;</title>
+      &pgpkey.scop;
+    </sect2>
+
+    <sect2 id="pgpkey-anray">
+      <title>&a.anray;</title>
+      &pgpkey.anray;
+    </sect2>
+
+    <sect2 id="pgpkey-glebius">
+      <title>&a.glebius;</title>
+      &pgpkey.glebius;
+    </sect2>
+
+    <sect2 id="pgpkey-kensmith">
+      <title>&a.kensmith;</title>
+      &pgpkey.kensmith;
+    </sect2>
+
+    <sect2 id="pgpkey-ben">
+      <title>&a.ben;</title>
+      &pgpkey.ben;
+    </sect2>
+
+    <sect2 id="pgpkey-des">
+      <title>&a.des;</title>
+      &pgpkey.des;
+    </sect2>
+
+    <sect2 id="pgpkey-sobomax">
+      <title>&a.sobomax;</title>
+      &pgpkey.sobomax;
+    </sect2>
+
+    <sect2 id="pgpkey-brian">
+      <title>&a.brian;</title>
+      &pgpkey.brian;
+    </sect2>
+
+    <sect2 id="pgpkey-nsouch">
+      <title>&a.nsouch;</title>
+      &pgpkey.nsouch;
+    </sect2>
+
+    <sect2 id="pgpkey-ssouhlal">
+      <title>&a.ssouhlal;</title>
+      &pgpkey.ssouhlal;
+    </sect2>
+    
+    <sect2 id="pgpkey-vsevolod">
+      <title>&a.vsevolod;</title>
+      &pgpkey.vsevolod;
+    </sect2>
+
+    <sect2 id="pgpkey-vs">
+      <title>&a.vs;</title>
+      &pgpkey.vs;
+    </sect2>
+
+    <sect2 id="pgpkey-gsutter">
+      <title>&a.gsutter;</title>
+      &pgpkey.gsutter;
+    </sect2>
+
+    <sect2 id="pgpkey-metal">
+      <title>&a.metal;</title>
+      &pgpkey.metal;
+    </sect2>
+
+    <sect2 id="pgpkey-garys">
+      <title>&a.garys;</title>
+      &pgpkey.garys;
+    </sect2>
+
+    <sect2 id="pgpkey-nyan">
+      <title>&a.nyan;</title>
+      &pgpkey.nyan;
+    </sect2>
+
+    <sect2 id="pgpkey-mi">
+      <title>&a.mi;</title>
+      &pgpkey.mi;
+    </sect2>
+
+    <sect2 id="pgpkey-gordon">
+      <title>&a.gordon;</title>
+      &pgpkey.gordon;
+    </sect2>
+
+    <sect2 id="pgpkey-lth">
+      <title>&a.lth;</title>
+      &pgpkey.lth;
+    </sect2>
+
+    <sect2 id="pgpkey-thierry">
+      <title>&a.thierry;</title>
+      &pgpkey.thierry;
+    </sect2>
+
+    <sect2 id="pgpkey-thompsa">
+      <title>&a.thompsa;</title>
+      &pgpkey.thompsa;
+    </sect2>
+
+    <sect2 id="pgpkey-flz">
+      <title>&a.flz;</title>
+      &pgpkey.flz;
+    </sect2>
+
+    <sect2 id="pgpkey-ume">
+      <title>&a.ume;</title>
+      &pgpkey.ume;
+    </sect2>
+
+    <sect2 id="pgpkey-ups">
+      <title>&a.ups;</title>
+      &pgpkey.ups;
+    </sect2>
+
+    <sect2 id="pgpkey-nectar">
+      <title>&a.nectar;</title>
+      &pgpkey.nectar;
+    </sect2>
+
+    <sect2 id="pgpkey-adamw">
+      <title>&a.adamw;</title>
+      &pgpkey.adamw;
+    </sect2>
+
+    <sect2 id="pgpkey-nate">
+      <title>&a.nate;</title>
+      &pgpkey.nate;
+    </sect2>
+
+    <sect2 id="pgpkey-wollman">
+      <title>&a.wollman;</title>
+      &pgpkey.wollman;
+    </sect2>
+
+    <sect2 id="pgpkey-joerg">
+      <title>&a.joerg;</title>
+      &pgpkey.joerg;
+    </sect2>
+
+    <sect2 id="pgpkey-emax">
+      <title>&a.emax;</title>
+      &pgpkey.emax;
+    </sect2>
+
+    <sect2 id="pgpkey-bz">
+      <title>&a.bz;</title>
+      &pgpkey.bz;
+    </sect2>
+
+    <sect2 id="pgpkey-phantom">
+      <title>&a.phantom;</title>
+      &pgpkey.phantom;
+    </sect2>
Index: share/pgpkeys/pgpkeys-officers.sgml
===================================================================
RCS file: share/pgpkeys/pgpkeys-officers.sgml
diff -N share/pgpkeys/pgpkeys-officers.sgml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ share/pgpkeys/pgpkeys-officers.sgml	1 Jan 2006 23:34:45 -0000
@@ -0,0 +1,20 @@
+<!--
+     The FreeBSD Documentation Project
+
+     $FreeBSD$
+-->
+
+    <sect2 id="pgpkey-security-officer">
+      <title>&a.security-officer;</title>
+      &pgpkey.security-officer;
+    </sect2>
+
+    <sect2 id="pgpkey-core-secretary">
+      <title>&a.core-secretary;</title>
+      &pgpkey.core-secretary;
+    </sect2>
+
+    <sect2 id="pgpkey-portmgr-secretary">
+      <title>&a.portmgr-secretary;</title>
+      &pgpkey.portmgr-secretary;
+    </sect2>
Index: share/pgpkeys/pgpkeys.ent
===================================================================
RCS file: /home/ncvs/doc/share/pgpkeys/pgpkeys.ent,v
retrieving revision 1.93
diff -u -d -r1.93 pgpkeys.ent
--- share/pgpkeys/pgpkeys.ent	17 Dec 2005 22:28:18 -0000	1.93
+++ share/pgpkeys/pgpkeys.ent	1 Jan 2006 23:35:17 -0000
@@ -211,3 +211,9 @@
 <!ENTITY pgpkey.wollman SYSTEM "wollman.key">
 <!ENTITY pgpkey.wosch SYSTEM "wosch.key">
 <!ENTITY pgpkey.yoichi SYSTEM "yoichi.key">
+
+<!-- PGP keyblocks -->
+<!ENTITY section.pgpkeys-core		SYSTEM "pgpkeys-core.sgml">
+<!ENTITY section.pgpkeys-developers	SYSTEM "pgpkeys-developers.sgml">
+<!ENTITY section.pgpkeys-officers	SYSTEM "pgpkeys-officers.sgml">
+
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-doc mailing list