Merge following changes in the English version.

1.90  -> 1.91	book.sgml
	1.146 -> 1.149	staff/chapter.sgml
	1.37  -> 1.40	pgpkeys/chapter.sgml
	1.34  -> 1.35	hw/chapter.sgml
	1.52  -> 1.53	cutting-edge/chapter.sgml
	1.109 -> 1.112	authors.ent

ja_JP.eucJP/books/handbook/authors.ent

@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.109
+     Original revision: 1.112
 
      IMPORTANT:  If you delete names from this file you *must* ensure that
                  all references to them have been removed from the handbook's
@@ -10,7 +10,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.31 2000/07/14 10:48:08 kuriyama Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.32 2000/07/17 01:54:20 kuriyama Exp $
 
      Names and email address of contributing authors and CVS committers.
      Entity names for committers should be the same as their login names on
@@ -57,6 +57,8 @@
 
 <!ENTITY a.awebster "Andrew Webster <email>awebster@pubnix.net</email>">
 
+<!ENTITY a.babkin  "Sergey Babkin <email>babkin@FreeBSD.org</email>">
+
 <!ENTITY a.bde  "Bruce Evans <email>bde@FreeBSD.org</email>">
 
 <!ENTITY a.ben  "Ben Smithurst <email>ben@FreeBSD.org</email>">
@@ -161,6 +163,8 @@
 
 <!ENTITY a.gallatin "Andrew Gallatin <email>gallatin@FreeBSD.org</email>">
 
+<!ENTITY a.gclarkii "Gary Clark II <email>gclarkii@FreeBSD.org</email>">
+
 <!ENTITY a.gehenna "Masahide MAEKAWA <email>gehenna@FreeBSD.org</email>">
 
 <!ENTITY a.gena "Gennady B. Sorokopud <email>gena@NetVision.net.il</email>">
@@ -285,6 +289,8 @@
 
 <!ENTITY a.jvh  "Johannes Helander <email>jvh@FreeBSD.org</email>">
 
+<!ENTITY a.karl  "Karl Strickland <email>karl@FreeBSD.org</email>">
+
 <!ENTITY a.kato "²ÃÆ£ ¾æŵ <email>kato@FreeBSD.org</email>">
 
 <!ENTITY a.kbyanc "Kelly Yancey <email>kbyanc@FreeBSD.org</email>">
@@ -469,6 +475,8 @@
 
 <!ENTITY a.takawata "ÅÏÊÕ Âºµª <email>takawata@FreeBSD.org</email>">
 
+<!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.org</email>">
+
 <!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.org</email>">
 
 <!ENTITY a.tg  "Thomas Gellekum <email>tg@FreeBSD.org</email>">

ja_JP.eucJP/books/handbook/book.sgml

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.90
+     Original revision: 1.91
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/book.sgml,v 1.57 2000/06/29 01:20:25 kuriyama Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/book.sgml,v 1.58 2000/07/20 00:20:57 hrs Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
@@ -24,7 +24,7 @@
 <!-- The currently released version of FreeBSD.  This value is used to
      create some links on web sites and such, so do NOT change it until
      it's really release time -->
-<!ENTITY rel.current CDATA "4.0">
+<!ENTITY rel.current CDATA "4.1">
 ]>
 
 <book>

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.52
+     Original revision: 1.53
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml,v 1.16 2000/07/18 15:24:37 hrs Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml,v 1.17 2000/07/20 12:22:32 hrs Exp $
 -->
 
 <chapter id="cutting-edge">
@@ -188,7 +188,7 @@ subscribe cvs-all</programlisting>
 	    </listitem>
 
 	    <listitem>
-	      <para><link linkend="mirrors-cvsup">cvsup</link> ¤ò <ulink
+	      <para><link linkend="cvsup">cvsup</link> ¤ò <ulink
 		  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/src/share/examples/cvsup/standard-supfile"> この supfile</ulink>
 		を用いて使用する. これは 2 番目に推薦される方法です.
 		なぜなら, cvsup によって一度全体を入手し,
@@ -374,7 +374,7 @@ subscribe cvs-all</programlisting>
 	    </listitem>
 
 	    <listitem>
-	      <para><link linkend="mirrors-cvsup">cvsup</link> ¤ò <ulink
+	      <para><link linkend="cvsup">cvsup</link> ¤ò <ulink
 		  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/src/share/examples/cvsup/stable-supfile">
 		  この supfile</ulink> を用いて使用する.
 		一度コレクション全体を入手してしまえば,
@@ -449,7 +449,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></scr
       追いかける方法は色々あります.
       私たちが提供している基本的なサービスは  <link
 	linkend="anoncvs">Anonymous CVS</link>, <link
