From e464d287a8dc2670dc8fde495ffc1d77a25a2eaa Mon Sep 17 00:00:00 2001
From: Jun Kuriyama <kuriyama@FreeBSD.org>
Date: Tue, 22 Aug 2000 06:22:32 +0000
Subject: [PATCH] Merge following changes in the English version.
1.113 -> 1.114 authors.ent
1.21 -> 1.22 basics/chapter.sgml
1.277 -> 1.280 contrib/chapter.sgml
1.53 -> 1.56 cutting-edge/chapter.sgml
1.80 -> 1.81 mirrors/chapter.sgml
1.40 -> 1.41 pgpkeys/chapter.sgml
1.17 -> 1.18 policies/chapter.sgml
1.150 -> 1.151 staff/chapter.sgml
---
.../articles/contributing/article.sgml | 16 +++---
ja_JP.eucJP/books/handbook/authors.ent | 6 ++-
.../books/handbook/basics/chapter.sgml | 4 +-
.../books/handbook/contrib/chapter.sgml | 16 +++---
.../books/handbook/cutting-edge/chapter.sgml | 50 +++++++++++++------
.../books/handbook/mirrors/chapter.sgml | 9 +++-
.../books/handbook/pgpkeys/chapter.sgml | 4 +-
.../books/handbook/policies/chapter.sgml | 6 +--
ja_JP.eucJP/books/handbook/staff/chapter.sgml | 8 ++-
ja_JP.eucJP/share/sgml/authors.ent | 6 ++-
10 files changed, 82 insertions(+), 43 deletions(-)
diff --git a/ja_JP.eucJP/articles/contributing/article.sgml b/ja_JP.eucJP/articles/contributing/article.sgml
index 584ec6c2d8..492e9b9abe 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.277
- $FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.40 2000/08/09 05:37:55 kuriyama Exp $
+ 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 $
-->
<chapter id="contrib">
@@ -3568,6 +3568,10 @@ Copyright (C) [ǯ]
<para>Lee Cremeans <email>lcremean@tidalwave.net</email></para>
</listitem>
+ <listitem>
+ <para>Leo Kim <email>leo@florida.sarang.net</email></para>
+ </listitem>
+
<listitem>
<para>Liang Tai-hwa
<email>avatar@www.mmlab.cse.yzu.edu.tw</email></para>
@@ -4715,10 +4719,6 @@ Copyright (C) [ǯ]
<para>R. Kym Horsell</para>
</listitem>
- <listitem>
- <para>Rajesh Vaidheeswarran <email>rv@fore.com</email></para>
- </listitem>
-
<listitem>
<para>Ralf Friedl <email>friedl@informatik.uni-kl.de</email></para>
</listitem>
@@ -5955,6 +5955,10 @@ Copyright (C) [ǯ]
<para>Guido van Rooij <email>guido@gvr.org</email></para>
</listitem>
+ <listitem>
+ <para>Guy Antony Halse <email>guy@rucus.ru.ac.za</email></para>
+ </listitem>
+
<listitem>
<para>Guy Harris <email>guy@auspex.com</email></para>
</listitem>
diff --git a/ja_JP.eucJP/books/handbook/authors.ent b/ja_JP.eucJP/books/handbook/authors.ent
index 07bd7e7525..1c1aeb45eb 100644
--- a/ja_JP.eucJP/books/handbook/authors.ent
+++ b/ja_JP.eucJP/books/handbook/authors.ent
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: 1.113
+ Original revision: 1.114
IMPORTANT: If you delete names from this file you *must* ensure that
all references to them have been removed from the handbook's
@@ -10,7 +10,7 @@
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.33 2000/08/04 08:47:35 kuriyama Exp $
+ $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.34 2000/08/09 01:29:34 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
@@ -431,6 +431,8 @@
<!ENTITY a.ru "Ruslan Ermilov <email>ru@FreeBSD.org</email>">
+<!ENTITY a.rv "Rajesh Vaidheeswarran <email>rv@FreeBSD.org</email>">
+
<!ENTITY a.rwatson "Robert Watson <email>rwatson@FreeBSD.org</email>">
<!ENTITY a.sada "���� ���� <email>sada@FreeBSD.org</email>">
diff --git a/ja_JP.eucJP/books/handbook/basics/chapter.sgml b/ja_JP.eucJP/books/handbook/basics/chapter.sgml
index 9a835319e1..9253c66088 100644
--- a/ja_JP.eucJP/books/handbook/basics/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/basics/chapter.sgml
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: 1.21
- $FreeBSD: doc/ja_JP.eucJP/books/handbook/basics/chapter.sgml,v 1.10 2000/07/20 12:22:31 hrs Exp $
+ Original revision: 1.22
+ $FreeBSD: doc/ja_JP.eucJP/books/handbook/basics/chapter.sgml,v 1.11 2000/08/09 01:29:35 kuriyama Exp $
-->
<chapter id="basics">
diff --git a/ja_JP.eucJP/books/handbook/contrib/chapter.sgml b/ja_JP.eucJP/books/handbook/contrib/chapter.sgml
index 584ec6c2d8..492e9b9abe 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.277
- $FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.40 2000/08/09 05:37:55 kuriyama Exp $
+ 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 $
-->
<chapter id="contrib">
@@ -3568,6 +3568,10 @@ Copyright (C) [ǯ]
<para>Lee Cremeans <email>lcremean@tidalwave.net</email></para>
</listitem>
+ <listitem>
+ <para>Leo Kim <email>leo@florida.sarang.net</email></para>
+ </listitem>
+
<listitem>
<para>Liang Tai-hwa
<email>avatar@www.mmlab.cse.yzu.edu.tw</email></para>
@@ -4715,10 +4719,6 @@ Copyright (C) [ǯ]
<para>R. Kym Horsell</para>
</listitem>
- <listitem>
- <para>Rajesh Vaidheeswarran <email>rv@fore.com</email></para>
- </listitem>
-
<listitem>
<para>Ralf Friedl <email>friedl@informatik.uni-kl.de</email></para>
</listitem>
@@ -5955,6 +5955,10 @@ Copyright (C) [ǯ]
<para>Guido van Rooij <email>guido@gvr.org</email></para>
</listitem>
+ <listitem>
+ <para>Guy Antony Halse <email>guy@rucus.ru.ac.za</email></para>
+ </listitem>
+
<listitem>
<para>Guy Harris <email>guy@auspex.com</email></para>
</listitem>
diff --git a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
index 70c1b45db1..89a296703c 100644
--- a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: 1.53
- $FreeBSD: doc/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml,v 1.17 2000/07/20 12:22:32 hrs Exp $
+ Original revision: 1.56
+ $FreeBSD: doc/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml,v 1.18 2000/08/04 08:47:37 kuriyama Exp $
-->
<chapter id="cutting-edge">
@@ -30,7 +30,7 @@
</sect1>
<sect1 id="current-stable">
- <title>-CURRENT v.s. -STABLE</title>
+ <title>-CURRENT vs. -STABLE</title>
<para>FreeBSD �ˤ���Ĥγ�ȯ�֥���������ޤ�. -CURRENT �� -STABLE �Ǥ�.
���ξϤǤϤ��줾��ˤĤ��ƾ�������������, �ɤΤ褦�ˤ��Ƥ��ʤ���
@@ -1041,19 +1041,28 @@ Script done, …</screen>
</sect2>
<sect2>
- <title><filename>/etc</filename> ���</title>
+ <title><command>make world</command> �ǹ�������ʤ��ե�����ι���</title>
<para>
�����ƥ�κƹ��ۤ�, �����Ĥ��Υǥ��쥯�ȥ� (
�ä�, <filename>/etc</filename>, �� <filename>/var</filename> ��
<filename>/usr</filename>) �ˤ�����,
������Ƴ�����줿��, �ѹ����줿����ե�����ˤ��
- �ե�����ι����ϹԤʤ��ޤ���.
- �����, ���ʤ����Ȥμ����, ������Ŭ�ڤ�
- &man.diff.1; �λ��Ѥ�ˤ�äƹԤʤ�ʤ���Фʤ�ޤ���.
- </para>
-
+ �ե�����ι����ϹԤʤ��ޤ���.</para>
+
<para>
+ �����Υե�����������äȤ��ñ����ˡ��, &man.mergemaster.8;
+ ��Ȥ����ȤǤ�. ����ϼ�ʬ�Ǥ�뤳�Ȥ��ǽ�ʤΤ�, �������Ƥ�
+ ���ޤ��ޤ���.
+ &man.mergemaster.8; �ϴ�ñ�˻Ȥ���Τ�, �������Ȥ����Ȥ�
+ �����ᤷ�ޤ�. ���ξ��ˤ� <link linkend="update-dev">
+ ���Υ��������</link> �˿ʤ�Ǥ�������.
+ �ޤ��ǽ�˥ޥ˥奢��ڡ������ɤ��, <filename>/etc</filename>
+ �ΥХå����åפ��ä���¬�λ��֤������Ƥ�������.
+ </para>
+
+ <para>
+ ��ư�ǹ������뤳�Ȥ���������,
ñ�˥ե������
<filename>/usr/src/etc</filename> ���� <filename>/etc</filename> ��
���ԡ����������Ǥ������ư����뤳�ȤϤǤ��ޤ���.
@@ -1068,6 +1077,7 @@ Script done, …</screen>
</para>
<para>
+ ��ư�ǹԤ��ݤ�
���ִ�ñ����ˡ��, �ե���������ǥ��쥯�ȥ�˥��ȡ��뤷�Ƥ���,
�����Τ�ΤȰۤʤäƤ�����ʬ��Ĵ�٤ƹ�����Ȥ�Ԥʤ����ȤǤ�.
</para>
@@ -1109,14 +1119,13 @@ Script done, …</screen>
���ִ�ñ�ʤ������, ���ΤȤ���Ǥ�. </para>
<screen>&prompt.root; <userinput>cd /var/tmp/root</userinput>
-&prompt.root; <userinput>find -d . -type d | /usr/bin/perl -lne \
- 'opendir(D,$_);@f=readdir(D);rmdir if $#f == 1;closedir(D);'</userinput></screen>
+&prompt.root; <userinput>find -d . -type d | xargs rmdir 2>/dev/null</userinput></screen>
<para>
- ����Ͽ���ͥ��õ���dzƥǥ��쥯�ȥ��������,
- �ޤޤ��ե�����ο��� 2 ��(������ץ���� <quote/1/ ��
- typo �ǤϤ���ޤ���), ���ʤ�� <quote/<filename/.// ��
- <quote/<filename/..// �ʤ��, ���Υǥ��쥯�ȥ�������ޤ�.
+ ����϶��ǥ��쥯�ȥ�٤ƺ�����ޤ�.
+ (���Ǥʤ��ǥ��쥯�ȥ�˴ؤ���ٹ���뤿���,
+ ɸ�२�顼���Ϥ� <filename>/dev/null</filename> ��
+ ������쥯�Ȥ���ޤ�)
</para>
<para>
@@ -1257,7 +1266,7 @@ Script done, …</screen>
</tip>
</sect2>
- <sect2>
+ <sect2 id="update-dev">
<title><filename>/dev</filename> ���</title>
<note>
@@ -1280,6 +1289,15 @@ Script done, …</screen>
</para>
<screen>&prompt.root; <userinput>cp /var/tmp/root/dev/MAKEDEV /dev</userinput></screen>
+
+ <para>
+ <filename>/etc</filename> �������
+ &man.mergemaster.8; ��Ȥä����,
+ <filename>MAKEDEV</filename> ������ץȤϴ��˹���
+ ����Ƥ���Ǥ��礦��, (&man.diff.1; ��Ȥä�)
+ �����å����뤳�Ȥ�̵�̤ǤϤ���ޤ���,
+ ɬ�פʤ鼫ʬ�ǥ��ԡ����Ƥ�������.
+ </para>
</step>
<step>
diff --git a/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml b/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
index 82246c52f1..2a44ede577 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.80
- $FreeBSD: doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml,v 1.27 2000/08/09 01:29:36 kuriyama Exp $
+ 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 $
-->
<appendix id="mirrors">
@@ -2933,6 +2933,11 @@ doc/ja_JP.eucJP</screen>
<listitem>
<para>cvsup.ca.FreeBSD.org
(�ݼ�ô�� <email>dan@jaded.net</email>)</para>
+ </listitem>
+
+ <listitem>
+ <para>cvsup2.ca.FreeBSD.org
+ (�ݼ�ô�� <email>mitayai@dreaming.org</email>)</para>
</listitem>
</itemizedlist>
</listitem>
diff --git a/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml b/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml
index 2c34e9f7e3..82c5bac77f 100644
--- a/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: 1.40
- $FreeBSD: doc/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml,v 1.12 2000/07/14 06:08:05 kuriyama Exp $
+ Original revision: 1.41
+ $FreeBSD: doc/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml,v 1.13 2000/08/04 08:47:36 kuriyama Exp $
-->
<appendix id="pgpkeys">
diff --git a/ja_JP.eucJP/books/handbook/policies/chapter.sgml b/ja_JP.eucJP/books/handbook/policies/chapter.sgml
index 99861d9fac..b28f1e3ea2 100644
--- a/ja_JP.eucJP/books/handbook/policies/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/policies/chapter.sgml
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: 1.17
- $FreeBSD: doc/ja_JP.eucJP/books/handbook/policies/chapter.sgml,v 1.8 2000/06/28 03:24:57 kuriyama Exp $
+ Original revision: 1.18
+ $FreeBSD: doc/ja_JP.eucJP/books/handbook/policies/chapter.sgml,v 1.9 2000/07/20 12:22:34 hrs Exp $
-->
<chapter id="policies">
@@ -276,7 +276,7 @@ obrien@FreeBSD.org - 30 March 1997</programlisting>
</sect1>
<sect1 id="policies-encumbered">
- <title>���������������դ�ɬ�פʥե����� (Encumbered files)</title>
+ <title>���������������դ�ɬ�פʥե����� (Encumbered Files)</title>
<para> ���ˤ�äƤ� FreeBSD �Υ������ĥ����˥�����������
���դ�ɬ�פʥե������ޤ�ɬ�פ����뤫���Τ�ޤ���. �㤨��, �ǥХ���
diff --git a/ja_JP.eucJP/books/handbook/staff/chapter.sgml b/ja_JP.eucJP/books/handbook/staff/chapter.sgml
index b410650483..6367e50b51 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.150
- $FreeBSD: doc/ja_JP.eucJP/books/handbook/staff/chapter.sgml,v 1.29 2000/08/04 08:47:36 kuriyama Exp $
+ 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 $
-->
<appendix id="staff">
@@ -849,6 +849,10 @@
<para>&a.ume;</para>
</listitem>
+ <listitem>
+ <para>&a.rv;</para>
+ </listitem>
+
<listitem>
<para>&a.hoek;</para>
</listitem>
diff --git a/ja_JP.eucJP/share/sgml/authors.ent b/ja_JP.eucJP/share/sgml/authors.ent
index 07bd7e7525..1c1aeb45eb 100644
--- a/ja_JP.eucJP/share/sgml/authors.ent
+++ b/ja_JP.eucJP/share/sgml/authors.ent
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: 1.113
+ Original revision: 1.114
IMPORTANT: If you delete names from this file you *must* ensure that
all references to them have been removed from the handbook's
@@ -10,7 +10,7 @@
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.33 2000/08/04 08:47:35 kuriyama Exp $
+ $FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.34 2000/08/09 01:29:34 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
@@ -431,6 +431,8 @@
<!ENTITY a.ru "Ruslan Ermilov <email>ru@FreeBSD.org</email>">
+<!ENTITY a.rv "Rajesh Vaidheeswarran <email>rv@FreeBSD.org</email>">
+
<!ENTITY a.rwatson "Robert Watson <email>rwatson@FreeBSD.org</email>">
<!ENTITY a.sada "���� ���� <email>sada@FreeBSD.org</email>">