diff --git a/ja_JP.eucJP/share/sgml/authors.ent b/ja_JP.eucJP/share/sgml/authors.ent
index 456a74676d..187c5a7241 100644
--- a/ja_JP.eucJP/share/sgml/authors.ent
+++ b/ja_JP.eucJP/share/sgml/authors.ent
@@ -1,660 +1,190 @@
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.174
+     $FreeBSD: doc/ja_JP.eucJP/share/sgml/authors.ent,v 1.66 2001/08/05 11:39:23 kuriyama Exp $
 
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.65 2001/07/18 19:29:08 hrs Exp $
+     These entities are for Japanese freefall committers to replace their
+     names of English with ones of Japanese.  To activate this,
+     explicit declaration of the public identifier is still needed.
 
      Names and email address of contributing authors and CVS committers.
      Entity names for committers should be the same as their login names on
      freefall.FreeBSD.org.
 
      Use these entities when referencing people.
 
      Please keep this list in alphabetical order by entity names.
 
      IMPORTANT:  If you delete names from this file you *must* ensure that
                  all references to them have been removed from the handbook's
                  translations.  If they haven't then you *will* break the
                  builds for the other languages, and we will poke fun of you
                  in public.
 -->
 
-<!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.org</email>">
-
-<!ENTITY a.ache "Andrey A. Chernov <email>ache@FreeBSD.org</email>">
-
-<!ENTITY a.adam  "Adam David <email>adam@FreeBSD.org</email>">
-
-<!ENTITY a.ade "Ade Lovett <email>ade@FreeBSD.org</email>">
-
-<!ENTITY a.adrian "Adrian Chadd <email>adrian@FreeBSD.org</email>">
-
 <!ENTITY a.akiyama "秋山 俊輔 <email>akiyama@FreeBSD.org</email>">
 
-<!ENTITY a.alc "Alan L. Cox <email>alc@FreeBSD.org</email>">
-
-<!ENTITY a.alex "Alexander Langer <email>alex@FreeBSD.org</email>">
-
-<!ENTITY a.alfred "Alfred Perlstein <email>alfred@FreeBSD.org</email>">
-
 <!ENTITY a.amurai  "村井 淳 <email>amurai@FreeBSD.org</email>">
 
-<!ENTITY a.andreas "Andreas Klemm <email>andreas@FreeBSD.org</email>">
-
-<!ENTITY a.andy "Andrey Zakhvatov <email>andy@FreeBSD.org</email>">
-
-<!ENTITY a.archie "Archie Cobbs <email>archie@FreeBSD.org</email>">
-
 <!ENTITY a.asami "浅見 賢 <email>asami@FreeBSD.org</email>">
 
