From 29ce7208b6e0cf78e77eda9fe719352c32b5e5ed Mon Sep 17 00:00:00 2001
From: Motoyuki Konno <motoyuki@FreeBSD.org>
Date: Sun, 27 Feb 2000 03:47:29 +0000
Subject: [PATCH] Merge following changes in the English version:

        1.69  -> 1.75   authors.ent
        1.82  -> 1.83   book.sgml
        1.17  -> 1.19   advanced-networking/chapter.sgml
        1.18  -> 1.19   bibliography/chapter.sgml
        1.12  -> 1.13   basics/chapter.sgml
        1.150 -> 1.159  contrib/chapter.sgml
        1.37  -> 1.38   cutting-edge/chapter.sgml
        1.37  -> 1.40   eresources/chapter.sgml
        1.47  -> 1.55   mirrors/chapter.sgml
        1.22  -> 1.24   pgpkeys/chapter.sgml
        1.18  -> 1.19   ppp-and-slip/chapter.sgml
        1.22  -> 1.23   printing/chapter.sgml

Submitted by:   Hori Masato <mho@cmpnetmail.com>
		Hiroki Sato <hrs@geocities.co.jp>
Reviewed by:    Hiroki Sato <hrs@geocities.co.jp>
References:     [doc-jp 7024,7073,7049,7043,7077,7098]

Note:
  basics/chapter.sgml:
    Ignore the original deltas(grammatical changes only),
    but slightly change in the line of translator's entry.

  cutting-edge/chapter.sgml:
    Ignore the original deltas that have
    already been fixed in the Japanese version.
---
 .../articles/contributing/article.sgml        | 361 ++++++-----
 .../handbook/advanced-networking/chapter.sgml | 583 +++++++++++++++++-
 ja_JP.eucJP/books/handbook/authors.ent        |  16 +-
 .../books/handbook/basics/chapter.sgml        |   4 +-
 .../books/handbook/bibliography/chapter.sgml  |  14 +-
 ja_JP.eucJP/books/handbook/book.sgml          |   6 +-
 .../books/handbook/contrib/chapter.sgml       | 361 ++++++-----
 .../books/handbook/cutting-edge/chapter.sgml  |   4 +-
 .../books/handbook/eresources/chapter.sgml    |  23 +-
 .../books/handbook/mirrors/chapter.sgml       |  39 +-
 .../books/handbook/pgpkeys/chapter.sgml       |  68 +-
 .../books/handbook/ppp-and-slip/chapter.sgml  |  13 +-
 .../books/handbook/printing/chapter.sgml      |  19 +-
 ja_JP.eucJP/share/sgml/authors.ent            |  16 +-
 14 files changed, 1087 insertions(+), 440 deletions(-)

diff --git a/ja_JP.eucJP/articles/contributing/article.sgml b/ja_JP.eucJP/articles/contributing/article.sgml
index 8fb977dd2f..c671ea55be 100644
--- a/ja_JP.eucJP/articles/contributing/article.sgml
+++ b/ja_JP.eucJP/articles/contributing/article.sgml
@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.150
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.29 2000/01/11 08:41:58 motoyuki Exp $
+     Original revision: 1.159
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.30 2000/01/23 04:31:17 kuriyama Exp $
 -->
 
 <chapter id="contrib">
@@ -11,7 +11,7 @@
 
   <para><emphasis>����: &a.jkh;.</emphasis></para>
 
-  <para><emphasis>��: &a.jp.iwasaki;.  27 April 1997.</emphasis></para>
+  <para><emphasis>��: &a.jp.iwasaki;, 1997 ǯ 4 �� 27 ��.</emphasis></para>
 
   <para>���ʤ��ⲿ�� FreeBSD �Τ���˹׸��������ʤ�ޤ�����?
     �����餷��! �䤿���Ͼ�˻ٱ��������Ѱդ�����ޤ���, FreeBSD
@@ -1341,6 +1341,10 @@ Copyright (C) [ǯ]
       <listitem>
 	<para>Adam McDougall <email>mcdouga9@egr.msu.edu</email></para>
       </listitem>
+
+      <listitem>
+	<para>Adam Strohl <email>troll@digitalspark.net</email></para>
+      </listitem>
       
       <listitem>
         <para>Adrian Colley <email>aecolley@ois.ie</email></para>
@@ -1358,10 +1362,6 @@ Copyright (C) [ǯ]
         <para>Adrian Steinmann <email>ast@marabu.ch</email></para>
       </listitem>
 
-      <listitem>
-	<para>Adam Strohl <email>troll@digitalspark.net</email></para>
-      </listitem>
-
       <listitem>
         <para>Adrian T. Filipi-Martin
 	  <email>atf3r@agate.cs.virginia.edu</email></para>
@@ -1441,12 +1441,12 @@ Copyright (C) [ǯ]
       </listitem>
 
       <listitem>
-        <para>Alexander Leidinger
-	  <email>netchild@wurzelausix.CS.Uni-SB.DE</email></para>
+	<para>Alexander Langer <email>alex@cichlids.com</email></para>
       </listitem>
 
       <listitem>
-	<para>Alexander Langer <email>alex@cichlids.com</email></para>
+        <para>Alexander Leidinger
+	  <email>netchild@wurzelausix.CS.Uni-SB.DE</email></para>
       </listitem>
 
       <listitem>
@@ -1618,6 +1618,10 @@ Copyright (C) [ǯ]
         <para>Antti Kaipila <email>anttik@iki.fi</email></para>
       </listitem>
 
+      <listitem>
+	<para>arci <email>vega@sophia.inria.fr</email></para>
+      </listitem>
+
       <listitem>
         <para>Are Bryne <email>are.bryne@communique.no</email></para>
       </listitem>
@@ -1698,6 +1702,10 @@ Copyright (C) [ǯ]
         <para>Bob Van Valzah <email>Bob@whitebarn.com</email></para>
       </listitem>
 
+      <listitem>
+        <para>Bob Wilcox <email>bob@obiwan.uucp</email></para>
+      </listitem>
+
       <listitem>
         <para>Bob Willcox <email>bob@luke.pmr.com</email></para>
       </listitem>
@@ -1706,6 +1714,10 @@ Copyright (C) [ǯ]
         <para>Boris Staeblow <email>balu@dva.in-berlin.de</email></para>
       </listitem>
 
+      <listitem>
+        <para>Boyd Faulkner <email>faulkner@mpd.tandem.com</email></para>
+      </listitem>
+
       <listitem>
         <para>Boyd R. Faulkner <email>faulkner@asgard.bga.com</email></para>
       </listitem>
@@ -1730,14 +1742,6 @@ Copyright (C) [ǯ]
         <para>&a.wlloyd</para>
       </listitem>
 
-      <listitem>
-        <para>Bob Wilcox <email>bob@obiwan.uucp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>Boyd Faulkner <email>faulkner@mpd.tandem.com</email></para>
-      </listitem>
-
       <listitem>
         <para>Brent J. Nordquist <email>bjn@visi.com</email></para>
       </listitem>
@@ -2012,11 +2016,6 @@ Copyright (C) [ǯ]
         <para>Cy Schubert <email>cschuber@uumail.gov.bc.ca</email></para>
       </listitem>
 
-      <listitem>
-        <para>DI. Christian Gusenbauer
-	  <email>cg@scotty.edvz.uni-linz.ac.at</email></para>
-      </listitem>
-
       <listitem>
         <para>Dai Ishijima <email>ishijima@tri.pref.osaka.jp</email></para>
       </listitem>
@@ -2211,10 +2210,19 @@ Copyright (C) [ǯ]
         <para>Denton Gentry <email>denny1@home.com</email></para>
       </listitem>
 
+      <listitem>
+	<para>der Mouse <email>mouse@Collatz.McRCIM.McGill.EDU</email></para>
+      </listitem>
+
       <listitem>
         <para>Derek Inksetter <email>derek@saidev.com</email></para>
       </listitem>
 
+      <listitem>
+        <para>DI. Christian Gusenbauer
+	  <email>cg@scotty.edvz.uni-linz.ac.at</email></para>
+      </listitem>
+
       <listitem>
         <para>Dima Sivachenko <email>dima@Chg.RU</email></para>
       </listitem>
@@ -2309,6 +2317,10 @@ Copyright (C) [ǯ]
         <para>Ed Hudson <email>elh@p5.spnet.com</email></para>
       </listitem>
 
+      <listitem>
+        <para>Edward Chuang <email>edwardc@firebird.org.tw</email></para>
+      </listitem>
+
       <listitem>
         <para>Edward Wang <email>edward@edcom.com</email></para>
       </listitem>
@@ -2317,6 +2329,10 @@ Copyright (C) [ǯ]
         <para>Edwin Groothus <email>edwin@nwm.wan.philips.com</email></para>
       </listitem>
 
+      <listitem>
+	<para>Ege Rekk <email>aagero@aage.priv.no</email></para>
+      </listitem>
+
       <listitem>
         <para>Eiji-usagi-MATSUmoto <email>usagi@clave.gr.jp</email></para>
       </listitem>
@@ -2431,10 +2447,6 @@ Copyright (C) [ǯ]
         <para>Frank Nobis <email>fn@Radio-do.de</email></para>
       </listitem>
 
-      <listitem>
-        <para>Frank Volf <email>volf@oasis.IAEhv.nl</email></para>
-      </listitem>
-
       <listitem>
         <para>Frank ten Wolde <email>franky@pinewood.nl</email></para>
       </listitem>
@@ -2443,6 +2455,10 @@ Copyright (C) [ǯ]
         <para>Frank van der Linden <email>frank@fwi.uva.nl</email></para>
       </listitem>
 
+      <listitem>
+        <para>Frank Volf <email>volf@oasis.IAEhv.nl</email></para>
+      </listitem>
+
       <listitem>
         <para>Fred Cawthorne <email>fcawth@jjarray.umn.edu</email></para>
       </listitem>
@@ -2473,6 +2489,10 @@ Copyright (C) [ǯ]
 	  <email>furusawa@com.cs.osakafu-u.ac.jp</email></para>
       </listitem>
 
+      <listitem>
+        <para>G. Adam Stanislav<email>adam@whizkidtech.net</email></para>
+      </listitem>
+
       <listitem>
         <para>Gabor Kincses <email>gabor@acm.org</email></para>
       </listitem>
@@ -2481,10 +2501,6 @@ Copyright (C) [ǯ]
         <para>Gabor Zahemszky <email>zgabor@CoDe.hu</email></para>
       </listitem>
 
-      <listitem>
-        <para>G. Adam Stanislav<email>adam@whizkidtech.net</email></para>
-      </listitem>
-
       <listitem>
         <para>Garance A Drosehn <email>gad@eclipse.its.rpi.edu</email></para>
       </listitem>
@@ -2539,12 +2555,12 @@ Copyright (C) [ǯ]
       </listitem>
 
       <listitem>
-        <para>Ginga Kawaguti
-	  <email>ginga@amalthea.phys.s.u-tokyo.ac.jp</email></para>
+        <para>Giles Lean <email>giles@nemeton.com.au</email></para>
       </listitem>
 
       <listitem>
-        <para>Giles Lean <email>giles@nemeton.com.au</email></para>
+        <para>Ginga Kawaguti
+	  <email>ginga@amalthea.phys.s.u-tokyo.ac.jp</email></para>
       </listitem>
 
       <listitem>
@@ -2612,15 +2628,6 @@ Copyright (C) [ǯ]
         <para>HAMADA Naoki <email>hamada@astec.co.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>HONDA Yasuhiro
-	  <email>honda@kashio.info.mie-u.ac.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>HOSOBUCHI Noriyuki <email>hoso@buchi.tama.or.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Hannu Savolainen <email>hannu@voxware.pp.fi</email></para>
       </listitem>
@@ -2720,6 +2727,11 @@ Copyright (C) [ǯ]
         <para>Holm Tiffe <email>holm@geophysik.tu-freiberg.de</email></para>
       </listitem>
 
+      <listitem>
+        <para>HONDA Yasuhiro
+	  <email>honda@kashio.info.mie-u.ac.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Horance Chou
 	  <email>horance@freedom.ie.cycu.edu.tw</email></para>
@@ -2729,6 +2741,10 @@ Copyright (C) [ǯ]
         <para>Horihiro Kumagai <email>kuma@jp.FreeBSD.org</email></para>
       </listitem>
 
+      <listitem>
+        <para>HOSOBUCHI Noriyuki <email>hoso@buchi.tama.or.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>HOTARU-YA <email>hotaru@tail.net</email></para>
       </listitem>
@@ -2753,15 +2769,6 @@ Copyright (C) [ǯ]
         <para>Hung-Chi Chu <email>hcchu@r350.ee.ntu.edu.tw</email></para>
       </listitem>
 
-      <listitem>
-        <para>IMAI Takeshi <email>take-i@ceres.dti.ne.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>IMAMURA Tomoaki
-	  <email>tomoak-i@is.aist-nara.ac.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Ian Dowse <email>iedowse@maths.tcd.ie</email></para>
       </listitem>
@@ -2802,6 +2809,15 @@ Copyright (C) [ǯ]
         <para>Ilya V. Komarov <email>mur@lynx.ru</email></para>
       </listitem>
 
+      <listitem>
+        <para>IMAI Takeshi <email>take-i@ceres.dti.ne.jp</email></para>
+      </listitem>
+
+      <listitem>
+        <para>IMAMURA Tomoaki
+	  <email>tomoak-i@is.aist-nara.ac.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Issei Suzuki <email>issei@jp.FreeBSD.org</email></para>
       </listitem>
@@ -2870,6 +2886,10 @@ Copyright (C) [ǯ]
         <para>James D. Stewart <email>jds@c4systm.com</email></para>
       </listitem>
 
+      <listitem>
+        <para>James da Silva <email>jds@cs.umd.edu</email></para>
+      </listitem>
+
       <listitem>
         <para>James Jegers <email>jimj@miller.cs.uwm.edu</email></para>
       </listitem>
@@ -2883,10 +2903,6 @@ Copyright (C) [ǯ]
         <para>James T. Liu <email>jtliu@phlebas.rockefeller.edu</email></para>
       </listitem>
 
-      <listitem>
-        <para>James da Silva <email>jds@cs.umd.edu</email></para>
-      </listitem>
-
       <listitem>
         <para>Jan Conard
 	  <email>charly@fachschaften.tu-muenchen.de</email></para>
@@ -2942,6 +2958,10 @@ Copyright (C) [ǯ]
         <para>Jeff Bartig <email>jeffb@doit.wisc.edu</email></para>
       </listitem>
 
+      <listitem>
+        <para>Jeff Brown <email>jabrown@caida.org</email></para>
+      </listitem>
+
       <listitem>
         <para>Jeff Forys <email>jeff@forys.cranbury.nj.us</email></para>
       </listitem>
@@ -3278,10 +3298,6 @@ Copyright (C) [ǯ]
         <para>K.Higashino <email>a00303@cc.hc.keio.ac.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>KUNISHIMA Takeo <email>kunishi@c.oka-pu.ac.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Kai Vorma <email>vode@snakemail.hut.fi</email></para>
       </listitem>
@@ -3310,11 +3326,6 @@ Copyright (C) [ǯ]
         <para>Karl Lehenbauer <email>karl@NeoSoft.com</email></para>
       </listitem>
 
-      <listitem><!-- kuriyama - ??? -->
-        <para>Kato Takenori
-	  <email>kato@eclogite.eps.nagoya-u.ac.jp</email></para>
-      </listitem>
-
       <listitem>
 	<para>KATO Tsuguru <email>tkato@prontomail.ne.jp</email></para>
       </listitem>
