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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Mon Feb 10 16:17:00 UTC 2014


Author: ryusuke
Date: Mon Feb 10 16:16:59 2014
New Revision: 43862
URL: http://svnweb.freebsd.org/changeset/doc/43862

Log:
  - Merge the following from the English version:
  
  	r21473 -> r21479	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	Mon Feb 10 16:12:22 2014	(r43861)
+++ head/ja_JP.eucJP/books/handbook/preface/preface.xml	Mon Feb 10 16:16:59 2014	(r43862)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r21473
+     Original revision: r21479
      $FreeBSD$
 -->
 <preface xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="book-preface">
@@ -118,19 +118,26 @@
 
   <bridgehead xml:id="preface-overview" renderas="sect1">¤³¤Îʸ½ñ¤Î¹½À®</bridgehead>
 
-  <para>¤³¤Îʸ½ñ¤Ï 3 Éô¹½À®¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
+  <para>¤³¤Îʸ½ñ¤Ï 5 Éô¹½À®¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
     Âè 1 Éô<emphasis>ƳÆþ</emphasis>¤Ç¤Ï¡¢
     FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤È´ðËÜŪ¤Ê»È¤¤Êý¤ò°·¤¤¤Þ¤¹¡£
     ³Æ¾Ï¤Ï½ç¤ËÆɤळ¤È¤òÁÛÄꤷ¤Æ¤¤¤Þ¤¹¤¬¡¢
     ÆëÀ÷¤ß¿¼¤¤ÏÃÂê¤ò°·¤Ã¤¿¾Ï¤ÏÈô¤Ð¤·¤Æ¤â¤è¤¤¤Ç¤·¤ç¤¦¡£
-    Âè 2 Éô<emphasis>¥·¥¹¥Æ¥à´ÉÍý</emphasis>¤Ï¡¢¤è¤ê¾åµé¤Î
-    FreeBSD ¥æ¡¼¥¶¤Î´Ø¿´¤ò¤Ò¤¯ÏÃÂê¤ò¹­¤¯°·¤Ã¤Æ¤¤¤Þ¤¹¡£
+    Âè 2 Éô<emphasis>Æü¡¹¤ÎÀ¸³è</emphasis>¤Ç¤Ï¡¢
+    FreeBSD ¤ÇÎɤ¯»È¤ï¤ì¤ëµ¡Ç½¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
+    ¤³¤Î¾Ï¤È¤½¤ì¤Ë³¤¯¾Ï¤Ï¡¢½çÉÔƱ¤ËÆɤळ¤È¤¬¤Ç¤­¤Þ¤¹¡£
     ³Æ¾Ï¤Î»Ï¤á¤Ë¤Ï¤½¤Î¾Ï¤¬²¿¤ò°·¤Ã¤Æ¤¤¤Æ¡¢
     ÆɼԤˤɤó¤ÊͽÈ÷Ã챤¬´üÂÔ¤µ¤ì¤ë¤«¤ò´Ê·é¤Ë½Ò¤Ù¤¿³µÍפ¬¤ª¤«¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢¤½¤Î¾Ï¤Ë´Ø¿´¤Î¤Ê¤¤ÆɼԤ¬¤½¤³¤òÈô¤Ð¤·¤Æ¶½Ì£¤Î¤¢¤ë¾Ï¤ò¸«¤Ä¤±¤é¤ì¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ç¤¹¡£
-    Âè 3 Éô¤Ï»²¹Í¾ðÊ󤫤é¤Ê¤ë<emphasis>ÉÕÏ¿</emphasis>¤Ç¤¹¡£</para>
+    Âè 3 Éô<emphasis>¥·¥¹¥Æ¥à´ÉÍý</emphasis>¤Ï¡¢
+    ¥·¥¹¥Æ¥à´ÉÍý¤Ë´Ø¤¹¤ëÏÃÂê¤ò°·¤Ã¤Æ¤¤¤Þ¤¹¡£
+    Âè 4 Éô<emphasis>¥Í¥Ã¥È¥ï¡¼¥¯ÄÌ¿®</emphasis>¤Ç¤Ï¡¢
+    ¥Í¥Ã¥È¥ï¡¼¥¯¤ª¤è¤Ó¥µ¡¼¥Ð¤Ë´Ø¤¹¤ëÏÃÂê¤ò°·¤Ã¤Æ¤¤¤Þ¤¹¡£
+    Âè 5 Éô¤Ï»²¹Í¾ðÊ󤫤é¤Ê¤ë<emphasis>ÉÕÏ¿</emphasis>¤Ç¤¹¡£</para>
 
   <variablelist>
