diff --git a/en/handbook/authors.ent b/en/handbook/authors.ent
index 36e43e6314..e073fb142f 100644
--- a/en/handbook/authors.ent
+++ b/en/handbook/authors.ent
@@ -7,7 +7,7 @@
 
      Please keep this list in alphabetical order by entity names.
 
-     $Id: authors.ent,v 1.9 1999-03-04 22:14:04 nik Exp $
+     $Id: authors.ent,v 1.10 1999-04-05 01:46:05 taoka Exp $
 -->
 
 <!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.ORG</email>">
@@ -306,6 +306,8 @@
 
 <!ENTITY a.swallace  "Steven Wallace <email>swallace@FreeBSD.ORG</email>">
 
+<!ENTITY a.taoka  "Satoshi Taoka <email>taoka@FreeBSD.ORG</email>">
+
 <!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.ORG</email>">
 
 <!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.ORG</email>">
diff --git a/en/handbook/contrib/chapter.sgml b/en/handbook/contrib/chapter.sgml
index 37b5fd3465..fa93dd76f0 100644
--- a/en/handbook/contrib/chapter.sgml
+++ b/en/handbook/contrib/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $Id: chapter.sgml,v 1.12 1999-03-08 22:04:37 nik Exp $
+     $Id: chapter.sgml,v 1.13 1999-04-05 01:46:05 taoka Exp $
 -->
 
 <chapter id="contrib">
@@ -4475,11 +4475,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <para>Satoh Junichi <email>junichi@astec.co.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>Satoshi Taoka
-	  <email>taoka@infonets.hiroshima-u.ac.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Scot Elliott <email>scot@poptart.org</email></para>
       </listitem>
diff --git a/en/handbook/staff/chapter.sgml b/en/handbook/staff/chapter.sgml
index e8582a0171..d1f958b29b 100644
--- a/en/handbook/staff/chapter.sgml
+++ b/en/handbook/staff/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $Id: chapter.sgml,v 1.13 1999-03-08 22:04:49 nik Exp $
+     $Id: chapter.sgml,v 1.14 1999-04-05 01:46:06 taoka Exp $
 -->
 
 <!-- 
@@ -540,6 +540,10 @@
 	<para>&a.karl;</para>
       </listitem>
       
+      <listitem>
+	<para>&a.taoka;</para>
+      </listitem>
+      
       <listitem>
 	<para>&a.dt;</para>
       </listitem>
diff --git a/en_US.ISO8859-1/articles/contributing/article.sgml b/en_US.ISO8859-1/articles/contributing/article.sgml
index aa13a578db..0fcd05d757 100644
--- a/en_US.ISO8859-1/articles/contributing/article.sgml
+++ b/en_US.ISO8859-1/articles/contributing/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $Id: article.sgml,v 1.12 1999-03-08 22:04:37 nik Exp $
+     $Id: article.sgml,v 1.13 1999-04-05 01:46:05 taoka Exp $
 -->
 
 <chapter id="contrib">
@@ -4475,11 +4475,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <para>Satoh Junichi <email>junichi@astec.co.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>Satoshi Taoka
-	  <email>taoka@infonets.hiroshima-u.ac.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Scot Elliott <email>scot@poptart.org</email></para>
       </listitem>
diff --git a/en_US.ISO8859-1/books/handbook/authors.ent b/en_US.ISO8859-1/books/handbook/authors.ent
index 36e43e6314..e073fb142f 100644
--- a/en_US.ISO8859-1/books/handbook/authors.ent
+++ b/en_US.ISO8859-1/books/handbook/authors.ent
@@ -7,7 +7,7 @@
 
      Please keep this list in alphabetical order by entity names.
 
-     $Id: authors.ent,v 1.9 1999-03-04 22:14:04 nik Exp $
+     $Id: authors.ent,v 1.10 1999-04-05 01:46:05 taoka Exp $
 -->
 
 <!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.ORG</email>">
@@ -306,6 +306,8 @@
 
 <!ENTITY a.swallace  "Steven Wallace <email>swallace@FreeBSD.ORG</email>">
 
+<!ENTITY a.taoka  "Satoshi Taoka <email>taoka@FreeBSD.ORG</email>">
+
 <!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.ORG</email>">
 
 <!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.ORG</email>">
diff --git a/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml b/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml
index 37b5fd3465..fa93dd76f0 100644
--- a/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $Id: chapter.sgml,v 1.12 1999-03-08 22:04:37 nik Exp $
+     $Id: chapter.sgml,v 1.13 1999-04-05 01:46:05 taoka Exp $
 -->
 
 <chapter id="contrib">