@@ -3455,6 +3466,10 @@ Copyright (C) [ǯ]
         <para>Kouichi Hirabayashi <email>kh@mogami-wire.co.jp</email></para>
       </listitem>
 
+      <listitem>
+        <para>KUNISHIMA Takeo <email>kunishi@c.oka-pu.ac.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Kurt D. Zeilenga <email>Kurt@Boolean.NET</email></para>
       </listitem>
@@ -3469,12 +3484,12 @@ Copyright (C) [ǯ]
       </listitem>
 
       <listitem>
-        <para>Lars K&ouml;ller
-	  <email>Lars.Koeller@Uni-Bielefeld.DE</email></para>
+        <para>Larry Altneu <email>larry@ALR.COM</email></para>
       </listitem>
 
       <listitem>
-        <para>Larry Altneu <email>larry@ALR.COM</email></para>
+        <para>Lars K&ouml;ller
+	  <email>Lars.Koeller@Uni-Bielefeld.DE</email></para>
       </listitem>
 
       <listitem>
@@ -3518,27 +3533,6 @@ Copyright (C) [ǯ]
         <para>M.C. Wong <email>unknown</email></para>
       </listitem>
 
-      <listitem>
-        <para>MANTANI Nobutaka <email>nobutaka@nobutaka.com</email></para>
-      </listitem>
-
-      <listitem>
-        <para>MIHIRA Sanpei Yoshiro <email>sanpei@sanpei.org</email></para>
-      </listitem>
-
-      <listitem>
-        <para>MITA Yoshio <email>mita@jp.FreeBSD.org</email></para>
-      </listitem>
-
-      <listitem>
-        <para>MITSUNAGA Noriaki
-	  <email>mitchy@er.ams.eng.osaka-u.ac.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>MOROHOSHI Akihiko <email>moro@race.u-tokyo.ac.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Magnus Enbom <email>dot@tinto.campus.luth.se</email></para>
       </listitem>
@@ -3560,6 +3554,10 @@ Copyright (C) [ǯ]
         <para>Malte Lance <email>malte.lance@gmx.net</email></para>
       </listitem>
 
+      <listitem>
+        <para>MANTANI Nobutaka <email>nobutaka@nobutaka.com</email></para>
+      </listitem>
+
       <listitem>
         <para>Manu Iyengar
 	  <email>iyengar@grunthos.pscwa.psca.com</email></para>
@@ -3668,12 +3666,12 @@ Copyright (C) [ǯ]
       </listitem>
 
       <listitem>
-        <para>Masachika ISHIZUKA
-	  <email>ishizuka@isis.min.ntt.jp</email></para>
+        <para>Mas.TAKEMURA <email>unknown</email></para>
       </listitem>
 
       <listitem>
-        <para>Mas.TAKEMURA <email>unknown</email></para>
+        <para>Masachika ISHIZUKA
+	  <email>ishizuka@isis.min.ntt.jp</email></para>
       </listitem>
 
       <listitem>
@@ -3738,6 +3736,10 @@ Copyright (C) [ǯ]
         <para>Matthew Stein <email>matt@bdd.net</email></para>
       </listitem>
 
+      <listitem>
+        <para>Matthew West <email>mwest@uct.ac.za</email></para>
+      </listitem>
+
       <listitem>
         <para>Matthias Pfaller <email>leo@dachau.marco.de</email></para>
       </listitem>
@@ -3843,6 +3845,10 @@ Copyright (C) [ǯ]
 	  <email>msagre@cactus.fi.uba.ar</email></para>
       </listitem>
 
+      <listitem>
+        <para>MIHIRA Sanpei Yoshiro <email>sanpei@sanpei.org</email></para>
+      </listitem>
+
       <listitem>
         <para>Mihoko Tanaka <email>m_tonaka@pa.yokogawa.co.jp</email></para>
       </listitem>
@@ -3928,6 +3934,15 @@ Copyright (C) [ǯ]
         <para>Ming-I Hseh <email>PA@FreeBSD.ee.Ntu.edu.TW</email></para>
       </listitem>
 
+      <listitem>
+        <para>MITA Yoshio <email>mita@jp.FreeBSD.org</email></para>
+      </listitem>
+
+      <listitem>
+        <para>MITSUNAGA Noriaki
+	  <email>mitchy@er.ams.eng.osaka-u.ac.jp</email></para>
+      </listitem>
+
       <listitem>
 	<para>Mitsuru Yoshida <email>mitsuru@riken.go.jp</email></para>
       </listitem>
@@ -3940,6 +3955,10 @@ Copyright (C) [ǯ]
         <para>Morgan Davis <email>root@io.cts.com</email></para>
       </listitem>
 
+      <listitem>
+        <para>MOROHOSHI Akihiko <email>moro@race.u-tokyo.ac.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Mostyn Lewis <email>mostyn@mrl.com</email></para>
       </listitem>
@@ -3952,10 +3971,6 @@ Copyright (C) [ǯ]
         <para>Motoyuki Kasahara <email>m-kasahr@sra.co.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>Motoyuki Konno <email>motoyuki@snipe.rim.or.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Murray Stokely <email>murray@cdrom.com</email></para>
       </listitem>
@@ -3964,6 +3979,10 @@ Copyright (C) [ǯ]
         <para>N.G.Smith <email>ngs@sesame.hensa.ac.uk</email></para>
       </listitem>
 
+      <listitem>
+        <para>Nadav Eiron <email>nadav@barcode.co.il</email></para>
+      </listitem>
+
       <listitem>
         <para>NAGAO Tadaaki <email>nagao@cs.titech.ac.jp</email></para>
       </listitem>
@@ -3982,18 +4001,6 @@ Copyright (C) [ǯ]
 	  <email>motonori@econ.kyoto-u.ac.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>NIIMI Satoshi <email>sa2c@and.or.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>NOKUBI Hirotaka <email>h-nokubi@yyy.or.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>Nadav Eiron <email>nadav@barcode.co.il</email></para>
-      </listitem>
-
       <listitem>
         <para>Nanbor Wang <email>nw1@cs.wustl.edu</email></para>
       </listitem>
@@ -4055,6 +4062,10 @@ Copyright (C) [ǯ]
         <para>Nickolay N. Dudorov <email>nnd@itfs.nsk.su</email></para>
       </listitem>
 
+      <listitem>
+        <para>NIIMI Satoshi <email>sa2c@and.or.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Niklas Hallqvist <email>niklas@filippa.appli.se</email></para>
       </listitem>
@@ -4063,10 +4074,6 @@ Copyright (C) [ǯ]
         <para>Nisha Talagala <email>nisha@cs.berkeley.edu</email></para>
       </listitem>
 
-      <listitem>
-        <para>No Name <email>ZW6T-KND@j.asahi-net.or.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>No Name <email>adrian@virginia.edu</email></para>
       </listitem>
@@ -4143,6 +4150,10 @@ Copyright (C) [ǯ]
         <para>No Name <email>fn@pain.csrv.uidaho.edu</email></para>
       </listitem>
 
+      <listitem>
+	<para>No Name <email>frf@xocolatl.com</email></para>
+      </listitem>
+
       <listitem>
         <para>No Name <email>gclarkii@netport.neosoft.com</email></para>
       </listitem>
@@ -4323,6 +4334,10 @@ Copyright (C) [ǯ]
         <para>No Name <email>ziggy@ryan.org</email></para>
       </listitem>
 
+      <listitem>
+        <para>No Name <email>ZW6T-KND@j.asahi-net.or.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Nobuhiro Yasutomi <email>nobu@psrc.isac.co.jp</email></para>
       </listitem>
@@ -4332,6 +4347,10 @@ Copyright (C) [ǯ]
 	  <email>kogane@koganemaru.co.jp</email></para>
       </listitem>
 
+      <listitem>
+        <para>NOKUBI Hirotaka <email>h-nokubi@yyy.or.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Norio Suzuki <email>nosuzuki@e-mail.ne.jp</email></para>
       </listitem>
@@ -4458,10 +4477,6 @@ Copyright (C) [ǯ]
         <para>Paul S. LaFollette, Jr. <email>unknown</email></para>
       </listitem>
 
-      <listitem>
-        <para>Paul Saab <email>paul@mu.org</email></para>
-      </listitem>
-
       <listitem>
         <para>Paul Sandys <email>myj@nyct.net</email></para>
       </listitem>
@@ -4772,27 +4787,6 @@ Copyright (C) [ǯ]
         <para>Ryan Younce <email>ryany@pobox.com</email></para>
       </listitem>
 
-      <listitem>
-        <para>SANETO Takanori <email>sanewo@strg.sony.co.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>SASAKI Shunsuke <email>ele@pop17.odn.ne.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>SAWADA Mizuki <email>miz@qb3.so-net.ne.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>SUGIMURA Takashi <email>sugimura@jp.FreeBSD.org</email></para>
-      </listitem>
-
-      <listitem>
-        <para>SURANYI Peter
-	  <email>suranyip@jks.is.tsukuba.ac.jp</email></para>
-      </listitem>
-
       <listitem>
 	<para>Sakai Hiroaki <email>sakai@miya.ee.kagu.sut.ac.jp</email></para>
       </listitem>
@@ -4825,6 +4819,14 @@ Copyright (C) [ǯ]
         <para>Sandro Sigala <email>ssigala@globalnet.it</email></para>
       </listitem>
 
+      <listitem>
+        <para>SANETO Takanori <email>sanewo@strg.sony.co.jp</email></para>
+      </listitem>
+
+      <listitem>
+        <para>SASAKI Shunsuke <email>ele@pop17.odn.ne.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Sascha Blank <email>blank@fox.uni-trier.de</email></para>
       </listitem>
@@ -4837,6 +4839,10 @@ Copyright (C) [ǯ]
         <para>Satoh Junichi <email>junichi@astec.co.jp</email></para>
       </listitem>
 
+      <listitem>
+        <para>SAWADA Mizuki <email>miz@qb3.so-net.ne.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Scot Elliott <email>scot@poptart.org</email></para>
       </listitem>
@@ -5110,6 +5116,10 @@ Copyright (C) [ǯ]
         <para>Sugimoto Sadahiro <email>ixtl@komaba.utmc.or.jp</email></para>
       </listitem>
 
+      <listitem>
+        <para>SUGIMURA Takashi <email>sugimura@jp.FreeBSD.org</email></para>
+      </listitem>
+
       <listitem>
         <para>Sugiura Shiro <email>ssugiura@duo.co.jp</email></para>
       </listitem>
@@ -5122,6 +5132,11 @@ Copyright (C) [ǯ]
         <para>Sune Stjerneby <email>stjerneby@usa.net</email></para>
       </listitem>
 
+      <listitem>
+        <para>SURANYI Peter
+	  <email>suranyip@jks.is.tsukuba.ac.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Suzuki Yoshiaki
 	  <email>zensyo@ann.tama.kawasaki.jp</email></para>
@@ -5187,10 +5202,6 @@ Copyright (C) [ǯ]
         <para>Tatoku Ogaito <email>tacha@tera.fukui-med.ac.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>Tatsumi HOSOKAWA <email>hosokawa@jp.FreeBSD.org</email></para>
-      </listitem>
-
       <listitem>
         <para>Ted Buswell <email>tbuswell@mediaone.net</email></para>
       </listitem>
@@ -5374,10 +5385,6 @@ Copyright (C) [ǯ]
         <para>Trevor Johnson <email>trevor@jpj.net</email></para>
       </listitem>
 
-      <listitem>
-        <para>URATA Shuichiro <email>s-urata@nmit.tmg.nec.co.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Udo Schweigert <email>ust@cert.siemens.de</email></para>
       </listitem>
@@ -5394,6 +5401,10 @@ Copyright (C) [ǯ]
         <para>Ulli Linzen <email>ulli@perceval.camelot.de</email></para>
       </listitem>
 
+      <listitem>
+        <para>URATA Shuichiro <email>s-urata@nmit.tmg.nec.co.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Ustimenko Semen <email>semen@iclub.nsu.ru</email></para>
       </listitem>
@@ -5506,10 +5517,6 @@ Copyright (C) [ǯ]
         <para>Wiljo Heinen <email>wiljo@freeside.ki.open.de</email></para>
       </listitem>
 
-      <listitem>
-        <para>Wilko Bulte <email>wilko@yedi.iaf.nl</email></para>
-      </listitem>
-
       <listitem>
 	<para>Will Andrews <email>andrews@technologist.com</email></para>
       </listitem>
@@ -5560,11 +5567,11 @@ Copyright (C) [ǯ]
       </listitem>
 
       <listitem>
-	<para>Yasuhito FUTATSUKI <email>futatuki@fureai.or.jp</email></para>
+	<para>Yasuhiro Fukama <email>yasuf@big.or.jp</email></para>
       </listitem>
 
       <listitem>
-	<para>Yasuhiro Fukama <email>yasuf@big.or.jp</email></para>
+	<para>Yasuhito FUTATSUKI <email>futatuki@fureai.or.jp</email></para>
       </listitem>
 
       <listitem>
@@ -5584,78 +5591,62 @@ Copyright (C) [ǯ]
       </listitem>
 
       <listitem>
-        <para>Yoichi Asai <email>yatt@msc.biglobe.ne.jp</email></para>
+	<para>Yoichi Asai <email>yatt@msc.biglobe.ne.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yoshiaki Uchikawa <email>yoshiaki@kt.rim.or.jp</email></para>
+	<para>Yoshiaki Uchikawa <email>yoshiaki@kt.rim.or.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yoshihiko OHTA <email>yohta@bres.tsukuba.ac.jp</email></para>
+	<para>Yoshihiko OHTA <email>yohta@bres.tsukuba.ac.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yoshihisa NAKAGAWA
-	  <email>y-nakaga@ccs.mt.nec.co.jp</email></para>
+	<para>Yoshihisa NAKAGAWA
+ 	  <email>y-nakaga@ccs.mt.nec.co.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yoshikazu Goto <email>gotoh@ae.anritsu.co.jp</email></para>
+	<para>Yoshikazu Goto <email>gotoh@ae.anritsu.co.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yoshimasa Ohnishi
+	<para>Yoshimasa Ohnishi
 	  <email>ohnishi@isc.kyutech.ac.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yoshishige Arai <email>ryo2@on.rim.or.jp</email></para>
+	<para>Yoshishige Arai <email>ryo2@on.rim.or.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yuichi MATSUTAKA <email>matutaka@osa.att.ne.jp</email></para>
+	<para>Yuichi MATSUTAKA <email>matutaka@osa.att.ne.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yujiro MIYATA
+	<para>Yujiro MIYATA
 	  <email>miyata@bioele.nuee.nagoya-u.ac.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yusuke Nawano <email>azuki@azkey.org</email></para>
+	<para>Yusuke Nawano <email>azuki@azkey.org</email></para>
       </listitem>
 
       <listitem>
-        <para>Yuu Yashiki <email>s974123@cc.matsuyama-u.ac.jp</email></para>
+	<para>Yuu Yashiki <email>s974123@cc.matsuyama-u.ac.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yuuichi Narahara <email>aconitum@po.teleway.ne.jp</email></para>
+	<para>Yuuichi Narahara <email>aconitum@po.teleway.ne.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yuval Yarom <email>yval@cs.huji.ac.il</email></para>
+	<para>Yuval Yarom <email>yval@cs.huji.ac.il</email></para>
       </listitem>
 
       <listitem>
