svn commit: r45590 - head/ja_JP.eucJP/books/handbook/preface

Author: ryusuke
Date: Thu Sep 11 13:23:58 2014
New Revision: 45590
URL: http://svnweb.freebsd.org/changeset/doc/45590

Log:
  - Merge the following from the English version:
  
  	r42896 -> r42988	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	Thu Sep 11 00:19:37 2014	(r45589)
+++ head/ja_JP.eucJP/books/handbook/preface/preface.xml	Thu Sep 11 13:23:58 2014	(r45590)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r42896
+     Original revision: r42988
      $FreeBSD$
 -->
 <preface xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="book-preface">
@@ -34,9 +34,9 @@
 
   <itemizedlist>
     <listitem>
-      <para><!-- <xref linkend="dtrace"/>, -->
-	¶¯ÎϤʥѥե©¡¼¥Þ¥ó¥¹²òÀϥġ¼¥ë
-	&dtrace; ¤Ë´Ø¤¹¤ë¾ðÊó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£</para>
+      <para>¶¯ÎϤʥѥե©¡¼¥Þ¥ó¥¹²òÀϥġ¼¥ë
+	<!-- <xref linkend="dtrace"/> --> &dtrace;
+        ¤Ë´Ø¤¹¤ë¾ðÊó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£</para>
     </listitem>
 
     <listitem>
@@ -126,8 +126,8 @@
 	<application>Samba</application> ¤òÍѤ¤¤Æ
 	&microsoft; &windows;
 	¥¯¥é¥¤¥¢¥ó¥ÈÍѤ˥µ¡¼¥Ð¤òÀßÄꤹ¤ëÊýË¡¤Ê¤É¤ò¼è¤ê¾å¤²¤Æ¤¤¤Þ¤¹¡£
-	ºÆ¹½À®¤Ë¤è¤ê¤¤¤¯¤Ä¤«¤ÎÀ᤬¡¢<xref
-	  linkend="advanced-networking"/>
+	ºÆ¹½À®¤Ë¤è¤ê¤¤¤¯¤Ä¤«¤ÎÀ᤬¡¢
+	<xref linkend="advanced-networking"/>
 	¤«¤é°ÜÆ°¤·¤Æ¤­¤Þ¤·¤¿¡£</para>
     </listitem>
 
@@ -176,32 +176,31 @@
 	  <quote>ÉÕÏ¿</quote> ¤Î 3 ¤Ä¤ÎÏÀÍýŪ¤ÊÉôʬ¤ËºÆ¹½À®¤µ¤ì¤Þ¤·¤¿¡£</para>
       </listitem>
       <listitem>
-	<para><xref linkend="install"/> (<quote>&os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë</quote>)
+	<para><xref linkend="install"/>
 	  ¤Ï¿·µ¬¥æ¡¼¥¶¡¼¤¬Ê¸¾Ï¤ÎÆâÍƤòÍý²ò¤·¤ä¤¹¤¤¤è¤¦¤Ë¿¤¯¤Î¥¹¥¯¥ê¡¼¥ó¥·¥ç¥Ã¥È¤òÆþ¤ì¤Æ´°Á´¤Ë½ñ¤­Ä¾¤µ¤ì¤Þ¤·¤¿¡£</para>
       </listitem>
       <listitem>
-	<para><xref linkend="basics"/> (<quote>&unix; ¤Î´ðÁÃÃμ±</quote>)
+	<para><xref linkend="basics"/>
 	  ¤Ë¤Ï¡¢¥×¥í¥»¥¹¡¢¥Ç¡¼¥â¥ó¡¢
 	  ¥·¥°¥Ê¥ë¤Ë´Ø¤¹¤ë¾ðÊó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£</para>
       </listitem>
       <listitem>
 	<para><xref linkend="ports"/>
-	  (<quote>¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë</quote>)
 	  ¤Ë¤Ï¡¢¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤Î´ÉÍý¤Ë´Ø¤¹¤ë¾ðÊó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£</para>
       </listitem>
       <listitem>