-<!ENTITY a.asmodai "Jeroen Ruigrok/Asmodai <email>asmodai@FreeBSD.org</email>">
-
-<!ENTITY a.assar "Assar Westerlund <email>assar@FreeBSD.org</email>">
-
-<!ENTITY a.ats  "Andreas Schulz <email>ats@FreeBSD.org</email>">
-
-<!ENTITY a.awebster "Andrew Webster <email>awebster@pubnix.net</email>">
-
-<!ENTITY a.babkin  "Sergey Babkin <email>babkin@FreeBSD.org</email>">
-
-<!ENTITY a.bbraun  "Rob Braun <email>bbraun@FreeBSD.org</email>">
-
-<!ENTITY a.bde  "Bruce Evans <email>bde@FreeBSD.org</email>">
-
-<!ENTITY a.ben  "Ben Smithurst <email>ben@FreeBSD.org</email>">
-
-<!ENTITY a.bean  "Rebecca Visger <email>bean@FreeBSD.org</email>">
-
-<!ENTITY a.benno  "Benno Rice <email>benno@FreeBSD.org</email>">
-
-<!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.org</email>">
-
-<!ENTITY a.bmah "Bruce A. Mah <email>bmah@FreeBSD.org</email>">
-
-<!ENTITY a.bmilekic "Bosko Milekic <email>bmilekic@FreeBSD.org</email>">
-
-<!ENTITY a.bp "Boris Popov <email>bp@FreeBSD.org</email>">
-
-<!ENTITY a.brandon  "Brandon Gillespie <email>brandon@FreeBSD.org</email>">
-
-<!ENTITY a.brian "Brian Somers <email>brian@FreeBSD.org</email>">
-
-<!ENTITY a.brooks "Brooks Davis <email>brooks@FreeBSD.org</email>">
-
-<!ENTITY a.bsd "Brian S. Dean <email>bsd@FreeBSD.org</email>">
-
-<!ENTITY a.cawimm "Charles A. Wimmer <email>cawimm@FreeBSD.org</email>">
-
-<!ENTITY a.cg "Cameron Grant <email>cg@FreeBSD.org</email>">
-
-<!ENTITY a.charnier "Philippe Charnier <email>charnier@FreeBSD.org</email>">
-
-<!ENTITY a.chern "Chern Lee <email>chern@FreeBSD.org</email>">
-
-<!ENTITY a.chm "Christoph Herrmann <email>chm@FreeBSD.org</email>">
-
-<!ENTITY a.chris "Chris Costello <email>chris@FreeBSD.org</email>">
-
-<!ENTITY a.chuck "Chuck Robey <email>chuckr@glue.umd.edu</email>">
-
-<!ENTITY a.chuckr "Chuck Robey <email>chuckr@FreeBSD.org</email>">
-
-<!ENTITY a.cjc "Crist J. Clark <email>cjc@FreeBSD.org</email>">
-
-<!ENTITY a.cjh "Junho CHOI <email>cjh@FreeBSD.org</email>">
-
-<!ENTITY a.clive "Clive Lin <email>clive@FreeBSD.org</email>">
-
-<!ENTITY a.cp "Chuck Paterson <email>cp@FreeBSD.org</email>">
-
-<!ENTITY a.cokane "Coleman Kane <email>cokane@FreeBSD.org</email>">
-
-<!ENTITY a.cpiazza "Chris Piazza <email>cpiazza@FreeBSD.org</email>">
-
-<!ENTITY a.cracauer "Martin Cracauer <email>cracauer@FreeBSD.org</email>">
-
-<!ENTITY a.csgr  "Geoff Rehmet <email>csgr@FreeBSD.org</email>">
-
-<!ENTITY a.cshumway "Christopher Shumway <email>cshumway@FreeBSD.org</email>">
-
-<!ENTITY a.cwt  "Chris Timmons <email>cwt@FreeBSD.org</email>">
-
-<!ENTITY a.dan	"Dan Moschuk <email>dan@FreeBSD.org</email>">
-
-<!ENTITY a.danny  "Daniel O'Callaghan <email>danny@FreeBSD.org</email>">
-
-<!ENTITY a.dannyboy "Daniel Harris <email>dannyboy@FreeBSD.org</email>">
-
-<!ENTITY a.darrenr "Darren Reed <email>darrenr@FreeBSD.org</email>">
-
-<!ENTITY a.davidn "David Nugent <email>davidn@blaze.net.au</email>">
-
-<!ENTITY a.dbaker "Daniel Baker <email>dbaker@FreeBSD.org</email>">
-
-<!ENTITY a.dburr "Donald Burr <email>dburr@FreeBSD.org</email>">
-
-<!ENTITY a.dcs "Daniel C. Sobral <email>dcs@FreeBSD.org</email>">
-
-<!ENTITY a.dd "Dima Dorfman <email>dd@FreeBSD.org</email>">
-
-<!ENTITY a.dec "David E. Cross <email>dec@FreeBSD.org</email>">
-
-<!ENTITY a.demon "Dmitry Sivachenko <email>demon@FreeBSD.org</email>">
-
-<!ENTITY a.deischen "Daniel Eischen <email>deischen@FreeBSD.org</email>">
-
-<!ENTITY a.des "Dag-Erling C. Sm&oslash;rgrav <email>des@FreeBSD.org</email>">
-
-<!ENTITY a.dfr  "Doug Rabson <email>dfr@FreeBSD.org</email>">
-
-<!ENTITY a.dg "David Greenman <email>dg@FreeBSD.org</email>">
-
-<!ENTITY a.dick "Richard Seaman Jr. <email>dick@FreeBSD.org</email>">
-
-<!ENTITY a.dillon "Matthew Dillon <email>dillon@FreeBSD.org</email>">
-
-<!ENTITY a.dima  "Dima Ruban <email>dima@FreeBSD.org</email>">
-
-<!ENTITY a.dinoex "Dirk Meyer <email>dinoex@FreeBSD.org</email>">
-
-<!ENTITY a.dirk "Dirk Fr&ouml;mberg <email>dirk@FreeBSD.org</email>">
-
-<!ENTITY a.dirkvangulik  "Dirk-Willem van Gulik <email>Dirk.vanGulik@jrc.it</email>">
-
-<!ENTITY a.dmlb "Duncan Barclay <email>dmlb@FreeBSD.org</email>">
-
-<!ENTITY a.dougb  "Doug Barton <email>DougB@FreeBSD.org</email>">
-
-<!ENTITY a.dt "Dmitrij Tejblum <email>dt@FreeBSD.org</email>">
-
-<!ENTITY a.dufault "Peter Dufault <email>dufault@FreeBSD.org</email>">
-
-<!ENTITY a.dwcjr "David W. Chapman Jr. <email>dwcjr@FreeBSD.org</email>">
-
-<!ENTITY a.dwhite "Doug White <email>dwhite@FreeBSD.org</email>">
-
-<!ENTITY a.dwmalone "David Malone <email>dwmalone@FreeBSD.org</email>">
-
-<!ENTITY a.dyson "John Dyson <email>dyson@FreeBSD.org</email>">
-
-<!ENTITY a.eivind  "Eivind Eklund <email>eivind@FreeBSD.org</email>">
-
-<!ENTITY a.ejc "Eric J. Chet <email>ejc@FreeBSD.org</email>">
-
-<!ENTITY a.eric "Eric Melville <email>eric@FreeBSD.org</email>">
-
-<!ENTITY a.erich  "Eric L. Hernes <email>erich@FreeBSD.org</email>">
-
 <!ENTITY a.faq "FAQ 保守担当者 <email>faq@FreeBSD.org</email>">
 
-<!ENTITY a.fenner  "Bill Fenner <email>fenner@FreeBSD.org</email>">
-
 <!ENTITY a.flathill "平岡 征一朗 <email>flathill@FreeBSD.org</email>">
 
-<!ENTITY a.foxfair "Howard F. Hu <email>foxfair@FreeBSD.org</email>">
-
-<!ENTITY a.fsmp "Steve Passe <email>fsmp@FreeBSD.org</email>">
-
 <!ENTITY a.furuta  "古田 敦 <email>furuta@FreeBSD.org</email>">
 
-<!ENTITY a.gad "Garance A Drosehn <email>gad@FreeBSD.org</email>">
-
-<!ENTITY a.gallatin "Andrew Gallatin <email>gallatin@FreeBSD.org</email>">
-
-<!ENTITY a.gclarkii "Gary Clark II <email>gclarkii@FreeBSD.org</email>">
-
-<!ENTITY a.gena "Gennady B. Sorokopud <email>gena@NetVision.net.il</email>">
-
-<!ENTITY a.ghelmer "Guy Helmer <email>ghelmer@cs.iastate.edu</email>">
-
-<!ENTITY a.gibbs "Justin T. Gibbs <email>gibbs@FreeBSD.org</email>">
-
-<!ENTITY a.gioria "Sebastien Gioria <email>gioria@FreeBSD.org</email>">
-
-<!ENTITY a.gj  "Gary Jennejohn <email>gj@FreeBSD.org</email>">
-
-<!ENTITY a.gpalmer "Gary Palmer <email>gpalmer@FreeBSD.org</email>">
-
-<!ENTITY a.graichen  "Thomas Graichen <email>graichen@FreeBSD.org</email>">
-
-<!ENTITY a.green  "Brian F. Feldman <email>green@FreeBSD.org</email>">
-
-<!ENTITY a.greid "George C. A. Reid <email>greid@FreeBSD.org</email>">
-
-<!ENTITY a.grog "Greg Lehey <email>grog@FreeBSD.org</email>">
-
-<!ENTITY a.groudier "Gerard Roudier <email>groudier@club-internet.fr</email>">
-
-<!ENTITY a.gryphon "Coranth Gryphon <email>gryphon@healer.com</email>">
-
-<!ENTITY a.gshapiro "Gregory Neil Shapiro <email>gshapiro@FreeBSD.org</email>">
-
-<!ENTITY a.gsutter "Gregory Sutter <email>gsutter@FreeBSD.org</email>">
-
-<!ENTITY a.guido  "Guido van Rooij <email>guido@FreeBSD.org</email>">
-
 <!ENTITY a.hanai "花井 浩之 <email>hanai@FreeBSD.org</email>">
 