-        <para>Yves Fonk <email>yves@cpcoup5.tn.tudelft.nl</email></para>
-      </listitem>
-
-      <listitem>
-        <para>Yves Fonk <email>yves@dutncp8.tn.tudelft.nl</email></para>
-      </listitem>
-
-      <listitem>
-        <para>Zach Heilig <email>zach@gaffaneys.com</email></para>
-      </listitem>
-
-      <listitem>
-        <para>Zahemszhky Gabor <email>zgabor@code.hu</email></para>
-      </listitem>
-
-      <listitem>
-        <para>Zhong Ming-Xun <email>zmx@mail.CDPA.nsysu.edu.tw</email></para>
+	<para>Yves Fonk <email>yves@cpcoup5.tn.tudelft.nl</email></para>
       </listitem>
 
       <listitem>
@@ -5663,15 +5654,15 @@ Copyright (C) [ǯ]
       </listitem>
 
       <listitem>
-        <para>der Mouse <email>mouse@Collatz.McRCIM.McGill.EDU</email></para>
+	<para>Zach Heilig <email>zach@gaffaneys.com</email></para>
       </listitem>
 
       <listitem>
-        <para>frf <email>frf@xocolatl.com</email></para>
+	<para>Zahemszhky Gabor <email>zgabor@code.hu</email></para>
       </listitem>
 
       <listitem>
-        <para>Ege Rekk <email>aagero@aage.priv.no</email></para>
+	<para>Zhong Ming-Xun <email>zmx@mail.CDPA.nsysu.edu.tw</email></para>
       </listitem>
     </itemizedlist>
   </sect1>
diff --git a/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml
index c9efb36082..d15330974e 100644
--- a/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml
@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.17
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml,v 1.6 1999/11/28 12:08:52 kuriyama Exp $
+     Original revision: 1.19
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml,v 1.7 2000/01/11 08:41:57 motoyuki Exp $
 -->
 
 <chapter id="advanced-networking">
@@ -1072,6 +1072,585 @@ ISDN BRI 
 
     </sect2>
   </sect1>
