From 1ea6552c46af48e5f6fc06dfe4767d8e7b7392db Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sat, 30 Dec 2000 11:51:09 +0000
Subject: [PATCH] Merge the following from the English version:
1.138 -> 1.139 authors.ent
1.355 -> 1.357 contrib/chapter.sgml
1.104 -> 1.105 mirrors/chapter.sgml
1.19 -> 1.20 serialcomms/chapter.sgml
---
ja_JP.eucJP/articles/contributing/article.sgml | 13 +++++++------
ja_JP.eucJP/books/handbook/authors.ent | 6 ++++--
ja_JP.eucJP/books/handbook/contrib/chapter.sgml | 13 +++++++------
ja_JP.eucJP/books/handbook/mirrors/chapter.sgml | 9 +++++++--
ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml | 6 +++---
ja_JP.eucJP/share/sgml/authors.ent | 6 ++++--
6 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/ja_JP.eucJP/articles/contributing/article.sgml b/ja_JP.eucJP/articles/contributing/article.sgml
index 4c8a34eea7..9b6ff85b94 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.355
- $FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.50 2000/11/14 09:09:03 kiri Exp $
+ Original revision: 1.357
+ $FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.51 2000/12/27 16:08:07 hrs Exp $
-->
<chapter id="contrib">
@@ -2639,10 +2639,6 @@ Copyright (C) [ǯ]
<email>fujimoto@oscar.elec.waseda.ac.jp</email></para>
</listitem>
- <listitem>
- <para>FUJISHIMA Satsuki <email>k5@respo.or.jp</email></para>
- </listitem>
-
<listitem>
<para>FURUSAWA Kazuhisa
<email>furusawa@com.cs.osakafu-u.ac.jp</email></para>
@@ -5482,6 +5478,11 @@ Copyright (C) [ǯ]
<email>zensyo@ann.tama.kawasaki.jp</email></para>
</listitem>
+ <listitem>
+ <para>Svein Skogen
+ <email>tds@nsn.no</email></para>
+ </listitem>
+
<listitem>
<para>Tadashi Kumano <email>kumano@strl.nhk.or.jp</email></para>
</listitem>
diff --git a/ja_JP.eucJP/books/handbook/authors.ent b/ja_JP.eucJP/books/handbook/authors.ent
index c589b67dba..09d94b9783 100644
--- a/ja_JP.eucJP/books/handbook/authors.ent
+++ b/ja_JP.eucJP/books/handbook/authors.ent
@@ -2,9 +2,9 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: 1.138
+ Original revision: 1.139
- $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.46 2000/11/23 19:57:08 hrs Exp $
+ $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.47 2000/12/25 15:48:38 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
@@ -481,6 +481,8 @@
<!ENTITY a.sef "Sean Eric Fagan <email>sef@FreeBSD.org</email>">
+<!ENTITY a.sf "FUJISHIMA Satsuki <email>sf@FreeBSD.org</email>">
+
<!ENTITY a.shafeeq "Shafeeq Sinnamohideen <email>shafeeq@FreeBSD.org</email>">
<!ENTITY a.sheldonh "Sheldon Hearn <email>sheldonh@FreeBSD.org</email>">
diff --git a/ja_JP.eucJP/books/handbook/contrib/chapter.sgml b/ja_JP.eucJP/books/handbook/contrib/chapter.sgml
index 4c8a34eea7..9b6ff85b94 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.355
- $FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.50 2000/11/14 09:09:03 kiri Exp $
+ Original revision: 1.357
+ $FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.51 2000/12/27 16:08:07 hrs Exp $
-->
<chapter id="contrib">
@@ -2639,10 +2639,6 @@ Copyright (C) [ǯ]
<email>fujimoto@oscar.elec.waseda.ac.jp</email></para>
</listitem>
- <listitem>
- <para>FUJISHIMA Satsuki <email>k5@respo.or.jp</email></para>
- </listitem>
-
<listitem>
<para>FURUSAWA Kazuhisa
<email>furusawa@com.cs.osakafu-u.ac.jp</email></para>
@@ -5482,6 +5478,11 @@ Copyright (C) [ǯ]
<email>zensyo@ann.tama.kawasaki.jp</email></para>
</listitem>
+ <listitem>
+ <para>Svein Skogen
+ <email>tds@nsn.no</email></para>
+ </listitem>
+
<listitem>
<para>Tadashi Kumano <email>kumano@strl.nhk.or.jp</email></para>
</listitem>
diff --git a/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml b/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
index 36ca2568fd..b8ab0b6666 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.104
- $FreeBSD: doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml,v 1.37 2000/11/23 19:57:09 hrs Exp $
+ Original revision: 1.105
+ $FreeBSD: doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml,v 1.38 2000/12/25 15:48:40 hrs Exp $
-->
<appendix id="mirrors">
@@ -3341,6 +3341,11 @@ doc/ja_JP.eucJP</screen>
<para>cvsup4.ru.FreeBSD.org
(�ݼ�ô�� <email>zhecka@klondike.ru</email>)</para>
</listitem>
+
+ <listitem>
+ <para>cvsup5.ru.FreeBSD.org
+ (�ݼ�ô�� <email>maxim@macomnet.ru</email>)</para>
+ </listitem>
</itemizedlist>
</listitem>
</varlistentry>
diff --git a/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml b/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml
index 3d68001dc7..f7a5a50747 100644
--- a/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: 1.19
- $FreeBSD: doc/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml,v 1.6 2000/07/17 04:21:35 kuriyama Exp $
+ Original revision: 1.20
+ $FreeBSD: doc/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml,v 1.7 2000/07/20 12:22:35 hrs Exp $
-->
<chapter id="serialcomms">
@@ -1624,7 +1624,7 @@ ttyd0 "/usr/libexec/getty xxx" dialup on</programlisting>
�����ʥ������, <filename>/etc/ttys</filename> ��
�ɤ߹���ľ�����Ƥ�������.
- <screen>&prompt.root; <userinput>kill -1 1</userinput></screen>
+ <screen>&prompt.root; <userinput>kill -HUP 1</userinput></screen>
����, �⤷���ƥ����ƥ�����ꤷ�Ƥ���ΤǤ����,
��ǥबŬ�ڤ����ꤵ
diff --git a/ja_JP.eucJP/share/sgml/authors.ent b/ja_JP.eucJP/share/sgml/authors.ent
index c589b67dba..09d94b9783 100644
--- a/ja_JP.eucJP/share/sgml/authors.ent
+++ b/ja_JP.eucJP/share/sgml/authors.ent
@@ -2,9 +2,9 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: 1.138
+ Original revision: 1.139
- $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.46 2000/11/23 19:57:08 hrs Exp $
+ $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.47 2000/12/25 15:48:38 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
@@ -481,6 +481,8 @@
<!ENTITY a.sef "Sean Eric Fagan <email>sef@FreeBSD.org</email>">
+<!ENTITY a.sf "FUJISHIMA Satsuki <email>sf@FreeBSD.org</email>">
+
<!ENTITY a.shafeeq "Shafeeq Sinnamohideen <email>shafeeq@FreeBSD.org</email>">
<!ENTITY a.sheldonh "Sheldon Hearn <email>sheldonh@FreeBSD.org</email>">