svn commit: r41385 - head/ja_JP.eucJP/books/handbook/advanced-networking

Ryusuke SUZUKI ryusuke at FreeBSD.org
Sat Apr 6 14:49:53 UTC 2013


Author: ryusuke
Date: Sat Apr  6 14:49:52 2013
New Revision: 41385
URL: http://svnweb.freebsd.org/changeset/doc/41385

Log:
  - Merge the following from the English version:
  
  	r20189 -> r20284	head/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml	Sat Apr  6 10:23:46 2013	(r41384)
+++ head/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml	Sat Apr  6 14:49:52 2013	(r41385)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r20189
+     Original revision: r20284
      $FreeBSD$
 -->
 
@@ -557,7 +557,7 @@ default            10.0.0.1           UG
 10.0.0/24          link#1             UC          0        0    xl0
 192.168.1/24       link#2             UC          0        0    xl1</screen>
 
-	<para>¤³¤ì¤Ï¸½ºß¤Î¥ë¡¼¥Æ¥£¥ó¥°¥Æ¡¼¥Ö¥ë¤Ç¤¹¡£<hostid>RouterA</hostid>
+	<para>¸½ºß¤Î¥ë¡¼¥Æ¥£¥ó¥°¥Æ¡¼¥Ö¥ë¤Ç¤Ï¡¢<hostid>RouterA</hostid>
 	  ¤Ï¤Þ¤À Internal Net 2 ¤Ë¤ÏÅþã¤Ç¤­¤Ê¤¤¤Ç¤·¤ç¤¦¡£
 	  <hostid role="ipaddr">192.168.2.0/24</hostid>
 	  ¤Î·ÐÏ©¤òÊÝ»ý¤·¤Æ¤¤¤Ê¤¤¤«¤é¤Ç¤¹¡£
@@ -567,7 +567,7 @@ default            10.0.0.1           UG
 	  role="ipaddr">192.168.1.2</hostid>
 	  ¤òÁ÷¤êÀè¤È¤·¤Æ¡¢Internal Net 2 ¥Í¥Ã¥È¥ï¡¼¥¯¤òÄɲä·¤Þ¤¹¡£</para>
 
-	<screen>&prompt.root; <userinput>route add network 192.168.2.0/24 192.168.1.2</userinput></screen>
+	<screen>&prompt.root; <userinput>route add -net 192.168.2.0/24 192.168.1.2</userinput></screen>
 
 	<para>¤³¤ì¤Ë¤è¤ê¡¢<hostid>RouterA</hostid> ¤Ï¡¢ 
 	  <hostid role="ipaddr">192.168.2.0/24</hostid>
@@ -586,7 +586,7 @@ default            10.0.0.1           UG
 
 	<programlisting># Add Internal Net 2 as a static route
 static_routes="internalnet2"
-route_internalnet2="network 192.168.2.0/24 192.168.1.2"</programlisting>
+route_internalnet2="-net 192.168.2.0/24 192.168.1.2"</programlisting>
 
 	<para><literal>static_routes</literal> ¤ÎÀßÄêÊÑ¿ô¤Ï¡¢
 	  ¥¹¥Ú¡¼¥¹¤Ë¤è¤Ã¤ÆʬΥ¤µ¤ì¤ëʸ»úÎó¤Î¥ê¥¹¥È¤Ç¤¹¡£
@@ -599,10 +599,10 @@ route_internalnet2="network 192.168.2.0/
 	  &man.route.8; ¥³¥Þ¥ó¥É¤ËÍ¿¤¨¤ë¤¹¤Ù¤Æ¤ÎÀßÄê¥Ñ¥é¥á¡¼¥¿¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹¡£
 	  Á°Àá¤ÎÎã¤Ç¤Ï¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É</para>
 
-	  <screen>&prompt.root; <userinput>route add network 192.168.2.0/24 192.168.1.2</userinput></screen>
+	  <screen>&prompt.root; <userinput>route add -net 192.168.2.0/24 192.168.1.2</userinput></screen>
 
 	<para>¤òÍѤ¤¤¿¤Î¤Ç¡¢