+
+  <sect1 id="nis">
+    <title>NIS/YP</title>
+
+    <para><emphasis>����: &a.unfurl;, 2000 ǯ 1 �� 21 ��.</emphasis></para>
+
+    <sect2>
+      <title>NIS/YP �Ȥ�?</title>
+  
+      <para>NIS �� RPC ��Ȥä����饤�����/�����Х����ƥ�Ǥ�. �����
+	�Ȥ����Ȥ�. NIS�ɥᥤ����Υޥ���֤Ƕ��̤�����ե������ͭ���뤳��
+	���Ǥ��ޤ�. �ޤ�, NIS ��Ȥ����Ȥǥ����ƥ�����ԤϺǾ��¤�����ǡ���
+	�� NIS ���饤����Ȥ�Ω���夲�뤳�Ȥ��Ǥ�, 1 ���꤫������ǡ�����
+	�ɲ�, ���, �ѹ�����ǽ�Ǥ�. </para>
+    </sect2>
+  
+    <sect2>
+      <title>ư��Τ�����</title>
+        
+      <para>NIS �Ķ��ˤ���ۥ��Ȥ�, ���� 3 �����ʬ�व��ޤ�. �����,
+        �ޥ�����������, ���졼�֥�����, ���饤����ȤǤ�.
+        �����Ф�, �ۥ��Ȥ����������濴Ū�ʾ����Ǽ�ˤ����򤷤ޤ�.
+        �ޥ����������Фϸ��Ȥʤ뿮��Ǥ��������ݻ���,
+        ���졼�֥����Ф�, ��Ĺ������ݤ��뤿��, ���ξ����ߥ顼���ޤ�.
+        �����ƥ��饤����Ȥ�, �����Ф��������󶡤������ư��ޤ�.</para>
+
+      <para>������ˡ���Ѥ��뤳�Ȥ�, ��¿���Υե�����ˤ�����󤬶�ͭ�Ǥ��ޤ�.
+        �褯 NIS �Ƕ�ͭ�����Τ�,
+        <filename>master.passwd</filename> �� <filename>group</filename>,
+	<filename>hosts</filename> �Ȥ��ä��ե�����Ǥ�.
+        ���饤����Ⱦ�Υץ�������, �̾��������Υե�����ˤ������ɬ��
+	�Ȥʤä��Ȥ�,
+        ���饤����Ȥ���³���Ƥ��륵���Ф��䤤��碌��Ԥ�, ���ξ�������ޤ�. 
+      </para>
+    </sect2>
+    
+    <sect2>
+      <title>NIS/YP ��Ȥ�</title>
+  
+      <sect3>
+        <title>�ײ��Ω�Ƥ�</title>
+  
+	 <para>�⤷ NIS �ˤ�륷���ƥ�����������Ԥʤ��Τ����Ƥʤ�,
+          �ɤΤ褦�ˤ������Τ�, �ҤȤȤ���Ǹ�ޤǹͤ��Ƥߤ뤳�Ȥ򤪴��ᤷ�ޤ�.
+          �ͥåȥ���ε��Ϥˤ�餺, �����Ĥ�����٤����Ȥ����뤿��Ǥ�.</para>
+  
+        <sect4>
+          <title>NIS �ɥᥤ��̾�����</title>
+  
+          <para>�����Ǥ����ɥᥤ��̾��, ���ޤǤ��ʤ����ȤäƤ���,
+            ������&ldquo;�ɥᥤ��̾&rdquo;
+            �ȸƤ�Ǥ�����ΤȤϰ㤤�ޤ�.
+	    ���Τˤ�&ldquo;NIS �ɥᥤ��̾&rdquo;�ȸƤФ�ޤ�.
+            ���饤����Ȥ������Ф˾�����׵᤹��Ȥ�,
+            �����׵�ˤϼ�ʬ��°���� NIS �ɥᥤ���̾�����ޤޤ�Ƥ��ޤ�.
+	    �����, 1 �ĤΥͥåȥ����ʣ���Υ����Ф��������,
+            �ɤΥ����Ф��׵�����������ɤ�������뤿��˻Ȥ��ޤ�.
+	    NIS �ɥᥤ��̾�Ȥ�, ��Ϣ�Τ���ۥ��Ȥ򥰥롼�ײ����뤿���̾���Ǥ���,
+            �ȹͤ�����ɤ��Ǥ��礦. </para>
+	
+	  <para>�ȿ��ˤ�äƤϥ��󥿡��ͥåȤΥɥᥤ��̾��
+            NIS �ɥᥤ��̾�˻ȤäƤ���Ȥ���������ޤ���,
+            ����ϥͥåȥ���Υȥ�֥��ǥХå�����Ȥ��˺���θ����Ȥʤ뤿��,
+            ������Ǥ��ޤ���.
+            NIS �ɥᥤ��̾�ϥͥåȥ����ǰ�դʤ���Фʤ�ʤ��Τ�,
+            �ɥᥤ��̾���ɥᥤ��˴ޤޤ��ޥ����ɽ���褦�ʤ�ΤǤ����,
+            ʬ����䤹���ʤ�ޤ�. ���Ȥ���
+            Acme �ҤΥ�����(Art)����Ǥ����,
+            NIS �ɥᥤ��̾��"acme-art"�Ȥ�����ɤ��Ǥ��礦. </para>
+        </sect4>
+
+        <sect4>
+          <title>�����Хޥ����ʪ��Ū�ʾ��Ȥ�</title>
+            
+	  <para>NIS �����ФȤ��ƻȤ��ޥ�������ֺݤˤ�,
+            �����Ĥ���������������ޤ�.
+            NIS �ˤ����뺤�ä����Ȥΰ�Ĥ�,
+            ���饤����ȤΥ����Фؤΰ�¸�٤�����ޤ�.
+            ���饤����Ȥ���ʬ�� NIS �ɥᥤ��Υ����Ф���³�Ǥ��ʤ����,
+            �ޥ��󤬻�����ǽ�ˤʤ뤳�Ȥ��褯����ޤ�.
+            �⤷, �桼���䥰�롼�פ˴ؤ�����������ʤ����,
+            �ۤȤ�ɤΥ����ƥ�ϰ��Ū�ˤǤ�����ߤ��Ƥ��ޤ��ޤ�.
+            �������ä����Ȥ�ǰƬ���֤���,
+            ����ä��夦��֡��Ȥ����ޥ����,
+            ��ȯ�˻Ȥ�줽���ʥޥ�������Фʤ��褦�ˤ��ʤ���Фʤ�ޤ���.
+            ����Ū�ˤ�, NIS �����Фϥ�����ɥ������
+            NIS ���������ѤȤʤ�ޥ���ˤ���٤��Ǥ�.
+            �ͥåȥ������٤��Ť��ʤ����,
+            ¾�Υ����ӥ������餻�Ƥ���ޥ���� NIS
+            �����Фˤ��Ƥ⤫�ޤ��ޤ���. ������ NIS
+            �����Ф��Ȥ��ʤ��ʤ��,
+            <emphasis>���٤Ƥ�</emphasis>���饤����Ȥ˱ƶ��򤪤�ܤ�,
+            �Ȥ������ˤ����դ��ʤ���Фʤ�ޤ���.</para>
+        </sect4>
+      </sect3>
+
+      <sect3>
+        <title>NIS ������</title>
+
+	<para>���Ȥʤ뤹�٤Ƥ� NIS �����,
+          NIS �ޥ����������ФȸƤФ�� 1 ��Υޥ�����֤���ޤ�.
+          ���ξ��󤬳�Ǽ�����ǡ����١����� NIS �ޥåפȸƤӤޤ�.
+          FreeBSD�Ǥ�, ���Υޥåפ�
+	  <filename>/var/yp/[domainname]</filename> ���֤���ޤ�.
+	  <filename>[domainname]</filename> ��,
+          �����Ф������ӥ����� NIS �ɥᥤ��Ǥ�.
+          1 ��� NIS �����Ф�ʣ���Υɥᥤ��򥵥ݡ��Ȥ��뤳�Ȥ��ǽ�Ǥ�.
+          �Ĥޤ�, ���Υǥ��쥯�ȥ��ơ��Υɥᥤ�󤴤Ȥ˺�뤳�Ȥ��Ǥ�,
+          �ƥɥᥤ�󤴤�, ��Ω�����ޥåפν������Ĥ��Ȥˤʤ�ޤ�.</para>
+
+	<para>NIS �Υޥ����������Фȥ��졼�֥����о�Ǥ�,
+	  <command>ypserv</command> �ǡ���󤬤��٤Ƥ� NIS �׵��������ޤ�.
+          <command>ypserv</command> �� NIS ���饤����Ȥ�����׵������դ�,
+          �ɥᥤ��̾�ȥޥå�̾���б�����ǡ����١����ե�����ؤΥѥ����Ѵ���,
+          �ǡ����򥯥饤����Ȥ��������ޤ�.</para>
+
+        <sect4>
+	  <title>NIS �ޥ����������Ф�����</title>
+
+	  <para>��ꤿ�����Ȥˤ���ޤ���,
+            NIS �ޥ����������Ф���������Ūñ��Ǥ�.
+            FreeBSD �ˤ� <command>ypinit</command>
+            �Ȥ��������ʥ�����ץȤ�����, �����Ȥ��Ƚ�������
+            ���˴�ñ�˹Ԥʤ����Ȥ��Ǥ��ޤ�.
+            ����������Ĵ�˿ʤ�뤿��ˤ�,
+            �����Ĥ������ˤ��ʤ���Фʤ�ʤ����Ȥ�����ޤ�.</para>
+
+	  <itemizedlist>
+	    <listitem>
+	      <para>NIS �ɥᥤ��̾�����ꤵ��Ƥ��뤳�Ȥ�, 
+		<command>domainname</command> ���ޥ�ɤdz�ǧ���Ƥ�������.
+		�ۥ��Ȥ�°���Ƥ��ʤ��ɥᥤ����Ф��Ƥ�
+		<command>ypinit</command> ��¹Ԥ��뤳�ȤϤǤ��ޤ���,
+		<literal>domainname</literal> �����ꤵ��Ƥ��ʤ����
+		�����ʳ������ꤹ����ɤ��Ǥ��礦.</para>
+	    </listitem>
+
+	    <listitem>
+	      <para><filename>master.passwd</filename> �ե����뤬
+		<filename>/var/yp</filename>
+                ���֤���Ƥ��뤳�Ȥ��ǧ���Ƥ�������.
+                NIS ��, ���饤����Ȥȶ�ͭ����ѥ���ɤ�
+                ���Υե����뤫��������ޤ�.
+		���Υե����뤬�ʤ����, <command>ypinit</command>
+                �ϥ��顼��λ���ޤ�. �����, ������
+                <filename>master.passwd</filename> �Ǥ�,
+                ���Ǥ�¸�ߤ��� <filename>/etc/master.passwd</filename> ��
+		���ԡ�������ΤǤ⤫�ޤ��ޤ���.  
+		���ԡ�������ˤ�,
+                �桼�����Τ䥰�롼�פ��Ф����ɤ߽Ф�����°����
+                ���ꤵ��Ƥ��ʤ����Ȥ��ǧ���Ƥ�������.
+		</para>
+	    </listitem>
+
+	    <listitem>
+	      <para><command>ypserv</command> �ǡ�����ư���Ƥ�������.
+                <command>ypinit</command> ��ư���ˤ�,
+		<command>ypserv</command> �� RPC(Remote Procedure Call)
+                �θƤӽФ���ȿ�����뤳�Ȥ�ɬ�פˤʤ�ޤ�.
+		�̾������Ǥ�,  
+		<command>ypserv</command>
+                �˥��ץ����ե饰����ꤹ��ɬ�פϤ���ޤ���.</para>
+	    </listitem>
+	  </itemizedlist>
+
+	  <para>�ʾ�μ�礬��λ������,
+	    <option>-m</option> �ե饰���դ��� <command>ypinit</command> ��
+            �¹Ԥ��Ƥ�������.
+            Ω�Ƥ褦�Ȥ��Ƥ���ޥ����������ФΥɥᥤ��̾��
+            <literal>domainname</literal> �����ꤷ����ΤȰۤʤäƤ���ʤ�,
+            ���Υɥᥤ�����ꤹ�뤳�Ȥ��Ǥ��ޤ�.
+	    ������Ǥ�, NIS �Υɥᥤ��̾��
+            <filename>test-domain</filename> �Ȥ��Ƥ��ޤ�.
+	    </para>
+
+	  <screen>
+# ypinit -m test-domain
+Server Type: MASTER Domain: test-domain
+
+Creating an YP server will require that you answer a few questions.
+Questions will all be asked at the beginning of the procedure.
+
+Do you want this procedure to quit on non-fatal errors? [y/n: n]  n
+
+Ok, please remember to go back and redo manually whatever fails.
+If you don't, something might not work. 
+
+At this point, we have to construct a list of this domains YP servers.
+master.example.com is already known as master server.
+Please continue to add any slave servers, one per line. When you are
+done with the list, type a &lt;Control D&gt;.
+        master server   :  master.example.com
+        next host to add:  <userinput>^D</userinput>
+The current list of NIS servers looks like this:
+
+master.example.com
+
+Is this correct?  [y/n: y]  <userinput>y</userinput>
+Building /var/yp/test-domain/ypservers...
+Running /var/yp/Makefile...
+NIS Map update started on Fri Dec  3 16:54:12 PST 1999 for domain test-domain
+Updating hosts.byname...
+Creating new /var/yp/passwd file from /var/yp/master.passwd...
+Updating netid.byname...
+Updating hosts.byaddr...
+Updating networks.byaddr...
+Updating networks.byname...
+Updating protocols.bynumber...
+Updating protocols.byname...
+Updating rpc.byname...
+Updating rpc.bynumber...
+Updating services.byname...
+Updating group.byname...
+Updating group.bygid...
+Updating passwd.byname...
+Updating passwd.byuid...
+Updating master.passwd.byname...
+Updating master.passwd.byuid...
+NIS Map update completed.
+
+master.example.com has been setup as an YP master server without any errors.</screen>
+
+	  <para>
+            NIS �����Ф򤭤����ư����뤿��ˤ�, 
+            <filename>/etc/rc.conf</filename> �˿���, �ɲä���ɬ�פ�����ޤ�.
+            ���Τ褦�ʹԤ����뤳�Ȥ��ǧ���Ʋ�����.
+          </para>
+
+	  <programlisting>
+nis_server_enable="YES"
+nis_server_flags=""
+nis_yppasswdd_enable="YES"
+nis_yppasswdd_flags=""</programlisting>
+
+	  <para>
+            �ۤȤ�ɤξ��, NIS �����Ф� <command>yppasswd</command> ��
+            �¹Ԥ����뤳�Ȥ�ͤ���Ǥ��礦.
+            ���������, ���饤����ȥޥ���ˤ���桼����,
+            �ѥ���ɤʤɤΥ桼��������⡼�Ȥ����ѹ����뤳�Ȥ���ǽ�ˤʤ�ޤ�.
+          </para>
+	</sect4>
+
+        <sect4>
+	  <title>NIS ���졼�֥����Ф�����</title>
+
+	  <para>
+            NIS ���졼�֥����Ф������, �ޥ����������Ф���������ñ��,
+            <command>ypinit</command> ���ޥ�ɤ�Ȥ������ǤۤȤ�ɽ����Ǥ�.
+            ���Ҥ����Ʊ���褦��, NIS �ɥᥤ��̾�Ȥ��� &ldquo;test-domain&rdquo;
+            ��ȤäƤ��ޤ�.  
+          </para>
+
+	  <screen>
+# ypinit -s master.example.com test-domain
+
+Server Type: SLAVE Domain: test-domain Master: master.example.com
+
+Creating an YP server will require that you answer a few questions.
+Questions will all be asked at the beginning of the procedure.
+
+Do you want this procedure to quit on non-fatal errors? [y/n: n]  <userinput>n</userinput>
+
+Ok, please remember to go back and redo manually whatever fails.
+If you don't, something might not work. 
+There will be no further questions. The remainder of the procedure
+should take a few minutes, to copy the databases from master.example.com.
+Transfering netgroup...
+ypxfr: Exiting: Map successfully transfered
+Transfering netgroup.byuser...
+ypxfr: Exiting: Map successfully transfered
+Transfering netgroup.byhost...
+ypxfr: Exiting: Map successfully transfered
+Transfering master.passwd.byuid...
+ypxfr: Exiting: Map successfully transfered
+Transfering passwd.byuid...
+ypxfr: Exiting: Map successfully transfered
+Transfering passwd.byname...
+ypxfr: Exiting: Map successfully transfered
+Transfering group.bygid...
+ypxfr: Exiting: Map successfully transfered
+Transfering group.byname...
+ypxfr: Exiting: Map successfully transfered
+Transfering services.byname...
+ypxfr: Exiting: Map successfully transfered
+Transfering rpc.bynumber...
+ypxfr: Exiting: Map successfully transfered
+Transfering rpc.byname...
+ypxfr: Exiting: Map successfully transfered
+Transfering protocols.byname...
+ypxfr: Exiting: Map successfully transfered
+Transfering master.passwd.byname...
+ypxfr: Exiting: Map successfully transfered
+Transfering networks.byname...
+ypxfr: Exiting: Map successfully transfered
+Transfering networks.byaddr...
+ypxfr: Exiting: Map successfully transfered
+Transfering netid.byname...
+ypxfr: Exiting: Map successfully transfered
+Transfering hosts.byaddr...
+ypxfr: Exiting: Map successfully transfered
+Transfering protocols.bynumber...
+ypxfr: Exiting: Map successfully transfered
+Transfering ypservers...
+ypxfr: Exiting: Map successfully transfered
+Transfering hosts.byname...
+ypxfr: Exiting: Map successfully transfered
+
+slave.example.com has been setup as an YP slave server without any errors. 
+Don't forget to update map ypservers on master.example.com.</screen>
+        
+	  <para>
+            �������, <filename>/var/yp/test-domain</filename>
+            �Ȥ����ǥ��쥯�ȥ꤬ɬ�פˤʤ�ޤ�.  
+            NIS �ޥ����������ФΥޥåץե�����Υ��ԡ���, 
+            ���Υǥ��쥯�ȥ���֤���,
+            �ǿ��Τ�Τ˰ݻ�����Ƥ��ʤ���Фʤ�ޤ���.
+            ���Υ���ȥ�򥹥졼�֥����Ф� <filename>/etc/crontab</filename>
+            ���ɲä��뤳�Ȥ�, �ǿ��Τ�Τ��ݤĤ��Ȥ��Ǥ��ޤ�.
+          </para>
+        
+	  <programlisting>
+20      *       *       *       *       root   /usr/libexec/ypxfr passwd.byname
+21      *       *       *       *       root   /usr/libexec/ypxfr passwd.byuid</programlisting>
+
+	  <para>
+            ������Ԥ�, ���졼�֥����Фˤ���ޥåץե������, 
+            �ޥ����������ФΥޥåץե������Ʊ���������ΤǤ���, 
+            ɬ�ܤȤ����櫓�ǤϤ���ޤ���. �ʤ��ʤ�,
+            �ޥ����������Ф�, NIS �ޥåפ��Ф����ѹ���
+            ���졼�֥����Ф������褦�Ȥ��뤫��Ǥ�.
+            ������, �����Ф��������륷���ƥ�ˤȤäƥѥ���ɾ���ϤȤƤ���פʤ�ΤǤ��Τ�,
+            ����Ū�˹������Ƥ��ޤ������ɤ��Ǥ��礦.
+            �ä�, �ޥåץե�����ι�����������ȹԤʤ��뤫�ɤ���
+            �狼��ʤ����餤��������ͥåȥ���Ǥ�, ���פʥݥ���Ȥˤʤ�ޤ�.
+          </para>
+	</sect4>
+      </sect3>
+
+      <sect3>
+        <title>NIS ���饤�����</title>
+	
+	<para>NIS ���饤����Ȥ� <application>ypbind</application>
+          �ǡ�����Ȥä�, ����� NIS
+          �����ФȤδ֤˷��(binding)�ȸƤФ��ط�����Ω�����ޤ�. 
+	  <application>ypbind</application> ��,
+          �����ƥ�Υǥե���ȤΥɥᥤ��(<command>domainname</command>
+          ���ޥ�ɤ����ꤵ��ޤ�)������å���, RPC �׵��
+          �֥����ɥ��㥹�ȥѥ��åȤȤ��ƥ�������ͥåȥ�����������ޤ�.
+          ���� RPC �׵�ˤ��, <command>ypbind</command>
+          ��������Ω�����褦�Ȥ��Ƥ���ɥᥤ��̾�����ꤵ��ޤ�.
+	  �׵ᤵ��Ƥ���ɥᥤ��̾���Ф��ƥ����ӥ�����褦���ꤵ�줿�����Ф�
+          �֥����ɥ��㥹�ȥѥ��åȤ���������, �����Ф�
+          <command>ypbind</command> �˱�����,
+          <command>ypbind</command> �ϱ����Τ��ä������ФΥ��ɥ쥹��Ͽ���ޤ�. 
+	  ʣ���Υ����Ф�����(���Ȥ��а�ĤΥޥ����������Ф�,
+          ʣ���Υ��졼�֥����Ф�����)���,
+          <command>ypbind</command> ��,
+          �ǽ�˱������������ФΥ��ɥ쥹����Ѥ��ޤ�.
+          ����ʹ�, ���饤����ȤΥ����ƥ��,
+          ���٤Ƥ� NIS ���׵�򤽤Υ����Ф˸������������ޤ�. 
+	  <application>ypbind</application> ��,
+          �����Ф���Ĵ��ư��Ƥ��뤳�Ȥ��ǧ���뤿��,
+          ���� &ldquo;ping&rdquo; �򥵡��Ф�����ޤ�.
+          ȿ������äƤ���٤�������� ping ���Ф����������ʤ����,
+	  <command>ypbind</command> ��,
+          ���Υɥᥤ�������ǽ(unbound)�Ȥ��Ƶ�Ͽ��,
+          �̤Υ����Ф򸫤Ĥ���٤�, �Ƥӥ֥����ɥ��㥹�ȥѥ��åȤ�������Ԥ��ޤ�. 
+        </para>
+
+	<sect4>
+	  <title>NIS ���饤����Ȥ�����</title>
+	  
+	  <para>FreeBSD �ޥ���ˤ����� NIS ���饤����Ȥ�����,
+            ���˴�ñ�Ǥ�.</para>
+	
+	  <itemizedlist>
+	    <listitem>
+	      <para>�ޤ�, �ۥ��Ȥ� NIS �ɥᥤ��̾�����ꤷ�ޤ�.
+                �����, <command>domainname</command>
+                ���ޥ�ɤ����ꤹ�뤫,
+                �ʲ��Υ���ȥ��
+                <filename>/etc/rc.conf</filename>
+                ���ɲä���, �֡��Ȼ������ꤵ���褦�ˤ��Ƥ�������.
+              </para>
+
+	      <programlisting>nisdomainname="test-domain"</programlisting>
+	    </listitem>
+
+	    <listitem>
+	      <para>NIS �����Фˤ���,
+                ���٤ƤΥѥ���ɥ���ȥ������ि��, 
+                <command>vipw</command>���ޥ�ɤǰʲ��ιԤ�
+                <filename>/etc/master.passwd</filename>
+                ���ɲä��ޤ�. </para>
+
+	      <programlisting>+:::::::::</programlisting>
+
+	      <note>
+		<para>���ιԤˤ�ä�,
+                  NIS �����ФΥѥ���ɥޥåפ˥�������Ȥ������������,
+                  ��������Ȥ�Ϳ�����ޤ�.
+                  ���ιԤ��ѹ������, ���ޤ��ޤ� NIS
+                  ���饤����Ȥ������Ԥʤ����Ȥ���ǽ�Ǥ�.
+		  ����ʾ�ܤ����Τꤿ������,
+                  O'Reilly ��
+                  <literal>Managing NFS and NIS</literal>
+                  ���ɤߤ�������.</para>
+	      </note>
+	    </listitem>
+
+	    <listitem>
+	      <para>
+                NIS �����Фˤ���,
+                ���٤ƤΥ��롼�ץ���ȥ������ि��, 
+	        �ʲ��ιԤ�
+                <filename>/etc/group</filename>
+                ���ɲä��ޤ�.
+	������</para>
+	        
+	      <programlisting>+:*::</programlisting>
+	    </listitem>
+	  </itemizedlist>
+
+	  <para>�嵭�μ�礬���٤ƴ�λ�����,
+	    <command>ypcat passwd</command> �ˤ�ä�
+            NIS �����Ф� passwd �ޥåפ����ȤǤ���褦�ˤʤäƤ���Ϥ��Ǥ�.
+          </para>
+	</sect4>
+      </sect3>
+    </sect2>
+
+    <sect2>
+      <title>NIS �������ƥ�</title>
+
+      <para>���̤�, �ɥᥤ��̾�����ΤäƤ����,
+        �ɤ��ˤ����⡼�ȥ桼���Ǥ� ypserv �� RPC ��ȯ�Ԥ�,
+        NIS �ޥåפ����Ƥ�����Ф����Ȥ��Ǥ��ޤ�.
+        �������ä������ʤ��Ȥ���ɤ�����,
+        ypserv �ˤ� securenets �ȸƤФ�뵡ǽ������ޤ�.
+        ����ϥ������������줿�ۥ��Ȥ��������¤��뵡ǽ�Ǥ�.
+        ypserv �ϵ�ư����,
+        <filename>/var/yp/securenets</filename> �ե����뤫��
+        securenets �˴ؤ��������ɤ߹��ߤޤ�.</para>
+	
+      <note>
+	<para>�嵭�Υѥ�̾��, <option>-p</option>
+          ���ץ����ǻ��ꤵ�줿�ѥ�̾�ˤ�ä��Ѥ��ޤ�.
+          ���Υե������, ����Ƕ��ڤ�줿
+          �ͥåȥ������ȥͥåȥޥ����Υ���ȥ꤫��ʤäƤ���,
+          &ldquo;#&rdquo; �ǻϤޤ�Ԥϥ����ȤȤߤʤ���ޤ�.
+          ��ñ�� securenets �ե���������ʲ��˼����ޤ�.</para>
+      </note>
+
+      <programlisting>
+# allow connections from local host -- mandatory
+127.0.0.1     255.255.255.255
+# allow connections from any host
+# on the 192.168.128.0 network
+192.168.128.0 255.255.255.0
+# allow connections from any host
+# between 10.0.0.0 to 10.0.15.255
+10.0.0.0      255.255.240.0</programlisting>
+
+      <para>ypserv ���嵭�Υ롼��ΰ�Ĥȹ��פ��륢�ɥ쥹������׵�������ä����,
+        �������̾�˹Ԥʤ��ޤ�.
+        �⤷���ɥ쥹���롼��˹��פ��ʤ����,
+        �����׵��̵�뤵��Ʒٹ��å������������˵�Ͽ����ޤ�.
+	�ޤ�, <filename>/var/yp/securenets</filename>
+        ��¸�ߤ��ʤ����, ypserv ��, ���٤ƤΥۥ��Ȥ������³���������ޤ�.
+      </para>
+
+      <para>ypserv ��,
+        Wietse Venema ��ˤ��
+	<application>tcpwrapper</application>
+        �ѥå������⥵�ݡ��Ȥ��Ƥ��ޤ�.
+        ������, <filename>/var/yp/securenets</filename> �������
+        tcpwrapper ������ե������Ȥäƥ������������Ԥʤ����Ȥ��ǽ�Ǥ�.
+      </para>
+
+      <note>
+	<para>�����Υ����������浡ǽ�ϰ���Υ������ƥ����󶡤��ޤ���,
+          �ɤ�����ø��ݡ��ȤΥƥ��ȤΤ褦�� &ldquo;IP spoofing&rdquo;
+          ������Ф����ȼ�Ǥ�.</para>
+      </note>
+    </sect2>
+
+    <sect2>
+      <title>NIS v1 �Ȥθߴ���</title>
+
+      <para>FreeBSD ��
+        <application>ypserv</application> ��,
+        NIS v1 ���饤����Ȥ���ʬŪ�˥��ݡ��Ȥ��ޤ�.
+        FreeBSD �� NIS ������ NIS v2 �ץ��ȥ���Τߤ���Ѥ��Ƥ��ޤ���,
+        �ۤ��μ����Ǥ�, �Ť������ƥ�Ȥβ��̸ߴ�����������뤿��
+        v1 �ץ��ȥ���򥵥ݡ��Ȥ��Ƥ����Τ⤢��ޤ�.
+        ���Τ褦�ʥ����ƥ���դ��Ƥ���
+        <application>ypbind</application> �ǡ�����,
+        ɬ�פ��ʤ��ˤ⤫����餺 NIS v1
+        �Υ����ФȤη�����Ω�����褦�Ȥ��ޤ�(������
+	v2 �����Ф���α��������������Ǥ�,
+        �֥����ɥ��㥹�Ȥ�³���뤫���Τ�ޤ���).
+        FreeBSD �� ypserv ��,
+        ���饤����Ȥ�����̾�Υꥯ�����Ȥϥ��ݡ��Ȥ��Ƥ��ޤ���,
+        v1 �Υޥå�ž���ꥯ�����Ȥϥ��ݡ��Ȥ��Ƥ��ʤ����Ȥ����դ��Ƥ�������.
+        �Ĥޤ� FreeBSD �� ypserv ��,
+        v1 �����򥵥ݡ��Ȥ���褦�ʸŤ� NIS �����Ф��Ȥ߹�碌��
+        �ޥ������䥹�졼�֥����ФȤ��ƻȤ����ȤϤǤ��ޤ���.
+        �����ʤ��Ȥ�, ����, ���Τ褦�ʥ����Ф��Ȥ��Ƥ��뤳�Ȥ�
+        �ۤȤ�ɤʤ��Ǥ��礦.</para>
+    </sect2>
+
+    <sect2>
+      <title>NIS ���饤����ȤȤ��Ƥ�ư��Ƥ��� NIS ������</title>
+
+      <para>ʣ���Υ����Ф�¸�ߤ�, �����м��Ȥ� NIS
+        ���饤����ȤǤ⤢��褦�ʥɥᥤ���  ypserv ���¹Ԥ������ˤ�,
+        ���դ�ɬ�פǤ�.
+        ����Ū���ɤ��Ȥ���Ƥ���Τ�,
+        ¾�Υ����Фȷ���Ĥ���褦�˥֥����ɥ��㥹�ȥѥ��åȤ������򤵤���ΤǤϤʤ�,
+        �����Ф򤽤켫�Ȥ˷�礵���뤳�ȤǤ�.
+        �⤷, ������Ʊ�Τ���¸�ط�����äƤ���, ��ĤΥ����Ф���ߤ����,
+        ��̯�ʥ����ӥ���ǽ���֤˴٤뤳�Ȥ�����ޤ�.
+        ���η��, ���٤ƤΥ��饤����Ȥϥ����ॢ���Ȥ򵯤�����
+        ¾�Υ����Ф˷�礷�褦�Ȼ�ߤޤ���,
+        ����ˤ�������֤Ϥ��ʤ��礭��,
+        ������Ʊ�Τ��ޤ��ߤ��˷�礷�Ƥ��ޤä��ꤹ���,
+        �����ӥ���ǽ���֤Ϥ���˷�³���뤳�Ȥˤʤ�ޤ�.</para>
+
+      <para>
+        <command>ypbind</command> ��
+        <option>-S</option> ���ץ����ե饰����ꤷ�Ƽ¹Ԥ��뤳�Ȥ�, 
+        �ۥ��Ȥ�����Υ����Ф˷�礹�뤳�Ȥ���ǽ�Ǥ�.
+      </para>
+    </sect2>
+
+    <sect2>
+      <title>libscrypt �� libdescrypt</title>
+
+      <para>
+        NIS ��������褦����ͤ�ï�⤬�֤Ĥ�������ΰ�Ĥ�,
+        �Ź�饤�֥��θߴ���������ޤ�.
+        NIS �����Ф� DES �Ź�饤�֥���ȤäƤ�����ˤ�,
+        Ʊ�ͤ� DES ����Ѥ��Ƥ��륯�饤����Ȥ������ݡ��ȤǤ��ޤ���. 
+	�����Фȥ��饤����Ȥ��ɤΥ饤�֥�����Ѥ��Ƥ��뤫��,
+        <filename>/usr/lib</filename>
+        �Υ���ܥ�å���󥯤򸫤�Ф狼��ޤ�.
+        ����ޥ��� DES �饤�֥���Ȥ��褦�����ꤵ��Ƥ�����,
+        ��󥯤ϰʲ��Τ褦�ˤʤäƤ��ޤ�. </para>
+
+      <screen>
+&prompt.user; <userinput>ls -l /usr/lib/*crypt*</userinput>
+lrwxrwxrwx  1 root  wheel     13 Jul 15 08:55 /usr/lib/libcrypt.a@ -> libdescrypt.a
+lrwxrwxrwx  1 root  wheel     14 Jul 15 08:55 /usr/lib/libcrypt.so@ -> libdescrypt.so
+lrwxrwxrwx  1 root  wheel     16 Jul 15 08:55 /usr/lib/libcrypt.so.2@ -> libdescrypt.so.2
+lrwxrwxrwx  1 root  wheel     15 Jul 15 08:55 /usr/lib/libcrypt_p.a@ -> libdescrypt_p.a
+-r--r--r--  1 root  wheel  13018 Nov  8 14:27 /usr/lib/libdescrypt.a
+lrwxr-xr-x  1 root  wheel     16 Nov  8 14:27 /usr/lib/libdescrypt.so@ -> libdescrypt.so.2
+-r--r--r--  1 root  wheel  12965 Nov  8 14:27 /usr/lib/libdescrypt.so.2
+-r--r--r--  1 root  wheel  14750 Nov  8 14:27 /usr/lib/libdescrypt_p.a</screen>
+
+      <para>�ޥ��� FreeBSD ��ɸ��� MD5 �Ź�饤�֥���Ȥ��褦��
+	���ꤵ��Ƥ�����ˤ�, �ʲ��Τ褦�ˤʤ�ޤ�. </para>
+
+      <screen>
+&prompt.user; <userinput>ls -l /usr/lib/*crypt*</userinput>
+lrwxrwxrwx  1 root  wheel     13 Jul 15 08:55 /usr/lib/libcrypt.a@ -> libscrypt.a
+lrwxrwxrwx  1 root  wheel     14 Jul 15 08:55 /usr/lib/libcrypt.so@ -> libscrypt.so
+lrwxrwxrwx  1 root  wheel     16 Jul 15 08:55 /usr/lib/libcrypt.so.2@ -> libscrypt.so.2
+lrwxrwxrwx  1 root  wheel     15 Jul 15 08:55 /usr/lib/libcrypt_p.a@ -> libscrypt_p.a
+-r--r--r--  1 root  wheel   6194 Nov  8 14:27 /usr/lib/libscrypt.a
+lrwxr-xr-x  1 root  wheel     14 Nov  8 14:27 /usr/lib/libscrypt.so@ -> libscrypt.so.2
+-r--r--r--  1 root  wheel   7579 Nov  8 14:27 /usr/lib/libscrypt.so.2
+-r--r--r--  1 root  wheel   6684 Nov  8 14:27 /usr/lib/libscrypt_p.a</screen>
+	
+      <para>NIS ���饤����Ȥ�ǧ�ڤǥȥ�֥뤬ȯ���������ˤ�,
+        ������������Ȥʤꤽ������ʬ��õ�����ɤ��Ǥ��礦.
+      </para>
+    </sect2>
+  </sect1>
 </chapter>
 
 <!--
diff --git a/ja_JP.eucJP/books/handbook/authors.ent b/ja_JP.eucJP/books/handbook/authors.ent
index 04892db175..e0500e45c6 100644
--- a/ja_JP.eucJP/books/handbook/authors.ent
+++ b/ja_JP.eucJP/books/handbook/authors.ent
@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.69
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.22 2000/01/11 08:41:57 motoyuki Exp $
+     Original revision: 1.76
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.23 2000/02/26 20:32:52 ume Exp $
 
      Names and email address of contributing authors and CVS committers.
      Entity names for committers should be the same as their login names on
@@ -52,6 +52,8 @@
 
 <!ENTITY a.brian "Brian Somers <email>brian@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>">
@@ -156,6 +158,8 @@
 
 <!ENTITY a.gryphon "Coranth Gryphon <email>gryphon@healer.com</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>">
@@ -244,7 +248,7 @@
 
 <!ENTITY a.kato "��ƣ ��ŵ <email>kato@FreeBSD.org</email>">
 
-<!ENTITY a.kelly "Sean Kelly <email>kelly@plutotech.com</email>">
+<!ENTITY a.kelly "Sean Kelly <email>kelly@ad1440.net</email>">
 
 <!ENTITY a.ken "Kenneth D. Merry <email>ken@FreeBSD.org</email>">
 
@@ -346,6 +350,8 @@
 
 <!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>">
@@ -426,13 +432,15 @@
 
 <!ENTITY a.ume "���� ȥ <email>ume@FreeBSD.org</email>">
 
+<!ENTITY a.unfurl "Bill Swingle <email>unfurl@FreeBSD.org</email>">
+
 <!ENTITY a.vanilla "Vanilla I. Shu <email>vanilla@FreeBSD.org</email>">
 
 <!ENTITY a.wes "Wes Peters <email>wes@FreeBSD.org</email>">
 
 <!ENTITY a.whiteside "Don Whiteside <email>whiteside@acm.org</email>">
 
-<!ENTITY a.wilko "Wilko Bulte <email>wilko@yedi.iaf.nl</email>">
+<!ENTITY a.wilko "Wilko Bulte <email>wilko@FreeBSD.org</email>">
 
 <!ENTITY a.wlloyd "Bill Lloyd <email>wlloyd@mpd.ca</email>">
 
diff --git a/ja_JP.eucJP/books/handbook/basics/chapter.sgml b/ja_JP.eucJP/books/handbook/basics/chapter.sgml
index dd4fcc2d20..7c70e965ea 100644
--- a/ja_JP.eucJP/books/handbook/basics/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/basics/chapter.sgml
@@ -3,13 +3,13 @@
      The FreeBSD Japanese Documentation Project
 
      Original revision: 1.12
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/basics/chapter.sgml,v 1.5 1999/11/13 15:34:51 kuriyama Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/basics/chapter.sgml,v 1.6 1999/12/06 02:23:29 kuriyama Exp $
 -->
 
 <chapter id="basics">
   <title>Unix �δ����μ�</title>
 
-  <para><emphasis>��: &a.jp.nakai;.  12 October 1996.</emphasis></para>
+  <para><emphasis>��: &a.jp.nakai;, 1996 ǯ 10 �� 12 ��.</emphasis></para>
 
   <sect1 id="basics-man">
     <title>����饤��ޥ˥奢��</title>
diff --git a/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml b/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml
index 9fcc8cd2dc..5395314061 100644
--- a/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml
@@ -2,14 +2,14 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.18
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml,v 1.6 1999/09/24 14:48:21 kuriyama Exp $
+     Original revision: 1.19
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml,v 1.7 1999/12/06 02:23:30 kuriyama Exp $
 -->
 
-<chapter id="bibliography">
+<appendix id="bibliography">
   <title>���Ϳ޽�</title>
 
-  <para><emphasis>��: &a.jp.nakai;.  12 October 1996.</emphasis></para>
+  <para><emphasis>��: &a.jp.nakai;, 1996 ǯ 10 �� 12 ��.</emphasis></para>
 
   <para>FreeBSD ���ڥ졼�ƥ��󥰥����ƥ�θġ�����ʬ�ˤĤ��Ƥ�
     �ޥ˥奢��ڡ���������Τ褦���������ʤ���Ƥ��ޤ���,
@@ -620,15 +620,15 @@
       </listitem>
     </itemizedlist>
   </sect1>
-</chapter>
+</appendix>
 
 <!--
      Local Variables:
      mode: sgml
-     sgml-declaration: "../chapter.decl"
+     sgml-declaration: "../appendix.decl"
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
-     sgml-parent-document: ("../book.sgml" "part" "chapter")
+     sgml-parent-document: ("../book.sgml" "part" "appendix")
      End:
 -->
diff --git a/ja_JP.eucJP/books/handbook/book.sgml b/ja_JP.eucJP/books/handbook/book.sgml
index 3995228918..1e87ae03c5 100644
--- a/ja_JP.eucJP/books/handbook/book.sgml
+++ b/ja_JP.eucJP/books/handbook/book.sgml
@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.82
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/book.sgml,v 1.52 2000/01/06 03:44:30 kuriyama Exp $
+     Original revision: 1.83
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/book.sgml,v 1.53 2000/02/19 03:11:10 kuriyama Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
@@ -111,7 +111,6 @@
     &chap.backups;
     &chap.quotas;
     &chap.x11;
-    &chap.hw;
     &chap.l10n;
   </part>
 
@@ -144,6 +143,7 @@
     &chap.eresources;
     &chap.staff;
     &chap.pgpkeys;
+    &chap.hw;
     &chap.jcontrib;
   </part>
 </book>
diff --git a/ja_JP.eucJP/books/handbook/contrib/chapter.sgml b/ja_JP.eucJP/books/handbook/contrib/chapter.sgml
index 8fb977dd2f..c671ea55be 100644
--- a/ja_JP.eucJP/books/handbook/contrib/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/contrib/chapter.sgml
@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.150
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.29 2000/01/11 08:41:58 motoyuki Exp $
+     Original revision: 1.159
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.30 2000/01/23 04:31:17 kuriyama Exp $
 -->
 
 <chapter id="contrib">
@@ -11,7 +11,7 @@
 
   <para><emphasis>����: &a.jkh;.</emphasis></para>
 
-  <para><emphasis>��: &a.jp.iwasaki;.  27 April 1997.</emphasis></para>
+  <para><emphasis>��: &a.jp.iwasaki;, 1997 ǯ 4 �� 27 ��.</emphasis></para>
 
   <para>���ʤ��ⲿ�� FreeBSD �Τ���˹׸��������ʤ�ޤ�����?
     �����餷��! �䤿���Ͼ�˻ٱ��������Ѱդ�����ޤ���, FreeBSD
@@ -1341,6 +1341,10 @@ Copyright (C) [ǯ]
       <listitem>
 	<para>Adam McDougall <email>mcdouga9@egr.msu.edu</email></para>
       </listitem>
+
+      <listitem>
+	<para>Adam Strohl <email>troll@digitalspark.net</email></para>
+      </listitem>
       
       <listitem>
         <para>Adrian Colley <email>aecolley@ois.ie</email></para>
@@ -1358,10 +1362,6 @@ Copyright (C) [ǯ]
         <para>Adrian Steinmann <email>ast@marabu.ch</email></para>
       </listitem>
 
-      <listitem>
-	<para>Adam Strohl <email>troll@digitalspark.net</email></para>
-      </listitem>
-
       <listitem>
         <para>Adrian T. Filipi-Martin
 	  <email>atf3r@agate.cs.virginia.edu</email></para>
@@ -1441,12 +1441,12 @@ Copyright (C) [ǯ]
       </listitem>
 
       <listitem>
-        <para>Alexander Leidinger
-	  <email>netchild@wurzelausix.CS.Uni-SB.DE</email></para>
+	<para>Alexander Langer <email>alex@cichlids.com</email></para>
       </listitem>
 
       <listitem>
-	<para>Alexander Langer <email>alex@cichlids.com</email></para>
+        <para>Alexander Leidinger
+	  <email>netchild@wurzelausix.CS.Uni-SB.DE</email></para>
       </listitem>
 
       <listitem>
@@ -1618,6 +1618,10 @@ Copyright (C) [ǯ]
         <para>Antti Kaipila <email>anttik@iki.fi</email></para>
       </listitem>
 
+      <listitem>
+	<para>arci <email>vega@sophia.inria.fr</email></para>
+      </listitem>
+
       <listitem>
         <para>Are Bryne <email>are.bryne@communique.no</email></para>
       </listitem>
@@ -1698,6 +1702,10 @@ Copyright (C) [ǯ]
         <para>Bob Van Valzah <email>Bob@whitebarn.com</email></para>
       </listitem>
 
+      <listitem>
+        <para>Bob Wilcox <email>bob@obiwan.uucp</email></para>
+      </listitem>
+
       <listitem>
         <para>Bob Willcox <email>bob@luke.pmr.com</email></para>
       </listitem>
@@ -1706,6 +1714,10 @@ Copyright (C) [ǯ]
         <para>Boris Staeblow <email>balu@dva.in-berlin.de</email></para>
       </listitem>
 
+      <listitem>
+        <para>Boyd Faulkner <email>faulkner@mpd.tandem.com</email></para>
+      </listitem>
+
       <listitem>
         <para>Boyd R. Faulkner <email>faulkner@asgard.bga.com</email></para>
       </listitem>
@@ -1730,14 +1742,6 @@ Copyright (C) [ǯ]
         <para>&a.wlloyd</para>
       </listitem>
 
-      <listitem>
-        <para>Bob Wilcox <email>bob@obiwan.uucp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>Boyd Faulkner <email>faulkner@mpd.tandem.com</email></para>
-      </listitem>
-
       <listitem>
         <para>Brent J. Nordquist <email>bjn@visi.com</email></para>
       </listitem>
@@ -2012,11 +2016,6 @@ Copyright (C) [ǯ]
         <para>Cy Schubert <email>cschuber@uumail.gov.bc.ca</email></para>
       </listitem>
 
-      <listitem>
-        <para>DI. Christian Gusenbauer
-	  <email>cg@scotty.edvz.uni-linz.ac.at</email></para>
-      </listitem>
-
       <listitem>
         <para>Dai Ishijima <email>ishijima@tri.pref.osaka.jp</email></para>
       </listitem>
@@ -2211,10 +2210,19 @@ Copyright (C) [ǯ]
         <para>Denton Gentry <email>denny1@home.com</email></para>
       </listitem>
 
+      <listitem>
+	<para>der Mouse <email>mouse@Collatz.McRCIM.McGill.EDU</email></para>
+      </listitem>
+
       <listitem>
         <para>Derek Inksetter <email>derek@saidev.com</email></para>
       </listitem>
 
+      <listitem>
+        <para>DI. Christian Gusenbauer
+	  <email>cg@scotty.edvz.uni-linz.ac.at</email></para>
+      </listitem>
+
       <listitem>
         <para>Dima Sivachenko <email>dima@Chg.RU</email></para>
       </listitem>
@@ -2309,6 +2317,10 @@ Copyright (C) [ǯ]
         <para>Ed Hudson <email>elh@p5.spnet.com</email></para>
       </listitem>
 
+      <listitem>
+        <para>Edward Chuang <email>edwardc@firebird.org.tw</email></para>
+      </listitem>
+
       <listitem>
         <para>Edward Wang <email>edward@edcom.com</email></para>
       </listitem>
@@ -2317,6 +2329,10 @@ Copyright (C) [ǯ]
         <para>Edwin Groothus <email>edwin@nwm.wan.philips.com</email></para>
       </listitem>
 
+      <listitem>
+	<para>Ege Rekk <email>aagero@aage.priv.no</email></para>
+      </listitem>
+
       <listitem>
         <para>Eiji-usagi-MATSUmoto <email>usagi@clave.gr.jp</email></para>
       </listitem>
@@ -2431,10 +2447,6 @@ Copyright (C) [ǯ]
         <para>Frank Nobis <email>fn@Radio-do.de</email></para>
       </listitem>
 
-      <listitem>
-        <para>Frank Volf <email>volf@oasis.IAEhv.nl</email></para>
-      </listitem>
-
       <listitem>
         <para>Frank ten Wolde <email>franky@pinewood.nl</email></para>
       </listitem>
@@ -2443,6 +2455,10 @@ Copyright (C) [ǯ]
         <para>Frank van der Linden <email>frank@fwi.uva.nl</email></para>
       </listitem>
 
+      <listitem>
+        <para>Frank Volf <email>volf@oasis.IAEhv.nl</email></para>
+      </listitem>
+
       <listitem>
         <para>Fred Cawthorne <email>fcawth@jjarray.umn.edu</email></para>
       </listitem>
@@ -2473,6 +2489,10 @@ Copyright (C) [ǯ]
 	  <email>furusawa@com.cs.osakafu-u.ac.jp</email></para>
       </listitem>
 
+      <listitem>
+        <para>G. Adam Stanislav<email>adam@whizkidtech.net</email></para>
+      </listitem>
+
       <listitem>
         <para>Gabor Kincses <email>gabor@acm.org</email></para>
       </listitem>
@@ -2481,10 +2501,6 @@ Copyright (C) [ǯ]
         <para>Gabor Zahemszky <email>zgabor@CoDe.hu</email></para>
       </listitem>
 
-      <listitem>
-        <para>G. Adam Stanislav<email>adam@whizkidtech.net</email></para>
-      </listitem>
-
       <listitem>
         <para>Garance A Drosehn <email>gad@eclipse.its.rpi.edu</email></para>
       </listitem>
@@ -2539,12 +2555,12 @@ Copyright (C) [ǯ]
       </listitem>
 
       <listitem>
-        <para>Ginga Kawaguti
-	  <email>ginga@amalthea.phys.s.u-tokyo.ac.jp</email></para>
+        <para>Giles Lean <email>giles@nemeton.com.au</email></para>
       </listitem>
 
       <listitem>
-        <para>Giles Lean <email>giles@nemeton.com.au</email></para>
+        <para>Ginga Kawaguti
+	  <email>ginga@amalthea.phys.s.u-tokyo.ac.jp</email></para>
       </listitem>
 
       <listitem>
@@ -2612,15 +2628,6 @@ Copyright (C) [ǯ]
         <para>HAMADA Naoki <email>hamada@astec.co.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>HONDA Yasuhiro
-	  <email>honda@kashio.info.mie-u.ac.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>HOSOBUCHI Noriyuki <email>hoso@buchi.tama.or.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Hannu Savolainen <email>hannu@voxware.pp.fi</email></para>
       </listitem>
@@ -2720,6 +2727,11 @@ Copyright (C) [ǯ]
         <para>Holm Tiffe <email>holm@geophysik.tu-freiberg.de</email></para>
       </listitem>
 
+      <listitem>
+        <para>HONDA Yasuhiro
+	  <email>honda@kashio.info.mie-u.ac.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Horance Chou
 	  <email>horance@freedom.ie.cycu.edu.tw</email></para>
@@ -2729,6 +2741,10 @@ Copyright (C) [ǯ]
         <para>Horihiro Kumagai <email>kuma@jp.FreeBSD.org</email></para>
       </listitem>
 
+      <listitem>
+        <para>HOSOBUCHI Noriyuki <email>hoso@buchi.tama.or.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>HOTARU-YA <email>hotaru@tail.net</email></para>
       </listitem>
@@ -2753,15 +2769,6 @@ Copyright (C) [ǯ]
         <para>Hung-Chi Chu <email>hcchu@r350.ee.ntu.edu.tw</email></para>
       </listitem>
 
-      <listitem>
-        <para>IMAI Takeshi <email>take-i@ceres.dti.ne.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>IMAMURA Tomoaki
-	  <email>tomoak-i@is.aist-nara.ac.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Ian Dowse <email>iedowse@maths.tcd.ie</email></para>
       </listitem>
@@ -2802,6 +2809,15 @@ Copyright (C) [ǯ]
         <para>Ilya V. Komarov <email>mur@lynx.ru</email></para>
       </listitem>
 
+      <listitem>
+        <para>IMAI Takeshi <email>take-i@ceres.dti.ne.jp</email></para>
+      </listitem>
+
+      <listitem>
+        <para>IMAMURA Tomoaki
+	  <email>tomoak-i@is.aist-nara.ac.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Issei Suzuki <email>issei@jp.FreeBSD.org</email></para>
       </listitem>
@@ -2870,6 +2886,10 @@ Copyright (C) [ǯ]
         <para>James D. Stewart <email>jds@c4systm.com</email></para>
       </listitem>
 
+      <listitem>
+        <para>James da Silva <email>jds@cs.umd.edu</email></para>
+      </listitem>
+
       <listitem>
         <para>James Jegers <email>jimj@miller.cs.uwm.edu</email></para>
       </listitem>
@@ -2883,10 +2903,6 @@ Copyright (C) [ǯ]
         <para>James T. Liu <email>jtliu@phlebas.rockefeller.edu</email></para>
       </listitem>
 
-      <listitem>
-        <para>James da Silva <email>jds@cs.umd.edu</email></para>
-      </listitem>
-
       <listitem>
         <para>Jan Conard
 	  <email>charly@fachschaften.tu-muenchen.de</email></para>
@@ -2942,6 +2958,10 @@ Copyright (C) [ǯ]
         <para>Jeff Bartig <email>jeffb@doit.wisc.edu</email></para>
       </listitem>
 
+      <listitem>
+        <para>Jeff Brown <email>jabrown@caida.org</email></para>
+      </listitem>
+
       <listitem>
         <para>Jeff Forys <email>jeff@forys.cranbury.nj.us</email></para>
       </listitem>
@@ -3278,10 +3298,6 @@ Copyright (C) [ǯ]
         <para>K.Higashino <email>a00303@cc.hc.keio.ac.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>KUNISHIMA Takeo <email>kunishi@c.oka-pu.ac.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Kai Vorma <email>vode@snakemail.hut.fi</email></para>
       </listitem>
@@ -3310,11 +3326,6 @@ Copyright (C) [ǯ]
         <para>Karl Lehenbauer <email>karl@NeoSoft.com</email></para>
       </listitem>
 
-      <listitem><!-- kuriyama - ??? -->
-        <para>Kato Takenori
-	  <email>kato@eclogite.eps.nagoya-u.ac.jp</email></para>
-      </listitem>
-
       <listitem>
 	<para>KATO Tsuguru <email>tkato@prontomail.ne.jp</email></para>
       </listitem>
@@ -3455,6 +3466,10 @@ Copyright (C) [ǯ]
         <para>Kouichi Hirabayashi <email>kh@mogami-wire.co.jp</email></para>
       </listitem>
 
+      <listitem>
+        <para>KUNISHIMA Takeo <email>kunishi@c.oka-pu.ac.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Kurt D. Zeilenga <email>Kurt@Boolean.NET</email></para>
       </listitem>
@@ -3469,12 +3484,12 @@ Copyright (C) [ǯ]
       </listitem>
 
       <listitem>
-        <para>Lars K&ouml;ller
-	  <email>Lars.Koeller@Uni-Bielefeld.DE</email></para>
+        <para>Larry Altneu <email>larry@ALR.COM</email></para>
       </listitem>
 
       <listitem>
-        <para>Larry Altneu <email>larry@ALR.COM</email></para>
+        <para>Lars K&ouml;ller
+	  <email>Lars.Koeller@Uni-Bielefeld.DE</email></para>
       </listitem>
 
       <listitem>
@@ -3518,27 +3533,6 @@ Copyright (C) [ǯ]
         <para>M.C. Wong <email>unknown</email></para>
       </listitem>
 
-      <listitem>
-        <para>MANTANI Nobutaka <email>nobutaka@nobutaka.com</email></para>
-      </listitem>
-
-      <listitem>
-        <para>MIHIRA Sanpei Yoshiro <email>sanpei@sanpei.org</email></para>
-      </listitem>
-
-      <listitem>
-        <para>MITA Yoshio <email>mita@jp.FreeBSD.org</email></para>
-      </listitem>
-
-      <listitem>
-        <para>MITSUNAGA Noriaki
-	  <email>mitchy@er.ams.eng.osaka-u.ac.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>MOROHOSHI Akihiko <email>moro@race.u-tokyo.ac.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Magnus Enbom <email>dot@tinto.campus.luth.se</email></para>
       </listitem>
@@ -3560,6 +3554,10 @@ Copyright (C) [ǯ]
         <para>Malte Lance <email>malte.lance@gmx.net</email></para>
       </listitem>
 
+      <listitem>
+        <para>MANTANI Nobutaka <email>nobutaka@nobutaka.com</email></para>
+      </listitem>
+
       <listitem>
         <para>Manu Iyengar
 	  <email>iyengar@grunthos.pscwa.psca.com</email></para>
@@ -3668,12 +3666,12 @@ Copyright (C) [ǯ]
       </listitem>
 
       <listitem>
-        <para>Masachika ISHIZUKA
-	  <email>ishizuka@isis.min.ntt.jp</email></para>
+        <para>Mas.TAKEMURA <email>unknown</email></para>
       </listitem>
 
       <listitem>
-        <para>Mas.TAKEMURA <email>unknown</email></para>
+        <para>Masachika ISHIZUKA
+	  <email>ishizuka@isis.min.ntt.jp</email></para>
       </listitem>
 
       <listitem>
@@ -3738,6 +3736,10 @@ Copyright (C) [ǯ]
         <para>Matthew Stein <email>matt@bdd.net</email></para>
       </listitem>
 
+      <listitem>
+        <para>Matthew West <email>mwest@uct.ac.za</email></para>
+      </listitem>
+
       <listitem>
         <para>Matthias Pfaller <email>leo@dachau.marco.de</email></para>
       </listitem>
@@ -3843,6 +3845,10 @@ Copyright (C) [ǯ]
 	  <email>msagre@cactus.fi.uba.ar</email></para>
       </listitem>
 
+      <listitem>
+        <para>MIHIRA Sanpei Yoshiro <email>sanpei@sanpei.org</email></para>
+      </listitem>
+
       <listitem>
         <para>Mihoko Tanaka <email>m_tonaka@pa.yokogawa.co.jp</email></para>
       </listitem>
@@ -3928,6 +3934,15 @@ Copyright (C) [ǯ]
         <para>Ming-I Hseh <email>PA@FreeBSD.ee.Ntu.edu.TW</email></para>
       </listitem>
 
+      <listitem>
+        <para>MITA Yoshio <email>mita@jp.FreeBSD.org</email></para>
+      </listitem>
+
+      <listitem>
+        <para>MITSUNAGA Noriaki
+	  <email>mitchy@er.ams.eng.osaka-u.ac.jp</email></para>
+      </listitem>
+
       <listitem>
 	<para>Mitsuru Yoshida <email>mitsuru@riken.go.jp</email></para>
       </listitem>
@@ -3940,6 +3955,10 @@ Copyright (C) [ǯ]
         <para>Morgan Davis <email>root@io.cts.com</email></para>
       </listitem>
 
+      <listitem>
+        <para>MOROHOSHI Akihiko <email>moro@race.u-tokyo.ac.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Mostyn Lewis <email>mostyn@mrl.com</email></para>
       </listitem>
@@ -3952,10 +3971,6 @@ Copyright (C) [ǯ]
         <para>Motoyuki Kasahara <email>m-kasahr@sra.co.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>Motoyuki Konno <email>motoyuki@snipe.rim.or.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Murray Stokely <email>murray@cdrom.com</email></para>
       </listitem>
@@ -3964,6 +3979,10 @@ Copyright (C) [ǯ]
         <para>N.G.Smith <email>ngs@sesame.hensa.ac.uk</email></para>
       </listitem>
 
+      <listitem>
+        <para>Nadav Eiron <email>nadav@barcode.co.il</email></para>
+      </listitem>
+
       <listitem>
         <para>NAGAO Tadaaki <email>nagao@cs.titech.ac.jp</email></para>
       </listitem>
@@ -3982,18 +4001,6 @@ Copyright (C) [ǯ]
 	  <email>motonori@econ.kyoto-u.ac.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>NIIMI Satoshi <email>sa2c@and.or.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>NOKUBI Hirotaka <email>h-nokubi@yyy.or.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>Nadav Eiron <email>nadav@barcode.co.il</email></para>
-      </listitem>
-
       <listitem>
         <para>Nanbor Wang <email>nw1@cs.wustl.edu</email></para>
       </listitem>
@@ -4055,6 +4062,10 @@ Copyright (C) [ǯ]
         <para>Nickolay N. Dudorov <email>nnd@itfs.nsk.su</email></para>
       </listitem>
 
+      <listitem>
+        <para>NIIMI Satoshi <email>sa2c@and.or.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Niklas Hallqvist <email>niklas@filippa.appli.se</email></para>
       </listitem>
@@ -4063,10 +4074,6 @@ Copyright (C) [ǯ]
         <para>Nisha Talagala <email>nisha@cs.berkeley.edu</email></para>
       </listitem>
 
-      <listitem>
-        <para>No Name <email>ZW6T-KND@j.asahi-net.or.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>No Name <email>adrian@virginia.edu</email></para>
       </listitem>
@@ -4143,6 +4150,10 @@ Copyright (C) [ǯ]
         <para>No Name <email>fn@pain.csrv.uidaho.edu</email></para>
       </listitem>
 
+      <listitem>
+	<para>No Name <email>frf@xocolatl.com</email></para>
+      </listitem>
+
       <listitem>
         <para>No Name <email>gclarkii@netport.neosoft.com</email></para>
       </listitem>
@@ -4323,6 +4334,10 @@ Copyright (C) [ǯ]
         <para>No Name <email>ziggy@ryan.org</email></para>
       </listitem>
 
+      <listitem>
+        <para>No Name <email>ZW6T-KND@j.asahi-net.or.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Nobuhiro Yasutomi <email>nobu@psrc.isac.co.jp</email></para>
       </listitem>
@@ -4332,6 +4347,10 @@ Copyright (C) [ǯ]
 	  <email>kogane@koganemaru.co.jp</email></para>
       </listitem>
 
+      <listitem>
+        <para>NOKUBI Hirotaka <email>h-nokubi@yyy.or.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Norio Suzuki <email>nosuzuki@e-mail.ne.jp</email></para>
       </listitem>
@@ -4458,10 +4477,6 @@ Copyright (C) [ǯ]
         <para>Paul S. LaFollette, Jr. <email>unknown</email></para>
       </listitem>
 
-      <listitem>
-        <para>Paul Saab <email>paul@mu.org</email></para>
-      </listitem>
-
       <listitem>
         <para>Paul Sandys <email>myj@nyct.net</email></para>
       </listitem>
@@ -4772,27 +4787,6 @@ Copyright (C) [ǯ]
         <para>Ryan Younce <email>ryany@pobox.com</email></para>
       </listitem>
 
-      <listitem>
-        <para>SANETO Takanori <email>sanewo@strg.sony.co.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>SASAKI Shunsuke <email>ele@pop17.odn.ne.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>SAWADA Mizuki <email>miz@qb3.so-net.ne.jp</email></para>
-      </listitem>
-
-      <listitem>
-        <para>SUGIMURA Takashi <email>sugimura@jp.FreeBSD.org</email></para>
-      </listitem>
-
-      <listitem>
-        <para>SURANYI Peter
-	  <email>suranyip@jks.is.tsukuba.ac.jp</email></para>
-      </listitem>
-
       <listitem>
 	<para>Sakai Hiroaki <email>sakai@miya.ee.kagu.sut.ac.jp</email></para>
       </listitem>
@@ -4825,6 +4819,14 @@ Copyright (C) [ǯ]
         <para>Sandro Sigala <email>ssigala@globalnet.it</email></para>
       </listitem>
 
+      <listitem>
+        <para>SANETO Takanori <email>sanewo@strg.sony.co.jp</email></para>
+      </listitem>
+
+      <listitem>
+        <para>SASAKI Shunsuke <email>ele@pop17.odn.ne.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Sascha Blank <email>blank@fox.uni-trier.de</email></para>
       </listitem>
@@ -4837,6 +4839,10 @@ Copyright (C) [ǯ]
         <para>Satoh Junichi <email>junichi@astec.co.jp</email></para>
       </listitem>
 
+      <listitem>
+        <para>SAWADA Mizuki <email>miz@qb3.so-net.ne.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Scot Elliott <email>scot@poptart.org</email></para>
       </listitem>
@@ -5110,6 +5116,10 @@ Copyright (C) [ǯ]
         <para>Sugimoto Sadahiro <email>ixtl@komaba.utmc.or.jp</email></para>
       </listitem>
 
+      <listitem>
+        <para>SUGIMURA Takashi <email>sugimura@jp.FreeBSD.org</email></para>
+      </listitem>
+
       <listitem>
         <para>Sugiura Shiro <email>ssugiura@duo.co.jp</email></para>
       </listitem>
@@ -5122,6 +5132,11 @@ Copyright (C) [ǯ]
         <para>Sune Stjerneby <email>stjerneby@usa.net</email></para>
       </listitem>
 
+      <listitem>
+        <para>SURANYI Peter
+	  <email>suranyip@jks.is.tsukuba.ac.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Suzuki Yoshiaki
 	  <email>zensyo@ann.tama.kawasaki.jp</email></para>
@@ -5187,10 +5202,6 @@ Copyright (C) [ǯ]
         <para>Tatoku Ogaito <email>tacha@tera.fukui-med.ac.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>Tatsumi HOSOKAWA <email>hosokawa@jp.FreeBSD.org</email></para>
-      </listitem>
-
       <listitem>
         <para>Ted Buswell <email>tbuswell@mediaone.net</email></para>
       </listitem>
@@ -5374,10 +5385,6 @@ Copyright (C) [ǯ]
         <para>Trevor Johnson <email>trevor@jpj.net</email></para>
       </listitem>
 
-      <listitem>
-        <para>URATA Shuichiro <email>s-urata@nmit.tmg.nec.co.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Udo Schweigert <email>ust@cert.siemens.de</email></para>
       </listitem>
@@ -5394,6 +5401,10 @@ Copyright (C) [ǯ]
         <para>Ulli Linzen <email>ulli@perceval.camelot.de</email></para>
       </listitem>
 
+      <listitem>
+        <para>URATA Shuichiro <email>s-urata@nmit.tmg.nec.co.jp</email></para>
+      </listitem>
+
       <listitem>
         <para>Ustimenko Semen <email>semen@iclub.nsu.ru</email></para>
       </listitem>
@@ -5506,10 +5517,6 @@ Copyright (C) [ǯ]
         <para>Wiljo Heinen <email>wiljo@freeside.ki.open.de</email></para>
       </listitem>
 
-      <listitem>
-        <para>Wilko Bulte <email>wilko@yedi.iaf.nl</email></para>
-      </listitem>
-
       <listitem>
 	<para>Will Andrews <email>andrews@technologist.com</email></para>
       </listitem>
@@ -5560,11 +5567,11 @@ Copyright (C) [ǯ]
       </listitem>
 
       <listitem>
-	<para>Yasuhito FUTATSUKI <email>futatuki@fureai.or.jp</email></para>
+	<para>Yasuhiro Fukama <email>yasuf@big.or.jp</email></para>
       </listitem>
 
       <listitem>
-	<para>Yasuhiro Fukama <email>yasuf@big.or.jp</email></para>
+	<para>Yasuhito FUTATSUKI <email>futatuki@fureai.or.jp</email></para>
       </listitem>
 
       <listitem>
@@ -5584,78 +5591,62 @@ Copyright (C) [ǯ]
       </listitem>
 
       <listitem>
-        <para>Yoichi Asai <email>yatt@msc.biglobe.ne.jp</email></para>
+	<para>Yoichi Asai <email>yatt@msc.biglobe.ne.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yoshiaki Uchikawa <email>yoshiaki@kt.rim.or.jp</email></para>
+	<para>Yoshiaki Uchikawa <email>yoshiaki@kt.rim.or.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yoshihiko OHTA <email>yohta@bres.tsukuba.ac.jp</email></para>
+	<para>Yoshihiko OHTA <email>yohta@bres.tsukuba.ac.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yoshihisa NAKAGAWA
-	  <email>y-nakaga@ccs.mt.nec.co.jp</email></para>
+	<para>Yoshihisa NAKAGAWA
+ 	  <email>y-nakaga@ccs.mt.nec.co.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yoshikazu Goto <email>gotoh@ae.anritsu.co.jp</email></para>
+	<para>Yoshikazu Goto <email>gotoh@ae.anritsu.co.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yoshimasa Ohnishi
+	<para>Yoshimasa Ohnishi
 	  <email>ohnishi@isc.kyutech.ac.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yoshishige Arai <email>ryo2@on.rim.or.jp</email></para>
+	<para>Yoshishige Arai <email>ryo2@on.rim.or.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yuichi MATSUTAKA <email>matutaka@osa.att.ne.jp</email></para>
+	<para>Yuichi MATSUTAKA <email>matutaka@osa.att.ne.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yujiro MIYATA
+	<para>Yujiro MIYATA
 	  <email>miyata@bioele.nuee.nagoya-u.ac.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yusuke Nawano <email>azuki@azkey.org</email></para>
+	<para>Yusuke Nawano <email>azuki@azkey.org</email></para>
       </listitem>
 
       <listitem>
-        <para>Yuu Yashiki <email>s974123@cc.matsuyama-u.ac.jp</email></para>
+	<para>Yuu Yashiki <email>s974123@cc.matsuyama-u.ac.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yuuichi Narahara <email>aconitum@po.teleway.ne.jp</email></para>
+	<para>Yuuichi Narahara <email>aconitum@po.teleway.ne.jp</email></para>
       </listitem>
 
       <listitem>
-        <para>Yuval Yarom <email>yval@cs.huji.ac.il</email></para>
+	<para>Yuval Yarom <email>yval@cs.huji.ac.il</email></para>
       </listitem>
 
       <listitem>
-        <para>Yves Fonk <email>yves@cpcoup5.tn.tudelft.nl</email></para>
-      </listitem>
-
-      <listitem>
-        <para>Yves Fonk <email>yves@dutncp8.tn.tudelft.nl</email></para>
-      </listitem>
-
-      <listitem>
-        <para>Zach Heilig <email>zach@gaffaneys.com</email></para>
-      </listitem>
-
-      <listitem>
-        <para>Zahemszhky Gabor <email>zgabor@code.hu</email></para>
-      </listitem>
-
-      <listitem>
-        <para>Zhong Ming-Xun <email>zmx@mail.CDPA.nsysu.edu.tw</email></para>
+	<para>Yves Fonk <email>yves@cpcoup5.tn.tudelft.nl</email></para>
       </listitem>
 
       <listitem>
@@ -5663,15 +5654,15 @@ Copyright (C) [ǯ]
       </listitem>
 
       <listitem>
-        <para>der Mouse <email>mouse@Collatz.McRCIM.McGill.EDU</email></para>
+	<para>Zach Heilig <email>zach@gaffaneys.com</email></para>
       </listitem>
 
       <listitem>
-        <para>frf <email>frf@xocolatl.com</email></para>
+	<para>Zahemszhky Gabor <email>zgabor@code.hu</email></para>
       </listitem>
 
       <listitem>
-        <para>Ege Rekk <email>aagero@aage.priv.no</email></para>
+	<para>Zhong Ming-Xun <email>zmx@mail.CDPA.nsysu.edu.tw</email></para>
       </listitem>
     </itemizedlist>
   </sect1>
diff --git a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
index dd0f3c8ead..c7ee075731 100644
--- a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.37
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml,v 1.7 1999/09/24 14:48:23 kuriyama Exp $
+     Original revision: 1.38
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml,v 1.9 2000/02/17 13:39:27 kuriyama Exp $
 -->
 
 <chapter id="cutting-edge">
diff --git a/ja_JP.eucJP/books/handbook/eresources/chapter.sgml b/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
index 3f511ed9d9..6b46ae743a 100644
--- a/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
@@ -2,17 +2,16 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.37
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/eresources/chapter.sgml,v 1.11 2000/01/06 03:44:35 kuriyama Exp $
+     Original revision: 1.40
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/eresources/chapter.sgml,v 1.12 2000/02/03 01:51:58 motoyuki Exp $
 -->
 
-<chapter id="eresources">
+<appendix id="eresources">
   <title>���󥿡��ͥåȾ�Υ꥽����</title>
 
   <para><emphasis>����: &a.jkh;.</emphasis></para>
 
-  <para><emphasis>��: &a.jp.yuki;.<!-- <br> -->
-      28 August 1996</emphasis></para>
+  <para><emphasis>��: &a.jp.yuki;, 1996 ǯ 8 �� 28 ��</emphasis></para>
 
   <para>FreeBSD �ο��⤬��®�Ǥ��뤿��,
     �ǿ��γ�ȯ��ե��������뤿��ˤ�,
@@ -411,11 +410,9 @@ help
 
       <para>���ٸ����ޤ���,
 	�䤿���ϵ���Ū�ʥ᡼��󥰥ꥹ�ȤǤϵ���Ū�ʵ������ݤĤ褦
-	�׵ᤷ�ޤ�. �⤷,
-	&ldquo;�⤤��٥�&rdquo;�ˤΤ߶�̣������ʤ�, freebsd-announce
-	�˻��ä���褦�˴���ޤ�.
-	����Ͼ��ʤ��ȥ�ե��å���ͽ��Ǥ�.</para>
-      <!-- kuriyama - high point ??? -->
+	�׵ᤷ�ޤ�. �⤷, ���פʥ��ʥ��󥹤ˤΤ߶�̣������ʤ�,
+        freebsd-announce �ؤλ��ä򤪴��ᤷ�ޤ�.
+	����ˤ�, ���ޤꤿ������Υ᡼���ή��ޤ���.</para>
     </sect2>
 
     <sect2 id="eresources-charters">
@@ -1386,15 +1383,15 @@ help
       </tgroup>
     </informaltable>
   </sect1>
-</chapter>
+</appendix>
 
 <!--
      Local Variables:
      mode: sgml
-     sgml-declaration: "../chapter.decl"
+     sgml-declaration: "../appendix.decl"
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
-     sgml-parent-document: ("../book.sgml" "part" "chapter")
+     sgml-parent-document: ("../book.sgml" "part" "appendix")
      End:
 -->
diff --git a/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml b/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
index f65e9e9992..996c9618d8 100644
--- a/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
@@ -2,11 +2,11 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.47
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml,v 1.13 2000/01/06 03:44:43 kuriyama Exp $
+     Original revision: 1.55
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml,v 1.14 2000/01/11 08:41:59 motoyuki Exp $
 -->
 
-<chapter id="mirrors">
+<appendix id="mirrors">
   <title>FreeBSD ��������ˡ</title>
 
   <sect1>
@@ -866,7 +866,7 @@
 	  <itemizedlist>
 	    <listitem>
 	      <para>cvsup.au.FreeBSD.org
-		(maintainer <email>dawes@physics.usyd.edu.au</email>)</para>
+		(maintainer <email>dawes@xfree86.org</email>)</para>
 	    </listitem>
 	  </itemizedlist>
 	</listitem>
@@ -1014,7 +1014,7 @@
 	  <itemizedlist>
 	    <listitem>
 	      <para>cvsup.jp.FreeBSD.org
-		(maintainer <email>simokawa@sat.t.u-tokyo.ac.jp</email>)</para>
+		(maintainer <email>cvsupadm@jp.FreeBSD.org</email>)</para>
 	    </listitem>
 
 	    <listitem>
@@ -1037,6 +1037,11 @@
 	      <para>cvsup5.jp.FreeBSD.org
 		(maintainer <email>cvsup@imasy.or.jp</email>)</para>
 	    </listitem>
+
+	    <listitem>
+	      <para>cvsup6.jp.FreeBSD.org
+                (maintainer <email>cvsupadm@jp.FreeBSD.org</email>)</para>
+	    </listitem>
 	  </itemizedlist>
 	</listitem>
       </varlistentry>
@@ -1074,7 +1079,7 @@
 	  <itemizedlist>
 	    <listitem>
 	      <para>cvsup.no.FreeBSD.org
-		(maintainer <email>Tor.Egge@idt.ntnu.no</email>)</para>
+		(maintainer <email>Per.Hove@math.ntnu.no</email>)</para>
 	    </listitem>
 	  </itemizedlist>
 	</listitem>
@@ -1096,7 +1101,7 @@
 	  <itemizedlist>
 	    <listitem>
 	      <para>cvsup.ru.FreeBSD.org
-		(maintainer <email>mishania@demos.su</email>)</para>
+		(maintainer <email>mishania@sibintek.net</email>)</para>
 	    </listitem>
 
 	    <listitem>
@@ -1244,29 +1249,29 @@
 	    <listitem>
 	      <para>cvsup2.FreeBSD.org
 		(maintainer
-		<email>jdp@FreeBSD.org</email>), ����ե���˥�</para>
+		<email>jdp@FreeBSD.org</email>), ����ե���˥���</para>
 	    </listitem>
 
 	    <listitem>
 	      <para>cvsup3.FreeBSD.org
 		(maintainer
-		<email>wollman@FreeBSD.org</email>), �ޥ����塼���å�</para>
+		<email>wollman@FreeBSD.org</email>), �ޥ����塼���åĽ�</para>
 	    </listitem>
 	    
 	    <listitem>
 	      <para>cvsup4.FreeBSD.org (maintainer
-		<email>rgrimes@FreeBSD.org</email>), ���쥴��</para>
+		<email>rgrimes@FreeBSD.org</email>), ���쥴��</para>
 	    </listitem>
 
 	    <listitem>
 	      <para>cvsup5.FreeBSD.org
 		(maintainer
-		<email>ck@adsu.bellsouth.com</email>), ���硼����</para>
+		<email>mjr@blackened.com</email>), ���꥾�ʽ�</para>
 	    </listitem>
 
 	    <listitem>
 	      <para>cvsup6.FreeBSD.org (maintainer
-		<email>jdp@FreeBSD.org</email>), �ե����</para>
+		<email>jdp@FreeBSD.org</email>), �ե������</para>
 	    </listitem>
 	    
 	    <listitem>
@@ -1274,10 +1279,6 @@
 		<email>jdp@FreeBSD.org</email>), �亮��ȥ�</para>
 	    </listitem>
 	    
-	    <listitem>
-	      <para>cvsup8.FreeBSD.org (maintainer
-		<email>mjr@blackened.com</email>), ���꥾��</para>
-	    </listitem>
 	  </itemizedlist>
 	</listitem>
       </varlistentry>
@@ -1379,15 +1380,15 @@ stacken.kth.se         # Stacken Computer Club, KTH, Sweden
       </varlistentry>
     </variablelist>
   </sect1>
-</chapter>
+</appendix>
 
 <!--
      Local Variables:
      mode: sgml
-     sgml-declaration: "../chapter.decl"
+     sgml-declaration: "../appendix.decl"
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
-     sgml-parent-document: ("../book.sgml" "part" "chapter")
+     sgml-parent-document: ("../book.sgml" "part" "appendix")
      End:
 -->
diff --git a/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml b/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml
index 8299e4e531..afb776043d 100644
--- a/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml
@@ -2,11 +2,11 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.22
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml,v 1.6 1999/11/13 02:35:32 kuriyama Exp $
+     Original revision: 1.24
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml,v 1.7 2000/01/06 03:44:44 kuriyama Exp $
 -->
 
-<chapter id="pgpkeys">
+<appendix id="pgpkeys">
   <title>PGP ������</title>
 
   <para><emphasis>����: ����.</emphasis></para>
@@ -660,7 +660,61 @@ qw1G19GgXUwUkPvy9+dNIM/aYoI/e0Iv3P9uug==
     </sect2>
 
     <sect2>
-      <title>&a.wosch;</title>
+      <title>&a.gsutter;</title>
+      
+      <programlisting>
+Type Bits KeyID      Created    Expires    Algorithm       Use
+sec+ 1024 0x40AE3052 1998-07-18 ---------- DSS             Sign & Encrypt
+f20    Fingerprint20 = 61D4 6A28 F282 482E 1D82  D077 E31E 323D 40AE 3052
+uid  Gregory S. Sutter &lt;gsutter@pobox.com&gt;
+uid  Gregory S. Sutter &lt;gsutter@zer0.org&gt;
+uid  Gregory S. Sutter &lt;gsutter@daemonnews.org&gt;
+uid  Gregory S. Sutter &lt;gsutter@freebsd.org&gt;
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: PGPfreeware 5.0i for non-commercial use
+
+mQGiBDWwRbkRBADL0OcTOXSuvEljVeSmPKgz6YipAxjRiGXGF7HuocoHXI+r8s3K
+v6PkuyNVrK3a7MSDoDrxVqj1wjnuQeLBsMcDdrAp1bVTEgP163jv5wHNEDijGs8+
+s9xYkfMtaD9pcG4K43IznHmrtZEoRLcr5UvFGLOmxhnQarrXVPpo2IwMPwCg/51/
+ux0NwYu2FvMoa6vtmrHuen0EAKCjgmbmjbyGrkTW7pTzU4yBsWFY3k50zKiUKROW
+aRT+sBd6oeMVs+utXDgsQMDuzl3xj3NX6Wx+VIZkqkw/3QyAf7VkiAOesWJp2dhq
+7554U4epQiN6W/GAdqU2q6N+jxIh1wdrJ/VMlKcFtGMbHDCt52HnGjYxjNoyDF0u
+e5g9A/0fx5ovCDcdWDIbl11SZZR/xs7XTUh8jktFcLuBmp9kus3UsAhCEhEHxz/k
+iZijslR9y/2fPW7s47/3pUCp63UFMbIqH1PEEp5BP7KSguVzFTiKrpGjOepnr3iD
+l6C4Bzdj3tVJpqponhw7uGtIA2Nn7LA++yrJJgMoG+4t+FwrErQlR3JlZ29yeSBT
+LiBTdXR0ZXIgPGdzdXR0ZXJAcG9ib3guY29tPokASwQQEQIACwUCNbBFuQQLAwEC
+AAoJEOMeMj1ArjBSFWMAoOLKlv5FuMyKu16cywqBzjL3RMF4AJ4h4pdOqQ9AZuzH
+Q8DvK+P9POroH4kAlQMFEDcCut6nMUamZyAzSQEBOEUD/3VxwTGQ0Dq0JrAgBimm
+bq0J7LD3X9Qn/vJUVIv/O6b6sDNk/YseZ2aee5jJYi6tgpRvMSxc7AlQhZXGYlWh
++RXj9ZrFYnDKa1o5S8/Dt24J1EtkRV09bG9pjonyvcE1q65zMNEDpeSHUAgMfHqx
+flFG3XLn/urWT/6Dz5oO4k8qtCRHcmVnb3J5IFMuIFN1dHRlciA8Z3N1dHRlckB6
+ZXIwLm9yZz6JAEsEEBECAAsFAjcCzSwECwMBAgAKCRDjHjI9QK4wUq80AKDiVGlw
+v8LBl9RB2bfSNh6zebaLPgCgwgKacEKFiZsjfBI2k+UMIt4P8+60KkdyZWdvcnkg
+Uy4gU3V0dGVyIDxnc3V0dGVyQGRhZW1vbm5ld3Mub3JnPokASwQQEQIACwUCOKMz
+4AQLAwECAAoJEOMeMj1ArjBSypAAoPGul5bdNLiS0sFkno8qIwkW/gn5AJ9bD1MC
+sKiw4AE9d778eiAlQAC3FbQnR3JlZ29yeSBTLiBTdXR0ZXIgPGdzdXR0ZXJAZnJl
+ZWJzZC5vcmc+iQBLBBARAgALBQI4ozP9BAsDAQIACgkQ4x4yPUCuMFItNwCfeLOH
+XGrmJmtTg5GXHpTXMykoUo4An1eV9eaD+HiOkWo7arv52CpMdVWOuQINBDWwW6UQ
+CADMB1dmE9coFmpddqM0j+buoK+A8cm6G1U/Lxg7fiIYcd9SdbWWSPTAy0bFpWrF
+we/YWtIhd1sDTFNtqu5iCOWqbU73T+X/578zmbgAWhNhkPehdtRr4KzChGt44akk
+hHBLwwbt8j+M3Xth3OKzZYME/5J+qI5HFKcxSr2cfWHQfSqh/8R5S3wKgO1SZzcJ
+sxhhJ96AvmvUASmWHVn1fUloG0QfJOGdbNDEZFKYD2aKylQWbgwVfxSU4TLJHNJ6
+0JHlzJEXJUSj49qjNPT4UKcdzury/P3t7mTpnxD+TUdTtpjvCDCfmJatyGL0pS9e
+UtnL08rrll2xEkzQCz+jHmDlAAICCACPwOCIs0e2pGE2El0Gx4Lrj59uohs/WFYq
+7TESaD+OODeCebEhPPrkyZe88nfAgqZ65qw3dhA6JhatmpZUcCypAaA1YKtwtdQg
+cdsAk0A+C8pHZKLkgor6EuV8iYoykpKrh7/ViO0ZcgDGolcjCIw985wjSzbN6Ul5
+FWcoMe8l686YDSAmfyJdwtMSC2hvc8rX3oZ83or011F0bKlv56+ZgUsrGYL48cp9
+r7vLLonu8e8voS0CGqmQQ6XfLRefRY0RE3iQSd4F4GhKlAUVncqIu2fSX/eW053+
+ZeNve8aHPL6xl8BwsqwVGnxdQXOn8XgJ5/FCCXtdtf2xPOx83tkXiQA/AwUYNbBb
+peMeMj1ArjBSEQKIRwCfTRtkMAYosaxcNRuO9ptFaOJIDu8AoPOSj8eMlvOqOVDM
+AW4VTHVXOY6g
+=Zu9y
+-----END PGP PUBLIC KEY BLOCK-----</programlisting>
+    </sect2>
+
+    <sect2>
+     <title>&a.wosch;</title>
       
       <programlisting>
 Type Bits/KeyID    Date       User ID
@@ -700,15 +754,15 @@ gAzQwuA9l7kS0mt5jFRPcEg5/KpuyehRLckjx8jpEM7cEJDHXhBIuVg=
      </sect2>
 
   </sect1>
-</chapter>
+</appendix>
 
 <!--
      Local Variables:
      mode: sgml
-     sgml-declaration: "../chapter.decl"
+     sgml-declaration: "../appendix.decl"
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
-     sgml-parent-document: ("../book.sgml" "part" "chapter")
+     sgml-parent-document: ("../book.sgml" "part" "appendix")
      End:
 -->
diff --git a/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.sgml b/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.sgml
index ccd534347f..da8fbd4725 100644
--- a/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.sgml
@@ -3,7 +3,7 @@
      The FreeBSD Japanese Documentation Project
 
      Original revision: 1.18
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.sgml,v 1.6 1999/11/13 15:35:02 kuriyama Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.sgml,v 1.8 2000/01/17 14:08:13 kuriyama Exp $
 -->
 
 <chapter id="ppp-and-slip">
@@ -2978,3 +2978,14 @@ import proto rip interface ed {
     </sect2>
   </sect1>
 </chapter>
+
+<!-- 
+     Local Variables:
+     mode: sgml
+     sgml-declaration: "../chapter.decl"
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     sgml-parent-document: ("../book.sgml" "part" "chapter")
+     End:
+-->
diff --git a/ja_JP.eucJP/books/handbook/printing/chapter.sgml b/ja_JP.eucJP/books/handbook/printing/chapter.sgml
index 585758782b..6b7ae25953 100644
--- a/ja_JP.eucJP/books/handbook/printing/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/printing/chapter.sgml
@@ -2,18 +2,16 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.22
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/printing/chapter.sgml,v 1.5 1999/10/02 02:57:56 kuriyama Exp $
+     Original revision: 1.23
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/printing/chapter.sgml,v 1.6 1999/11/13 15:35:03 kuriyama Exp $
 -->
 
 <chapter id="printing">
   <title>�ץ�󥿤�����</title>
 
-  <para><emphasis>���� &a.kelly;<!-- <br> -->
-      30 September 1995</emphasis></para>
+  <para><emphasis>����: &a.kelly;, 1995 ǯ 9 �� 30 ��</emphasis></para>
 
-  <para><emphasis>���� &a.jp.kimura;.<!-- <br> -->
-      3 September 1996</emphasis></para>
+  <para><emphasis>��: &a.jp.kimura;, 1996 ǯ 9 �� 3 ��</emphasis></para>
 
   <para>FreeBSD �ǥץ�󥿤���Ѥ��뤿��ˤ�, �С����쥤�饤��ץ��
     ���ס���󥰥����ƥ� (LPD���ס���󥰥����ƥ�Ȥ��Ƥ��Τ���
@@ -4359,6 +4357,15 @@ done
 	  �ץ�󥿤Υͥåȥ�����󥿥ե���������°����ɥ�����
 	  �Ȥ򻲾Ȥ��Ƥ�������.</para>
 
+	<tip>
+	  <para>
+            �ҥ塼��åȡ��ѥå����ɼҤ� Laserjet ���꡼������Ѥ��Ƥ�����ˤ�,
+            �ץ��̾�� <literal>text</literal> �Ȥ����,
+            ��ưŪ�� LF ���� CRLF �ؤ��Ѵ����Ԥʤ��ޤ�.
+            ���Τ���, <filename>hpif</filename> ������ץȤ�ɬ�פ���ޤ���.
+          </para>
+	</tip>
+
 	<para>����,
 	  ���Υץ�󥿤˥��������������ȻפäƤ���¾�ۥ��Ȥˤ�����,
 	  ���Υۥ��Ȥ� <filename>/etc/printcap</filename>
diff --git a/ja_JP.eucJP/share/sgml/authors.ent b/ja_JP.eucJP/share/sgml/authors.ent
index 04892db175..e0500e45c6 100644
--- a/ja_JP.eucJP/share/sgml/authors.ent
+++ b/ja_JP.eucJP/share/sgml/authors.ent
@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.69
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.22 2000/01/11 08:41:57 motoyuki Exp $
+     Original revision: 1.76
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.23 2000/02/26 20:32:52 ume Exp $
 
      Names and email address of contributing authors and CVS committers.
      Entity names for committers should be the same as their login names on
@@ -52,6 +52,8 @@
 
 <!ENTITY a.brian "Brian Somers <email>brian@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>">
@@ -156,6 +158,8 @@
 
 <!ENTITY a.gryphon "Coranth Gryphon <email>gryphon@healer.com</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>">
@@ -244,7 +248,7 @@
 
 <!ENTITY a.kato "��ƣ ��ŵ <email>kato@FreeBSD.org</email>">
 
-<!ENTITY a.kelly "Sean Kelly <email>kelly@plutotech.com</email>">
+<!ENTITY a.kelly "Sean Kelly <email>kelly@ad1440.net</email>">
 
 <!ENTITY a.ken "Kenneth D. Merry <email>ken@FreeBSD.org</email>">
 
@@ -346,6 +350,8 @@
 
 <!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>">
@@ -426,13 +432,15 @@
 
 <!ENTITY a.ume "���� ȥ <email>ume@FreeBSD.org</email>">
 
+<!ENTITY a.unfurl "Bill Swingle <email>unfurl@FreeBSD.org</email>">
+
 <!ENTITY a.vanilla "Vanilla I. Shu <email>vanilla@FreeBSD.org</email>">
 
 <!ENTITY a.wes "Wes Peters <email>wes@FreeBSD.org</email>">
 
 <!ENTITY a.whiteside "Don Whiteside <email>whiteside@acm.org</email>">
 
-<!ENTITY a.wilko "Wilko Bulte <email>wilko@yedi.iaf.nl</email>">
+<!ENTITY a.wilko "Wilko Bulte <email>wilko@FreeBSD.org</email>">
 
 <!ENTITY a.wlloyd "Bill Lloyd <email>wlloyd@mpd.ca</email>">