-<!ENTITY a.handy "Brian N. Handy <email>handy@sxt4.physics.montana.edu</email>">
-
 <!ENTITY a.hrs "佐藤 広生 <email>hrs@FreeBSD.org</email>">
 
-<!ENTITY a.roger "Roger Hardiman <email>roger@freebsd.org</email>">
-
-<!ENTITY a.helbig "Wolfgang Helbig <email>helbig@FreeBSD.org</email>">
-
-<!ENTITY a.hm "Hellmuth Michaelis <email>hm@FreeBSD.org</email>">
-
-<!ENTITY a.hoek "Tim Vanderhoek <email>hoek@FreeBSD.org</email>">
-
 <!ENTITY a.horikawa  "堀川 和雄 <email>horikawa@FreeBSD.org</email>">
 
 <!ENTITY a.hosokawa  "細川 達己 <email>hosokawa@FreeBSD.org</email>">
 
-<!ENTITY a.hsu  "Jeffrey Hsu <email>hsu@FreeBSD.org</email>">
-
-<!ENTITY a.iedowse "Ian Dowse <email>iedowse@FreeBSD.org</email>">
-
-<!ENTITY a.ijliao "Ying-Chieh Liao <email>ijliao@FreeBSD.org</email>">
-
-<!ENTITY a.imp "Warner Losh <email>imp@FreeBSD.org</email>">
-
-<!ENTITY a.imura  "R. Imura <email>imura@FreeBSD.org</email>">
-
 <!ENTITY a.issei "鈴木 一生 <email>issei@FreeBSD.org</email>">
 
 <!ENTITY a.itojun "萩野 (itojun) 純一郎 <email>itojun@itojun.org</email>">
 
 <!ENTITY a.iwasaki "岩崎 満 <email>iwasaki@FreeBSD.org</email>">
 
-<!ENTITY a.jake "Jake Burkholder <email>jake@FreeBSD.org</email>">
-
-<!ENTITY a.jasone "Jason Evans <email>jasone@FreeBSD.org</email>">
-
-<!ENTITY a.jayanth "Jayanth Vijayaraghavan <email>jayanth@FreeBSD.org</email>">
-
-<!ENTITY a.jb  "John Birrell <email>jb@cimlogic.com.au</email>">
-
-<!ENTITY a.jdp  "John Polstra <email>jdp@FreeBSD.org</email>">
-
-<!ENTITY a.jedgar "Chris D. Faulhaber <email>jedgar@FreeBSD.org</email>">
-
-<!ENTITY a.jeh "James Housley <email>jeh@FreeBSD.org</email>">
-
-<!ENTITY a.jehamby "Jake Hamby <email>jehamby@lightside.com</email>">
-
-<!ENTITY a.jesper "Jesper Skriver <email>jesper@FreeBSD.org</email>">
-
-<!ENTITY a.jesusr "Jesus Rodriguez <email>jesusr@FreeBSD.org</email>">
-
-<!ENTITY a.jfieber "John Fieber <email>jfieber@FreeBSD.org</email>">
-
-<!ENTITY a.jfitz "James FitzGibbon <email>jfitz@FreeBSD.org</email>">
-
-<!ENTITY a.jgreco "Joe Greco <email>jgreco@FreeBSD.org</email>">
-
-<!ENTITY a.jhay "John Hay <email>jhay@FreeBSD.org</email>">
-
-<!ENTITY a.jhb "John Baldwin <email>jhb@FreeBSD.org</email>">
-
-<!ENTITY a.jhs "Julian Stacey <email>jhs@FreeBSD.org</email>">
-
-<!ENTITY a.jim "Jim Mock <email>jim@FreeBSD.org</email>">
-
-<!ENTITY a.jkh "Jordan K. Hubbard <email>jkh@FreeBSD.org</email>">
-
-<!ENTITY a.jkoshy "Joseph Koshy <email>jkoshy@FreeBSD.org</email>">
-
-<!ENTITY a.jlemon  "Jonathan Lemon <email>jlemon@FreeBSD.org</email>">
-
-<!ENTITY a.jlind "John Lind <email>john@starfire.MN.ORG</email>">
-
-<!ENTITY a.jlrobin  "James L. Robinson <email>jlrobin@FreeBSD.org</email>">
-
-<!ENTITY a.jmacd  "Joshua Peck Macdonald <email>jmacd@FreeBSD.org</email>">
-
-<!ENTITY a.jmas  "Jose M. Alcaide <email>jmas@FreeBSD.org</email>">
-
-<!ENTITY a.jmb  "Jonathan M. Bresler <email>jmb@FreeBSD.org</email>">
-
-<!ENTITY a.jmg  "John-Mark Gurney <email>jmg@FreeBSD.org</email>">
-
-<!ENTITY a.jmz  "Jean-Marc Zucconi <email>jmz@FreeBSD.org</email>">
-
-<!ENTITY a.joe "Josef Karthauser <email>joe@FreeBSD.org</email>">
-
-<!ENTITY a.keichii "Michael C. Wu <email>keichii@FreeBSD.org</email>">
-
-<!ENTITY a.joerg "J&ouml;rg Wunsch <email>joerg@FreeBSD.org</email>">
-
-<!ENTITY a.jon "Jonathan Chen <email>jon@FreeBSD.org</email>">
-
-<!ENTITY a.john "John Cavanaugh <email>john@FreeBSD.org</email>">
-
-<!ENTITY a.jraynard "James Raynard <email>jraynard@FreeBSD.org</email>">
-
-<!ENTITY a.jseger "Justin Seger <email>jseger@FreeBSD.org</email>">
-
-<!ENTITY a.julian  "Julian Elischer <email>julian@FreeBSD.org</email>">
-
-<!ENTITY a.jwd  "John W. DeBoskey <email>jwd@FreeBSD.org</email>">
-
-<!ENTITY a.jvh  "Johannes Helander <email>jvh@FreeBSD.org</email>">
-
-<!ENTITY a.karl  "Karl Strickland <email>karl@FreeBSD.org</email>">
-
 <!ENTITY a.kato "加藤 丈典 <email>kato@FreeBSD.org</email>">
 