-	<para><xref linkend="x11"/> (<quote>The X Window System</quote>) ¤Ï¡¢
+	<para><xref linkend="x11"/> ¤Ï¡¢
 	  &xfree86; 4.X ¾å¤Ç <application>KDE</application> ¤ä
 	  <application>GNOME</application>
 	  ¤Î¤è¤¦¤Ê¶áÂåŪ¤Ê¥Ç¥¹¥¯¥È¥Ã¥×¥Æ¥¯¥Î¥í¥¸¡¼¤òÍøÍѤ¹¤ë¤³¤È¤ËÎÏÅÀ¤ò¤ª¤¤¤Æ¡¢
 	  ´°Á´¤Ë½ñ¤­Ä¾¤µ¤ì¤Þ¤·¤¿¡£</para>
       </listitem>
       <listitem>
-	<para><xref linkend="boot"/> (<quote>&os; ¤Îµ¯Æ°¥×¥í¥»¥¹</quote>)
+	<para><xref linkend="boot"/>
 	  ¤¬³ÈÄ¥¤µ¤ì¤Þ¤·¤¿¡£</para>
       </listitem>
       <listitem>
-	<para><xref linkend="disks"/> (<quote>¥¹¥È¥ì¡¼¥¸</quote>) ¤Ï¡¢
+	<para><xref linkend="disks"/> ¤Ï¡¢
 	  <quote>¥Ç¥£¥¹¥¯</quote> ¤È <quote>¥Ð¥Ã¥¯¥¢¥Ã¥×</quote> ¤Î
 	  2 ¤Ä¤Î¾Ï¤Ëʬ¤«¤ì¤Æ¤¤¤¿¤â¤Î¤ò¤Þ¤È¤á¤Æ½ñ¤­Ä¾¤µ¤ì¤Þ¤·¤¿¡£»ä¤¿¤Á¤Ï¡¢
 	  ¤³¤ÎÏÃÂê¤Ï 1 ¤Ä¤Î¾Ï¤Ë¤Þ¤È¤á¤Æ¼¨¤·¤¿Êý¤¬Ê¬¤«¤ê¤ä¤¹¤¤¤È´¶¤¸¤Æ¤¤¤Þ¤¹¡£
@@ -209,26 +208,24 @@
 	  ¤Ë´Ø¤¹¤ëÀá¤âÄɲ䵤ì¤Þ¤·¤¿¡£</para>
       </listitem>
       <listitem>
-	<para><xref linkend="serialcomms"/> (<quote>¥·¥ê¥¢¥ëÄÌ¿®</quote>)
+	<para><xref linkend="serialcomms"/>
 	  ¤Ï &os; 4.X/5.X ¸þ¤±¤Ë°ì¤«¤éºÆ¹½À®¤µ¤ì¤Þ¤·¤¿¡£</para>
       </listitem>
       <listitem>
-	<para><xref linkend="ppp-and-slip"/> (<quote>PPP ¤È SLIP</quote>)
+	<para><xref linkend="ppp-and-slip"/>
 	  ¤ÏÂçÉý¤Ë¹¹¿·¤µ¤ì¤Þ¤·¤¿¡£</para>
       </listitem>
       <listitem>
 	<para><xref linkend="advanced-networking"/>
-	  (<quote>¹âÅ٤ʥͥåȥ¥¯</quote>)
 	  ¤Ë¡¢Â¿¤¯¤Î¿·¤·¤¤À᤬Äɲ䵤ì¤Þ¤·¤¿¡£</para>
       </listitem>
       <listitem>
-	<para><xref linkend="mail"/> (<quote>ÅŻҥ᡼¥ë</quote>) ¤Ë¡¢
-	  <application>sendmail</application>
+	<para><xref linkend="mail"/>
+	  ¤Ë¡¢<application>sendmail</application>
 	  ¤ÎÀßÄê¤Ë¤Ä¤¤¤Æ¤è¤ê¿¤¯¤Î¾ðÊ󤬲䨤é¤ì¤Þ¤·¤¿¡£</para>
       </listitem>
       <listitem>
-	<para><xref linkend="linuxemu"/> (<quote>&linux;
-	    ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½</quote>)
+	<para><xref linkend="linuxemu"/>
 	  ¤Ë¤Ï¡¢<application>&oracle;</application> ¤ä
 	  <application>&mathematica;</application>
 	  ¤Î¥¤¥ó¥¹¥È¡¼¥ë¾ðÊ󤬲䨤é¤ì¤Þ¤·¤¿
@@ -238,10 +235,11 @@
 	<para>¤³¤ÎÂè 2 ÈǤǤϡ¢°Ê²¼¤Î¿·¤¿¤ÊÏÃÂ꤬°·¤ï¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 	<itemizedlist>
 	  <listitem>