+
+<!-- Part I - Introduction -->
+
     <varlistentry>
       <term><emphasis><xref linkend="introduction"/>, ¤Ï¤¸¤á¤Ë</emphasis></term>
       <listitem>
@@ -171,6 +178,52 @@
 	¤Î¤è¤¦¤Ê°ìÈÌŪ¤Ê¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ë¤â¿¨¤ì¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
+
+<!-- Part II Common Tasks -->
+
+    <varlistentry>
+      <term><emphasis><xref linkend="desktop"/>, ¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</emphasis></term>
+      <listitem>
+	<para>Web ¥Ö¥é¥¦¥¶¤äÀ¸»ºÀ­¸þ¾å¥Ä¡¼¥ë¤Î¤è¤¦¤Ê°ìÈÌŪ¤Ê¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¤¤¤¯¤Ä¤«µó¤²¡¢
+	  FreeBSD ¤Ë¤ª¤±¤ë¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><emphasis><xref linkend="multimedia"/>, ¥Þ¥ë¥Á¥á¥Ç¥£¥¢</emphasis></term>
+      <listitem>
+	<para>¥·¥¹¥Æ¥à¤ò²»À¼¤ä¥Ó¥Ç¥ªºÆÀ¸¤ËÂбþ¤µ¤»¤ë¤¿¤á¤Ë¤É¤¦ÀßÄꤹ¤ë¤«¤òÀâÌÀ¤·¤Þ¤¹¡£
+	  ¤Þ¤¿¡¢²»À¼¤ä¥Ó¥Ç¥ª¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤âÎ㼨¤·¤Æ¤¤¤Þ¤¹¡£</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><emphasis><xref linkend="kernelconfig"/>, FreeBSD
+      ¥«¡¼¥Í¥ë¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó</emphasis></term>
+      <listitem>
+	<para>¤É¤Î¤è¤¦¤Ê¾ì¹ç¤Ë¿·¤¿¤Ë¥«¡¼¥Í¥ë¤ò¹½À®¤¹¤ëɬÍפ¬¤¢¤ë¤«¤òÀâÌÀ¤·¡¢
+	¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¡¢¹½ÃÛ¡¢
+	¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ä¤¤¤Æ¾Ü¤·¤¯ÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><emphasis><xref linkend="printing"/>, ¥×¥ê¥ó¥¿¤ÎÍøÍÑ</emphasis></term>
+      <listitem>
+	<para>FreeBSD ¤Ë¤ª¤±¤ë¥×¥ê¥ó¥¿¤Î¼è¤ê°·¤¤¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
+	¥Ð¥Ê¡¼¥Ú¡¼¥¸¡¢¥×¥ê¥ó¥¿¡¼¤Î²Ý¶â¡¢½é´üÀßÄê¤È¤¤¤Ã¤¿¤³¤È¤Ç¤¹¡£</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><emphasis><xref linkend="linuxemu"/>, Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½</emphasis></term>
+      <listitem>
+	<para>FreeBSD ¤Î Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢
+	<application>&oracle;</application>,
+	<application>&sap.r3;</application>,
+	<application>&mathematica;</application> ¤È¤¤¤Ã¤¿¿Íµ¤¤Î¹â¤¤
+	Linux ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò¾Ü¤·¤¯ÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+      </listitem>
+    </varlistentry>
+
+<!-- Part III - System Administration -->
+
     <varlistentry>
       <term><emphasis><xref linkend="config-tuning"/>, ÀßÄê¤È¥Á¥å¡¼¥Ë¥ó¥°</emphasis></term>
       <listitem>
@@ -196,15 +249,6 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="kernelconfig"/>, FreeBSD
-      ¥«¡¼¥Í¥ë¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó</emphasis></term>
-      <listitem>
-	<para>¤É¤Î¤è¤¦¤Ê¾ì¹ç¤Ë¿·¤¿¤Ë¥«¡¼¥Í¥ë¤ò¹½À®¤¹¤ëɬÍפ¬¤¢¤ë¤«¤òÀâÌÀ¤·¡¢
-	¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¡¢¹½ÃÛ¡¢
-	¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ä¤¤¤Æ¾Ü¤·¤¯ÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
       <term><emphasis><xref linkend="security"/>, ¥»¥­¥å¥ê¥Æ¥£</emphasis></term>
       <listitem>
 	<para>FreeBSD ¥·¥¹¥Æ¥à¤ò°ÂÁ´¤ËÊݤĤ¿¤á¤ËÌòΩ¤Ä Kerberos, IPsec, OpenSSH,
