diff --git a/ja_JP.eucJP/articles/contributing/article.sgml b/ja_JP.eucJP/articles/contributing/article.sgml
index 492e9b9abe..738405229c 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.280
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.41 2000/08/10 02:25:56 kuriyama Exp $
+     Original revision: 1.281
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.42 2000/08/22 06:22:28 kuriyama Exp $
 -->
 
 <chapter id="contrib">
@@ -1787,10 +1787,6 @@ Copyright (C) [ǯ]
         <para>Brion Moss <email>brion@queeg.com</email></para>
       </listitem>
 
-      <listitem>
-        <para>Bruce A. Mah <email>bmah@ca.sandia.gov</email></para>
-      </listitem>
-
       <listitem>
         <para>Bruce Albrecht <email>bruce@zuhause.mn.org</email></para>
       </listitem>
diff --git a/ja_JP.eucJP/books/handbook/authors.ent b/ja_JP.eucJP/books/handbook/authors.ent
index 1c1aeb45eb..2d6d56a035 100644
--- a/ja_JP.eucJP/books/handbook/authors.ent
+++ b/ja_JP.eucJP/books/handbook/authors.ent
@@ -2,15 +2,9 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.114
+     Original revision: 1.115
 
-     IMPORTANT:  If you delete names from this file you *must* ensure that
-                 all references to them have been removed from the handbook's
-                 translations.  If they haven't then you *will* break the
-                 builds for the other languages, and we will poke fun of you
-                 in public.
-
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.34 2000/08/09 01:29:34 kuriyama Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.35 2000/08/22 06:22:27 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
@@ -19,6 +13,12 @@
      Use these entities when referencing people.
 
      Please keep this list in alphabetical order by entity names.
+
+     IMPORTANT:  If you delete names from this file you *must* ensure that
+                 all references to them have been removed from the handbook's
+                 translations.  If they haven't then you *will* break the
+                 builds for the other languages, and we will poke fun of you
+                 in public.
 -->
 
 <!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.org</email>">
@@ -65,6 +65,8 @@
 
 <!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.org</email>">
 
+<!ENTITY a.bmah "Bruce A. Mah <email>bmah@FreeBSD.org</email>">
+
 <!ENTITY a.bp "Boris Popov <email>bp@FreeBSD.org</email>">
 
 <!ENTITY a.brandon  "Brandon Gillespie <email>brandon@FreeBSD.org</email>">
diff --git a/ja_JP.eucJP/books/handbook/contrib/chapter.sgml b/ja_JP.eucJP/books/handbook/contrib/chapter.sgml
index 492e9b9abe..738405229c 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.280
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.41 2000/08/10 02:25:56 kuriyama Exp $
+     Original revision: 1.281
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.42 2000/08/22 06:22:28 kuriyama Exp $
 -->
 
 <chapter id="contrib">
@@ -1787,10 +1787,6 @@ Copyright (C) [ǯ]
         <para>Brion Moss <email>brion@queeg.com</email></para>
       </listitem>
 
-      <listitem>
-        <para>Bruce A. Mah <email>bmah@ca.sandia.gov</email></para>
-      </listitem>
-
       <listitem>
         <para>Bruce Albrecht <email>bruce@zuhause.mn.org</email></para>
       </listitem>
diff --git a/ja_JP.eucJP/books/handbook/jauthors.ent b/ja_JP.eucJP/books/handbook/jauthors.ent
index 920c489807..143921ae08 100644
--- a/ja_JP.eucJP/books/handbook/jauthors.ent
+++ b/ja_JP.eucJP/books/handbook/jauthors.ent
@@ -3,7 +3,7 @@
      The FreeBSD Japanese Documentation Project
 
      Original revision: 
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/jauthors.ent,v 1.6 2000/07/09 15:56:25 hrs Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/jauthors.ent,v 1.7 2000/07/20 00:20:57 hrs Exp $
 
      Names and email address of Japanese local contributing authors and 
      castle.jp.freebsd.org CVS committers.
@@ -19,7 +19,7 @@
 
 <!ENTITY a.jp.candy  "���� �ҹ� <email>candy@fct.kgc.co.jp</email>">
 
-<!ENTITY a.jp.condle "�� ľǷ <email>condle@mcu.or.jp</email>">
+<!ENTITY a.jp.condle "�� ľǷ <email>mori@jp.FreeBSD.org</email>">
 
 <!ENTITY a.jp.g92k0323 "����  ���� <email>g92k0323@cfi.waseda.ac.jp</email>">
 
