svn commit: r48395 - in head/ja_JP.eucJP/books/handbook: introduction multimedia

[Ryusuke SUZUKI]

Author: ryusuke
Date: Sun Mar 13 13:44:32 2016
New Revision: 48395
URL: https://svnweb.freebsd.org/changeset/doc/48395

Log:
  - Merge the following from the English version:
  
  	r47949 -> r48326	head/ja_JP.eucJP/books/handbook/introduction/chapter.xml
  	r48032 -> r48257	head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/introduction/chapter.xml
  head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/introduction/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/introduction/chapter.xml	Sun Mar 13 12:01:26 2016	(r48394)
+++ head/ja_JP.eucJP/books/handbook/introduction/chapter.xml	Sun Mar 13 13:44:32 2016	(r48395)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r47949
+     Original revision: r48326
      $FreeBSD$
 -->
 
@@ -698,8 +698,7 @@
 	    <indexterm>
 	      <primary>FreeNAS</primary>
 	    </indexterm> -
-	    ¥Í¥Ã¥È¥ï¡¼¥¯¥Õ¥¡¥¤¥ë¥µ¡¼¥Ð¥¢¥×¥é¥¤¥¢¥ó¥¹¤È¤·¤Æ»ÈÍѤ¹¤ë¤è¤¦¤ËÀ߷פµ¤ì¤¿
-	    ¥¹¥¿¥Þ¥¤¥ºÈǤΠ&os; ¤Ç¤¹¡£
+	    ¥Í¥Ã¥È¥ï¡¼¥¯¥Õ¥¡¥¤¥ë¥µ¡¼¥Ð¥¢¥×¥é¥¤¥¢¥ó¥¹¤È¤·¤Æ»ÈÍѤ¹¤ë¤è¤¦¤ËÀ߷פµ¤ì¤¿¥«¥¹¥¿¥Þ¥¤¥ºÈǤΠ&os; ¤Ç¤¹¡£
 	    UFS ¤ª¤è¤Ó ZFS ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎξÊý¤ò´Êñ¤Ë´ÉÍý¤Ç¤­¤ë¤è¤¦¤Ë
 	    python ¥Ù¡¼¥¹¤Î¥¦¥§¥Ö¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
 	    NFS, SMB/CIFS, AFP, FTP ¤ª¤è¤Ó iSCSI ¤ËÂбþ¤·¤Æ¤ª¤ê¡¢
@@ -736,6 +735,19 @@
 
 	<listitem>
 	  <para><link
+	      xlink:href="http://www.opnsense.org/">OPNSense</link>
+	    <indexterm>
+	      <primary>OPNsense</primary>
+	    </indexterm> - OPNsense ¤Ï¡¢¥ª¡¼¥×¥ó¥½¡¼¥¹¤Î»È¤¤¤ä¤¹¤¯¹½ÃÛ¤¬´Êñ¤Ê
+	    FreeBSD ¥Ù¡¼¥¹¤Î¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤ª¤è¤Ó¥ë¡¼¥¿¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤¹¡£
+	    OPNsense ¤Ï¡¢
+	    ¹â²Á¤Ê¾¦ÍѤΥե¡¥¤¥¢¥¦¥©¡¼¥ë¤äɸ½à¤ÇÍøÍѲÄǽ¤Ê¤Û¤È¤ó¤É¤Îµ¡Ç½¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
+	    ¥ª¡¼¥×¥ó¤Ç¸¡¾Ú²Äǽ¤Ê¥½¡¼¥¹¤È¶¦¤Ë¡¢
+	    ¾¦Éʤ¬Ä󶡤·¤Æ¤¤¤ëË­É٤ʵ¡Ç½¤Î¥»¥Ã¥È¤òÄ󶡤·¤Þ¤¹¡£</para>
+	</listitem>
+
+	<listitem>
+	  <para><link
 	      xlink:href="http://www.pcbsd.org/">PC-BSD</link>
 	    <indexterm>
 	      <primary>PC-BSD</primary>
@@ -758,17 +770,6 @@
 
 	<listitem>
 	  <para><link
-	      xlink:href="http://m0n0.ch/wall/">m0n0wall</link>
-	    <indexterm>
-	      <primary>m0n0wall</primary>
-	    </indexterm> - ¥¦¥§¥Ö¥µ¡¼¥Ð¤ª¤è¤Ó PHP ¤ò»ý¤ÄºÇ¾®µ¡Ç½¤Î
-	    &os; ¤Ç¤¹¡£
-	    ¤³¤ì¤Ï¡¢¥á¥â¥ê»ÈÍÑÎ̤¬ 12 MB
-	    °Ê²¼¤ÎÁȤ߹þ¤ß¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¥¢¥×¥é¥¤¥¢¥ó¥¹¤È¤·¤ÆÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-	</listitem>
-
-	<listitem>
-	  <para><link
 	      xlink:href="http://zrouter.org/">ZRouter</link>
 	    <indexterm>
 	      <primary>ZRouter</primary>

Modified: head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml	Sun Mar 13 12:01:26 2016	(r48394)
+++ head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml	Sun Mar 13 13:44:32 2016	(r48395)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r48032
+     Original revision: r48257
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"