-	  <literal>"network 192.168.2.0/24 192.168.1.2"</literal>
+	  <literal>"-net 192.168.2.0/24 192.168.1.2"</literal>
 	  ¤¬É¬Íפˤʤê¤Þ¤¹¡£</para>
 
 	<para>¾åµ­¤Î¤è¤¦¤Ë <literal>static_routes</literal> 
@@ -614,8 +614,9 @@ route_internalnet2="network 192.168.2.0/
 	  ²¾Áۥ롼¥¿¾å¤ËÀÅŪ¤Ê·ÐÏ©¤È¤·¤ÆÄɲ乤ëÎã¤Ç¤¹¡£</para>
 
 	  <programlisting>static_routes="net1 net2"
-route_net1="network 192.168.0.0/24 192.168.0.1"
-route_net2="network 192.168.1.0/24 192.168.1.1"</programlisting>
+route_net1="-net 192.168.0.0/24 192.168.0.1"
+route_net2="-net 192.168.1.0/24 192.168.1.1"</programlisting>
+
       </sect3>
     </sect2>
 
@@ -871,16 +872,17 @@ wi0: flags=8843<UP,BROADCAST,RUNNING,
 &prompt.root; <userinput>sysctl net.link.ether.bridge.config="wi0,xl0"</userinput>
 &prompt.root; <userinput>sysctl net.inet.ip.forwarding=1</userinput></screen>
 
-	  <para>¤µ¤Æ¡¢ÌµÀþ¥«¡¼¥É¤òÀßÄꤹ¤ë¤È¤­¤Ç¤¹¡£</para>
-	  <para>¼¡¤Î¥³¥Þ¥ó¥É¤Ï¥«¡¼¥É¤ò¥¢¥¯¥»¥¹¥Ý¥¤¥ó¥È¤È¤·¤ÆÀßÄꤷ¤Þ¤¹¡£</para>
+	  <para>¤µ¤Æ¡¢ÌµÀþ¥«¡¼¥É¤òÀßÄꤹ¤ë¤È¤­¤Ç¤¹¡£
+	    ¼¡¤Î¥³¥Þ¥ó¥É¤Ï¥«¡¼¥É¤ò¥¢¥¯¥»¥¹¥Ý¥¤¥ó¥È¤È¤·¤ÆÀßÄꤷ¤Þ¤¹¡£</para>
 
 	  <screen>
-&prompt.root; <userinput>ifconfig wi0 ssid my_net channel 11 media DS/11Mbps mediaopt hostap up stationname "FreeBSD AP"</userinput></screen>
+&prompt.root; <userinput>ifconfig wi0 ssid <replaceable>my_net</replaceable> channel 11 media DS/11Mbps mediaopt hostap up stationname "<replaceable>FreeBSD AP</replaceable>"</userinput>
+	  </screen>
 
 	  <para>¤³¤Î &man.ifconfig.8; ¥³¥Þ¥ó¥É¹Ô¤Ï
 	    <devicename>wi0</devicename> ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò up
-	    ¾õÂ֤ˤ·¡¢SSID ¤ò <literal>my_net</literal> ¤ËÀßÄꤷ¡¢
-	    ¥¹¥Æ¡¼¥·¥ç¥ó̾¤ò <literal>FreeBSD AP</literal> ¤ËÀßÄꤷ¤Þ¤¹¡£
+	    ¾õÂ֤ˤ·¡¢SSID ¤ò <replaceable>my_net</replaceable> ¤ËÀßÄꤷ¡¢
+	    ¥¹¥Æ¡¼¥·¥ç¥ó̾¤ò <replaceable>FreeBSD AP</replaceable> ¤ËÀßÄꤷ¤Þ¤¹¡£
 	    <option>media DS/11Mbps</option> ¥ª¥×¥·¥ç¥ó¤Ï¥«¡¼¥É¤ò 11Mbps
 	    ¥â¡¼¥É¤ËÀßÄꤷ¡¢¤Þ¤¿ <option>mediaopt</option>
 	    ¤ò¼ÂºÝ¤ËÍ­¸ú¤Ë¤¹¤ë¤Î¤ËɬÍפǤ¹¡£
