From 18594e484cac1de859a318ef4cf36cb05a744f60 Mon Sep 17 00:00:00 2001 From: Ryusuke SUZUKI <ryusuke@FreeBSD.org> Date: Sat, 18 Sep 2010 09:19:46 +0000 Subject: [PATCH] Merge the following from the English version: 1.194 -> 1.204 doc/ja_JP.eucJP/books/handbook/install/chapter.sgml Reference : [doc-jp-work 2114] --- .../books/handbook/install/chapter.sgml | 93 ++++++++++++++----- 1 file changed, 69 insertions(+), 24 deletions(-) diff --git a/ja_JP.eucJP/books/handbook/install/chapter.sgml b/ja_JP.eucJP/books/handbook/install/chapter.sgml index d9d328b1d6..2f51656357 100644 --- a/ja_JP.eucJP/books/handbook/install/chapter.sgml +++ b/ja_JP.eucJP/books/handbook/install/chapter.sgml @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: 1.194 + Original revision: 1.204 $FreeBSD$ --> @@ -1599,11 +1599,19 @@ Mounting root from ufs:/dev/md0c ����ĤΥ��֥ǥ��쥯�ȥ꤬�����Ǥ��礦�� �ǥ��쥯�ȥ�ĥ�ϰʲ��Τ褦�ˤʤ�ޤ���</para> - <literallayout class="monospaced"> / + <mediaobject> + <imageobject> + <imagedata fileref="install/example-dir1" format="EPS"> + </imageobject> + + <textobject> + <literallayout class="monospaced"> / | +--- A1 | `--- A2</literallayout> + </textobject> + </mediaobject> <para>�ե����륷���ƥ�ϥե����륷���ƥ���Υǥ��쥯�ȥ�˥ޥ���Ȥ��ʤ���Ф����ޤ��� ����Ǥϡ�<literal>A1</literal> �ǥ��쥯�ȥ�� @@ -1612,7 +1620,13 @@ Mounting root from ufs:/dev/md0c ���֤�������졢 ������ <literal>B</literal> ��Υǥ��쥯�ȥ꤬����˱����Ƹ���ޤ���</para> - <literallayout class="monospaced"> / + <mediaobject> + <imageobject> + <imagedata fileref="install/example-dir2" format="EPS"> + </imageobject> + + <textobject> + <literallayout class="monospaced"> / | +--- A1 | | @@ -1621,6 +1635,8 @@ Mounting root from ufs:/dev/md0c | `--- B2 | `--- A2</literallayout> + </textobject> + </mediaobject> <para><literal>B1</literal> �ޤ��� <literal>B2</literal> ��ˤ���ɤ�ʥե�����⡢ɬ�פʤȤ��� @@ -1634,7 +1650,13 @@ Mounting root from ufs:/dev/md0c <para>�⤷ <literal>B</literal> �� <literal>A2</literal> �˥ޥ���Ȥ���Ƥ����顢���οޤΤ褦�ˤʤ�ޤ���</para> - <literallayout class="monospaced"> / + <mediaobject> + <imageobject> + <imagedata fileref="install/example-dir3" format="EPS"> + </imageobject> + + <textobject> + <literallayout class="monospaced"> / | +--- A1 | @@ -1643,6 +1665,8 @@ Mounting root from ufs:/dev/md0c +--- B1 | `--- B2</literallayout> + </textobject> + </mediaobject> <para>�����ơ��ѥ��Ϥ��줾�� <filename>/A2/B1</filename> ����� <filename>/A2/B2</filename> �Ȥʤ�Ǥ��礦��</para> @@ -1653,7 +1677,13 @@ Mounting root from ufs:/dev/md0c �ǥ��쥯�ȥ��˥ޥ���ȤǤ��ޤ��� ���οޤΤ褦�ˤʤ�ޤ���</para> - <literallayout class="monospaced"> / + <mediaobject> + <imageobject> + <imagedata fileref="install/example-dir4" format="EPS"> + </imageobject> + + <textobject> + <literallayout class="monospaced"> / | +--- A1 | @@ -1666,11 +1696,19 @@ Mounting root from ufs:/dev/md0c | `--- C2 | `--- B2</literallayout> + </textobject> + </mediaobject> <para>�ޤ��� <literal>C</literal> �� <literal>A1</literal> �β��� <literal>A</literal> �ե����륷���ƥ��ľ�ܥޥ���ȤǤ��ޤ���</para> - <literallayout class="monospaced"> / + <mediaobject> + <imageobject> + <imagedata fileref="install/example-dir5" format="EPS"> + </imageobject> + + <textobject> + <literallayout class="monospaced"> / | +--- A1 | | @@ -1683,6 +1721,8 @@ Mounting root from ufs:/dev/md0c +--- B1 | `--- B2</literallayout> + </textobject> + </mediaobject> <para>�⤷���ʤ��� DOS ��Ȥ��ʤ�Ƥ���ʤ顢 �ޤä���Ʊ���ǤϤ���ޤ�������� <command>join</command> ���ޥ�ɤ� @@ -2651,17 +2691,19 @@ Mounting root from ufs:/dev/md0c XFree86 �δĶ�����ȥǥե���ȥǥ����ȥåפ�����ϥ��ȡ��륹�ƥåפθ�˹Ԥ��ޤ���</para> <para>���ȡ��뤵��� <application>XFree86</application> - �Υǥե���ȥС������ϡ����ȡ��뤹�� FreeBSD �ΥС������˰�¸���ޤ��� - 4.6 ������ FreeBSD �ΥС������Ǥ� <application>XFree86 3.X</application> - �����ȡ��뤵�졢4.6 �ʹߤǤ� <application>XFree86 4.X</application> - ���ǥե���Ȥǥ��ȡ��뤵��ޤ���</para> + �Υǥե���ȥС������ϡ����ȡ��뤹�� FreeBSD + �ΥС������˰�¸���ޤ��� + 4.6 ������ FreeBSD �ΥС������Ǥ� + <application>XFree86 3.X</application> �����ȡ��뤵�졢 + 4.6 �ʹߤǤ� <application>XFree86 4.X</application> + ���ǥե���Ȥǥ��ȡ��뤵��ޤ���</para> <para><ulink url="http://www.xfree86.org/">XFree86</ulink> - �Υ����֥����ȤǤ��ʤ��Υӥǥ������ɤ����ݡ��Ȥ���Ƥ��뤫�ɤ���������å����Ƥ��������� - �Ȥ����������ɤ����ȡ��뤵��� XFree86 �Υǥե���ȥС��������б����Ƥ��ʤ����ˤϡ� - ���ȡ���� X ��ޤޤʤ��ǥ����ȥ�ӥ塼���������ޤ��� - �����ƥ��ȡ����ˡ�Ports Collection ��Ȥä�Ŭ�ڤ� <application>XFree86</application> - �Υ��ȡ���ȥ���ե�����졼������Ԥ��ޤ���</para> + �Υ����֥����ȤǤ��ʤ��Υӥǥ������ɤ����ݡ��Ȥ���Ƥ��뤫�ɤ���������å����Ƥ��������� + �Ȥ����������ɤ����ȡ��뤵��� XFree86 �Υǥե���ȥС��������б����Ƥ��ʤ����ˤϡ� + ���ȡ���� X ��ޤޤʤ��ǥ����ȥ�ӥ塼���������ޤ��� + �����ƥ��ȡ����ˡ�Ports Collection ��Ȥä�Ŭ�ڤ� <application>XFree86</application> + �Υ��ȡ���ȥ���ե�����졼������Ԥ��ޤ���</para> <para>�������५���ͥ��ѥ��뤹��ͽ��ʤ�Х����������ɤ�ޤ४�ץ��������ޤ��� �ʤ��������५���ͥ���ۤ���Τ����ޤ��������५���ͥ�ι�����ˡ�˴ؤ��Ƥ� @@ -3836,8 +3878,9 @@ To change any of these settings later, edit /etc/rc.conf X �����Ф����ꤹ��ɬ�פ�����ޤ���</para> <note> - <para>root �ʳ��Υ桼���� XFree86 ��¹Ԥ���ˤϡ� - <application>wrapper</application> �ȡ��뤷�Ƥ��������� + <para><username>root</username> �ʳ��Υ桼���� XFree86 ��¹Ԥ���ˤϡ� + <filename role="package">x11/wrapper</filename> + �ȡ��뤷�Ƥ��������� Package Selection ��˥塼���饤�ȡ���Ǥ��ޤ���</para> </note> @@ -4054,7 +4097,7 @@ group indicator, etc.)? n</screen> <screen>Now we want to set the specifications of the monitor. The two critical parameters are the vertical refresh rate, which is the rate at which the -the whole screen is refreshed, and most importantly the horizontal sync rate, +whole screen is refreshed, and most importantly the horizontal sync rate, which is the rate at which scanlines are displayed. The valid range for horizontal sync and vertical sync should be documented @@ -4528,7 +4571,7 @@ failed. Would you like to try again? <keycap>Enter</keycap> ���ơ��桼�����ɲä��Ƥ���������</para> <figure id="add-user2"> - <title>Add User ������</title> + <title>User ������</title> <mediaobject> <imageobject> @@ -4537,7 +4580,7 @@ failed. Would you like to try again? </mediaobject> </figure> - <para>��������� <guimenuitem>Add User</guimenuitem> �����ơ� + <para>��������� <guimenuitem>User</guimenuitem> �����ơ� <keycap>Enter</keycap> ���Ƥ���������</para> <figure id="add-user3"> @@ -4620,8 +4663,8 @@ failed. Would you like to try again? <term>Login shell</term> <listitem> <para>�桼���Υ��������� - (����ˤ���ȥǥե���Ȥ����ꤵ��ޤ�)�� - (<filename>/bin/sh</filename>)</para> + (����ˤ���ȥǥե���� (�� <filename>/bin/sh</filename>) + �����ꤵ��ޤ���)</para> </listitem> </varlistentry> </variablelist> @@ -4753,7 +4796,8 @@ failed. Would you like to try again? ��������θ�˥ץ���ץȤ��饳�ޥ�ɥ饤��� <command>dmesg</command> �����Ϥ��뤳�Ȥˤ�äƤ���뤳�Ȥ��Ǥ��ޤ���</para> - <para>���ȡ���κݤ����ꤷ���桼��̾ (������ξ�硢rpratt) + <para>���ȡ���κݤ����ꤷ���桼��̾ + (������ξ�硢<username>rpratt</username>) �ȥѥ���ɤ��Ѥ��ƥ������Ƥ��������� ɬ�פʻ������ <username>root</username> �Ȥ��ƥ������뤳�Ȥ��Ƥ���������</para> @@ -4933,7 +4977,8 @@ Password:</screen> �����Ÿ�����Ȥ������ȤϤ��ʤ��Ǥ��������� �ޤ������ޥ�ɥ饤�� <command>su</command> �����Ϥ��� <username>root</username> �ѥ���ɤ����Ϥ��ƥ����ѥ桼���Ȥʤ�ޤ��� - ����� wheel ���롼�פΥ��ФȤʤäƤ���桼���������Ԥ����Ȥ��Ǥ��ޤ��� + ����� <groupname>wheel</groupname> + ���롼�פΥ��ФȤʤäƤ���桼���������Ԥ����Ȥ��Ǥ��ޤ��� �ޤ��� <username>root</username> �Ȥ��ƥ������� <command>shutdown -h now</command> ����Ѥ��ޤ���</para>