svn commit: r45543 - head/ja_JP.eucJP/books/handbook/preface
Ryusuke SUZUKI <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
Author: ryusuke
Date: Tue Sep 2 11:56:23 2014
New Revision: 45543
URL: http://svnweb.freebsd.org/changeset/doc/45543
Log:
- Merge the following from the English version:
r33417 -> r36722 head/ja_JP.eucJP/books/handbook/preface/preface.xml
Modified:
head/ja_JP.eucJP/books/handbook/preface/preface.xml
Modified: head/ja_JP.eucJP/books/handbook/preface/preface.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/preface/preface.xml Tue Sep 2 09:48:25 2014 (r45542)
+++ head/ja_JP.eucJP/books/handbook/preface/preface.xml Tue Sep 2 11:56:23 2014 (r45543)
@@ -3,7 +3,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r33417
+ Original revision: r36722
$FreeBSD$
-->
<preface xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="book-preface">
@@ -11,13 +11,13 @@
<bridgehead xml:id="preface-audience" renderas="sect1">ÁÛÄꤷ¤Æ¤¤¤ëÆɼÔ</bridgehead>
- <para>ºÇ½é¤ÎÉôʬ¤Ï FreeBSD ¤ò»È¤¤»Ï¤á¤¿¿Í¸þ¤±¤Ç¡¢FreeBSD
+ <para>ºÇ½é¤ÎÉôʬ¤Ï &os; ¤ò»È¤¤»Ï¤á¤¿¿Í¸þ¤±¤Ç¡¢&os;
¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î²áÄø¤ò¼ê°ú¤¤·¡¢&unix;
¤Î´ðÁäȤʤäƤ¤¤ë³µÇ°¤ä´·½¬¤òÃúÇ«¤Ë¾Ò²ð¤·¤Þ¤¹¡£
¤³¤ÎÉôʬ¤Ë¼è¤êÁȤि¤á¤ËɬÍפʤΤϡ¢Ãµµæ¿´¤È¡¢
¾Ò²ð¤µ¤ì¤¿¿·¤¿¤Ê³µÇ°¤òÍý²ò¤¹¤ëǽÎϤÀ¤±¤Ç¤¹¡£</para>
- <para>¤½¤Î¼¡¤Î¡¢¥Ï¥ó¥É¥Ö¥Ã¥¯¤Î¤Ï¤ë¤«¤ËÂ礤ÊÉôʬ¤Ç¤Ï¡¢FreeBSD
+ <para>¤½¤Î¼¡¤Î¡¢¥Ï¥ó¥É¥Ö¥Ã¥¯¤Î¤Ï¤ë¤«¤ËÂ礤ÊÉôʬ¤Ç¤Ï¡¢&os;
¥·¥¹¥Æ¥à´ÉÍý¼Ô¤¬¶½Ì£¤òÊú¤¯¤¢¤é¤æ¤ë¼ïÎà¤ÎÏÃÂ꤬ʬ¤«¤ê¤ä¤¹¤¯¸ÀµÚ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
°ìÉô¤Î¾Ï¤Ï¡¢¤½¤Î¾Ï¤ÎÁ°¤ËÆɤó¤Ç¤ª¤¯¤Ù¤¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤ª¤ê¡¢
³Æ¾Ï¤Î»Ï¤á¤Î³µÍפǽҤ٤é¤ì¤Æ¤¤¤Þ¤¹¡£</para>
@@ -28,7 +28,7 @@
<bridgehead xml:id="preface-changes-from3" renderas="sect1">Âè 3
ÈǤ«¤é¤ÎÊѹ¹</bridgehead>
- <para>¥ª¥ó¥é¥¤¥óÈǤΥϥó¥É¥Ö¥Ã¥¯¤Ï¡¢FreeBSD
+ <para>¥ª¥ó¥é¥¤¥óÈǤΥϥó¥É¥Ö¥Ã¥¯¤Ï¡¢&os;
¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤Î¸¥¿ÈŪ¤Ê¥á¥ó¥Ð¡¼¤Ë¤è¤ë
10 ǯ°Ê¾å¤ËÅϤëºî¶È¤ÎĺÅÀ¤ËΩ¤Ä¤â¤Î¤Ç¤¹¡£
2004 ǯ¤Ë½ÐÈǤµ¤ì¤¿ 2 ´¬ÁȤÎÂè 3 ÈǤ«¤é¤Î¼ç¤ÊÊѹ¹¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¹¡£</para>
@@ -37,7 +37,7 @@
<listitem>
<para><!-- <xref linkend="dtrace"/>, -->
¶¯ÎϤʥѥե©¡¼¥Þ¥ó¥¹²òÀϥġ¼¥ë
- DTrace ¤Ë´Ø¤¹¤ë¾ðÊó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£</para>
+ &dtrace; ¤Ë´Ø¤¹¤ë¾ðÊó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£</para>
</listitem>
<listitem>
@@ -48,6 +48,12 @@
</listitem>
<listitem>
+ <para><!-- <xref linkend="audit"/>, -->
+ ¥»¥¥å¥ê¥Æ¥£´Æºº¤Î¾Ï¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
+ &os; ¤Ë¤ª¤±¤ë¿·¤·¤¤´Æºº¤Î¥±¥¤¥Ñ¥Ó¥ê¥Æ¥£¤ª¤è¤Ó¤½¤Î»ÈÍÑÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+ </listitem>
+
+ <listitem>
<para><!-- <xref linkend="virtualization"/>, --> ²¾ÁÛ²½¤Î¾Ï¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
&os; ¤ò²¾ÁÛ²½¥½¥Õ¥È¤Ø¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤Ê¤É¤ò¼è¤ê¾å¤²¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
@@ -56,7 +62,7 @@
<bridgehead xml:id="preface-changes-from2" renderas="sect1">Âè 2 ÈÇ (2004)
¤«¤é¤ÎÊѹ¹</bridgehead>
- <para>Âè 3 ÈǤϡ¢FreeBSD
+ <para>Âè 3 ÈǤϡ¢&os;
¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤Î¸¥¿ÈŪ¤Ê¥á¥ó¥Ð¡¼¤Ë¤è¤ë
2 ǯ°Ê¾å¤ËÅϤëºî¶È¤ÎĺÅÀ¤ËΩ¤Ä¤â¤Î¤Ç¤¹¡£
¥µ¥¤¥º¤¬Â礤¯¤Ê¤Ã¤¿¤¿¤á¡¢°õºþÈǤϡ¢2 ´¬¤Ç¤Î½ÐÈǤȤʤê¤Þ¤·¤¿¡£
@@ -80,7 +86,7 @@
<para><!-- <xref linkend="mac"/> --> Mandatory Access Control (MAC)
¤Î¾Ï¤¬¤³¤ÎÈǤÇÄɲ䵤ì¤Þ¤·¤¿¡£
MAC ¤¬¤É¤Î¤è¤¦¤Ê¤â¤Î¤Ç¡¢
- ¤³¤Î¥á¥«¥Ë¥º¥à¤¬¤É¤Î¤è¤¦¤Ë FreeBSD
+ ¤³¤Î¥á¥«¥Ë¥º¥à¤¬¤É¤Î¤è¤¦¤Ë &os;
¥·¥¹¥Æ¥à¤ò°ÂÁ´¤Ë¤¹¤ë¤«¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
@@ -127,7 +133,7 @@
<listitem>
<para><xref linkend="advanced-networking"/> ¤Ë¡¢
- FreeBSD ¤Ç¤Î &bluetooth; ¥Ç¥Ð¥¤¥¹¤Î»ÈÍÑ¡¢
+ &os; ¤Ç¤Î &bluetooth; ¥Ç¥Ð¥¤¥¹¤Î»ÈÍÑ¡¢
¥ï¥¤¥ä¥ì¥¹¥Í¥Ã¥È¥ï¡¼¥¯¤ÎÀßÄê¡¢
Asynchronous Transfer Mode (ATM)
¥Í¥Ã¥È¥ï¡¼¥¯¤Ë´Ø¤¹¤ë¾ðÊó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£</para>
@@ -145,7 +151,7 @@
<bridgehead xml:id="preface-changes" renderas="sect1">Âè 1 ÈÇ (2001)
¤«¤é¤ÎÊѹ¹</bridgehead>
- <para>Âè 2 ÈǤϡ¢FreeBSD
+ <para>Âè 2 ÈǤϡ¢&os;
¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤Î¸¥¿ÈŪ¤Ê¥á¥ó¥Ð¡¼¤Ë¤è¤ë
2 ǯ°Ê¾å¤ËÅϤëºî¶È¤ÎĺÅÀ¤ËΩ¤Ä¤â¤Î¤Ç¤·¤¿¡£
¤³¤Î¿·¤¿¤ÊÈǤˤª¤±¤ë¼ç¤ÊÊѹ¹¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤·¤¿¡£</para>
@@ -169,7 +175,7 @@
<quote>ÉÕÏ¿</quote> ¤Î 3 ¤Ä¤ÎÏÀÍýŪ¤ÊÉôʬ¤ËºÆ¹½À®¤µ¤ì¤Þ¤·¤¿¡£</para>
</listitem>
<listitem>
- <para><xref linkend="install"/> (<quote>FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë</quote>)
+ <para><xref linkend="install"/> (<quote>&os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë</quote>)
¤Ï¿·µ¬¥æ¡¼¥¶¡¼¤¬Ê¸¾Ï¤ÎÆâÍƤòÍý²ò¤·¤ä¤¹¤¤¤è¤¦¤Ë¿¤¯¤Î¥¹¥¯¥ê¡¼¥ó¥·¥ç¥Ã¥È¤òÆþ¤ì¤Æ´°Á´¤Ë½ñ¤Ä¾¤µ¤ì¤Þ¤·¤¿¡£</para>
</listitem>
<listitem>
@@ -188,7 +194,7 @@
´°Á´¤Ë½ñ¤Ä¾¤µ¤ì¤Þ¤·¤¿¡£</para>
</listitem>
<listitem>
- <para><xref linkend="boot"/> (<quote>FreeBSD ¤Îµ¯Æ°¥×¥í¥»¥¹</quote>)
+ <para><xref linkend="boot"/> (<quote>&os; ¤Îµ¯Æ°¥×¥í¥»¥¹</quote>)
¤¬³ÈÄ¥¤µ¤ì¤Þ¤·¤¿¡£</para>
</listitem>
<listitem>
@@ -201,7 +207,7 @@
</listitem>
<listitem>
<para><xref linkend="serialcomms"/> (<quote>¥·¥ê¥¢¥ëÄÌ¿®</quote>)
- ¤Ï FreeBSD 4.X/5.X ¸þ¤±¤Ë°ì¤«¤éºÆ¹½À®¤µ¤ì¤Þ¤·¤¿¡£</para>
+ ¤Ï &os; 4.X/5.X ¸þ¤±¤Ë°ì¤«¤éºÆ¹½À®¤µ¤ì¤Þ¤·¤¿¡£</para>
</listitem>
<listitem>
<para><xref linkend="ppp-and-slip"/> (<quote>PPP ¤È SLIP</quote>)
@@ -219,7 +225,8 @@
<listitem>
<para><xref linkend="linuxemu"/> (<quote>&linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½</quote>)
¤Ë¤Ï¡¢<application>&oracle;</application> ¤ä
- <application>&sap.r3;</application> ¤Î¥¤¥ó¥¹¥È¡¼¥ë¾ðÊ󤬲䨤é¤ì¤Þ¤·¤¿
+ <application>&mathematica;</application>
+ ¤Î¥¤¥ó¥¹¥È¡¼¥ë¾ðÊ󤬲䨤é¤ì¤Þ¤·¤¿
(ÌõÃí: ÆüËܸìÈǤϺî¶ÈÃæ¤Ç¤¹)¡£</para>
</listitem>
<listitem>
@@ -239,11 +246,11 @@
<para>¤³¤Îʸ½ñ¤Ï 5 Éô¹½À®¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
Âè 1 Éô<emphasis>ƳÆþ</emphasis>¤Ç¤Ï¡¢
- FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤È´ðËÜŪ¤Ê»È¤¤Êý¤ò°·¤¤¤Þ¤¹¡£
+ &os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤È´ðËÜŪ¤Ê»È¤¤Êý¤ò°·¤¤¤Þ¤¹¡£
³Æ¾Ï¤Ï½ç¤ËÆɤळ¤È¤òÁÛÄꤷ¤Æ¤¤¤Þ¤¹¤¬¡¢
ÆëÀ÷¤ß¿¼¤¤ÏÃÂê¤ò°·¤Ã¤¿¾Ï¤ÏÈô¤Ð¤·¤Æ¤â¤è¤¤¤Ç¤·¤ç¤¦¡£
Âè 2 Éô<emphasis>Æü¡¹¤ÎÀ¸³è</emphasis>¤Ç¤Ï¡¢
- FreeBSD ¤ÇÎɤ¯»È¤ï¤ì¤ëµ¡Ç½¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
+ &os; ¤ÇÎɤ¯»È¤ï¤ì¤ëµ¡Ç½¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
¤³¤Î¾Ï¤È¤½¤ì¤Ë³¤¯¾Ï¤Ï¡¢½çÉÔƱ¤ËÆɤळ¤È¤¬¤Ç¤¤Þ¤¹¡£
³Æ¾Ï¤Î»Ï¤á¤Ë¤Ï¤½¤Î¾Ï¤¬²¿¤ò°·¤Ã¤Æ¤¤¤Æ¡¢
ÆɼԤˤɤó¤ÊͽÈ÷Ã챤¬´üÂÔ¤µ¤ì¤ë¤«¤ò´Ê·é¤Ë½Ò¤Ù¤¿³µÍפ¬¤ª¤«¤ì¤Æ¤¤¤Þ¤¹¡£
@@ -260,7 +267,7 @@
<varlistentry>
<term><emphasis><xref linkend="introduction"/>, ¤Ï¤¸¤á¤Ë</emphasis></term>
<listitem>
- <para>¿·µ¬¥æ¡¼¥¶¤Ë FreeBSD ¤ò¾Ò²ð¤·¤Þ¤¹¡£¤³¤³¤Ç¤Ï¡¢FreeBSD
+ <para>¿·µ¬¥æ¡¼¥¶¤Ë &os; ¤ò¾Ò²ð¤·¤Þ¤¹¡£¤³¤³¤Ç¤Ï¡¢&os;
¥×¥í¥¸¥§¥¯¥È¤ÎÎò»Ë¡¢ÌÜɸ¤È³«È¯¥â¥Ç¥ë¤Ë¤Ä¤¤¤Æ½Ò¤Ù¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
</varlistentry>
@@ -274,7 +281,7 @@
<varlistentry>
<term><emphasis><xref linkend="basics"/>, &unix; ¤Î´ðÁÃÃμ±</emphasis></term>
<listitem>
- <para>FreeBSD
+ <para>&os;
¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î´ðËÜŪ¤Ê¥³¥Þ¥ó¥É¤äµ¡Ç½¤ò°·¤Ã¤Æ¤¤¤Þ¤¹¡£
&linux; ¤ä¤½¤Î¾¤Î &unix; É÷¤Î¤â¤Î¤ËÆëÀ÷¤ó¤Ç¤¤¤¿¤é¡¢
¤³¤Î¾Ï¤òÈô¤Ð¤·¤Æ¤â¹½¤ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£</para>
@@ -283,14 +290,14 @@
<varlistentry>
<term><emphasis><xref linkend="ports"/>, ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë</emphasis></term>
<listitem>
- <para>FreeBSD ¤Î³×¿·Åª¤Ê <quote>Ports Collection</quote>
+ <para>&os; ¤Î³×¿·Åª¤Ê <quote>Ports Collection</quote>
¤ª¤è¤Óɸ½àŪ¤Ê¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤ë¥µ¡¼¥É¥Ñ¡¼¥Æ¥£¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis><xref linkend="x11"/>, X Window System</emphasis></term>
<listitem>
- <para>X Window System Á´È̤ȡ¢ÆÃ¤Ë FreeBSD ¾å¤Ç¤Î
+ <para>X Window System Á´È̤ȡ¢ÆÃ¤Ë &os; ¾å¤Ç¤Î
X11 ¤ÎÍøÍѤˤĤ¤¤Æ½Ò¤Ù¤Æ¤¤¤Þ¤¹¡£
¤Þ¤¿¡¢<application>KDE</application> ¤ä
<application>GNOME</application>
@@ -304,7 +311,7 @@
<term><emphasis><xref linkend="desktop"/>, ¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</emphasis></term>
<listitem>
<para>Web ¥Ö¥é¥¦¥¶¤äÀ¸»ºÀ¸þ¾å¥Ä¡¼¥ë¤Î¤è¤¦¤Ê°ìÈÌŪ¤Ê¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¤¤¤¯¤Ä¤«µó¤²¡¢
- FreeBSD ¤Ë¤ª¤±¤ë¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+ &os; ¤Ë¤ª¤±¤ë¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -315,7 +322,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><emphasis><xref linkend="kernelconfig"/>, FreeBSD
+ <term><emphasis><xref linkend="kernelconfig"/>, &os;
¥«¡¼¥Í¥ë¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó</emphasis></term>
<listitem>
<para>¤É¤Î¤è¤¦¤Ê¾ì¹ç¤Ë¿·¤¿¤Ë¥«¡¼¥Í¥ë¤ò¹½À®¤¹¤ëɬÍפ¬¤¢¤ë¤«¤òÀâÌÀ¤·¡¢
@@ -326,16 +333,15 @@
<varlistentry>
<term><emphasis><xref linkend="printing"/>, ¥×¥ê¥ó¥¿¤ÎÍøÍÑ</emphasis></term>
<listitem>
- <para>FreeBSD ¤Ë¤ª¤±¤ë¥×¥ê¥ó¥¿¤Î¼è¤ê°·¤¤¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
+ <para>&os; ¤Ë¤ª¤±¤ë¥×¥ê¥ó¥¿¤Î¼è¤ê°·¤¤¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
¥Ð¥Ê¡¼¥Ú¡¼¥¸¡¢¥×¥ê¥ó¥¿¡¼¤Î²Ý¶â¡¢½é´üÀßÄê¤È¤¤¤Ã¤¿¤³¤È¤Ç¤¹¡£</para>
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis><xref linkend="linuxemu"/>, &linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½</emphasis></term>
<listitem>
- <para>FreeBSD ¤Î &linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢
+ <para>&os; ¤Î &linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢
<application>&oracle;</application>,
- <application>&sap.r3;</application>,
<application>&mathematica;</application> ¤È¤¤¤Ã¤¿¿Íµ¤¤Î¹â¤¤
&linux; ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò¾Ü¤·¤¯ÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
@@ -346,16 +352,16 @@
<varlistentry>
<term><emphasis><xref linkend="config-tuning"/>, ÀßÄê¤È¥Á¥å¡¼¥Ë¥ó¥°</emphasis></term>
<listitem>
- <para>¥·¥¹¥Æ¥à´ÉÍý¼Ô¤¬ FreeBSD
+ <para>¥·¥¹¥Æ¥à´ÉÍý¼Ô¤¬ &os;
¥·¥¹¥Æ¥à¤òÄ´À°¤·¤ÆºÇŬ¤ÊÀǽ¤ò°ú¤½Ð¤¹¤Î¤ËÍøÍѤǤ¤ë¥Ñ¥é¥á¡¼¥¿¤Ë¤Ä¤¤¤Æ½Ò¤Ù¤Æ¤¤¤Þ¤¹¡£
- ¤Þ¤¿¡¢FreeBSD
+ ¤Þ¤¿¡¢&os;
¤ÇÍøÍѤµ¤ì¤Æ¤¤¤ëÍͤÊÀßÄê¥Õ¥¡¥¤¥ë¤È¤½¤Î¤¢¤ê¤«¤â²òÀ⤷¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis><xref linkend="boot"/>, µ¯Æ°¥×¥í¥»¥¹</emphasis></term>
<listitem>
- <para>FreeBSD ¤Îµ¯Æ°¥×¥í¥»¥¹¤ò²òÀ⤷¡¢
+ <para>&os; ¤Îµ¯Æ°¥×¥í¥»¥¹¤ò²òÀ⤷¡¢
¤³¤Î¥×¥í¥»¥¹¤òÀßÄꥪ¥×¥·¥ç¥ó¤ÇÀ©¸æ¤¹¤ëÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
</varlistentry>
@@ -370,7 +376,7 @@
<varlistentry>
<term><emphasis><xref linkend="security"/>, ¥»¥¥å¥ê¥Æ¥£</emphasis></term>
<listitem>
- <para>FreeBSD ¥·¥¹¥Æ¥à¤ò°ÂÁ´¤ËÊݤĤ¿¤á¤ËÌòΩ¤Ä Kerberos, IPsec ¤ª¤è¤Ó
+ <para>&os; ¥·¥¹¥Æ¥à¤ò°ÂÁ´¤ËÊݤĤ¿¤á¤ËÌòΩ¤Ä Kerberos, IPsec ¤ª¤è¤Ó
OpenSSH ¤È¤¤¤Ã¤¿ÍøÍѲÄǽ¤Ê¤µ¤Þ¤¶¤Þ¤Ê¥Ä¡¼¥ë¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
</varlistentry>
@@ -385,7 +391,7 @@
<term><emphasis><xref linkend="mac"/>, Mandatory Access Control</emphasis></term>
<listitem>
<para>Mandatory Access Control (MAC) ¤¬¤É¤Î¤è¤¦¤Ê¤â¤Î¤Ç¡¢
- ¤³¤Î¥á¥«¥Ë¥º¥à¤¬¤É¤Î¤è¤¦¤Ë FreeBSD
+ ¤³¤Î¥á¥«¥Ë¥º¥à¤¬¤É¤Î¤è¤¦¤Ë &os;
¥·¥¹¥Æ¥à¤ò°ÂÁ´¤Ë¤¹¤ë¤«¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
</varlistentry>
@@ -400,7 +406,7 @@
<varlistentry>
<term><emphasis><xref linkend="disks"/>, ¥¹¥È¥ì¡¼¥¸</emphasis></term>
<listitem>
- <para>FreeBSD
+ <para>&os;
¤Ç¥¹¥È¥ì¡¼¥¸¥á¥Ç¥£¥¢¤ä¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¤É¤¦°·¤¦¤«¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£
Âоݤϡ¢ÊªÍý¥Ç¥£¥¹¥¯¡¢RAID ¥¢¥ì¥¤¡¢
¸÷³Ø¤ª¤è¤Ó¥Æ¡¼¥×¥á¥Ç¥£¥¢¡¢¥á¥â¥ê¥Ù¡¼¥¹¤Î¥Ç¥£¥¹¥¯¡¢
@@ -411,7 +417,7 @@
<varlistentry>
<term><emphasis><xref linkend="geom"/>, GEOM</emphasis></term>
<listitem>
- <para>FreeBSD ¤Î GEOM ¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤ª¤è¤Ó¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë
+ <para>&os; ¤Î GEOM ¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤ª¤è¤Ó¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë
RAID ¥ì¥Ù¥ë¤ÎÀßÄêÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
</varlistentry>
@@ -433,10 +439,20 @@
<varlistentry>
<term><emphasis><xref linkend="l10n"/>, ÃÏ°è²½</emphasis></term>
<listitem>
- <para>FreeBSD ¤ò±Ñ¸ì°Ê³°¤Î¸À¸ì¤Ç»È¤¦ÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£
+ <para>&os; ¤ò±Ñ¸ì°Ê³°¤Î¸À¸ì¤Ç»È¤¦ÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£
¥·¥¹¥Æ¥à¤È¥¢¥×¥ê¥±¡¼¥·¥ç¥óξÊý¤Î¥ì¥Ù¥ë¤ÎÃÏ°è²½¤ò°·¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><emphasis><xref linkend="updating-upgrading"/>, ³«È¯¤ÎºÇÁ°Àþ</emphasis></term>
+ <listitem>
+ <para>&os;-STABLE, &os;-CURRENT ¤È &os;
+ ¤Î¥ê¥ê¡¼¥¹¤Î°ã¤¤¤òÀâÌÀ¤·¤Þ¤¹¡£
+ ¤É¤ó¤Ê¥æ¡¼¥¶¤Ë¤È¤Ã¤Æ³«È¯¥·¥¹¥Æ¥à¤òÄɿ魯¤ë¤Î¤¬ÍÍѤ«¤ò½Ò¤Ù¡¢
+ ¤½¤ÎÊýË¡¤Î³µÍפò¤Þ¤È¤á¤Æ¤¤¤Þ¤¹¡£
+ ¥·¥¹¥Æ¥à¤òºÇ¿·¤Î¥»¥¥å¥ê¥Æ¥£¥ê¥ê¡¼¥¹¤Ø¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤âÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+ </listitem>
+ </varlistentry>
<!-- <varlistentry>
<term><emphasis><xref linkend="dtrace">, &dtrace;</emphasis></term>
<listitem>
@@ -451,34 +467,16 @@
<!-- Part IV - Network Communications -->
<varlistentry>
- <term><emphasis><xref linkend="updating-upgrading"/>, ³«È¯¤ÎºÇÁ°Àþ</emphasis></term>
- <listitem>
- <para>FreeBSD-STABLE, FreeBSD-CURRENT ¤È FreeBSD
- ¤Î¥ê¥ê¡¼¥¹¤Î°ã¤¤¤òÀâÌÀ¤·¤Þ¤¹¡£
- ¤É¤ó¤Ê¥æ¡¼¥¶¤Ë¤È¤Ã¤Æ³«È¯¥·¥¹¥Æ¥à¤òÄɿ魯¤ë¤Î¤¬ÍÍѤ«¤ò½Ò¤Ù¡¢
- ¤½¤ÎÊýË¡¤Î³µÍפò¤Þ¤È¤á¤Æ¤¤¤Þ¤¹¡£</para>
- </listitem>
- </varlistentry>
-<!-- <varlistentry>
- <term><emphasis><xref linkend="updating"/>, Updating &os;</emphasis></term>
- <listitem>
- <para>Describes the latest system utilities that may be used to
- update a &os; system. These are &man.freebsd-update.8; for
- the base system, and &man.portsnap.8; for the
- Ports Collection.</para>
- </listitem>
- </varlistentry> -->
- <varlistentry>
<term><emphasis><xref linkend="serialcomms"/>, ¥·¥ê¥¢¥ëÄÌ¿®</emphasis></term>
<listitem>
- <para>FreeBSD ¥·¥¹¥Æ¥à¤ËüËö¤ä¥â¥Ç¥à¤ò¡¢
+ <para>&os; ¥·¥¹¥Æ¥à¤ËüËö¤ä¥â¥Ç¥à¤ò¡¢
¥À¥¤¥ä¥ë¥¤¥ó¤Þ¤¿¤Ï¥À¥¤¥ä¥ë¥¢¥¦¥ÈÍѤËÀܳ¤¹¤ëÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis><xref linkend="ppp-and-slip"/>, PPP ¤È SLIP</emphasis></term>
<listitem>
- <para>FreeBSD ¤Ç¡¢PPP, SLIP ¤ä PPP over Ethernet
+ <para>&os; ¤Ç¡¢PPP, SLIP ¤ä PPP over Ethernet
¤ò»È¤Ã¤Æ¥ê¥â¡¼¥È¥·¥¹¥Æ¥à¤ËÀܳ¤¹¤ëÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
</varlistentry>
@@ -494,7 +492,7 @@
<!-- <varlistentry>
<term><emphasis><xref linkend="network-servers"/>, Network Servers</emphasis></term>
<listitem>
- <para>FreeBSD ¤ò¥Í¥Ã¥È¥ï¡¼¥¯¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥µ¡¼¥Ð¡¢NIS ¥µ¡¼¥Ð¡¢
+ <para>&os; ¤ò¥Í¥Ã¥È¥ï¡¼¥¯¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥µ¡¼¥Ð¡¢NIS ¥µ¡¼¥Ð¡¢
»þ¹ïƱ´ü¥µ¡¼¥Ð¤ËÀßÄꤹ¤ë¤¿¤á¤Î¼ê½ç¤ª¤è¤ÓÀßÄê¥Õ¥¡¥¤¥ë¤ÎÎã¤ò¼è¤ê¾å¤²¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
</varlistentry>
@@ -502,7 +500,7 @@
<term><emphasis><xref linkend="firewalls"/>, ¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë</emphasis></term>
<listitem>
<para>¥½¥Õ¥È¥¦¥§¥¢¥Ù¡¼¥¹¤Î¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤ÎÇطʤˤ¢¤ëů³Ø¤Ë¤Ä¤¤¤Æ¤ÎÀâÌÀ¡¢
- FreeBSD ¤ÇÍøÍѲÄǽ¤Ê¤µ¤Þ¤¶¤Þ¤Ê¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤Î¾ÜºÙ¤ÊÀßÄêÊýË¡¤ò¼è¤ê°·¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
+ &os; ¤ÇÍøÍѲÄǽ¤Ê¤µ¤Þ¤¶¤Þ¤Ê¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤Î¾ÜºÙ¤ÊÀßÄêÊýË¡¤ò¼è¤ê°·¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
</varlistentry> -->
<varlistentry>
@@ -515,9 +513,9 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><emphasis><xref linkend="mirrors"/>, FreeBSD ¤ÎÆþ¼êÊýË¡</emphasis></term>
+ <term><emphasis><xref linkend="mirrors"/>, &os; ¤ÎÆþ¼êÊýË¡</emphasis></term>
<listitem>
- <para>FreeBSD ¤ò¼ýÏ¿¤·¤¿ CDROM ¤ä DVD ¤ÎÍÍ¡¹¤ÊÆþ¼êÀè¤ä¡¢FreeBSD
+ <para>&os; ¤ò¼ýÏ¿¤·¤¿ CDROM ¤ä DVD ¤ÎÍÍ¡¹¤ÊÆþ¼êÀè¤ä¡¢&os;
¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤ë¥¤¥ó¥¿¡¼¥Í¥Ã¥È¾å¤Î¥µ¥¤¥È¤òµó¤²¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
</varlistentry>
@@ -533,7 +531,7 @@
<varlistentry>
<term><emphasis><xref linkend="eresources"/>, ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¾å¤Î¥ê¥½¡¼¥¹</emphasis></term>
<listitem>
- <para>FreeBSD ¥æ¡¼¥¶¤¬ FreeBSD ¤Ë¤Ä¤¤¤Æ¼ÁÌ䤷¤¿¤ê¡¢
+ <para>&os; ¥æ¡¼¥¶¤¬ &os; ¤Ë¤Ä¤¤¤Æ¼ÁÌ䤷¤¿¤ê¡¢
µ»½ÑŪ¤ÊµÄÏÀ¤Ë»²²Ã¤Ç¤¤ë¡¢
¿¤¯¤Î¸ø³«¤µ¤ì¤¿¾ì¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
@@ -541,7 +539,7 @@
<varlistentry>
<term><emphasis><xref linkend="pgpkeys"/>, PGP ¸ø³«¸°</emphasis></term>
<listitem>
- <para>¿¤¯¤Î FreeBSD ³«È¯¼Ô¤Î PGP fingerprint ¤òºÜ¤»¤Æ¤¤¤Þ¤¹¡£</para>
+ <para>¿¤¯¤Î &os; ³«È¯¼Ô¤Î PGP fingerprint ¤òºÜ¤»¤Æ¤¤¤Þ¤¹¡£</para>
</listitem>
</varlistentry>
</variablelist>
@@ -629,7 +627,7 @@
<screen><prompt>E:\></prompt> <userinput>tools\fdimage floppies\kern.flp A:</userinput></screen>
- <para>&prompt.root; ¤Ç»Ï¤Þ¤ëÎã¤Ï¡¢FreeBSD
+ <para>&prompt.root; ¤Ç»Ï¤Þ¤ëÎã¤Ï¡¢&os;
¾å¤Ç¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¸¢¸Â¤Ç¼Â¹Ô¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¥³¥Þ¥ó¥É¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
¤½¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ¹¤ë¤Ë¤Ï¡¢
<systemitem class="username">root</systemitem> ¤È¤·¤Æ¥í¥°¥¤¥ó¤¹¤ë¤«¡¢
@@ -657,13 +655,13 @@
½ÐÈÇÈñÍѤò½Ð¤·¤¿¤ê¤·¤Æ¡¢¤³¤Îʸ½ñ¤òºî¤ê¾å¤²¤ë¤Î¤ò±ç½õ¤·¤Æ¤¯¤ì¤Þ¤·¤¿¡£
Æäˡ¢BSDi (¤½¤Î¸å <link xlink:href="http://www.windriver.com">Wind River Systems</link>
¤ËÇã¼ý¤µ¤ì¤Þ¤·¤¿) ¤Ï¡¢¥Õ¥ë¥¿¥¤¥à¤Ç¤³¤Îʸ½ñ¤Î²þÁ±ºî¶È¤ò¤¹¤ë¤è¤¦¤Ë
- FreeBSD ¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤Î¥á¥ó¥Ð¡¼¤ò¸ÛÍѤ·¡¢¤½¤ì¤¬
+ &os; ¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤Î¥á¥ó¥Ð¡¼¤ò¸ÛÍѤ·¡¢¤½¤ì¤¬
2000 ǯ 3 ·î¤ÎºÇ½é¤Î½ÐÈÇ (ISBN 1-57176-241-8) ¤Ë¤Ä¤Ê¤¬¤ê¤Þ¤·¤¿¡£
¤½¤Î¸å¡¢Wind River Systems ¤Ï¡¢°õºþ½ÐÎϤλÅÁȤߤòÀ°È÷¤·¡¢
¾Ï¤òÄɲ乤뤿¤á¤ËÃø¼Ô¤ò²¿Ì¾¤«ÄɲäǸÛÍѤ·¤Æ¤¯¤ì¤Þ¤·¤¿¡£¤³¤Îºî¶È¤Ï¡¢
2001 ǯ 11 ·î¤ÎÂè 2 ÈǤνÐÈÇ (ISBN 1-57176-303-1) ¤Ë·ë¼Â¤·¤Þ¤·¤¿¡£
2003-2004 ǯ¤Ë¤Ï¡¢¥Ï¥ó¥É¥Ö¥Ã¥¯Âè 3 ÈǤνÐÈǽàÈ÷¤Î¤¿¤á¤Ë <link
- xlink:href="http://www.freebsdmall.com">FreeBSD Mall, Inc</link>
+ xlink:href="http://www.freebsdmall.com">&os; Mall, Inc</link>
¤¬¹×¸¥¼Ô¤ò¸ÛÍѤ·¤Æ¤¯¤ì¤Þ¤·¤¿¡£</para>
</preface>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"