-<!ENTITY a.kbyanc "Kelly Yancey <email>kbyanc@FreeBSD.org</email>">
-
-<!ENTITY a.keith "Jing-Tang Keith Jang <email>keith@FreeBSD.org</email>">
-
-<!ENTITY a.kelly "Sean Kelly <email>kelly@ad1440.net</email>">
-
-<!ENTITY a.ken "Kenneth D. Merry <email>ken@FreeBSD.org</email>">
-
-<!ENTITY a.kevlo "Kevin Lo <email>kevlo@FreeBSD.org</email>">
-
 <!ENTITY a.kiri "桐山 和彦 <email>kiri@FreeBSD.org</email>">
 
 <!ENTITY a.kjc "長 健二朗 <email>kjc@FreeBSD.org</email>">
 
 <!ENTITY a.knu "武者 晶紀 <email>knu@FreeBSD.org</email>">
 
-<!ENTITY a.kris "Kris Kennaway <email>kris@FreeBSD.org</email>">
-
 <!ENTITY a.kuriyama "栗山 淳 <email>kuriyama@FreeBSD.org</email>">
 
-<!ENTITY a.lars  "Lars Fredriksen <email>lars@FreeBSD.org</email>">
-
-<!ENTITY a.lile  "Larry Lile <email>lile@FreeBSD.org</email>">
-
-<!ENTITY a.lioux "M&aacute;rio S&eacute;rgio Fujikawa Ferreira<email>lioux@FreeBSD.org</email>">
-
-<!ENTITY a.ljo  "L Jonas Olsson <email>ljo@FreeBSD.org</email>">
-
-<!ENTITY a.lkoeller  "Lars Koeller <email>lkoeller@FreeBSD.org</email>">
-
-<!ENTITY a.logo "Valentino Vaschetto <email>logo@blackened.com</email>">
-
-<!ENTITY a.luigi  "Luigi Rizzo <email>luigi@FreeBSD.org</email>">
-
-<!ENTITY a.luoqi "Luoqi Chen <email>luoqi@FreeBSD.org</email>">
-
-<!ENTITY a.marcel "Marcel Moolenaar <email>marcel@FreeBSD.org</email>">
-
-<!ENTITY a.markm  "Mark Murray <email>markm@FreeBSD.org</email>">
-
-<!ENTITY a.marko  "Mark Ovens <email>marko@FreeBSD.org</email>">
-
-<!ENTITY a.markp  "Mark Pulford <email>markp@FreeBSD.org</email>">
-
-<!ENTITY a.martin  "Martin Renters <email>martin@FreeBSD.org</email>">
-
 <!ENTITY a.max "中根 雅文 <email>max@FreeBSD.org</email>">
 
-<!ENTITY a.mayo "Mark Mayo <email>mark@vmunix.com</email>">
-
-<!ENTITY a.mb  "Maxim Bolotin <email>mb@FreeBSD.org</email>">
-
-<!ENTITY a.mbarkah "Ade Barkah <email>mbarkah@FreeBSD.org</email>">
-
-<!ENTITY a.mckay "Stephen McKay <email>mckay@FreeBSD.org</email>">
-
-<!ENTITY a.mckusick "Kirk McKusick <email>mckusick@FreeBSD.org</email>">
-
-<!ENTITY a.md "Mark Dapoz <email>md@bsc.no</email>">
-
-<!ENTITY a.mdodd "Matthew N. Dodd <email>winter@jurai.net</email>">
-
-<!ENTITY a.mharo  "Michael Haro <email>mharo@FreeBSD.org</email>">
-
-<!ENTITY a.mi  "Mikhail Teterin <email>mi@FreeBSD.org</email>">
-
-<!ENTITY a.mike  "Mike Barcroft <email>mike@FreeBSD.org</email>">
-
-<!ENTITY a.mikeh  "Mike Heffner <email>mikeh@FreeBSD.org</email>">
-
 <!ENTITY a.mita  "三田 吉郎 <email>mita@FreeBSD.org</email>">
 
-<!ENTITY a.mjacob "Matthew Jacob <email>mjacob@FreeBSD.org</email>">
-
-<!ENTITY a.mks "Mike Spengler <email>mks@FreeBSD.org</email>">
-
 <!ENTITY a.motoyuki "今野 元之 <email>motoyuki@FreeBSD.org</email>">
 
-<!ENTITY a.mp "Mark Peek <email>mp@FreeBSD.org</email>">
-
-<!ENTITY a.mph "Matthew Hunt <email>mph@FreeBSD.org</email>">
-
-<!ENTITY a.mpp  "Mike Pritchard <email>mpp@FreeBSD.org</email>">
-
-<!ENTITY a.msmith "Michael Smith <email>msmith@FreeBSD.org</email>">
-
-<!ENTITY a.mtaylor "Mark J. Taylor <email>mtaylor@FreeBSD.org</email>">
-
-<!ENTITY a.murray "Murray Stokely <email>murray@FreeBSD.org</email>">
-
 <!ENTITY a.nakai  "中井 幸博 <email>nakai@FreeBSD.org</email>">
 