diff --git a/ja_JP.eucJP/books/handbook/l10n/chapter.sgml b/ja_JP.eucJP/books/handbook/l10n/chapter.sgml
index 919c4ef2f6..5c613ab805 100644
--- a/ja_JP.eucJP/books/handbook/l10n/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/l10n/chapter.sgml
@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.39
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/l10n/chapter.sgml,v 1.6 2000/07/20 00:20:59 hrs Exp $
+     Original revision: 1.40
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/l10n/chapter.sgml,v 1.7 2000/07/20 12:22:34 hrs Exp $
 -->
 
 <chapter id="l10n">
@@ -703,7 +703,7 @@ options         SC_MOUSE_CHAR=0x03</programlisting>
       <para><emphasis>����: &a.ache;.</emphasis></para>
 
       <para>KOI8-R ���󥳡��ǥ��󥰤ξܺ٤ˤĤ��Ƥ�,
-	<ulink url="http://nagual.pp.ru/~ache/koi8.html">KOI8-R References
+	<ulink url="http://koi8.pp.ru/">KOI8-R References
 	  (Russian Net Character Set)</ulink> �򻲾Ȥ��Ƥ�������.</para>
 
       <sect3>
@@ -739,17 +739,11 @@ options		SC_MOUSE_CHAR=0x03</programlisting>
 
 	    <programlisting>
 keymap="ru.koi8-r"
-keychange="61 ^[[K"
 scrnmap="koi8-r2cp866"
 font8x16="cp866b-8x16"
 font8x14="cp866-8x14"
 font8x8="cp866-8x8"</programlisting>
 