@@ -4475,11 +4475,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <para>Satoh Junichi <email>junichi@astec.co.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>Satoshi Taoka
-	  <email>taoka@infonets.hiroshima-u.ac.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Scot Elliott <email>scot@poptart.org</email></para>
       </listitem>
diff --git a/en_US.ISO8859-1/books/handbook/staff/chapter.sgml b/en_US.ISO8859-1/books/handbook/staff/chapter.sgml
index e8582a0171..d1f958b29b 100644
--- a/en_US.ISO8859-1/books/handbook/staff/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/staff/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $Id: chapter.sgml,v 1.13 1999-03-08 22:04:49 nik Exp $
+     $Id: chapter.sgml,v 1.14 1999-04-05 01:46:06 taoka Exp $
 -->
 
 <!-- 
@@ -540,6 +540,10 @@
 	<para>&a.karl;</para>
       </listitem>
       
+      <listitem>
+	<para>&a.taoka;</para>
+      </listitem>
+      
       <listitem>
 	<para>&a.dt;</para>
       </listitem>
diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent
index 36e43e6314..e073fb142f 100644
--- a/en_US.ISO8859-1/share/sgml/authors.ent
+++ b/en_US.ISO8859-1/share/sgml/authors.ent
@@ -7,7 +7,7 @@
 
      Please keep this list in alphabetical order by entity names.
 
-     $Id: authors.ent,v 1.9 1999-03-04 22:14:04 nik Exp $
+     $Id: authors.ent,v 1.10 1999-04-05 01:46:05 taoka Exp $
 -->
 
 <!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.ORG</email>">
@@ -306,6 +306,8 @@
 
 <!ENTITY a.swallace  "Steven Wallace <email>swallace@FreeBSD.ORG</email>">
 
+<!ENTITY a.taoka  "Satoshi Taoka <email>taoka@FreeBSD.ORG</email>">
+
 <!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.ORG</email>">
 
 <!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.ORG</email>">
diff --git a/en_US.ISO_8859-1/books/handbook/authors.ent b/en_US.ISO_8859-1/books/handbook/authors.ent
index 36e43e6314..e073fb142f 100644
--- a/en_US.ISO_8859-1/books/handbook/authors.ent
+++ b/en_US.ISO_8859-1/books/handbook/authors.ent
@@ -7,7 +7,7 @@
 
      Please keep this list in alphabetical order by entity names.
 
-     $Id: authors.ent,v 1.9 1999-03-04 22:14:04 nik Exp $
+     $Id: authors.ent,v 1.10 1999-04-05 01:46:05 taoka Exp $
 -->
 
 <!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.ORG</email>">
@@ -306,6 +306,8 @@
 
 <!ENTITY a.swallace  "Steven Wallace <email>swallace@FreeBSD.ORG</email>">
 
+<!ENTITY a.taoka  "Satoshi Taoka <email>taoka@FreeBSD.ORG</email>">
+
 <!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.ORG</email>">
 
 <!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.ORG</email>">
diff --git a/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml b/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml
index 37b5fd3465..fa93dd76f0 100644
--- a/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $Id: chapter.sgml,v 1.12 1999-03-08 22:04:37 nik Exp $
+     $Id: chapter.sgml,v 1.13 1999-04-05 01:46:05 taoka Exp $
 -->
 
 <chapter id="contrib">
@@ -4475,11 +4475,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <para>Satoh Junichi <email>junichi@astec.co.jp</email></para>
       </listitem>
 
-      <listitem>
-        <para>Satoshi Taoka
-	  <email>taoka@infonets.hiroshima-u.ac.jp</email></para>
-      </listitem>
-
       <listitem>
         <para>Scot Elliott <email>scot@poptart.org</email></para>
       </listitem>
diff --git a/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml b/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml
index e8582a0171..d1f958b29b 100644
--- a/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $Id: chapter.sgml,v 1.13 1999-03-08 22:04:49 nik Exp $
+     $Id: chapter.sgml,v 1.14 1999-04-05 01:46:06 taoka Exp $
 -->
 
 <!-- 
@@ -540,6 +540,10 @@
 	<para>&a.karl;</para>
       </listitem>
       
+      <listitem>
+	<para>&a.taoka;</para>
+      </listitem>
+      
       <listitem>
 	<para>&a.dt;</para>
       </listitem>