-<!ENTITY a.nate  "Nate Williams <email>nate@FreeBSD.org</email>">
-
-<!ENTITY a.nbm  "Neil Blakey-Milner <email>nbm@FreeBSD.org</email>">
-
-<!ENTITY a.nectar "Jacques Vidrine <email>nectar@FreeBSD.org</email>">
-
-<!ENTITY a.newton "Mark Newton <email>newton@FreeBSD.org</email>">
-
-<!ENTITY a.nhibma "Nick Hibma <email>n_hibma@FreeBSD.org</email>">
-
-<!ENTITY a.nik "Nik Clayton <email>nik@FreeBSD.org</email>">
-
 <!ENTITY a.non "光永 法明 <email>non@FreeBSD.org</email>">
 
-<!ENTITY a.nsayer  "Nick Sayer <email>nsayer@FreeBSD.org</email>">
-
-<!ENTITY a.nsj "Nate Johnson <email>nsj@FreeBSD.org</email>">
-
-<!ENTITY a.nsouch  "Nicolas Souchu <email>nsouch@FreeBSD.org</email>">
-
 <!ENTITY a.nyan "高橋 佳大 <email>nyan@FreeBSD.org</email>">
 
-<!ENTITY a.obrien "David O'Brien <email>obrien@FreeBSD.org</email>">
-
 <!ENTITY a.okazaki "岡崎 哲朗 <email>okazaki@FreeBSD.org</email>">
 
-<!ENTITY a.olah  "Andras Olah <email>olah@FreeBSD.org</email>">
-
-<!ENTITY a.olgeni "Jimmy Olgeni <email>olgeni@FreeBSD.org</email>">
-
 <!ENTITY a.onoe "尾上 淳 <email>onoe@FreeBSD.org</email>">
 
-<!ENTITY a.opsys "Chris Watson <email>opsys@open-systems.net</email>">
-
-<!ENTITY a.orion "Orion Hodson <email>orion@FreeBSD.org</email>">
-
-<!ENTITY a.patrick "Patrick S. Gardella <email>patrick@FreeBSD.org</email>">
-
-<!ENTITY a.paul "Paul Richards <email>paul@FreeBSD.org</email>">
-
-<!ENTITY a.pb "Pierre Beyssac <email>pb@fasterix.freenix.org</email>">
-
-<!ENTITY a.pds "Peter da Silva <email>pds@FreeBSD.org</email>">
-
-<!ENTITY a.peter "Peter Wemm <email>peter@FreeBSD.org</email>">
-
-<!ENTITY a.phantom "Alexey Zelkin <email>phantom@FreeBSD.org</email>">
-
-<!ENTITY a.phk "Poul-Henning Kamp <email>phk@FreeBSD.org</email>">
-
-<!ENTITY a.pho "Peter Holm <email>pho@FreeBSD.org</email>">
-
-<!ENTITY a.piero "Piero Serini <email>piero@strider.inet.it</email>">
-
-<!ENTITY a.pirzyk "Jim Pirzyk <email>pirzyk@FreeBSD.org</email>">
-
-<!ENTITY a.pjc "Peter Childs <email>pjchilds@imforei.apana.org.au</email>">
-
-<!ENTITY a.proven  "Chris Provenzano <email>proven@FreeBSD.org</email>">
-
-<!ENTITY a.ps "Paul Saab <email>ps@FreeBSD.org</email>">
-
-<!ENTITY a.pst "Paul Traina <email>pst@FreeBSD.org</email>">
-
-<!ENTITY a.reg "Jeremy Lea <email>reg@FreeBSD.org</email>">
-
-<!ENTITY a.rgrimes "Rodney Grimes <email>rgrimes@FreeBSD.org</email>">
-
-<!ENTITY a.rhuff "Robert Huff <email>rhuff@cybercom.net</email>">
-
-<!ENTITY a.ricardag "Ricardo AG <email>ricardag@ag.com.br</email>">
-
-<!ENTITY a.rich  "Rich Murphey <email>rich@FreeBSD.org</email>">
-
-<!ENTITY a.rnordier "Robert Nordier <email>rnordier@FreeBSD.org</email>">
-
-<!ENTITY a.roam "Peter Pentchev <email>roam@FreeBSD.org</email>">
-
-<!ENTITY a.roberto  "Ollivier Robert <email>roberto@FreeBSD.org</email>">
-
-<!ENTITY a.rse  "Ralf S. Engelschall <email>rse@FreeBSD.org</email>">
-
-<!ENTITY a.ru "Ruslan Ermilov <email>ru@FreeBSD.org</email>">
-
-<!ENTITY a.rv "Rajesh Vaidheeswarran <email>rv@FreeBSD.org</email>">
-
-<!ENTITY a.rvb  "Robert V. Baron <email>rvb@FreeBSD.org</email>">
-
-<!ENTITY a.rwatson "Robert Watson <email>rwatson@FreeBSD.org</email>">
-
 <!ENTITY a.sada "佐田 憲治 <email>sada@FreeBSD.org</email>">
 
 <!ENTITY a.sanpei "三平 善郎 <email>sanpei@FreeBSD.org</email>">
 
-<!ENTITY a.schweikh "Jens Schweikhardt <email>schweikh@FreeBSD.org</email>">
-
-<!ENTITY a.scottl "Scott Long <email>scottl@FreeBSD.org</email>">
-
-<!ENTITY a.scrappy "Marc G. Fournier <email>scrappy@FreeBSD.org</email>">
-
-<!ENTITY a.se  "Stefan Esser <email>se@FreeBSD.org</email>">
-
-<!ENTITY a.sef  "Sean Eric Fagan <email>sef@FreeBSD.org</email>">
-
-<!ENTITY a.semenu  "Ustimenko Semen <email>semenu@FreeBSD.org</email>">
-
-<!ENTITY a.sethk "Seth Kingsley <email>seth.kingsley@windriver.com</email>">
-
 <!ENTITY a.sf "FUJISHIMA Satsuki <email>sf@FreeBSD.org</email>">
 
-<!ENTITY a.shafeeq "Shafeeq Sinnamohideen <email>shafeeq@FreeBSD.org</email>">
-
-<!ENTITY a.sheldonh "Sheldon Hearn <email>sheldonh@FreeBSD.org</email>">
-
 <!ENTITY a.shiba  "Takeshi Shibagaki <email>shiba@FreeBSD.org</email>">
 
 <!ENTITY a.shige "福島 茂之 <email>shige@FreeBSD.org</email>">
 
 <!ENTITY a.shin "井上 良信 <email>shin@FreeBSD.org</email>">
 