-	    <para>ÀßÄê¤È¥Á¥å¡¼¥Ë¥ó¥° (<xref linkend="config-tuning"/>)</para>
+	    <para><xref
+		linkend="config-tuning"/></para>
 	  </listitem>
 	  <listitem>
-           <para>¥Þ¥ë¥Á¥á¥Ç¥£¥¢ (<xref linkend="multimedia"/>)</para>
+           <para><xref linkend="multimedia"/></para>
 	  </listitem>
 	</itemizedlist>
       </listitem>
@@ -270,17 +268,14 @@
 <!-- Part I - Introduction -->
 
     <varlistentry>
-      <term><emphasis><xref linkend="introduction"/>,
-	¤Ï¤¸¤á¤Ë</emphasis></term>
+      <term><emphasis><xref linkend="introduction"/></emphasis></term>
       <listitem>
 	<para>¿·µ¬¥æ¡¼¥¶¤Ë &os; ¤ò¾Ò²ð¤·¤Þ¤¹¡£¤³¤³¤Ç¤Ï¡¢&os;
 	  ¥×¥í¥¸¥§¥¯¥È¤ÎÎò»Ë¡¢ÌÜɸ¤È³«È¯¥â¥Ç¥ë¤Ë¤Ä¤¤¤Æ½Ò¤Ù¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="bsdinstall"/>,
-	&os;&nbsp;9.<replaceable>X</replaceable>
-	¤Î¥¤¥ó¥¹¥È¡¼¥ë</emphasis></term>
+      <term><emphasis><xref linkend="bsdinstall"/></emphasis></term>
       <listitem>
 	<para><application>bsdinstall</application> ¤òÍѤ¤¤¿
 	  &os;&nbsp;9.<replaceable>x</replaceable>
@@ -288,9 +283,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="install"/>,
-	&os;&nbsp;8.<replaceable>X</replaceable>
-	¤Î¥¤¥ó¥¹¥È¡¼¥ë</emphasis></term>
+      <term><emphasis><xref linkend="install"/></emphasis></term>
       <listitem>
 	<para><application>sysinstall</application> ¤òÍѤ¤¤¿
 	  &os;&nbsp;8.<replaceable>x</replaceable> °Ê¹ß¤Î¥·¥¹¥Æ¥à¤Î
@@ -299,8 +292,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="basics"/>, &unix;
-	¤Î´ðÁÃÃμ±</emphasis></term>
+      <term><emphasis><xref linkend="basics"/></emphasis></term>
       <listitem>
 	<para>&os;
 	  ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î´ðËÜŪ¤Ê¥³¥Þ¥ó¥É¤äµ¡Ç½¤ò°·¤Ã¤Æ¤¤¤Þ¤¹¡£
@@ -309,15 +301,14 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="ports"/>,
-	¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë</emphasis></term>
+      <term><emphasis><xref linkend="ports"/></emphasis></term>
       <listitem>
 	<para>&os; ¤Î³×¿·Åª¤Ê <quote>Ports Collection</quote>
 	  ¤ª¤è¤Óɸ½àŪ¤Ê¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤ë¥µ¡¼¥É¥Ñ¡¼¥Æ¥£¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="x11"/>, X Window System</emphasis></term>
+      <term><emphasis><xref linkend="x11"/></emphasis></term>
       <listitem>
 	<para>X Window System Á´È̤ȡ¢ÆÃ¤Ë &os; ¾å¤Ç¤Î
 	  X11 ¤ÎÍøÍѤˤĤ¤¤Æ½Ò¤Ù¤Æ¤¤¤Þ¤¹¡£
@@ -330,24 +321,21 @@
 <!-- Part II Common Tasks -->
 
     <varlistentry>
-      <term><emphasis><xref linkend="desktop"/>,
-	¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</emphasis></term>
+      <term><emphasis><xref linkend="desktop"/></emphasis></term>
       <listitem>
 	<para>Web ¥Ö¥é¥¦¥¶¤äÀ¸»ºÀ­¸þ¾å¥Ä¡¼¥ë¤Î¤è¤¦¤Ê°ìÈÌŪ¤Ê¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¤¤¤¯¤Ä¤«µó¤²¡¢
 	  &os; ¤Ë¤ª¤±¤ë¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="multimedia"/>,
