From f85f269b709c23ed6ea9b1bfa8cb0cc13f68b5f7 Mon Sep 17 00:00:00 2001
From: Motoyuki Konno <motoyuki@FreeBSD.org>
Date: Mon, 24 Aug 1998 15:19:24 +0000
Subject: [PATCH] Changes in the English version are merged.   authors.sgml   :
 1.109 -> 1.110   contrib.sgml   : 1.298 -> 1.299   submitters.sgml: 1.231 ->
 1.232

jmembers.sgml:
  delete the entity name a.motoyuki (this moved to authors.sgml).
---
 ja/handbook/authors.sgml    | 8 ++++++--
 ja/handbook/contrib.sgml    | 5 +++--
 ja/handbook/jmembers.sgml   | 5 ++++-
 ja/handbook/submitters.sgml | 6 ++++--
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ja/handbook/authors.sgml b/ja/handbook/authors.sgml
index c1b6fbc236..cd746685f2 100644
--- a/ja/handbook/authors.sgml
+++ b/ja/handbook/authors.sgml
@@ -1,6 +1,6 @@
-<!-- $Id: authors.sgml,v 1.46 1998-08-09 16:22:10 kuriyama Exp $ -->
+<!-- $Id: authors.sgml,v 1.47 1998-08-24 15:19:23 motoyuki Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.109 -->
+<!-- Original revision: 1.110 -->
 
 <!--
 Names and email address of contributing authors and CVS committers.
@@ -375,6 +375,10 @@ Please keep this list in alphabetical order by entity names.
   <tt><htmlurl url='mailto:md@bsc.no'
   name='&lt;md@bsc.no&gt;'></tt>">
 
+<!ENTITY a.motoyuki "Motoyuki Konno
+  <tt><htmlurl url='mailto:motoyuki@FreeBSD.ORG'
+  name='&lt;motoyuki@FreeBSD.ORG&gt;'></tt>">
+
 <!ENTITY a.mph "Matthew Hunt
   <tt><htmlurl url='mailto:mph@FreeBSD.ORG'
   name='&lt;mph@FreeBSD.ORG&gt;'></tt>">
diff --git a/ja/handbook/contrib.sgml b/ja/handbook/contrib.sgml
index d6816fabbb..da84caf06e 100644
--- a/ja/handbook/contrib.sgml
+++ b/ja/handbook/contrib.sgml
@@ -1,6 +1,6 @@
-<!-- $Id: contrib.sgml,v 1.84 1998-08-10 12:58:48 kuriyama Exp $ -->
+<!-- $Id: contrib.sgml,v 1.85 1998-08-24 15:19:23 motoyuki Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.298 -->
+<!-- Original revision: 1.299 -->
 
 <!-- Please try to keep the file 'avail' (from CVSROOT) 
      in sync with the list of FreeBSD Developers -->
@@ -93,6 +93,7 @@
 	<item>&a.nsj;
 	<item>&a.kato;
 	<item>&a.andreas;
+	<item>&a.motoyuki;
         <item>&a.jkoshy;
 	<item>&a.kuriyama;
 	<item>&a.imp;
diff --git a/ja/handbook/jmembers.sgml b/ja/handbook/jmembers.sgml
index 6b4ef10cfa..948eec5ba7 100644
--- a/ja/handbook/jmembers.sgml
+++ b/ja/handbook/jmembers.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: jmembers.sgml,v 1.15 1998-08-09 16:22:10 kuriyama Exp $ -->
+<!-- $Id: jmembers.sgml,v 1.16 1998-08-24 15:19:24 motoyuki Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 
 <!-- 
@@ -130,9 +130,12 @@
   <tt><htmlurl url='mailto:candy@fct.kgc.co.jp' 
   name='&lt;candy@fct.kgc.co.jp&gt;'></tt>">
 
+<!--
 <!ENTITY a.motoyuki "今野 元之
   <tt><htmlurl url='mailto:motoyuki@jp.FreeBSD.org' 
   name='&lt;motoyuki@jp.FreeBSD.org&gt;'></tt>">
+  authors.sgml に入っているのでコメントアウト
+-->
 
 <!ENTITY a.shou "広瀬 昌一
   <tt><htmlurl url='mailto:shou@kt.rim.or.jp' 
diff --git a/ja/handbook/submitters.sgml b/ja/handbook/submitters.sgml
index 90e9ff2ed9..f117bf3482 100644
--- a/ja/handbook/submitters.sgml
+++ b/ja/handbook/submitters.sgml
@@ -1,6 +1,6 @@
-<!-- $Id: submitters.sgml,v 1.72 1998-08-19 14:31:28 hanai Exp $ -->
+<!-- $Id: submitters.sgml,v 1.73 1998-08-24 15:19:24 motoyuki Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.231 -->
+<!-- Original revision: 1.232 -->
 
 <chapt><heading>FreeBSD への貢献<label id="contrib"></heading>
 
@@ -811,6 +811,8 @@ id="contrib:additional"></heading>
         name='&lt;shanee@rabbit.augusta.de&gt;'></tt>
   <item>Andreas Lohr <tt><htmlurl url='mailto:andreas@marvin.RoBIN.de'
         name='&lt;andreas@marvin.RoBIN.de&gt;'></tt>
+  <item>Andrew Gallatin <tt><htmlurl url='mailto:gallatin@cs.duke.edu'
+	name='&lt;gallatin@cs.duke.edu&gt;'></tt>
   <item>Andrew Gordon <tt><htmlurl url='mailto:andrew.gordon@net-tel.co.uk'
         name='&lt;andrew.gordon@net-tel.co.uk&gt;'></tt>
   <item>Andrew Herbert <tt><htmlurl url='mailto:andrew@werple.apana.org.au'