-<!ENTITY a.silby "Mike Silbersack <email>silby@FreeBSD.org</email>">
-
 <!ENTITY a.simokawa "下川 英敏 <email>simokawa@FreeBSD.org</email>">
 
-<!ENTITY a.smace  "Scott Mace <email>smace@FreeBSD.org</email>">
-
-<!ENTITY a.smpatel "Sujal Patel <email>smpatel@FreeBSD.org</email>">
-
-<!ENTITY a.sobomax  "Maxim Sobolev <email>sobomax@FreeBSD.org</email>">
-
-<!ENTITY a.sos  "S&oslash;ren Schmidt <email>sos@FreeBSD.org</email>">
-
-<!ENTITY a.stanislav  "G. Adam Stanislav. <email>adam@whizkidtech.net</email>">
+<!ENTITY a.sumikawa  "角川 宗近 <email>sumikawa@FreeBSD.org</email>">
 
-<!ENTITY a.stark "Gene Stark <email>stark@FreeBSD.org</email>">
+<!ENTITY a.tanimura  "谷村 正剛 <email>tanimura@FreeBSD.org</email>">
 
-<!ENTITY a.stb "Stefan Bethke <email>stb@FreeBSD.org</email>">
+<!ENTITY a.taoka  "田岡 智志 <email>taoka@FreeBSD.org</email>">
 
-<!ENTITY a.steve "Steve Price <email>steve@FreeBSD.org</email>">
+<!ENTITY a.takawata "渡辺 尊紀 <email>takawata@FreeBSD.org</email>">
 
-<!ENTITY a.sumikawa  "角川 宗近 <email>sumikawa@FreeBSD.org</email>">
+<!ENTITY a.toshi  "新井 利彦 <email>toshi@FreeBSD.org</email>">
 
-<!ENTITY a.swallace  "Steven Wallace <email>swallace@FreeBSD.org</email>">
+<!ENTITY a.tshiozak  "塩崎 拓也 <email>tshiozak@FreeBSD.org</email>">
 
-<!ENTITY a.tanimura  "谷村 正剛 <email>tanimura@FreeBSD.org</email>">
+<!ENTITY a.uch  "UCHIYAMA Yasushi <email>uch@FreeBSD.org</email>">
 
-<!ENTITY a.taoka  "田岡 智志 <email>taoka@FreeBSD.org</email>">
+<!ENTITY a.ume "梅本 肇 <email>ume@FreeBSD.org</email>">
 
-<!ENTITY a.takawata "渡辺 尊紀 <email>takawata@FreeBSD.org</email>">
+<!ENTITY a.yokota  "横田 和隆 <email>yokota@FreeBSD.org</email>">
 
-<!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.org</email>">
+<!--
+     Names and email address of Japanese local contributing authors and 
+     castle.jp.freebsd.org CVS committers.
+     Entity names for committers on castle should be the same as their login
+     names on castle.jp.FreeBSD.org.
+-->
 
-<!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.org</email>">
+<!ENTITY a.jp.arimura "有村 光晴 <email>arimura@jp.FreeBSD.org</email>">
 
-<!ENTITY a.tg  "Thomas Gellekum <email>tg@FreeBSD.org</email>">
+<!ENTITY a.jp.candy  "神田 敏広 <email>candy@fct.kgc.co.jp</email>">
 
-<!ENTITY a.thepish "Peter Hawkins <email>thepish@FreeBSD.org</email>">
+<!ENTITY a.jp.condle "森 直之 <email>mori@jp.FreeBSD.org</email>">
 
-<!ENTITY a.tmm "Thomas M&ouml;stl <email>tmm@FreeBSD.org</email>">
+<!ENTITY a.jp.g92k0323 "狩野  宏樹 <email>g92k0323@cfi.waseda.ac.jp</email>">
 
-<!ENTITY a.tobez "Anton Berezin <email>tobez@FreeBSD.org</email>">
+<!ENTITY a.jp.graphite "石墨 紀孝 <email>graphite@jp.FreeBSD.org</email>">
 
-<!ENTITY a.tom "Tom Hukins <email>tom@FreeBSD.org</email>">
+<!ENTITY a.jp.hino "日野 浩志 <email>hino@ccm.cl.nec.co.jp</email>">
 
-<!ENTITY a.tomsoft "Thomas-Henning von Kamptz <email>tomsoft@FreeBSD.org</email>">
+<!ENTITY a.jp.ikuo "中川 郁夫 <email>ikuo@jp.FreeBSD.org</email>">
 
-<!ENTITY a.torstenb  "Torsten Blum <email>torstenb@FreeBSD.org</email>">
+<!ENTITY a.jp.iwasaki "岩崎 満 <email>iwasaki@jp.FreeBSD.org</email>">
 
-<!ENTITY a.toshi  "新井 利彦 <email>toshi@FreeBSD.org</email>">
+<!ENTITY a.jp.katsu "勝間田 淳 <email>katsu@baum.kiyose.tokyo.jp</email>">
 
-<!ENTITY a.trevor "Trevor Johnson <email>trevor@FreeBSD.org</email>">
+<!ENTITY a.jp.kimura "木村 成伴 <email>kimura@netlab.is.tsukuba.ac.jp</email>">
 
-<!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis <email>truckman@FreeBSD.org</email>">
+<!ENTITY a.jp.kiroh "はらだ きろう <email>kiroh@jp.FreeBSD.org</email>">
 
-<!ENTITY a.tshiozak  "塩崎 拓也 <email>tshiozak@FreeBSD.org</email>">
+<!ENTITY a.jp.kmiyakoda "都田　克郎 <email>kmiyakoda@ctn.co.jp</email>">
 
-<!ENTITY a.uch  "UCHIYAMA Yasushi <email>uch@FreeBSD.org</email>">
+<!ENTITY a.jp.masaki  "櫛田 昌希 <email>masaki@po.iijnet.or.jp</email>">
 
-<!ENTITY a.ue "Udo Erdelhoff <email>ue@FreeBSD.org</email>">
+<!ENTITY a.jp.mihoko "田中 美穂子 <email>Mihoko_Tanaka@yokogawa.co.jp</email>">
 