-	¥Þ¥ë¥Á¥á¥Ç¥£¥¢</emphasis></term>
+      <term><emphasis><xref linkend="multimedia"/></emphasis></term>
       <listitem>
 	<para>¥·¥¹¥Æ¥à¤ò²»À¼¤ä¥Ó¥Ç¥ªºÆÀ¸¤ËÂбþ¤µ¤»¤ë¤¿¤á¤Ë¤É¤¦ÀßÄꤹ¤ë¤«¤òÀâÌÀ¤·¤Þ¤¹¡£
 	  ¤Þ¤¿¡¢²»À¼¤ä¥Ó¥Ç¥ª¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤âÎ㼨¤·¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="kernelconfig"/>, &os;
-	¥«¡¼¥Í¥ë¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó</emphasis></term>
+      <term><emphasis><xref linkend="kernelconfig"/></emphasis></term>
       <listitem>
 	<para>¤É¤Î¤è¤¦¤Ê¾ì¹ç¤Ë¿·¤¿¤Ë¥«¡¼¥Í¥ë¤ò¹½À®¤¹¤ëɬÍפ¬¤¢¤ë¤«¤òÀâÌÀ¤·¡¢
 	  ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¡¢¹½ÃÛ¡¢
@@ -355,14 +343,14 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="printing"/>, ¥×¥ê¥ó¥¿¤ÎÍøÍÑ</emphasis></term>
+      <term><emphasis><xref linkend="printing"/></emphasis></term>
       <listitem>
 	<para>&os; ¤Ë¤ª¤±¤ë¥×¥ê¥ó¥¿¤Î¼è¤ê°·¤¤¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
 	  ¥Ð¥Ê¡¼¥Ú¡¼¥¸¡¢¥×¥ê¥ó¥¿¡¼¤Î²Ý¶â¡¢½é´üÀßÄê¤È¤¤¤Ã¤¿¤³¤È¤Ç¤¹¡£</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="linuxemu"/>, &linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½</emphasis></term>
+      <term><emphasis><xref linkend="linuxemu"/></emphasis></term>
       <listitem>
 	<para>&os; ¤Î &linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢
 	  <application>&oracle;</application>,
@@ -374,8 +362,7 @@
 <!-- Part III - System Administration -->
 
     <varlistentry>
-      <term><emphasis><xref linkend="config-tuning"/>,
-	ÀßÄê¤È¥Á¥å¡¼¥Ë¥ó¥°</emphasis></term>
+      <term><emphasis><xref linkend="config-tuning"/></emphasis></term>
       <listitem>
 	<para>¥·¥¹¥Æ¥à´ÉÍý¼Ô¤¬ &os;
 	  ¥·¥¹¥Æ¥à¤òÄ´À°¤·¤ÆºÇŬ¤ÊÀ­Ç½¤ò°ú¤­½Ð¤¹¤Î¤ËÍøÍѤǤ­¤ë¥Ñ¥é¥á¡¼¥¿¤Ë¤Ä¤¤¤Æ½Ò¤Ù¤Æ¤¤¤Þ¤¹¡£
@@ -384,23 +371,14 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="boot"/>, µ¯Æ°¥×¥í¥»¥¹</emphasis></term>
+      <term><emphasis><xref linkend="boot"/></emphasis></term>
       <listitem>
 	<para>&os; ¤Îµ¯Æ°¥×¥í¥»¥¹¤ò²òÀ⤷¡¢
 	  ¤³¤Î¥×¥í¥»¥¹¤òÀßÄꥪ¥×¥·¥ç¥ó¤ÇÀ©¸æ¤¹¤ëÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="users"/>,
-	¥æ¡¼¥¶¤È´ðËÜŪ¤Ê¥¢¥«¥¦¥ó¥È¤Î´ÉÍý</emphasis></term>
-      <listitem>
-	<para>¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤ÎÀ¸À®¡¢Áàºî¤Ë¤Ä¤¤¤Æ½Ò¤Ù¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢
-	  ¥æ¡¼¥¶¡¼¤Ë²Ý¤¹¤³¤È¤¬¤Ç¤­¤ë»ñ¸»¤ÎÀ©¸Â¤ä¤½¤Î¾¤Î¥¢¥«¥¦¥ó¥È´ÉÍýºî¶È¤Ë¤Ä¤¤¤ÆµÄÏÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><emphasis><xref linkend="security"/>,
-	¥»¥­¥å¥ê¥Æ¥£</emphasis></term>
+      <term><emphasis><xref linkend="security"/></emphasis></term>
       <listitem>
 	<para>&os; ¥·¥¹¥Æ¥à¤ò°ÂÁ´¤ËÊݤĤ¿¤á¤ËÌòΩ¤Ä
 	  Kerberos, IPsec ¤ª¤è¤Ó OpenSSH
