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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Mon Feb 10 15:33:02 2014
New Revision: 43858
URL: http://svnweb.freebsd.org/changeset/doc/43858

Log:
  - Merge the following from the English version:
  
  	r21372 -> r21473	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 12:11:12 2014	(r43857)
+++ head/ja_JP.eucJP/books/handbook/preface/preface.xml	Mon Feb 10 15:33:02 2014	(r43858)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.20
+     Original revision: r21473
      $FreeBSD$
 -->
 <preface xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="book-preface">
@@ -211,6 +211,14 @@
 	  ¥Í¥Ã¥È¥ï¡¼¥¯¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤È¤¤¤Ã¤¿ÍøÍѲÄǽ¤ÊÍÍ¡¹¤Ê¥Ä¡¼¥ë¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>
+<!--    <varlistentry>
+      <term><emphasis><xref linkend="mac"/>, Mandatory Access Control</emphasis></term>
+      <listitem>
+	<para>Mandatory Access Control (MAC) ¤¬¤É¤Î¤è¤¦¤Ê¤â¤Î¤Ç¡¢
+	  ¤³¤Î¥á¥«¥Ë¥º¥à¤¬¤É¤Î¤è¤¦¤Ë
+	  FreeBSD ¥·¥¹¥Æ¥à¤ò°ÂÁ´¤Ë¤¹¤ë¤«¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+      </listitem>
+    </varlistentry> -->
     <varlistentry>
       <term><emphasis><xref linkend="printing"/>, ¥×¥ê¥ó¥¿¤ÎÍøÍÑ</emphasis></term>
       <listitem>
@@ -267,11 +275,18 @@
       <term><emphasis><xref linkend="advanced-networking"/>, ¹âÅ٤ʥͥåȥ¥¯</emphasis></term>
       <listitem>
 	<para>LAN ¾å¤Î¾¤Î¥³¥ó¥Ô¥å¡¼¥¿¤È¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÀܳ¤Î¶¦Í­¡¢
-	  ¥Í¥Ã¥È¥ï¡¼¥¯¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÍøÍÑ¡¢NIS ·Ðͳ¤Î¥¢¥«¥¦¥ó¥È¾ðÊó¤Î¶¦Í­¡¢
-	  ¥É¥á¥¤¥ó¥Í¡¼¥à¥µ¡¼¥Ð¤ÎÀßÄêÅù¡¹¡¢
-	  ¥Í¥Ã¥È¥ï¡¼¥¯¤Ë´Ø¤¹¤ëÍÍ¡¹¤ÊÏÃÂê¤ò¼è¤ê°·¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
+	  ¹âÅ٤ʥ롼¥Æ¥£¥ó¥°¤Ë´Ø¤¹¤ë¥È¥Ô¥Ã¥¯¥¹¡¢¥ï¥¤¥ä¥ì¥¹¥Í¥Ã¥È¥ï¡¼¥¯¡¢
+	  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>