-<!ENTITY a.ugen  "Ugen J.S.Antsilevich <email>ugen@FreeBSD.org</email>">
+<!ENTITY a.jp.mita "三田 吉郎 <email>mita@jp.FreeBSD.org</email>">
 
-<!ENTITY a.uhclem "Frank Durda IV <email>uhclem@FreeBSD.org</email>">
+<!ENTITY a.jp.miyasita "宮下 健輔 <email>miyasita@hashilab.ee.ous.ac.jp</email>">
 
-<!ENTITY a.ulf "Ulf Zimmermann <email>ulf@FreeBSD.org</email>">
+<!--
+<!ENTITY a.jp.motoyuki "今野 元之 <email>motoyuki@jp.FreeBSD.org</email>">
+authors.sgml に入っているのでコメントアウト
+-->
 
-<!ENTITY a.ume "梅本 肇 <email>ume@FreeBSD.org</email>">
+<!ENTITY a.jp.mrt "むらたしゅういちろう <email>mrt@mickey.ai.kyutech.ac.jp</email>">
 
-<!ENTITY a.unfurl "Bill Swingle <email>unfurl@FreeBSD.org</email>">
+<!ENTITY a.jp.nakai "中井 幸博 <email>nakai@mlab.t.u-tokyo.ac.jp</email>">
 
-<!ENTITY a.vanilla "Vanilla I. Shu <email>vanilla@FreeBSD.org</email>">
+<!ENTITY a.jp.nao "浜田 直樹 <email>nao@tom-yam.or.jp</email>">
 
-<!ENTITY a.wes "Wes Peters <email>wes@FreeBSD.org</email>">
+<!ENTITY a.jp.saeki "佐伯 隆司 <email>saeki@jp.FreeBSD.org</email>">
 
-<!ENTITY a.whiteside "Don Whiteside <email>whiteside@acm.org</email>">
+<!ENTITY a.jp.shou "広瀬 昌一 <email>shou@kt.rim.or.jp</email>">
 
-<!ENTITY a.wilko "Wilko Bulte <email>wilko@FreeBSD.org</email>">
+<!ENTITY a.jp.simokawa "下川 英敏 <email>simokawa@jp.FreeBSD.org</email>">
 
-<!ENTITY a.will "Will Andrews <email>will@FreeBSD.org</email>">
+<!ENTITY a.jp.sugimura "杉村 貴士 <email>sugimura@jp.FreeBSD.org</email>">
 
-<!ENTITY a.wjv "Johann Visagie <email>wjv@FreeBSD.org</email>">
+<!ENTITY a.jp.tmaruya "丸山 剛司 <email>tmaruya@nnc.or.jp</email>">
 
-<!ENTITY a.wlloyd "Bill Lloyd <email>wlloyd@mpd.ca</email>">
+<!ENTITY a.jp.tomo "渡辺 智雄 <email>tomo@jp.FreeBSD.org</email>">
 
-<!ENTITY a.wollman "Garrett Wollman <email>wollman@FreeBSD.org</email>">
+<!ENTITY a.jp.ts "冨田 重成 <email>ts@icu.ac.jp</email>">
 
-<!ENTITY a.wosch  "Wolfram Schneider <email>wosch@FreeBSD.org</email>">
+<!ENTITY a.jp.y-koga "こがよういちろう <email>y-koga@ccs.mt.nec.co.jp</email>">
 
-<!ENTITY a.wpaul  "Bill Paul <email>wpaul@FreeBSD.org</email>">
+<!ENTITY a.jp.yasu "鈴木 康修 <email>yasu@hike.te.chiba-u.ac.jp</email>">
 
-<!ENTITY a.wsanchez "Wilfredo S&aacute;nchez <email>wsanchez@FreeBSD.org</email>">
+<!ENTITY a.jp.yoshiaki "内川 喜章 <email>yoshiaki@kt.rim.or.jp</email>">
 
-<!ENTITY a.wylie "Wylie Stilwell <email>wylie@osd.bsdi.com</email>">
+<!ENTITY a.jp.yuki "前田 幸範 <email>yuki@jp.FreeBSD.org</email>">
 
-<!ENTITY a.yar  "Yar Tikhiy <email>yar@FreeBSD.org</email>">
+<!--
+     Names of FreeBSD mailing list in Japan.  If we refer many mailing
+     lists in Japan, create jmailing-lists.ent file and store them in
+     it.
+-->
 
-<!ENTITY a.yokota  "横田 和隆 <email>yokota@FreeBSD.org</email>">
+<!ENTITY a.jp.doc-jp "日本語ドキュメンテーションプロジェクト <email>doc-jp@jp.FreeBSD.org</email>">
 
-<!ENTITY a.zarzycki  "Dave Zarzycki <email>zarzycki@FreeBSD.org</email>">
+<!ENTITY a.jp.users-jp "FreeBSD users-jp メーリングリスト <email>FreeBSD-users-jp@jp.FreeBSD.org</email>">
diff --git a/ja_JP.eucJP/share/sgml/catalog b/ja_JP.eucJP/share/sgml/catalog
index 2635dac5fe..7908ab61e6 100644
--- a/ja_JP.eucJP/share/sgml/catalog
+++ b/ja_JP.eucJP/share/sgml/catalog
@@ -1,11 +1,14 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
   
-  -- $FreeBSD: doc/ja_JP.eucJP/share/sgml/catalog,v 1.1 2000/09/28 23:29:46 nbm Exp $
+  -- $FreeBSD: doc/ja_JP.eucJP/share/sgml/catalog,v 1.2 2001/06/21 03:38:32 chris Exp $
   --
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JP"
+PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA"
 	"mailing-lists.ent"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//JA"