@@ -889,7 +891,7 @@ wi0: flags=8843<UP,BROADCAST,RUNNING,
 	    <option>channel 11</option> ¥ª¥×¥·¥ç¥ó¤Ï»ÈÍѤ¹¤ë¥Á¥ã¥Í¥ë¤ò
 	    802.11b ¤ËÀßÄꤷ¤Þ¤¹¡£
 	    ³Æµ¬À©ÃÏ°è (regulatory domain) ¤ÇÍ­¸ú¤Ê¥Á¥ã¥Í¥ëÈÖ¹æ¤Ï
-	    &man.wicontrol.8; ¥Þ¥Ë¥å¥¢¥ë¤ËºÜ¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
+	    &man.wicontrol.8; ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ËºÜ¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
 
 	  <para>¤µ¤Æ¡¢
 	    ¤³¤ì¤Ç´°Á´¤Ëµ¡Ç½¤¹¤ë¥¢¥¯¥»¥¹¥Ý¥¤¥ó¥È¤¬Î©¤Á¾å¤¬¤ê¡¢Æ°ºî¤·¤Æ¤¤¤Þ¤¹¡£
@@ -949,14 +951,14 @@ wi0: flags=8843<UP,BROADCAST,RUNNING,
 
 	  <para>ÀßÄê¤ò¤Ï¤¸¤á¤ëÁ°¤Ë¡¢
 	    ¤¢¤Ê¤¿¤¬Àܳ¤·¤è¤¦¤È¤¹¤ë̵Àþ¥Í¥Ã¥È¥ï¡¼¥¯¤Ë¤Ä¤¤¤Æ¤¤¤¯¤Ä¤«ÃΤäƤª¤«¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-	    ¤³¤ÎÎã¤Ç¤Ï¡¢<literal>my_net</literal>
+	    ¤³¤ÎÎã¤Ç¤Ï¡¢<replaceable>my_net</replaceable>
 	    ¤È¤¤¤¦Ì¾Á°¤Ç°Å¹æ²½¤Ï̵¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¥Í¥Ã¥È¥ï¡¼¥¯¤ËÀܳ¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
-	  <para>Note: ¤³¤ÎÎã¤Ç¤Ï°Å¹æ²½¤ò¹Ô¤Ã¤Æ¤¤¤Ê¤¤¤Î¤Ç¤¹¤¬¡¢
+	  <note><para>¤³¤ÎÎã¤Ç¤Ï°Å¹æ²½¤ò¹Ô¤Ã¤Æ¤¤¤Ê¤¤¤Î¤Ç¤¹¤¬¡¢
 	    ¤³¤ì¤Ï´í¸±¤Ê¾õ¶·¤Ç¤¹¡£¼¡¤ÎÀá¤Ç¡¢°Å¹æ²½¤òÍ­¸ú¤Ë¤¹¤ëÊýË¡¤È¡¢
 	    ¤Ê¤¼¤½¤ì¤¬½ÅÍפǡ¢
 	    °Å¹æµ»½Ñ¤Ë¤è¤Ã¤Æ¤Ï´°Á´¤Ë¤Ï¤¢¤Ê¤¿¤òÊݸ¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¤¤Î¤Ï¤Ê¤¼¤«¡¢
-	    ¤È¤¤¤¦¤³¤È¤ò³Ø¤Ö¤Ç¤·¤ç¤¦¡£</para>
+	    ¤È¤¤¤¦¤³¤È¤ò³Ø¤Ö¤Ç¤·¤ç¤¦¡£</para></note>
 
 	  <para>¥«¡¼¥É¤¬ FreeBSD ¤Ëǧ¼±¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -972,9 +974,9 @@ wi0: flags=8843<UP,BROADCAST,RUNNING,
         channel 10 authmode OPEN powersavemode OFF powersavesleep 100
         wepmode OFF weptxkey 1</screen>
 