@@ -408,15 +386,14 @@
       </listitem>
     </varlistentry>
 <!--    <varlistentry>
-      <term><emphasis><xref linkend="jails">, Jails</emphasis></term>
+      <term><emphasis><xref linkend="jails"/></emphasis></term>
       <listitem>
 	<para>jail ¥Õ¥ì¡¼¥à¥ï¡¼¥¯¡¢&os; ¤ÎÅÁÅýŪ¤Ê chroot ¥µ¥Ý¡¼¥È¤ËÂФ¹¤ë
 	  jails ¤Î²þÎÉÅÀ¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="mac"/>, Mandatory Access
-	Control</emphasis></term>
+      <term><emphasis><xref linkend="mac"/></emphasis></term>
       <listitem>
 	<para>Mandatory Access Control (MAC) ¤¬¤É¤Î¤è¤¦¤Ê¤â¤Î¤Ç¡¢
 	  ¤³¤Î¥á¥«¥Ë¥º¥à¤¬¤É¤Î¤è¤¦¤Ë &os;
@@ -424,8 +401,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="audit">,
-	¥»¥­¥å¥ê¥Æ¥£¥¤¥Ù¥ó¥È¸¡ºº</emphasis></term>
+      <term><emphasis><xref linkend="audit"/></emphasis></term>
       <listitem>
 	<para>&os; ¥¤¥Ù¥ó¥È¸¡ºº¤¬²¿¤Ç¤¢¤ë¤«¡¢
 	  ¤É¤Î¤è¤¦¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤ª¤è¤ÓÀßÄê¤ò¹Ô¤¦¤«¡¢
@@ -433,8 +409,7 @@
       </listitem>
     </varlistentry> -->
     <varlistentry>
-      <term><emphasis><xref linkend="disks"/>,
-	¥¹¥È¥ì¡¼¥¸</emphasis></term>
+      <term><emphasis><xref linkend="disks"/></emphasis></term>
       <listitem>
 	<para>&os;
 	  ¤Ç¥¹¥È¥ì¡¼¥¸¥á¥Ç¥£¥¢¤ä¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¤É¤¦°·¤¦¤«¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£
@@ -445,16 +420,14 @@
     </varlistentry>
 <!--
     <varlistentry>
-      <term><emphasis><xref linkend="geom-synopsis"/>,
-	GEOM</emphasis></term>
+      <term><emphasis><xref linkend="geom"/></emphasis></term>
       <listitem>
 	<para>&os; ¤Î GEOM ¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤ª¤è¤Ó¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë
 	  RAID ¥ì¥Ù¥ë¤ÎÀßÄêÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="filesystems">, File Systems
-	Support</emphasis></term>
+      <term><emphasis><xref linkend="filesystems"/></emphasis></term>
       <listitem>
 	<para>&sun; ¤Î Z ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¤è¤¦¤Ê¡¢
 	  ¥Í¥¤¥Æ¥£¥Ö¤Ç¤Ï¤Ê¤¤¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î &os;
@@ -462,24 +435,21 @@
       </listitem>
    </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="virtualization"/>,
-	Virtualization</emphasis></term>
+      <term><emphasis><xref linkend="virtualization"/></emphasis></term>
       <listitem>
 	<para>²¾ÁÛ²½¤¬²¿¤òÄ󶡤¹¤ë¤«¡¢&os;
 	  ¤Ç¤É¤Î¤è¤¦¤Ë»È¤¦¤³¤È¤¬¤Ç¤­¤ë¤«¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry> -->
     <varlistentry>