-	linkend="mirrors-cvsup">CVSup</link> ¤È <link linkend="ctm">CTM</link>
+	linkend="cvsup">CVSup</link> ¤È <link linkend="ctm">CTM</link>
       です:</para>
 
     <para><application>Anonymous CVS</application> と

ja_JP.eucJP/books/handbook/hw/chapter.sgml

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.34
+     Original revision: 1.35
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/hw/chapter.sgml,v 1.11 2000/07/12 08:54:13 kuriyama Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/hw/chapter.sgml,v 1.12 2000/07/14 05:45:30 kuriyama Exp $
 -->
 
 <appendix id="hw">
@@ -3222,7 +3222,7 @@ sio2: type 16550A (multiport master)</screen>
       <sect3 id="cy">
 	<title><devicename>cy</devicename> ドライバのコンフィグ</title>
 
-	<para><emphasis>¸¶ºî: &a.alex;.<!-- <br> -->
+	<para><emphasis>¸¶ºî: Alex Nash.<!-- <br> -->
 	    6 June 1996.</emphasis></para>
 
 	<para><emphasis>訳: &a.jp.yuki;.<!-- <br> -->

ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.37
+     Original revision: 1.40
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml,v 1.11 2000/06/05 02:00:10 kuriyama Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml,v 1.12 2000/07/14 06:08:05 kuriyama Exp $
 -->
 
 <appendix id="pgpkeys">
@@ -741,48 +741,6 @@ ATGhlLHxWuNLTlPAVD5FsdJdOHI7UdkJh19JpphV+usu/mihMFEfM/kOVJeTXed1
       </programlisting>
     </sect2>
 
-    <sect2>
-      <title>&a.cpiazza;</title>
-
-      <programlisting>
-Type Bits/KeyID    Date       User ID
-pub  2048/FB722BE5 1996/04/07 Chris Piazza &lt;cpiazza@jaxon.net&gt;
-                              Chris Piazza &lt;cpiazza@home.net&gt;
-                              Chris Piazza &lt;cpiazza@FreeBSD.org&gt;
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: 2.6.3ia
-
-mQENAzFnIKcAAAEIANA6TShD9jrbc0IODhZooybcqM04h94IOaX5HPcYo/5FHSFB
-ezBuea19iBB/spGQUfpDAuGuqsz1DCCtL0OBz1cn4r74OMqrY4bQHKunCF8hUL8H
-hRVn33B5KmljTHo8jFQAV/8QwvU6OUaLgM4CoZsMdrgfSaAxGNGu+RAK2xbm9KX7
-BykXX+MIYRbJHpxA+25o8OZTOEC0Sa3kg94F9lT+iL1zB5s3dTPrQPzOFZCD0PdK
-ByEnGt+GoFNV1j7nO26vNa0fQZTSL+bNmnO54NPE0u8gtaqhGqRN+EHbo90eJ487
-XqDOI0b+XHK98y2T1lEGYmjuSLmA9xHAr/tyK+UABRG0IENocmlzIFBpYXp6YSA8
-Y3BpYXp6YUBqYXhvbi5uZXQ+iQEVAwUQOD+czfcRwK/7civlAQGdqggAnDjRfVCG
-QLCCncva1yLPQY2OUBz4SW4NfR4RSPbmDTs+kDJpqAN4/w76LwOry3B6Hp4MnrZP
-Iv0DDzePM+5hs535wDNcU6KQwbZEyv7e9Q+dpWW6vj8hEynZYp5Vcb0VbejU9NJf
-rHuSIx0cIKfztxM11csTYqPHGZcHUPy3w7BtB03ATioWt0/Ybj3vtLj36JHI1csk
-yzgeHJrQ17yvcoNGno2Aqrdbf+PJ7lO/Wiy+40r6jyJmt9o5neT1kOgVvXGVOp7R
-dbOQXGAZay2nxRcQALrRD7VF/ugpJke2MykL0GebFYmSOVWRjVkmLlXl/AXLS/Vw
-FJ0MTMDOOq7MCbQfQ2hyaXMgUGlhenphIDxjcGlhenphQGhvbWUubmV0PokBFQMF
-EDg/nOT3EcCv+3Ir5QEBc8sIAKz1sxByTTiwj8+FKKb1lFYgxXYfqUzp1dl31eFy
-fTXv6thrGvBzmBtMRLVOymvBBy7VP3cLN7rtyyS3jKR+UdDZcJBKM1bF5lBCWF7T
-DmpvHR79Od79pgWTiU7bkHM7LBXOEhahO9Q6SAIaIhw85LfVRV/oh2ZB+PocvyLe
-iJhKehe6W+ao0ZSUDm5tlG8wrgvjKEkEAOHh/pCCxFh2zQmUwyxFljy8/OooTE37
-tBaTTaVx98dQUtm59u8ITFpbmPX5mIlKu8H9R3oY1Ur6DPtHV7OTVewTBCjuatyw
-FwbGcP7DLEAmmYhICwtYQOa62+ORNh2/v/GHTt+ZxHFGHuW0IkNocmlzIFBpYXp6
-YSA8Y3BpYXp6YUBGcmVlQlNELm9yZz6JARUDBRA3a0Oi9xHAr/tyK+UBARC7B/9+
-CaKMlF11O8TpP3FfWUpwMwdMynaebd3Xx3U01DleHqnqfy8PwhZY9jwcvgggaXSN
-7FUUzRocsTTEbFj7hZHAYRfNH+KcXr3EmB5b82M10NHeqWIFF8vcpEwM6lvFIbne
-Mve1eVw4S2Vl0yHQJvoVUqAvlFpN3dgFOg69qBPe6qWsaNDPN+dwUorWckV613EP
-Gbxp9cs2j3awBnENjP16jkmEKuQPcAnl6l6XgP1X27PKICkPUTLO+CKfRq15Qs9p
-evhyqAaUMNU/GYMqs5sceDQq1PUpmE1syGCZUQmvYfXfRmujHdZnDRDl+afN4UoH
-hrCuygxmOl22RDH3aEXi
-=JxBt
------END PGP PUBLIC KEY BLOCK-----</programlisting>
-    </sect2>
-
     <sect2>
       <title>&a.jdp;</title>
 	  