-	  <para>¤½¤ì¤Ç¤Ï¡¢¤³¤Î¥«¡¼¥É¤ò¥Í¥Ã¥È¥ï¡¼¥¯¤Ë¹ç¤ï¤»¤ÆÀßÄꤷ¤Þ¤·¤ç¤¦¡£</para>
+	<para>¤½¤ì¤Ç¤Ï¡¢¤³¤Î¥«¡¼¥É¤ò¥Í¥Ã¥È¥ï¡¼¥¯¤Ë¹ç¤ï¤»¤ÆÀßÄꤷ¤Þ¤·¤ç¤¦¡£</para>
 
-	  <screen>&prompt.root; <userinput>ifconfig wi0 inet 192.168.0.20 netmask 255.255.255.0 ssid my_net</userinput></screen>
+       <screen>&prompt.root; <userinput>ifconfig wi0 inet <replaceable>192.168.0.20</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>my_net</replaceable></userinput></screen>
 
 	  <para><hostid role="ipaddr">192.168.0.20</hostid> ¤È
 	    <hostid role="netmask">255.255.255.0</hostid>
@@ -997,9 +999,9 @@ wi0: flags=8843<UP,BROADCAST,RUNNING,
 	    ¤½¤ÎÃæ¤Ë°Ê²¼¤Îɽ¼¨¤¬¤¢¤ë¤Ï¤º¤Ç¤¹¡£</para>
 	  <screen>status: associated</screen>
 
-	  <para>¤â¤·¤³¤Î¤è¤¦¤ËÀܳ¤µ¤ì¤Æ¤¤¤ë¤Èɽ¼¨¤µ¤ì¤Ê¤±¤ì¤Ð¡¢
+	  <para>¤â¤· <literal>associated</literal> ¤Èɽ¼¨¤µ¤ì¤Ê¤±¤ì¤Ð¡¢
 	    ¥¢¥¯¥»¥¹¥Ý¥¤¥ó¥È¤ÎÈϰϳ°¤«¤â¤·¤ì¤Ê¤¤¤·¡¢
-	    °Å¹æ²½¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¤¤Î¤«¤â¤·¤ì¤Ê¤¤¤·¡¢
+	    °Å¹æ²½¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤â¤·¤ì¤Ê¤¤¤·¡¢
 	    ¤Þ¤¿¤ÏÀßÄê¤ÎÌäÂê¤òÊú¤¨¤Æ¤¤¤ë¤Î¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para>
 	</sect4>
       </sect3>
@@ -1038,13 +1040,13 @@ wi0: flags=8843<UP,BROADCAST,RUNNING,
 	    ¼¡¤Î¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¡¢¤¢¤Ê¤¿¤Î¿·¤·¤¤ FreeBSD ¥¢¥¯¥»¥¹¥Ý¥¤¥ó¥È¾å¤Ç
 	    WEP ¤òÍ­¸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-	  <screen>&prompt.root; <userinput>ifconfig wi0 inet up ssid my_net wepmode on wepkey 0x1234567890 media DS/11Mbps mediaopt hostap</userinput></screen>
+      <screen>&prompt.root; <userinput>ifconfig wi0 inet up ssid <replaceable>my_net</replaceable> wepmode on wepkey <replaceable>0x1234567890</replaceable> media DS/11Mbps mediaopt hostap</userinput></screen>
 
 	  <para>¥¯¥é¥¤¥¢¥ó¥È¤Ë¤Ä¤¤¤Æ¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤Ç WEP ¤òÍ­¸ú¤Ë¤Ç¤­¤Þ¤¹¡£</para>
 
-	  <screen>&prompt.root; <userinput>ifconfig wi0 inet 192.168.0.20 netmask 255.255.255.0 ssid my_net wepmode on wepkey 0x1234567890</userinput></screen>
+      <screen>&prompt.root; <userinput>ifconfig wi0 inet <replaceable>192.168.0.20</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>my_net</replaceable> wepmode on wepkey <replaceable>0x1234567890</replaceable></userinput></screen>
 