+        "authors.ent"
diff --git a/ja_JP.eucJP/share/sgml/mailing-lists.ent b/ja_JP.eucJP/share/sgml/mailing-lists.ent
index 4191ed3ca3..0fa9bb1d11 100644
--- a/ja_JP.eucJP/share/sgml/mailing-lists.ent
+++ b/ja_JP.eucJP/share/sgml/mailing-lists.ent
@@ -1,117 +1,117 @@
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
      Original revision: 1.6
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/mailing-lists.ent,v 1.7 2000/12/24 19:08:49 hrs Exp $
+     $FreeBSD: doc/ja_JP.eucJP/share/sgml/mailing-lists.ent,v 1.1 2001/06/21 03:38:32 chris Exp $
 
      Names of FreeBSD mailing lists and related software.
 -->
 
 <!ENTITY a.advocacy "FreeBSD advocacy メーリングリスト
   <email>freebsd-advocacy@FreeBSD.org</email>">
 
 <!ENTITY a.announce "FreeBSD announce メーリングリスト
   <email>freebsd-announce@FreeBSD.org</email>">
 
-<!ENTITY a.bugs "FreeBSD problem reports メーリングリスト
+<!ENTITY a.bugs "FreeBSD 障害報告メーリングリスト
   <email>freebsd-bugs@FreeBSD.org</email>">
 
 <!ENTITY a.chat "FreeBSD chat メーリングリスト
   <email>freebsd-chat@FreeBSD.org</email>">
 
 <!ENTITY a.committers "FreeBSD コミッターのメーリングリスト
   <email>cvs-committers@FreeBSD.org</email>">
 
 <!ENTITY a.core "FreeBSD コアチーム
   <email>freebsd-core@FreeBSD.org</email>">
 
 <!ENTITY a.current "FreeBSD-current メーリングリスト
   <email>freebsd-current@FreeBSD.org</email>">
 
 <!ENTITY a.cvsall "FreeBSD CVS commit メッセージ メーリングリスト
   <email>cvs-all@FreeBSD.org</email>">
 
 <!ENTITY a.database "FreeBSD ベースのデータベースに関するメーリングリスト
   <email>freebsd-database@FreeBSD.org</email>">
 
 <!ENTITY a.developers "FreeBSD 開発者のためのメーリングリスト
   <email>freebsd-developers@FreeBSD.org</email>">
 
 <!ENTITY a.doc "FreeBSD ドキュメンテーションプロジェクト メーリングリスト
   <email>freebsd-doc@FreeBSD.org</email>">
 
 <!ENTITY a.emulation "FreeBSD-emulation メーリングリスト
   <email>freebsd-emulation@FreeBSD.org</email>">
 
 <!ENTITY a.fs "FreeBSD filesystem プロジェクト メーリングリスト
   <email>freebsd-fs@FreeBSD.org</email>">
 
 <!ENTITY a.hackers "FreeBSD の技術的議論に関するメーリングリスト
   <email>freebsd-hackers@FreeBSD.org</email>">
 
 <!ENTITY a.hardware "FreeBSD のハードウェア・周辺機器に関するメーリングリスト
   <email>freebsd-hardware@FreeBSD.org</email>">
 
 <!ENTITY a.isdn "FreeBSD ISDN メーリングリスト
   <email>freebsd-isdn@FreeBSD.org</email>">
 
 <!ENTITY a.isp "FreeBSD インターネットサービスプロバイダーメーリングリスト
   <email>freebsd-isp@FreeBSD.org</email>">
 
 <!ENTITY a.java "FreeBSD Java 言語メーリングリスト
   <email>freebsd-java@FreeBSD.org</email>">
 
 <!ENTITY a.jobs "FreeBSD 関連の雇用に関するメーリングリスト
   <email>freebsd-jobs@FreeBSD.org</email>">
 
 <!ENTITY a.mobile "FreeBSD ラップトップコンピューターメーリングリスト
   <email>freebsd-mobile@FreeBSD.org</email>">
 
 <!ENTITY a.mozilla "Mozilla ブラウザーの FreeBSD への移植に関するメーリングリスト
   <email>freebsd-mozilla@FreeBSD.org</email>">
 
 <!ENTITY a.multimedia "FreeBSD マルチメディア関連のメーリングリスト
   <email>freebsd-multimedia@FreeBSD.org</email>">
 
 <!ENTITY a.net "FreeBSD ネットワーク関係のメーリングリスト
   <email>freebsd-net@FreeBSD.org</email>">
 
 <!ENTITY a.newbies "FreeBSD 初心者メーリングリスト
   <email>freebsd-newbies@FreeBSD.org</email>">
 
 <!ENTITY a.newbus "New Bus アーキテクチャのメーリングリスト
   <email>new-bus-arch@bostonradio.org</email>">
 
 <!ENTITY a.ports "FreeBSD ports メーリングリスト
   <email>freebsd-ports@FreeBSD.org</email>">
 
 <!ENTITY a.questions "FreeBSD 一般的な質問用のメーリングリスト
   <email>freebsd-questions@FreeBSD.org</email>">
 
 <!ENTITY a.scsi "FreeBSD SCSI subsystem メーリングリスト
   <email>freebsd-scsi@FreeBSD.org</email>">
 
 <!ENTITY a.security "FreeBSD セキュリティ関連メーリングリスト
   <email>freebsd-security@FreeBSD.org</email>">
 
 <!ENTITY a.security-notifications "FreeBSD セキュリティ関連のお知らせメーリングリスト
   <email>freebsd-security-notifications@FreeBSD.org</email>">
 
 <!ENTITY a.small "FreeBSD-small メーリングリスト
   <email>freebsd-small@FreeBSD.org</email>">
 
 <!ENTITY a.smp "FreeBSD 対称型マルチプロセッシングに関するメーリングリスト
   <email>freebsd-smp@FreeBSD.org</email>">
 
 <!ENTITY a.stable "FreeBSD-stable メーリングリスト
   <email>freebsd-stable@FreeBSD.org</email>">
 
 <!ENTITY a.tokenring "FreeBSD TokenRing メーリングリスト
   <email>freebsd-tokenring@FreeBSD.org</email>">
 
-<!ENTITY a.www "FreeBSD Webmaster メーリングリスト
+<!ENTITY a.www "FreeBSD ウェブマスタメーリングリスト
   <email>freebsd-www@FreeBSD.org</email>">
 
 <!ENTITY a.majordomo "<email>majordomo@FreeBSD.org</email>">