ja_JP.eucJP/books/handbook/staff/chapter.sgml

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.146
+     Original revision: 1.149
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/staff/chapter.sgml,v 1.27 2000/07/14 06:16:36 kuriyama Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/staff/chapter.sgml,v 1.28 2000/07/17 01:56:30 kuriyama Exp $
 -->
 
 <appendix id="staff">
@@ -117,6 +117,10 @@
 	<para>&a.toshi;</para>
       </listitem>
 
+      <listitem>
+	<para>&a.babkin;</para>
+      </listitem>
+
       <listitem>
 	<para>&a.dbaker;</para>
       </listitem>

ja_JP.eucJP/share/sgml/authors.ent

@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.109
+     Original revision: 1.112
 
      IMPORTANT:  If you delete names from this file you *must* ensure that
                  all references to them have been removed from the handbook's
@@ -10,7 +10,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.31 2000/07/14 10:48:08 kuriyama Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.32 2000/07/17 01:54:20 kuriyama Exp $
 
      Names and email address of contributing authors and CVS committers.
      Entity names for committers should be the same as their login names on
@@ -57,6 +57,8 @@
 
 <!ENTITY a.awebster "Andrew Webster <email>awebster@pubnix.net</email>">
 
+<!ENTITY a.babkin  "Sergey Babkin <email>babkin@FreeBSD.org</email>">
+
 <!ENTITY a.bde  "Bruce Evans <email>bde@FreeBSD.org</email>">
 
 <!ENTITY a.ben  "Ben Smithurst <email>ben@FreeBSD.org</email>">
@@ -161,6 +163,8 @@
 
 <!ENTITY a.gallatin "Andrew Gallatin <email>gallatin@FreeBSD.org</email>">
 
+<!ENTITY a.gclarkii "Gary Clark II <email>gclarkii@FreeBSD.org</email>">
+
 <!ENTITY a.gehenna "Masahide MAEKAWA <email>gehenna@FreeBSD.org</email>">
 
 <!ENTITY a.gena "Gennady B. Sorokopud <email>gena@NetVision.net.il</email>">
@@ -285,6 +289,8 @@
 
 <!ENTITY a.jvh  "Johannes Helander <email>jvh@FreeBSD.org</email>">
 
+<!ENTITY a.karl  "Karl Strickland <email>karl@FreeBSD.org</email>">
+
 <!ENTITY a.kato "²ÃÆ£ ¾æŵ <email>kato@FreeBSD.org</email>">
 
 <!ENTITY a.kbyanc "Kelly Yancey <email>kbyanc@FreeBSD.org</email>">
@@ -469,6 +475,8 @@
 
 <!ENTITY a.takawata "ÅÏÊÕ Âºµª <email>takawata@FreeBSD.org</email>">
 
+<!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.org</email>">
+
 <!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.org</email>">
 
 <!ENTITY a.tg  "Thomas Gellekum <email>tg@FreeBSD.org</email>">