-	    <para>������, <literal>^[</literal> ����ʪ�Υ���������ʸ����
-              <filename>/etc/rc.conf</filename>
-	      ��ľ�����Ϥ��뤳��ɽ���Ƥ��ޤ�.
-              '^' �� '['
-              �Ȥ���ʸ����³�������Ϥ���櫓�ǤϤ���ޤ���.</para>
 	  </listitem>
 
 	  <listitem>
@@ -852,13 +846,20 @@ FontPath   "/usr/X11R6/lib/X11/fonts/cyrillic/100dpi"</programlisting>
 	  <listitem>
 	    <para>��������Υ����ܡ��ɤ�Ȥ���褦�ˤ���ˤ�,
 	      �ʲ��ιԤ� <filename>XF86Config</filename> �ե������
-	      <literal>"Keyboard"</literal> �����������ɲä��ޤ�:
-	    </para>
+	      <literal>"Keyboard"</literal> �����������ɲä��ޤ�.</para>
+
+	    <para>XFree86 v3.* ��:</para>
 
 	    <programlisting>
 XkbLayout  "ru"
 XkbOptions "grp:caps_toggle"</programlisting>
 
+	    <para>XFree86 v4.* ��:</para>
+
+	    <programlisting>
+Option "XkbLayout"   "ru"
+Option "XkbOptions"  "grp:caps_toggle"</programlisting>
+
 	    <para>�ޤ�, <literal>XkbDisable</literal> ��̵��
 	      (�����ȥ�����) �ˤʤäƤ��뤳�Ȥ��ǧ���Ƥ�������.
 	    </para>
@@ -872,11 +873,18 @@ XkbOptions "grp:caps_toggle"</programlisting>
 	    <para>�����ܡ��ɤ� <quote>Windows</quote> ����������,
 	      ��������⡼�ɤǤ��Υ����ˤ����Ĥ�����ѻ�������
 	      ������Ƥ��Ƥ���褦�ʤ�, <filename>XF86Config</filename>
-	      �ե�����˰ʲ��ιԤ��ɲä��Ƥ�������:</para>
+	      �ե�����˰ʲ��ιԤ��ɲä��Ƥ�������.</para>
+
+	    <para>XFree86 v3.* ��:</para>
 
 	<programlisting>
 XkbVariant "winkeys"</programlisting>
 
+	    <para>XFree86 v4.* ��:</para>
+
+	<programlisting>
+Option "XkbVariant" "winkeys"</programlisting>
+
 	    <note>
 	      <para>��������� XKB �����ܡ��ɤϸŤ��С�������
 		XFree86 �ǤϤ��ޤ�ư���ʤ������Τ�ޤ���.
@@ -888,7 +896,7 @@ XkbVariant "winkeys"</programlisting>
 		<literal>XtSetLanguageProc (NULL, NULL, NULL);</literal>
 		��ƤӽФ��٤��Ǥ�.
 		X11 ���ץꥱ���������ϰ貽������ˡ�ˤĤ��Ƥ�,
-		<ulink url="http://nagual.pp.ru/~ache/koi8/xwin.html">
+		<ulink url="http://koi8.pp.ru/xwin.html">
 		KOI8-R for X-Window</ulink>
 		�򻲾Ȥ��Ƥ�������.</para>
 	    </note>
diff --git a/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml b/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
index 2a44ede577..58d13b7ab0 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.81
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml,v 1.28 2000/08/10 02:26:37 kuriyama Exp $
+     Original revision: 1.84
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml,v 1.29 2000/08/22 06:22:31 kuriyama Exp $
 -->
 
 <appendix id="mirrors">
@@ -3389,6 +3389,12 @@ doc/ja_JP.eucJP</screen>
                   ���꥾�ʽ�</para>
               </listitem>
 
+              <listitem>
+                <para>cvsup6.FreeBSD.org
+                  (�ݼ�ô�� <email>jdp@FreeBSD.org</email>),
+                  �ե������</para>
+              </listitem>
+
               <listitem>
                 <para>cvsup7.FreeBSD.org
                   (�ݼ�ô�� <email>jdp@FreeBSD.org</email>),
diff --git a/ja_JP.eucJP/books/handbook/staff/chapter.sgml b/ja_JP.eucJP/books/handbook/staff/chapter.sgml
index 6367e50b51..a9da1d3d0a 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.151
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/staff/chapter.sgml,v 1.30 2000/08/09 01:29:36 kuriyama Exp $
+     Original revision: 1.152
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/staff/chapter.sgml,v 1.31 2000/08/22 06:22:32 kuriyama Exp $
 -->
 
 <appendix id="staff">
@@ -536,7 +536,11 @@
       <listitem>
 	<para>&a.gehenna;</para>
       </listitem>
-      
+
+      <listitem>
+	<para>&a.bmah;</para>
+      </listitem>
+
       <listitem>
 	<para>&a.dwmalone;</para>
       </listitem>
diff --git a/ja_JP.eucJP/share/sgml/authors.ent b/ja_JP.eucJP/share/sgml/authors.ent
index 1c1aeb45eb..2d6d56a035 100644
--- a/ja_JP.eucJP/share/sgml/authors.ent
+++ b/ja_JP.eucJP/share/sgml/authors.ent
@@ -2,15 +2,9 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.114
+     Original revision: 1.115
 
-     IMPORTANT:  If you delete names from this file you *must* ensure that
-                 all references to them have been removed from the handbook's
-                 translations.  If they haven't then you *will* break the
-                 builds for the other languages, and we will poke fun of you
-                 in public.
-
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.34 2000/08/09 01:29:34 kuriyama Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.35 2000/08/22 06:22:27 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
@@ -19,6 +13,12 @@
      Use these entities when referencing people.
 
      Please keep this list in alphabetical order by entity names.
+
+     IMPORTANT:  If you delete names from this file you *must* ensure that
+                 all references to them have been removed from the handbook's
+                 translations.  If they haven't then you *will* break the
+                 builds for the other languages, and we will poke fun of you
+                 in public.
 -->
 
 <!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.org</email>">
@@ -65,6 +65,8 @@
 
 <!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.org</email>">
 
+<!ENTITY a.bmah "Bruce A. Mah <email>bmah@FreeBSD.org</email>">
+
 <!ENTITY a.bp "Boris Popov <email>bp@FreeBSD.org</email>">
 
 <!ENTITY a.brandon  "Brandon Gillespie <email>brandon@FreeBSD.org</email>">
diff --git a/ja_JP.eucJP/share/sgml/jauthors.ent b/ja_JP.eucJP/share/sgml/jauthors.ent
index 920c489807..143921ae08 100644
--- a/ja_JP.eucJP/share/sgml/jauthors.ent
+++ b/ja_JP.eucJP/share/sgml/jauthors.ent
@@ -3,7 +3,7 @@
      The FreeBSD Japanese Documentation Project
 
      Original revision: 
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/jauthors.ent,v 1.6 2000/07/09 15:56:25 hrs Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/jauthors.ent,v 1.7 2000/07/20 00:20:57 hrs Exp $
 
      Names and email address of Japanese local contributing authors and 
      castle.jp.freebsd.org CVS committers.
@@ -19,7 +19,7 @@
 
 <!ENTITY a.jp.candy  "���� �ҹ� <email>candy@fct.kgc.co.jp</email>">
 
-<!ENTITY a.jp.condle "�� ľǷ <email>condle@mcu.or.jp</email>">
+<!ENTITY a.jp.condle "�� ľǷ <email>mori@jp.FreeBSD.org</email>">
 
 <!ENTITY a.jp.g92k0323 "����  ���� <email>g92k0323@cfi.waseda.ac.jp</email>">