diff --git a/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml
index 8b5536403d..5cc660e3f3 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.27
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml,v 1.8 2000/02/27 03:47:20 motoyuki Exp $
+     Original revision: 1.28
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml,v 1.9 2000/08/07 07:03:10 kuriyama Exp $
 -->
 
 <chapter id="advanced-networking">
@@ -476,7 +476,7 @@ Local1 (10.20.30.1, 10.9.9.30)  --&gt;  T1-GW (10.9.9.1)
 
 	<para>�����ͥ�ǥ֥�å���ǽ��ͭ���ˤ���ˤ�</para>
 
-	<programlisting>option BRIDGE</programlisting>
+	<programlisting>options BRIDGE</programlisting>
 
 	<para>�Ȥ����Ԥ򥫡��ͥ륳��ե����졼�����ե�������ɲä���
 	  �����ͥ��ƹ��ۤ��Ƥ�������.</para>
diff --git a/ja_JP.eucJP/books/handbook/authors.ent b/ja_JP.eucJP/books/handbook/authors.ent
index 369e1af5e8..07bd7e7525 100644
--- a/ja_JP.eucJP/books/handbook/authors.ent
+++ b/ja_JP.eucJP/books/handbook/authors.ent
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.112
+     Original revision: 1.113
 
      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.32 2000/07/17 01:54:20 kuriyama Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.33 2000/08/04 08:47:35 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
@@ -383,6 +383,8 @@
 
 <!ENTITY a.olah  "Andras Olah <email>olah@FreeBSD.org</email>">
 
+<!ENTITY a.onoe "Atsushi Onoe <email>onoe@FreeBSD.org</email>">
+
 <!ENTITY a.opsys "Chris Watson <email>opsys@open-systems.net</email>">
 
 <!ENTITY a.patrick "Patrick S. Gardella <email>patrick@FreeBSD.org</email>">
diff --git a/ja_JP.eucJP/books/handbook/basics/chapter.sgml b/ja_JP.eucJP/books/handbook/basics/chapter.sgml
index deb1fe7f2d..9a835319e1 100644
--- a/ja_JP.eucJP/books/handbook/basics/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/basics/chapter.sgml
@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.20
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/basics/chapter.sgml,v 1.9 2000/06/18 12:37:43 kuriyama Exp $
+     Original revision: 1.21
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/basics/chapter.sgml,v 1.10 2000/07/20 12:22:31 hrs Exp $
 -->
 
 <chapter id="basics">
@@ -330,11 +330,11 @@
       <filename>/usr/local/bin/emacs</filename> ��
       ���åȤ��뤫�ѹ�����ʤ�м��Τ褦�ˤ��ޤ�.</para>
 
-    <para><command>setenv EDITOR /usr/local/bin/emacs</command></para>
+    <screen>&prompt.user; <userinput>setenv EDITOR /usr/local/bin/emacs</userinput></screen>
 
     <para>Bourne ������Ǥϼ��Τ褦�ˤʤ�ޤ�.</para>
 
-    <para><command>export EDITOR="/usr/local/bin/emacs"</command></para>
+    <screen>&prompt.user; <userinput>export EDITOR="/usr/local/bin/emacs"</userinput></screen>
 
     <para>�ۤȤ�ɤΥ�����Ǥ�,
       ���ޥ�ɥ饤������ѿ�̾������ <literal>$</literal> ʸ�����֤����Ȥ�,
@@ -456,14 +456,14 @@
         �����Υޥ˥奢��� man ���ޥ�ɤǸ��뤳�Ȥ��Ǥ��ޤ�. man
         ���ޥ�ɤλȤ����ϴ�ñ�Ǥ�.</para>
       
-      <para><command>&prompt.user; man ���ޥ��̾</command></para>
+      <screen>&prompt.user; <userinput>man <replaceable>���ޥ��̾</replaceable></userinput></screen>
       
       <para><literal>���ޥ��̾</literal>
         �ΤȤ����ˤ�, �Τꤿ�����ޥ�ɤ�̾��������ޤ�.
         ���Ȥ��� <command>ls</command> ���ޥ�ɤˤĤ����Τꤿ�����ˤ�,
         ���Τ褦�����Ϥ��ޤ�.</para>
       
-      <para><command>&prompt.user; man ls</command></para>
+      <screen>&prompt.user; <userinput>man ls</userinput></screen>
       
       <para>����饤��ޥ˥奢���,
         ����������ֹ��ʬ�व��Ƥ��ޤ�.</para>
@@ -514,7 +514,7 @@
         ���ξ��, man ���ޥ�ɤ˥���������ֹ��Ϳ���뤳�Ȥ�,
         �ɤ���򻲾Ȥ�����������ꤹ�뤳�Ȥ��Ǥ��ޤ�.</para>
       