@@ -220,13 +264,6 @@
       </listitem>
     </varlistentry> -->
     <varlistentry>
-      <term><emphasis><xref linkend="printing"/>, ¥×¥ê¥ó¥¿¤ÎÍøÍÑ</emphasis></term>
-      <listitem>
-	<para>FreeBSD ¤Ë¤ª¤±¤ë¥×¥ê¥ó¥¿¤Î¼è¤ê°·¤¤¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
-	¥Ð¥Ê¡¼¥Ú¡¼¥¸¡¢¥×¥ê¥ó¥¿¡¼¤Î²Ý¶â¡¢½é´üÀßÄê¤È¤¤¤Ã¤¿¤³¤È¤Ç¤¹¡£</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
       <term><emphasis><xref linkend="disks"/>, ¥¹¥È¥ì¡¼¥¸</emphasis></term>
       <listitem>
 	<para>FreeBSD
@@ -243,18 +280,16 @@
 	  ¥·¥¹¥Æ¥à¤È¥¢¥×¥ê¥±¡¼¥·¥ç¥óξÊý¤Î¥ì¥Ù¥ë¤ÎÃÏ°è²½¤ò°·¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
+
+<!-- Part IV - Network Communications -->
+
     <varlistentry>
-      <term><emphasis><xref linkend="desktop"/>, ¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</emphasis></term>
-      <listitem>
-	<para>Web ¥Ö¥é¥¦¥¶¤äÀ¸»ºÀ­¸þ¾å¥Ä¡¼¥ë¤Î¤è¤¦¤Ê°ìÈÌŪ¤Ê¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¤¤¤¯¤Ä¤«µó¤²¡¢
-	  FreeBSD ¤Ë¤ª¤±¤ë¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><emphasis><xref linkend="multimedia"/>, ¥Þ¥ë¥Á¥á¥Ç¥£¥¢</emphasis></term>
+      <term><emphasis><xref linkend="updating-upgrading"/>, ³«È¯¤ÎºÇÁ°Àþ</emphasis></term>
       <listitem>
-	<para>¥·¥¹¥Æ¥à¤ò²»À¼¤ä¥Ó¥Ç¥ªºÆÀ¸¤ËÂбþ¤µ¤»¤ë¤¿¤á¤Ë¤É¤¦ÀßÄꤹ¤ë¤«¤òÀâÌÀ¤·¤Þ¤¹¡£
-	  ¤Þ¤¿¡¢²»À¼¤ä¥Ó¥Ç¥ª¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤âÎ㼨¤·¤Æ¤¤¤Þ¤¹¡£</para>
+	<para>FreeBSD-STABLE, FreeBSD-CURRENT ¤È FreeBSD
+	  ¤Î¥ê¥ê¡¼¥¹¤Î°ã¤¤¤òÀâÌÀ¤·¤Þ¤¹¡£
+	  ¤É¤ó¤Ê¥æ¡¼¥¶¤Ë¤È¤Ã¤Æ³«È¯¥·¥¹¥Æ¥à¤òÄɿ魯¤ë¤Î¤¬Í­ÍѤ«¤ò½Ò¤Ù¡¢
+	  ¤½¤ÎÊýË¡¤Î³µÍפò¤Þ¤È¤á¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
     <varlistentry>