-      <term><emphasis><xref linkend="l10n"/>,
-	ÃÏ°è²½</emphasis></term>
+      <term><emphasis><xref linkend="l10n"/></emphasis></term>
       <listitem>
 	<para>&os; ¤ò±Ñ¸ì°Ê³°¤Î¸À¸ì¤Ç»È¤¦ÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£
 	  ¥·¥¹¥Æ¥à¤È¥¢¥×¥ê¥±¡¼¥·¥ç¥óξÊý¤Î¥ì¥Ù¥ë¤ÎÃÏ°è²½¤ò°·¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="updating-upgrading"/>,
-	³«È¯¤ÎºÇÁ°Àþ</emphasis></term>
+      <term><emphasis><xref linkend="updating-upgrading"/></emphasis></term>
       <listitem>
 	<para>&os;-STABLE, &os;-CURRENT ¤È &os;
 	  ¤Î¥ê¥ê¡¼¥¹¤Î°ã¤¤¤òÀâÌÀ¤·¤Þ¤¹¡£
@@ -489,8 +459,7 @@
       </listitem>
     </varlistentry>
 <!--    <varlistentry>
-      <term><emphasis><xref linkend="dtrace">,
-	&dtrace;</emphasis></term>
+      <term><emphasis><xref linkend="dtrace"/></emphasis></term>
       <listitem>
 	<para>&sun; ¤Î &dtrace;
 	  ¥Ä¡¼¥ë¤ò¤É¤Î¤è¤¦¤ËÀßÄꤷ¤Æ»È¤¦¤«¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£
@@ -503,23 +472,21 @@
 <!-- Part IV - Network Communications -->
 
     <varlistentry>
-      <term><emphasis><xref linkend="serialcomms"/>,
-	¥·¥ê¥¢¥ëÄÌ¿®</emphasis></term>
+      <term><emphasis><xref linkend="serialcomms"/></emphasis></term>
       <listitem>
 	<para>&os; ¥·¥¹¥Æ¥à¤ËüËö¤ä¥â¥Ç¥à¤ò¡¢
 	  ¥À¥¤¥ä¥ë¥¤¥ó¤Þ¤¿¤Ï¥À¥¤¥ä¥ë¥¢¥¦¥ÈÍѤËÀܳ¤¹¤ëÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="ppp-and-slip"/>, PPP ¤È
-	SLIP</emphasis></term>
+      <term><emphasis><xref linkend="ppp-and-slip"/></emphasis></term>
       <listitem>
-	<para>&os; ¤Ç¡¢PPP, SLIP ¤ä PPP over Ethernet
+	<para>&os; ¤Ç¡¢PPP
 	  ¤ò»È¤Ã¤Æ¥ê¥â¡¼¥È¥·¥¹¥Æ¥à¤ËÀܳ¤¹¤ëÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="mail"/>, ÅŻҥ᡼¥ë</emphasis></term>
+      <term><emphasis><xref linkend="mail"/></emphasis></term>
       <listitem>
 	<para>ÅŻҥ᡼¥ë¥µ¡¼¥Ð¤Î¹½À®Í×ÁǤò¤½¤ì¤¾¤ìÀâÌÀ¤·¡¢
 	  ºÇ¤â¤è¤¯»È¤ï¤ì¤Æ¤¤¤ë¥á¡¼¥ë¥µ¡¼¥Ð¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¢¤ë
@@ -528,24 +495,21 @@
       </listitem>
     </varlistentry>
 <!--    <varlistentry>
-      <term><emphasis><xref linkend="network-servers"/>, Network
-	Servers</emphasis></term>
+      <term><emphasis><xref linkend="network-servers"/></emphasis></term>
       <listitem>
 	<para>&os; ¤ò¥Í¥Ã¥È¥ï¡¼¥¯¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥µ¡¼¥Ð¡¢NIS ¥µ¡¼¥Ð¡¢
 	  »þ¹ïƱ´ü¥µ¡¼¥Ð¤ËÀßÄꤹ¤ë¤¿¤á¤Î¼ê½ç¤ª¤è¤ÓÀßÄê¥Õ¥¡¥¤¥ë¤ÎÎã¤ò¼è¤ê¾å¤²¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="firewalls"/>,
-	¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë</emphasis></term>
+      <term><emphasis><xref linkend="firewalls"/></emphasis></term>
       <listitem>
 	<para>¥½¥Õ¥È¥¦¥§¥¢¥Ù¡¼¥¹¤Î¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤ÎÇطʤˤ¢¤ëů³Ø¤Ë¤Ä¤¤¤Æ¤ÎÀâÌÀ¡¢
 	  &os; ¤ÇÍøÍѲÄǽ¤Ê¤µ¤Þ¤¶¤Þ¤Ê¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤Î¾ÜºÙ¤ÊÀßÄêÊýË¡¤ò¼è¤ê°·¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry> -->
     <varlistentry>