-      <para><command>&prompt.user; man 1 chmod</command></para>
+      <screen>&prompt.user; <userinput>man 1 chmod</userinput></screen>
       
       <para>��Τ褦�ˤ����,
         �桼�����ޥ�� <command>chmod</command>
@@ -533,7 +533,7 @@
         ���ޥ�ɲ���(description)��ʸ�Ϥ���,
         ���ꤷ��������ɤ򸡺����뤳�Ȥ��Ǥ��ޤ�.</para>
       
-      <para><command>&prompt.user; man -k mail</command></para>
+      <screen>&prompt.user; <userinput>man -k mail</userinput></screen>
       
       <para>���Υ��ޥ�ɤˤ��,
         <quote>mail</quote>
@@ -544,11 +544,17 @@
         �ˤ��뤵�ޤ��ޤʥ��ޥ�ɤ��٤Ƥ򸫤Ƥ���,
         ����餬�ºݤˤɤ�Ư���Τ���, �ޤä���������Ĥ��ʤ��Ȥ��ˤ�
         �ɤ��������ɤ��Ǥ��礦?
-        ���ΤȤ���ñ���,
-        <command>&prompt.user; cd /usr/bin; man -f *</command>
-        �Ȥ��뤫, ���뤤��Ʊ��Ư���򤹤�
-        <command>&prompt.user; cd /usr/bin; whatis *</command>
-        �Ȥ��Ƥ�������.</para>
+        ���ΤȤ���ñ���,</para>
+
+	<screen>&prompt.user; <userinput>cd /usr/bin</userinput>
+&prompt.user; <userinput>man -f *</userinput></screen>
+
+      <para>�Ȥ��뤫, ���뤤��Ʊ��Ư���򤹤�</para>
+
+	<screen>&prompt.user; <userinput>cd /usr/bin</userinput>
+&prompt.user; <userinput>whatis *</userinput></screen>
+
+      <para>�Ȥ��Ƥ�������.</para>
     </sect2>
     
     <sect2 id="basics-info">
@@ -567,7 +573,7 @@
       
       <para>&man.info.1; ���ޥ�ɤ�Ȥ��ˤ�, ñ�˼��Τ褦�����Ϥ��ޤ�.</para>
       
-      <para><command>&prompt.user; info</command></para>
+      <screen>&prompt.user; <userinput>info</userinput></screen>
       
       <para>
         <literal>h</literal> �����Ϥ����,
diff --git a/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml b/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml
index 4d5f1e04ba..988160ce14 100644
--- a/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml
@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.26
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml,v 1.12 2000/06/24 02:31:30 kuriyama Exp $
+     Original revision: 1.27
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml,v 1.13 2000/07/12 08:28:08 kuriyama Exp $
 -->
 
 <appendix id="bibliography">
@@ -146,6 +146,13 @@
 	    url="http://www.pc.mycom.co.jp/">�������ߥ�˥��������
 	  </ulink>, 1998.  ISBN4-8399-0088-4 P3800E.</para>
       </listitem>
+
+      <listitem>
+	<para><ulink url="http://www.ed.ac.uk/">Edinburgh
+	  University</ulink> has written an <ulink
+	  url="http://unixhelp.ed.ac.uk/">Online Guide</ulink> for
+	  newcomers to the UNIX environment.</para>
+      </listitem>
     </itemizedlist>
   </sect1>
 
diff --git a/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml b/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
index 9380284f3c..4605257e45 100644
--- a/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.76
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml,v 1.25 2000/07/18 15:24:39 hrs Exp $
+     Original revision: 1.79
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml,v 1.26 2000/08/04 08:54:31 kuriyama Exp $
 -->
 
 <appendix id="mirrors">
@@ -267,6 +267,18 @@
 	    <listitem>
 	      <para><ulink url="ftp://ftp3.fr.FreeBSD.org/pub/FreeBSD/">ftp://ftp3.fr.FreeBSD.org/pub/FreeBSD/</ulink></para>
 	    </listitem>
+
+	    <listitem>
+	      <para><ulink url="ftp://ftp4.fr.FreeBSD.org/pub/FreeBSD/">ftp://ftp4.fr.FreeBSD.org/pub/FreeBSD/</ulink></para>
+	    </listitem>
+
+	    <listitem>
+	      <para><ulink url="ftp://ftp5.fr.FreeBSD.org/pub/FreeBSD/">ftp://ftp5.fr.FreeBSD.org/pub/FreeBSD/</ulink></para>
+	    </listitem>
+
+	    <listitem>
+	      <para><ulink url="ftp://ftp6.fr.FreeBSD.org/pub/FreeBSD/">ftp://ftp6.fr.FreeBSD.org/pub/FreeBSD/</ulink></para>
+	    </listitem>
 	  </itemizedlist>
 	</listitem>
       </varlistentry>