@@ -272,22 +307,6 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="advanced-networking"/>, ¹âÅ٤ʥͥåȥ¥¯</emphasis></term>
-      <listitem>
-	<para>LAN ¾å¤Î¾¤Î¥³¥ó¥Ô¥å¡¼¥¿¤È¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÀܳ¤Î¶¦Í­¡¢
-	  ¹âÅ٤ʥ롼¥Æ¥£¥ó¥°¤Ë´Ø¤¹¤ë¥È¥Ô¥Ã¥¯¥¹¡¢¥ï¥¤¥ä¥ì¥¹¥Í¥Ã¥È¥ï¡¼¥¯¡¢
-	  bluetooth, ATM, IPv6 Åù¡¹¡¢
-	  ¥Í¥Ã¥È¥ï¡¼¥¯¤Ë´Ø¤¹¤ë¤µ¤Þ¤¶¤Þ¤ÊÏÃÂê¤ò¼è¤ê°·¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
-      </listitem>
-    </varlistentry>
-<!--    <varlistentry>
-      <term><emphasis><xref linkend="network-servers"/>, Network Servers</emphasis></term>
-      <listitem>
- 	<para>FreeBSD ¤ò¥Í¥Ã¥È¥ï¡¼¥¯¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥µ¡¼¥Ð¡¢NIS ¥µ¡¼¥Ð¡¢
-	  »þ¹ïƱ´ü¥µ¡¼¥Ð¤ËÀßÄꤹ¤ë¤¿¤á¤Î¼ê½ç¤ª¤è¤ÓÀßÄê¥Õ¥¡¥¤¥ë¤ÎÎã¤ò¼è¤ê¾å¤²¤Æ¤¤¤Þ¤¹¡£</para>
-      </listitem>
-    </varlistentry> -->
-    <varlistentry>
       <term><emphasis><xref linkend="mail"/>, ÅŻҥ᡼¥ë</emphasis></term>
       <listitem>
 	<para>ÅŻҥ᡼¥ë¥µ¡¼¥Ð¤Î¹½À®Í×ÁǤò¤½¤ì¤¾¤ìÀâÌÀ¤·¡¢
@@ -296,23 +315,20 @@
 	ñ½ã¤ÊÀßÄê¤ò¤È¤ê¤¢¤²¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
-    <varlistentry>
-      <term><emphasis><xref linkend="updating-upgrading"/>, ³«È¯¤ÎºÇÁ°Àþ</emphasis></term>
+<!--    <varlistentry>
+      <term><emphasis><xref linkend="network-servers"/>, Network Servers</emphasis></term>
       <listitem>
-	<para>FreeBSD-STABLE, FreeBSD-CURRENT ¤È FreeBSD
-	  ¤Î¥ê¥ê¡¼¥¹¤Î°ã¤¤¤òÀâÌÀ¤·¤Þ¤¹¡£
-	  ¤É¤ó¤Ê¥æ¡¼¥¶¤Ë¤È¤Ã¤Æ³«È¯¥·¥¹¥Æ¥à¤òÄɿ魯¤ë¤Î¤¬Í­ÍѤ«¤ò½Ò¤Ù¡¢
-	  ¤½¤ÎÊýË¡¤Î³µÍפò¤Þ¤È¤á¤Æ¤¤¤Þ¤¹¡£</para>
+ 	<para>FreeBSD ¤ò¥Í¥Ã¥È¥ï¡¼¥¯¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥µ¡¼¥Ð¡¢NIS ¥µ¡¼¥Ð¡¢
+	  »þ¹ïƱ´ü¥µ¡¼¥Ð¤ËÀßÄꤹ¤ë¤¿¤á¤Î¼ê½ç¤ª¤è¤ÓÀßÄê¥Õ¥¡¥¤¥ë¤ÎÎã¤ò¼è¤ê¾å¤²¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
-    </varlistentry>
+    </varlistentry> -->
     <varlistentry>
-      <term><emphasis><xref linkend="linuxemu"/>, Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½</emphasis></term>
+      <term><emphasis><xref linkend="advanced-networking"/>, ¹âÅ٤ʥͥåȥ¥¯</emphasis></term>
       <listitem>
-	<para>FreeBSD ¤Î Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢
-	<application>&oracle;</application>,
-	<application>&sap.r3;</application>,
-	<application>&mathematica;</application> ¤È¤¤¤Ã¤¿¿Íµ¤¤Î¹â¤¤
-	Linux ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò¾Ü¤·¤¯ÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+	<para>LAN ¾å¤Î¾¤Î¥³¥ó¥Ô¥å¡¼¥¿¤È¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÀܳ¤Î¶¦Í­¡¢
+	  ¹âÅ٤ʥ롼¥Æ¥£¥ó¥°¤Ë´Ø¤¹¤ë¥È¥Ô¥Ã¥¯¥¹¡¢¥ï¥¤¥ä¥ì¥¹¥Í¥Ã¥È¥ï¡¼¥¯¡¢
+	  bluetooth, ATM, IPv6 Åù¡¹¡¢
+	  ¥Í¥Ã¥È¥ï¡¼¥¯¤Ë´Ø¤¹¤ë¤µ¤Þ¤¶¤Þ¤ÊÏÃÂê¤ò¼è¤ê°·¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
     <varlistentry>


More information about the svn-doc-all mailing list