-      <term><emphasis><xref linkend="advanced-networking"/>,
-	¹âÅ٤ʥͥåȥ¥¯</emphasis></term>
+      <term><emphasis><xref linkend="advanced-networking"/></emphasis></term>
       <listitem>
 	<para>LAN ¾å¤Î¾¤Î¥³¥ó¥Ô¥å¡¼¥¿¤È¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÀܳ¤Î¶¦Í­¡¢
 	  ¹âÅ٤ʥ롼¥Æ¥£¥ó¥°¤Ë´Ø¤¹¤ë¥È¥Ô¥Ã¥¯¥¹¡¢¥ï¥¤¥ä¥ì¥¹¥Í¥Ã¥È¥ï¡¼¥¯¡¢
@@ -554,15 +518,14 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="mirrors"/>, &os;
-	¤ÎÆþ¼êÊýË¡</emphasis></term>
+      <term><emphasis><xref linkend="mirrors"/></emphasis></term>
       <listitem>
 	<para>&os; ¤ò¼ýÏ¿¤·¤¿ CDROM ¤ä DVD ¤ÎÍÍ¡¹¤ÊÆþ¼êÀè¤ä¡¢&os;
 	  ¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤ë¥¤¥ó¥¿¡¼¥Í¥Ã¥È¾å¤Î¥µ¥¤¥È¤òµó¤²¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="bibliography"/>, »²¹Í¿Þ½ñ</emphasis></term>
+      <term><emphasis><xref linkend="bibliography"/></emphasis></term>
       <listitem>
 	<para>¤³¤Îʸ½ñ¤Ï¡¢
 	  ¤â¤Ã¤È¾Ü¤·¤¤ÀâÌÀ¤¬Íߤ·¤¯¤Ê¤ë¤«¤â¤·¤ì¤Ê¤¤¤µ¤Þ¤¶¤Þ¤ÊÂêÌܤˤĤ¤¤Æ¿¨¤ì¤Æ¤¤¤Þ¤¹¡£
@@ -571,8 +534,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="eresources"/>,
-	¥¤¥ó¥¿¡¼¥Í¥Ã¥È¾å¤Î¥ê¥½¡¼¥¹</emphasis></term>
+      <term><emphasis><xref linkend="eresources"/></emphasis></term>
       <listitem>
 	<para>&os; ¥æ¡¼¥¶¤¬ &os; ¤Ë¤Ä¤¤¤Æ¼ÁÌ䤷¤¿¤ê¡¢
 	  µ»½ÑŪ¤ÊµÄÏÀ¤Ë»²²Ã¤Ç¤­¤ë¡¢
@@ -580,8 +542,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="pgpkeys"/>, PGP
-	¸ø³«¸°</emphasis></term>
+      <term><emphasis><xref linkend="pgpkeys"/></emphasis></term>
       <listitem>
 	<para>¿¤¯¤Î &os; ³«È¯¼Ô¤Î PGP fingerprint ¤òºÜ¤»¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
@@ -660,7 +621,7 @@
 <!-- How to type in key stokes, etc.. -->
   <bridgehead xml:id="preface-conv-examples" renderas="sect2">Îã</bridgehead>
 
-  <para><filename>E:\&gt;</filename> ¤Ç»Ï¤Þ¤ëÎã¤Ï¡¢&ms-dos;
+  <para><filename>C:\&gt;</filename> ¤Ç»Ï¤Þ¤ëÎã¤Ï¡¢&ms-dos;
     ¥³¥Þ¥ó¥É¤òɽ¤·¤Æ¤¤¤Þ¤¹¡£ÆäËÃí¼á¤¬¤Ê¤±¤ì¤Ð¡¢¤½¤ì¤é¤Î¥³¥Þ¥ó¥É¤ÏºÇ¶á¤Î
     &microsoft.windows; ¤Î <quote>¥³¥Þ¥ó¥É¥×¥í¥ó¥×¥È</quote>
     ´Ä¶­¤Ç¤â¼Â¹Ô¤Ç¤­¤Þ¤¹¡£</para>

_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"