From 052972279eb325158859160dedf968111f23b4dd Mon Sep 17 00:00:00 2001
From: Jun Kuriyama <kuriyama@FreeBSD.org>
Date: Wed, 12 Jul 2000 07:58:09 +0000
Subject: [PATCH] Merge changes in the English version (1.100 -> 1.104).

---
 ja_JP.eucJP/books/handbook/authors.ent | 12 ++++++++++--
 ja_JP.eucJP/share/sgml/authors.ent     | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ja_JP.eucJP/books/handbook/authors.ent b/ja_JP.eucJP/books/handbook/authors.ent
index e8f649fbfb..4c039810e8 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.100
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.27 2000/07/08 11:49:07 hrs Exp $
+     Original revision: 1.104
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.28 2000/07/09 15:56:25 hrs 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.bde  "Bruce Evans <email>bde@FreeBSD.org</email>">
 
+<!ENTITY a.ben  "Ben Smithurst <email>ben@FreeBSD.org</email>">
+
 <!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.org</email>">
 
 <!ENTITY a.bp "Boris Popov <email>bp@FreeBSD.org</email>">
@@ -130,6 +132,8 @@
 
 <!ENTITY a.dwhite "Doug White <email>dwhite@FreeBSD.org</email>">
 
+<!ENTITY a.dwmalone "David Malone <email>dwmalone@FreeBSD.org</email>">
+
 <!ENTITY a.dyson "John Dyson <email>dyson@FreeBSD.org</email>">
 
 <!ENTITY a.eivind  "Eivind Eklund <email>eivind@FreeBSD.org</email>">
@@ -278,6 +282,8 @@
 
 <!ENTITY a.kato "²ÃÆ£ ¾æŵ <email>kato@FreeBSD.org</email>">
 
+<!ENTITY a.kbyanc "Kelly Yancey <email>kbyanc@FreeBSD.org</email>">
+
 <!ENTITY a.kelly "Sean Kelly <email>kelly@ad1440.net</email>">
 
 <!ENTITY a.ken "Kenneth D. Merry <email>ken@FreeBSD.org</email>">
@@ -352,6 +358,8 @@
 
 <!ENTITY a.nik "Nik Clayton <email>nik@FreeBSD.org</email>">
 
+<!ENTITY a.non "Noriaki Mitsunaga <email>non@FreeBSD.org</email>">
+
 <!ENTITY a.nsayer  "Nick Sayer <email>nsayer@FreeBSD.org</email>">
 
 <!ENTITY a.nsj "Nate Johnson <email>nsj@FreeBSD.org</email>">
diff --git a/ja_JP.eucJP/share/sgml/authors.ent b/ja_JP.eucJP/share/sgml/authors.ent
index e8f649fbfb..4c039810e8 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.100
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.27 2000/07/08 11:49:07 hrs Exp $
+     Original revision: 1.104
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.28 2000/07/09 15:56:25 hrs 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.bde  "Bruce Evans <email>bde@FreeBSD.org</email>">
 
+<!ENTITY a.ben  "Ben Smithurst <email>ben@FreeBSD.org</email>">
+
 <!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.org</email>">
 
 <!ENTITY a.bp "Boris Popov <email>bp@FreeBSD.org</email>">
@@ -130,6 +132,8 @@
 
 <!ENTITY a.dwhite "Doug White <email>dwhite@FreeBSD.org</email>">
 
+<!ENTITY a.dwmalone "David Malone <email>dwmalone@FreeBSD.org</email>">
+
 <!ENTITY a.dyson "John Dyson <email>dyson@FreeBSD.org</email>">
 
 <!ENTITY a.eivind  "Eivind Eklund <email>eivind@FreeBSD.org</email>">
@@ -278,6 +282,8 @@
 
 <!ENTITY a.kato "²ÃÆ£ ¾æŵ <email>kato@FreeBSD.org</email>">
 
+<!ENTITY a.kbyanc "Kelly Yancey <email>kbyanc@FreeBSD.org</email>">
+
 <!ENTITY a.kelly "Sean Kelly <email>kelly@ad1440.net</email>">
 
 <!ENTITY a.ken "Kenneth D. Merry <email>ken@FreeBSD.org</email>">
@@ -352,6 +358,8 @@
 
 <!ENTITY a.nik "Nik Clayton <email>nik@FreeBSD.org</email>">
 
+<!ENTITY a.non "Noriaki Mitsunaga <email>non@FreeBSD.org</email>">
+
 <!ENTITY a.nsayer  "Nick Sayer <email>nsayer@FreeBSD.org</email>">
 
 <!ENTITY a.nsj "Nate Johnson <email>nsj@FreeBSD.org</email>">