-	  <para><literal>0x1234567890</literal>
+	  <para><replaceable>0x1234567890</replaceable>
 	    ¤ò¤è¤êÆðۤʥ­¡¼¤ËÊѹ¹¤¹¤Ù¤­¤Ç¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 	</sect4>
 
@@ -1054,7 +1056,7 @@ wi0: flags=8843<UP,BROADCAST,RUNNING,
 	  <para>&man.ipsec.4;
 	    ¤Ï¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Ç¸ò¤ï¤µ¤ì¤ë¥Ç¡¼¥¿¤ò°Å¹æ²½¤¹¤ë¤¿¤á¤Î¡¢
 	    ¤Ï¤ë¤«¤Ë´è·ò¤Ç¶¯ÎϤʥġ¼¥ë¤Ç¤¹¡£
-	    ¤³¤ì¤Ï¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î̵Àþ¥Ç¡¼¥¿¤ò°Å¹æ²½¤¹¤ëÌÀ¤é¤«¤Ë¹¥¤Þ¤·¤¤ÊýË¡¤Ç¤¹¡£
+	    ¤³¤ì¤Ï̵Àþ¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î¥Ç¡¼¥¿¤ò°Å¹æ²½¤¹¤ëÌÀ¤é¤«¤Ë¹¥¤Þ¤·¤¤ÊýË¡¤Ç¤¹¡£
 	    ¥Ï¥ó¥É¥Ö¥Ã¥¯Æâ¤Î <link linkend="ipsec">IPsec</link> Àá¤Ç
 	    &man.ipsec.4; ¥»¥­¥å¥ê¥Æ¥£¡¢
 	    ¤ª¤è¤Ó¤½¤Î¼ÂÁõÊýË¡¤Î¾ÜºÙ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
@@ -1077,7 +1079,7 @@ wi0: flags=8843<UP,BROADCAST,RUNNING,
 	  <para><application>bsd-airtools</application> ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï
 	    <filename role="package">net/bsd-airtools</filename> port
 	    ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£
-	    ports ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë´Ø¤¹¤ë¾ðÊó¤Ï¥Ï¥ó¥É¥Ö¥Ã¥¯¤Î
+	    ports ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë´Ø¤¹¤ë¾ðÊó¤Ï¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Î
 	    <xref linkend="ports"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	  <para><command>dstumbler</command> ¥×¥í¥°¥é¥à¤Ï¡¢
@@ -1095,7 +1097,7 @@ wi0: flags=8843<UP,BROADCAST,RUNNING,
 	</sect4>
 
 	<sect4>
-	  <title><application>wicontrol</application>, <application>ancontrol</application> ¤ª¤è¤Ó <application>raycontrol</application> ¥æ¡¼¥Æ¥£¥ê¥Æ¥£</title>
+	  <title><command>wicontrol</command>, <command>ancontrol</command> ¤ª¤è¤Ó <command>raycontrol</command> ¥æ¡¼¥Æ¥£¥ê¥Æ¥£</title>
 
 	  <para>¤³¤ì¤é¤Ï¡¢ÌµÀþ¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Ç̵Àþ¥«¡¼¥É¤¬¤É¤Î¤è¤¦¤ËÆ°ºî¤¹¤ë¤«¤òÀ©¸æ¤¹¤ë¥Ä¡¼¥ë¤Ç¤¹¡£
 	    ¾åµ­¤ÎÎã¤Ç¤Ï¡¢ÌµÀþ¥«¡¼¥É¤¬ <devicename>wi0</devicename>
@@ -1107,7 +1109,7 @@ wi0: flags=8843<UP,BROADCAST,RUNNING,
 	</sect4>
 
 	<sect4>
-	  <title><application>ifconfig</application> ¥³¥Þ¥ó¥É</title>
+	  <title><command>ifconfig</command> ¥³¥Þ¥ó¥É</title>
 	  <indexterm><primary>ifconfig</primary></indexterm>
 
 	  <para>&man.ifconfig.8; ¤Ï &man.wicontrol.8;


More information about the svn-doc-all mailing list