@@ -745,7 +757,7 @@
         �����Ƽ��� &man.cvs.1; ���ޥ�ɤ�Ȥ����Ȥ�, 
         �긵�ˤ����ݥ��ȥ��Ʊ���褦�˥��������Ǥ���褦�ˤʤ�ޤ�.</para>
       
-      <para><link linkend="mirrors-cvsup">CVSup</link> ��
+      <para><link linkend="cvsup">CVSup</link> ��
         <emphasis>anoncvs</emphasis>
         �Υ����ӥ����ܼ�Ū��Ʊ����ǽ�ǤϤʤ����Ȥ������Ȥ�����Ƥ��ޤ���,
         �桼����Ʊ��������ˡ�����֤Ȥ��˱ƶ���Ϳ����,
@@ -1864,7 +1876,7 @@ src-all</programlisting>
 	  <para>���������ɤ��������ꤹ�뤫��
 	    <command>cvsup</command> �������뤿���
 	    <literal>host=</literal>  �ե�����ɤ���Ѥ��ޤ�.
-	    <link linkend="mirrors-cvsup">CVSup �ߥ顼������</link>
+	    <link linkend="cvsup-mirrors">CVSup �ߥ顼������</link>
 	    �Τɤ�����Ǥ�����Ǥ��ޤ���,
 	    �ͥåȾ�ǤκǴ��Υ����Ȥ����֤٤��Ǥ��礦.
 	    ������Ǥ�, ���۾�� FreeBSD ���ۥ�����
@@ -2841,10 +2853,10 @@ doc/ja_JP.eucJP</screen>
 	  ���äƤ�������.</para>
     </sect2>
 
-    <sect2 id="mirrors-cvsup">
+    <sect2 id="cvsup-mirrors">
       <title>CVSup ������</title>
 
-      <para>FreeBSD �� <link linkend="mirrors-cvsup">CVSup</link>
+      <para>FreeBSD �� <link linkend="cvsup">CVSup</link>
         �����Фϰʲ��Υ����ȤDz�Ư���Ƥ��ޤ�:</para>
 
       <variablelist>
@@ -3005,6 +3017,11 @@ doc/ja_JP.eucJP</screen>
                 <para>cvsup.fr.FreeBSD.org
                   (�ݼ�ô�� <email>hostmaster@fr.FreeBSD.org</email>)</para>
               </listitem>
+
+	      <listitem>
+		<para>cvsup2.fr.FreeBSD.org
+		  (�ݼ�ô�� <email>ftpmaint@uvsq.fr</email>)</para>
+	      </listitem>
             </itemizedlist>
           </listitem>
         </varlistentry>
@@ -3027,6 +3044,11 @@ doc/ja_JP.eucJP</screen>
               <listitem>
                 <para>cvsup3.de.FreeBSD.org
                   (�ݼ�ô�� <email>ag@leo.org</email>)</para>
+	      </listitem>
+
+	      <listitem>
+		<para>cvsup4.de.FreeBSD.org
+		  (�ݼ�ô�� <email>cvsup@cosmo-project.de</email>)</para>
               </listitem>
             </itemizedlist>
           </listitem>
diff --git a/ja_JP.eucJP/books/handbook/staff/chapter.sgml b/ja_JP.eucJP/books/handbook/staff/chapter.sgml
index c8418caa60..b410650483 100644
--- a/ja_JP.eucJP/books/handbook/staff/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/staff/chapter.sgml
@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.149
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/staff/chapter.sgml,v 1.28 2000/07/17 01:56:30 kuriyama Exp $
+     Original revision: 1.150
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/staff/chapter.sgml,v 1.29 2000/08/04 08:47:36 kuriyama Exp $
 -->
 
 <appendix id="staff">
@@ -620,6 +620,10 @@
       <listitem>
 	<para>&a.ljo;</para>
       </listitem>
+      
+      <listitem>
+	<para>&a.onoe;</para>
+      </listitem>
 
       <listitem>
 	<para>&a.marko;</para>
diff --git a/ja_JP.eucJP/share/sgml/authors.ent b/ja_JP.eucJP/share/sgml/authors.ent
index 369e1af5e8..07bd7e7525 100644
--- a/ja_JP.eucJP/share/sgml/authors.ent
+++ b/ja_JP.eucJP/share/sgml/authors.ent
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.112
+     Original revision: 1.113
 
      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.32 2000/07/17 01:54:20 kuriyama Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.33 2000/08/04 08:47:35 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
@@ -383,6 +383,8 @@
 
 <!ENTITY a.olah  "Andras Olah <email>olah@FreeBSD.org</email>">
 
+<!ENTITY a.onoe "Atsushi Onoe <email>onoe@FreeBSD.org</email>">
+
 <!ENTITY a.opsys "Chris Watson <email>opsys@open-systems.net</email>">
 
 <!ENTITY a.patrick "Patrick S. Gardella <email>patrick@FreeBSD.org</email>">