svn commit: r49689 - head/ja_JP.eucJP/books/handbook/security

Author: ryusuke
Date: Mon Nov 21 13:46:02 2016
New Revision: 49689
URL: https://svnweb.freebsd.org/changeset/doc/49689

Log:
  - Merge the following from the English version:
  
  	r17714 -> r17804	head/ja_JP.eucJP/books/handbook/security/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/security/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/security/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/security/chapter.xml	Mon Nov 21 08:29:05 2016	(r49688)
+++ head/ja_JP.eucJP/books/handbook/security/chapter.xml	Mon Nov 21 13:46:02 2016	(r49689)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r17714
+     Original revision: r17804
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="security">
@@ -1258,7 +1258,7 @@
     <sect2>
       <title>¿®Íê¤Ç¤­¤ëÄÌ¿®Ï©¤Ç¤Î½é´ü²½</title>
 
-      <para>¿®Íê¤Ç¤­¤ëÄÌ¿®Ï© (¤¿¤È¤¨¤Ð¤¢¤ë¥Þ¥·¥ó¤Î¥³¥ó¥½¡¼¥ë²èÌ̤䡢ssh
+      <para>¿®Íê¤Ç¤­¤ëÄÌ¿®Ï© (¤¿¤È¤¨¤Ð¤¢¤ë¥Þ¥·¥ó¤Î¥³¥ó¥½¡¼¥ë²èÌ̤䡢<application>ssh</application>
 	¤ò»È¤Ã¤Æ¤¤¤ë»þ¤Ê¤É) ¤òÍøÍѤ·¤Æ¤¤¤ë¤È¤­¤Ë¡¢S/Key ¤ò½é¤á¤Æ½é´ü²½
 	¤¹¤ë¤³¤È¡¢S/Key ¤ÎÈëÌ©¤Î¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÊѹ¹¤¹¤ë¤³¤È¡¢¤Þ¤¿¤Ï¥·¡¼
 	¥É¤òÊѹ¹¤¹¤ë¤³¤È¡¢¤ò¤ª¤³¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤½¤Î¤¿¤á¤Ë¤Ï¡¢¤Þ¤º
@@ -1537,7 +1537,7 @@ Enter secret pass phrase: <userinput>&lt
 	ÀäÂФˤ³¤Î¥Þ¥Ë¥å¥¢¥ë¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£</para>
 
       <para>¤â¤· <filename>/etc/skey.access</filename>
-	¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤¤¤Ê¤é¤Ð (FreeBSD 4.x
+	¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤¤¤Ê¤é¤Ð (FreeBSD 4.X
 	¤Î¥Ç¥Õ¥©¥ë¥È¾õÂ֤ǤϤ½¤¦¤Ç¤¹)¡¢¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤¬ Unix
 	¥Ñ¥¹¥ï¡¼¥É¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	µÕ¤Ë¡¢¤â¤·¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ë¤Ê¤é¤Ð¡¢
@@ -3430,7 +3430,8 @@ Network #2            [ Internal Hosts ]
 
       <orderedlist>
         <listitem>
-          <para>2 ¤Ä¤Î¥Í¥Ã¥È¥ï¡¼¥¯´Ö¤Ë¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤ò·Ðͳ¤·¤Æ¡¢"virtual"
+          <para>2 ¤Ä¤Î¥Í¥Ã¥È¥ï¡¼¥¯´Ö¤Ë¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤ò·Ðͳ¤·¤Æ¡¢
+	    <quote>virtual</quote>
 	    ¥Í¥Ã¥È¥ï¡¼¥¯¤Î¥ê¥ó¥¯¤òºîÀ®¤·¤Þ¤¹¡£
 	    ¤½¤ì¤¬Å¬ÀÚ¤ËÆ°¤¤¤Æ¤¤¤ë¤³¤È¤ò &man.ping.8;
 	    ¤Î¤è¤¦¤Ê¥Ä¡¼¥ë¤ò»È¤Ã¤Æ¡¢»î¸³¤ò¹Ô¤¤¤Þ¤¹¡£</para>
@@ -3501,7 +3502,7 @@ Network #2            [ Internal Hosts ]
       </orderedlist>
 
       <para>¤³¤ì¤Ï¡¢2 ¤Ä¤Î¥Í¥Ã¥È¥ï¡¼¥¯´Ö¤Ç¡¢ <quote>tunnel</quote>
-        ¤¬É¬ÍפȤ¤¤¦¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£Æó¤Ä¤Î "¥È¥ó¥Í¥ë¥Þ¥¦¥¹" ¤Ï¡¢
+        ¤¬É¬ÍפȤ¤¤¦¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£Æó¤Ä¤Î <quote>¥È¥ó¥Í¥ë¥Þ¥¦¥¹</quote> ¤Ï¡¢
 	IP ¥¢¥É¥ì¥¹
 	<systemitem class="ipaddress">A.B.C.D</systemitem> ¤È
 	<systemitem class="ipaddress">W.X.Y.Z</systemitem>
@@ -3570,7 +3571,7 @@ physical address inet A.B.C.D --&gt; W.X
 	¤Î´Ö¤ÎÄÌ¿®¤¬¥È¥ó¥Í¥ë¤Çµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
  
       <para>ξÊý¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Î¥ë¡¼¥Æ¥£¥ó¥°¥Æ¡¼¥Ö¥ë¤Ë¥¨¥ó¥È¥ê¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
-	"netstat -rn" ¤Ç³Îǧ¤Ç¤­¤Þ¤¹¡£
+	<command>netstat -rn</command> ¤Ç³Îǧ¤Ç¤­¤Þ¤¹¡£
 	¥Í¥Ã¥È¥ï¡¼¥¯ #1
         ¤Î¥²¡¼¥È¥¦¥§¥¤¥Û¥¹¥È¤Ç¤Î½ÐÎϤϰʲ¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
  
@@ -3599,7 +3600,7 @@ Destination      Gateway       Flags    
         ¤ò·Ðͳ¤¹¤ë¥È¥é¥Õ¥£¥Ã¥¯¤òµöÍƤ¹¤ë¤è¤¦¤Ê¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤òÀßÄꤹ¤ë¤È¡¢
 	¥Æ¥¹¥È¤òÂ礭¤¯´Êά²½¤Ç¤­¤Þ¤¹¡£
 	¸å¤Ç¤¤¤Ä¤Ç¤â¡¢¥»¥­¥å¥ê¥Æ¥£¤ò¶¯²½¤Ç¤­¤Þ¤¹¡£
-	¤â¤·¡¢¥²¡¼¥È¥¦¥§¥¤¥³¥ó¥Ô¥å¡¼¥¿¤Ç ipfw (8) ¤òÍѤ¤¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
+	¤â¤·¡¢¥²¡¼¥È¥¦¥§¥¤¥³¥ó¥Ô¥å¡¼¥¿¤Ç &man.ipfw.8; ¤òÍѤ¤¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
 	°Ê²¼¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤Ç¡¢
         ¾¤Î¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤Î¥ë¡¼¥ë¤Ë±Æ¶Á¤¹¤ë¤³¤È¤Ê¤¯¡¢
         VPN ¤ÎËöü¤Î´Ö¤Î¥È¥é¥Õ¥£¥Ã¥¯¤òµö²Ä¤·¤Þ¤¹¡£</para>
@@ -3714,8 +3715,8 @@ route_vpn="192.168.2.0 192.168.2.1 netma
     <sect2>
       <title>¥¹¥Æ¥Ã¥× 2: ¥ê¥ó¥¯¤ò°ÂÁ´¤Ë¤¹¤ë¡£</title>
 
-      <para>¥ê¥ó¥¯¤ò°ÂÁ´¤Ë¤¹¤ë¤¿¤á¤Ë¡¢IPSec ¤òÍѤ¤¤Þ¤¹¡£
-	IPSec ¤Ï¡¢2 ¤Ä¤Î¥Û¥¹¥È¤¬°Å¹æ¸°¤Ë¹ç°Õ¤·¡¢
+      <para>¥ê¥ó¥¯¤ò°ÂÁ´¤Ë¤¹¤ë¤¿¤á¤Ë¡¢IPsec ¤òÍѤ¤¤Þ¤¹¡£
+	IPsec ¤Ï¡¢2 ¤Ä¤Î¥Û¥¹¥È¤¬°Å¹æ¸°¤Ë¹ç°Õ¤·¡¢
 	¤½¤Î¸°¤ò 2
         ¤Ä¤Î¥Û¥¹¥È¤Î´Ö¤Ç¥Ç¡¼¥¿¤ò°Å¹æ²½¤¹¤ë¤Î¤ËÍѤ¤¤ë¥á¥«¥Ë¥º¥à¤òÄ󶡤·¤Þ¤¹¡£</para>
 
@@ -3726,7 +3727,7 @@ route_vpn="192.168.2.0 192.168.2.1 netma
           <para>2 ¤Ä¤Î¥Û¥¹¥È¤Ç¡¢
 	    ÍѤ¤¤ë°Å¹æ¥á¥«¥Ë¥º¥à¤Ë¹ç°Õ¤¹¤ë¥á¥«¥Ë¥º¥à¤¬É¬ÍפǤ¹¡£
 	    2 ¤Ä¤Î¥Û¥¹¥È¤¬°ìÅÙ¤³¤Î¥á¥«¥Ë¥º¥à¤Ë¹ç°Õ¤·¤¿¤é¡¢
-	    ¤³¤ì¤é¤Î´Ö¤Ç "¥»¥­¥å¥ê¥Æ¥£¥¢¥½¥·¥¨¡¼¥·¥ç¥ó"
+	    ¤³¤ì¤é¤Î´Ö¤Ç <quote>¥»¥­¥å¥ê¥Æ¥£¥¢¥½¥·¥¨¡¼¥·¥ç¥ó</quote>
 	    ¤¬³ÎΩ¤µ¤ì¤¿¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
         </listitem>
         <listitem>
@@ -3741,7 +3742,7 @@ route_vpn="192.168.2.0 192.168.2.1 netma
        <para>¥»¥­¥å¥ê¥Æ¥£¥¢¥½¥·¥¨¡¼¥·¥ç¥ó¤ª¤è¤Ó¥»¥­¥å¥ê¥Æ¥£¥Ý¥ê¥·¤ÎξÊý¤Ï¡¢
          ¥«¡¼¥Í¥ë¤Ë¤è¤ê´ÉÍý¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤½¤·¤Æ¡¢¥æ¡¼¥¶¥é¥ó¥É¥×¥í¥°¥é¥à¤Ë¤è¤ê¡¢
 	 Êѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	 ¤·¤«¤·¤Ê¤¬¤é¡¢¤³¤ì¤ò¹Ô¤¦Á°¤Ë¡¢¥«¡¼¥Í¥ë¤ò IPSec ¤ª¤è¤Ó
+	 ¤·¤«¤·¤Ê¤¬¤é¡¢¤³¤ì¤ò¹Ô¤¦Á°¤Ë¡¢¥«¡¼¥Í¥ë¤ò IPsec ¤ª¤è¤Ó
 	 Encapsulated Security Payload (ESP) ¥×¥í¥È¥³¥ë¤ËÂбþ¤¹¤ë¤è¤¦¤Ë¡¢
 	 ÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 	 ¤³¤ì¤Ï¡¢¥«¡¼¥Í¥ë¤ò°Ê²¼¤Î¤è¤¦¤ËÀßÄꤹ¤ë¤³¤È¤Ç²Äǽ¤Ç¤¹¡£</para>
@@ -3799,18 +3800,19 @@ options IPSEC_ESP
 	¤³¤³¤Ë¤Ï¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤¬ÃÖ¤«¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢
 	¤½¤ì¤Û¤É¿¤¯Êѹ¹¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
 	¤ª¤½¤é¤¯¤¢¤Ê¤¿¤¬Êѹ¹¤¹¤Ù¤­ racoon ¤ÎÀßÄê¤Î¾¤ÎÉôʬ¤Ï¡¢
-	'pre-shared key' ¤Ç¤¹¡£</para>
+	<quote>pre-shared key</quote> ¤Ç¤¹¡£</para>
 
        <para>¥Ç¥Õ¥©¥ë¥È¤Î racoon ¤ÎÀßÄê¤Ç¤Ï¡¢¤³¤ì¤Ï¡¢
-         ${PREFIX}/etc/racoon/psk.txt ¥Õ¥¡¥¤¥ë¤Ë¤¢¤ë¤È²¾Äꤵ¤ì¤Æ¤¤¤Þ¤¹¡£
+         <filename>${PREFIX}/etc/racoon/psk.txt</filename>
+	 ¥Õ¥¡¥¤¥ë¤Ë¤¢¤ë¤È²¾Äꤵ¤ì¤Æ¤¤¤Þ¤¹¡£
 	 pre-shared key ¤Ï¡¢VPN ¥ê¥ó¥¯¤ò·Ðͳ¤¹¤ë¥È¥é¥Õ¥£¥Ã¥¯¤Î°Å¹æ²½¤Ë¤Ï¡¢
-	 *ÍѤ¤¤é¤ì¤Þ¤»¤ó*¡£
+	 <emphasis>ÍѤ¤¤é¤ì¤Þ¤»¤ó</emphasis>¡£
          ¸°´ÉÍý¥Ç¡¼¥â¥ó¤¬¤ª¸ß¤¤¤ò¿®Íꤹ¤ë¤¿¤á¤Î¥È¡¼¥¯¥ó¤Ç¤¹¡£</para>
 
        <para><filename>psk.txt</filename> ¤Ï¡¢
          ¤¢¤Ê¤¿¤¬¼è¤ê°·¤¦³Æ¥ê¥â¡¼¥È¤Î¥µ¥¤¥È¤Ë´ØÏ¢¤¹¤ë¹Ô¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
          ¤³¤ÎÎã¤Ç¤Ï¡¢¤É¤³¤Ë 2 ¤Ä¤Î¥µ¥¤¥È¤¬¤¢¤ë¤Î¤«¡¢
-	 ³Æ psk.txt ¥Õ¥¡¥¤¥ë¤Ï¡¢°ì¹Ô¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹
+	 ³Æ <filename>psk.txt</filename> ¥Õ¥¡¥¤¥ë¤Ï¡¢°ì¹Ô¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹
 	 (¤Ê¤¼¤Ê¤é¤Ð¡¢³Æ VPN ¤Îü¤Ï¡¢Â¾¤Îü¤Î¤ß¤ò¼è¤ê°·¤¦¤¿¤á)¡£</para>
  
        <para>¥²¡¼¥È¥¦¥§¥¤¥Û¥¹¥È¤Î #1 ¤Ç¤Ï¡¢
@@ -3818,9 +3820,9 @@ options IPSEC_ESP
  
        <programlisting>W.X.Y.Z            secret</programlisting>
 
-       <para>¤³¤ì¤Ï¡¢¥ê¥â¡¼¥Èü¤Î *¸ø³«* IP ¥¢¥É¥ì¥¹¡¢¶õÇò¡¢
+       <para>¤³¤ì¤Ï¡¢¥ê¥â¡¼¥Èü¤Î <emphasis>¸ø³«</emphasis> IP ¥¢¥É¥ì¥¹¡¢¶õÇò¡¢
          °ÂÁ´¤òÄ󶡤¹¤ë¤¿¤á¤Î¥Æ¥­¥¹¥Èʸ»ú¤Ç¤¹¡£
-         ÌÀ¤é¤«¤Ë¡¢"secret" ¤ò¤¢¤Ê¤¿¤Î¸°¤Ë»È¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+         ÌÀ¤é¤«¤Ë¡¢<quote>secret</quote> ¤ò¤¢¤Ê¤¿¤Î¸°¤Ë»È¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
          ¥Ñ¥¹¥ï¡¼¥É¤ËÂФ¹¤ëÄ̾ï¤Îµ¬Â§¤Ë½¾¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
  
       <para>¥²¡¼¥È¥¦¥§¥¤¥Û¥¹¥È #2 ¤Ç¤Ï¡¢¤³¤Î¹Ô¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
@@ -3987,7 +3989,7 @@ spdadd A.B.C.D/32 W.X.Y.Z/32 ipencap -P 
 
        <para>2 ¹ÔÌܤϡ¢¥Ñ¥±¥Ã¥È¤ò¤É¤Î¤è¤¦¤Ë°Å¹æ²½¤¹¤ë¤«¤ò»ØÄꤷ¤Þ¤¹¡£
          <option>esp</option> ¤Ï»ÈÍѤ¹¤ë¥×¥í¥È¥³¥ë¤Ç¡¢
-         <option>tunnel</option> ¤Ï¡¢IPSec
+         <option>tunnel</option> ¤Ï¡¢IPsec
 	 ¥Ñ¥±¥Ã¥È¤Ë¤ª¤¤¤Æ¤µ¤é¤Ë¥«¥×¥»¥ë²½¤µ¤ì¤ë¤³¤È¤ò»ØÄꤷ¤Þ¤¹¡£
 	 <systemitem class="ipaddress">A.B.C.D</systemitem> ¤ª¤è¤Ó
 	 <systemitem class="ipaddress">W.X.Y.Z</systemitem> ¤Ï¡¢
@@ -4068,7 +4070,7 @@ ipfw add 1 allow ipencap from W.X.Y.Z to
        <programlisting>XXX tcpdump output</programlisting>
  
        <para>&man.tcpdump.1; ¤Ï¡¢ESP ¥Ñ¥±¥Ã¥È¤òɽ¼¨¤·¤Þ¤¹¡£
-         -s ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¼Â¹Ô¤¹¤ë¤È¡¢
+         <option>-s</option> ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¼Â¹Ô¤¹¤ë¤È¡¢
          °Å¹æ²½¤Î¤¿¤á¡¢¸«¤Æ¤âÍý²ò¤Ç¤­¤Ê¤¤¤â¤Î¤¬É½¼¨¤µ¤ì¤ë¤Ç¤·¤ç¤¦¡£</para>
 
       <para>¤ª¤á¤Ç¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£
@@ -4196,8 +4198,10 @@ ipfw add 1 allow ipencap from W.X.Y.Z to
       <screen>sshd_enable="YES"</screen>
 
       <para>¼¡¤Ëµ¯Æ°¤·¤¿¤È¤­¤«¤é
-	<application>ssh</application> ¥Ç¡¼¥â¥ó¤¬µ¯Æ°¤·¤Þ¤¹¡£
-	¤â¤·¤¯¤Ïñ¤Ë <application>sshd</application>
+	<application>ssh</application> ¤Î¥Ç¡¼¥â¥ó¥×¥í¥°¥é¥à¤Ç¤¢¤ë
+	&man.sshd.8; ¤¬µ¯Æ°¤·¤Þ¤¹¡£
+	¤â¤·¤¯¤Ï¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤éñ¤Ë <command>sshd</command>
+	¤ÈÆþÎϤ·¤Æ¡¢Ä¾ÀÜ <application>sshd</application>
 	¥Ç¡¼¥â¥ó¤ò¼Â¹Ô¤·¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</para>
     </sect2>

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