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

Author: ryusuke
Date: Sat Oct 14 01:48:30 2017
New Revision: 51118
URL: https://svnweb.freebsd.org/changeset/doc/51118

Log:
  - Merge the following from the English version:
  
  	r30930 -> r32503	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	Fri Oct 13 16:10:56 2017	(r51117)
+++ head/ja_JP.eucJP/books/handbook/security/chapter.xml	Sat Oct 14 01:48:30 2017	(r51118)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r30930
+     Original revision: r32503
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="security">
@@ -54,7 +54,7 @@
       </listitem>
 
       <listitem>
-	<para><command>inetd</command> ¤ÈÁȤ߹ç¤ï¤»¤Æ
+	<para><application>inetd</application> ¤ÈÁȤ߹ç¤ï¤»¤Æ
 	  <acronym>TCP</acronym> Wrappers ¤òÀßÄꤹ¤ëÊýË¡</para>
       </listitem>
 
@@ -406,57 +406,36 @@
 	²¿¤â¤·¤Ê¤¤¤è¤ê¤ÏÎɤ¤¤Î¤Ç¤¹¤¬¡¢
 	ɬ¤º¤·¤âºÇ¤â°ÂÁ´¤ÊÁªÂò»è¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£</para>
 
-      <!-- XXX:
-	This will need updating depending on the outcome of PR bin/71147.
-	Personally I know what I'd like to see, which puts this in definite
-	need of a rewrite, but we'll have to wait and see.  ceri@
-      -->
+      <para>¥¢¥«¥¦¥ó¥È¤ò´°Á´¤Ë¥í¥Ã¥¯¤¹¤ë¤Ë¤Ï¡¢
+	&man.pw.8; ¥³¥Þ¥ó¥É¤ò»È¤¦¤Ù¤­¤Ç¤¹¡£</para>
 
-      <para>¥¹¥¿¥Ã¥Õ¤Î¥¢¥«¥¦¥ó¥È¡¢¤Þ¤¿µæ¶Ë¤Ë¤Ï
-	<systemitem class="username">root</systemitem> ¥¢¥«¥¦¥ó¥È¤Î°ÂÁ´À­
-	¤ò¹â¤á¤ë´ÖÀÜŪ¤ÊÊýË¡¤Ï¡¢ÊÌ¤Î¥í¥°¥¤¥ó¥¢¥¯¥»¥¹¤ÎÊýË¡¤òÍѤ¤¤Æ¥¹¥¿¥Ã
-	¥Õ¤Î¥¢¥«¥¦¥ó¥È¤Î°ÂÁ´À­¤ò¹â¤á¡¢¤½¤Î¾å¤Ç¤½¤Î¥¹¥¿¥Ã¥Õ¤Î¥¢¥«¥¦¥ó¥È
-	¤Î°Å¹æ²½¥Ñ¥¹¥ï¡¼¥É¤ò <quote>¥¢¥¹¥¿¥ê¥¹¥¯²½</quote>
-	¤¹¤ë¤â¤Î¤Ç¤¹¡£
-	&man.vipw.8; ¥³¥Þ¥ó¥É¤ò»È¤¨¤Ð¡¢°Å¹æ²½¤µ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤ò
-	<quote><literal>*</literal></quote> 1 ʸ»ú¤ËÃÖ¤­´¹¤¨¤é¤ì¤Þ¤¹¡£
-	¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢<filename>/etc/master.passwd</filename>
-	¥Õ¥¡¥¤¥ë¤È¥æ¡¼¥¶/¥Ñ¥¹¥ï¡¼¥É¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·¤·¤Æ¡¢
-	¥Ñ¥¹¥ï¡¼¥Éǧ¾Ú¤Ë¤è¤ë¥í¥°¥¤¥ó¤¬¤Ç¤­¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
+      <screen>&prompt.root;<userinput>pw lock <replaceable>staff</replaceable></userinput></screen>
 
-      <para>¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥¹¥¿¥Ã¥Õ¥¢¥«¥¦¥ó¥È¤ò¡¢</para>
+      <para>¤³¤ì¤Ë¤è¤ê¡¢¥æ¡¼¥¶¤Ï¡¢&man.ssh.1;
+	¤ò´Þ¤à¤¤¤«¤Ê¤ëÊýË¡¤Ç¤â¥í¥°¥¤¥ó¤Ç¤­¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£</para>
 
+      <para>¥¢¥«¥¦¥ó¥È¤Ø¤Î¥¢¥¯¥»¥¹¤ò¥Ö¥í¥Ã¥¯¤¹¤ë¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ï¡¢
+	°Å¹æ²½¤µ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤ò
+	<quote><literal>*</literal></quote> 1 ʸ»ú¤ËÃÖ¤­´¹¤¨¤ë¤³¤È¤Ç¤¹¡£
+	¤³¤Îʸ»ú¤Ï¡¢°Å¹æ²½¤µ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤Ë¥Þ¥Ã¥Á¤¹¤ë¤³¤È¤Ï¤Ê¤¤¤Î¤Ç¡¢
+	¥æ¡¼¥¶¥¢¥¯¥»¥¹¤ò¥Ö¥í¥Ã¥¯¤·¤Þ¤¹¡£
+	¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥¹¥¿¥Ã¥Õ¥¢¥«¥¦¥ó¥È¤ò¡¢</para>
+
       <programlisting>foobar:R9DT/Fa1/LV9U:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh</programlisting>
 
       <para>¤³¤¦Êѹ¹¤·¤Þ¤¹¡£</para>
 
       <programlisting>foobar:*:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh</programlisting>
 
-      <para>°Å¹æ²½¤µ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤Ï
-	<quote><literal>*</literal></quote> ¤È°ìÃפ¹¤ë¤³¤È¤¬¤Ê¤¤¤Î¤Ç¡¢
-	¤³¤ÎÊѹ¹¤Ë¤è¤Ã¤ÆÄ̾ï¤Î¥í¥°¥¤¥ó¤Ï¤Ç¤­¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£
-	¤³¤¦¤·¤¿¸å¤Ï¡¢¥¹¥¿¥Ã¥Õ¥á¥ó¥Ð¤Ïǧ¾Ú¤Î¤¿¤á¤Ë &man.kerberos.1; ¤ä
-	¸ø³«¸° / ÈëÌ©¸°¤ÎÁȤòÍѤ¤¤ë &man.ssh.1; ¤Î¤è¤¦¤ÊÂå¤ï¤ê¤È¤Ê¤ëǧ
-	¾Ú¼êÃʤòÍøÍѤ·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-	Kerberos ¤Î¤è¤¦¤Ê¥í¥°¥¤¥óµ¡¹½¤ò»È¤¦¾ì¹ç¤Ï¡¢°ìÈÌ¤Ë Kerberos
-	¥µ¡¼¥Ð¤ò¼Â¹Ô¤¹¤ë¥Þ¥·¥ó¤È¼«Ê¬¤Î¥Ç¥¹¥¯¥È¥Ã¥×¥ï¡¼¥¯¥¹¥Æ¡¼¥·¥ç¥ó¤Î°ÂÁ´À­¤ò³ÎÊݤ·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-	¤Þ¤¿ ssh ¤Ç¸ø³«¸° / ÈëÌ©¸°¤ÎÁȤò»È¤¦¾ì¹ç¡¢
-	°ìÈ̤ˡ¢<emphasis>¥í¥°¥¤¥ó¸µ</emphasis>¥Þ¥·¥ó (Ä̾ï¤Ï¼«Ê¬¤Î¥ï¡¼
-	¥¯¥¹¥Æ¡¼¥·¥ç¥ó) ¤Î°ÂÁ´À­¤ò³ÎÊݤ·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤³¤³¤Ç¡¢
-	&man.ssh-keygen.1; ¤Ç¸ø³«¸° / ÈëÌ©¸°¤ÎÁȤòÀ¸À®¤¹¤ëºÝ¡¢¸°¤ÎÁÈ
-	¤ò¥Ñ¥¹¥ï¡¼¥É¤ÇËɸ椹¤ë¤³¤È¤Ë¤è¤ê¡¢¸°¤ÎÁȤؤÎËɸæÁؤòÄɲ乤뤳
-	¤È¤â¤Ç¤­¤Þ¤¹¡£¥¹¥¿¥Ã¥Õ¥¢¥«¥¦¥ó¥È¤Î¥Ñ¥¹¥ï¡¼¥É¤ò
-	<quote>¥¢¥¹¥¿¥ê¥¹¥¯</quote> ¤Ç¤Ä¤Ö¤¹¤³¤È¤¬¤Ç¤­¤ë¤È¡¢
-	´ÉÍý¼Ô¼«¿È¤¬ÀßÄê
-	¤·¤¿°ÂÁ´À­¤Î¹â¤¤ÊýË¡¤Ç¤·¤«¥¹¥¿¥Ã¥Õ¥á¥ó¥Ð¤¬¥í¥°¥¤¥ó¤Ç¤­¤Ê¤¤¤³¤È
-	¤âÊݾڤǤ­¤Þ¤¹¡£¤³¤¦¤·¤Æ¡¢Â¿¤¯¤Î¿¯Æþ¼Ô¤¬»È¤¦½ÅÂç¤Ê¥»¥­¥å¥ê¥Æ¥£
-	¤Î·ê¤Ç¤¢¤ë¡¢
-	°ÂÁ´À­¤ÎÄ㤤̵´Ø·¸¤Ê¥Þ¥·¥ó¤«¤é¥Í¥Ã¥È¥ï¡¼¥¯¤òÇÁ¤­¸«¤ëÊýË¡¤òºÉ¤°¤è¤¦¤Ê¥»¥Ã¥·¥ç¥ó¤òÄ󶡤¹¤ë¡¢
-	°ÂÁ´À­¤Î¹â¤¤°Å¹æ
-	²½¤µ¤ì¤¿¥³¥Í¥¯¥·¥ç¥ó¤ò»È¤¦¤³¤È¤ò¡¢¥¹¥¿¥Ã¥Õ¥á¥ó¥ÐÁ´°÷¤Ë¶¯À©¤¹¤ë
-	¤³¤È¤¬¤Ç¤­¤ë¤Î¤Ç¤¹¡£</para>
+      <para>¤³¤ÎÊѹ¹¤Ë¤è¤Ã¤Æ
+	<systemitem class="username">foobar</systemitem> ¥æ¡¼¥¶¤Ï¡¢
+	Ä̾ï¤Î¥í¥°¥¤¥ó¤Ï¤Ç¤­¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£
+	¤³¤Î¤è¤¦¤Ê¥¢¥¯¥»¥¹À©¸Â¤ò¤·¤¿¸å¤Ï¡¢
+	¥µ¥¤¥È¤Ç <application>Kerberos</application> ¤ò¥»¥Ã¥È¥¢¥Ã¥×¤·¤¿¤ê¡¢
+	¥æ¡¼¥¶¤¬ &man.ssh.1;
+	¤Î¸°¤òÀßÄꤹ¤ë¤Ê¤É¤È¤¤¤Ã¤¿Ç§¾Ú¼êÃʤòÍøÍѤ·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
 
-      <para>¤è¤ê´ÖÀÜŪ¤Ê¥»¥­¥å¥ê¥Æ¥£¤Î»ÅÁȤߤǤϡ¢À©¸Â¤Î¶¯¤¤¥µ¡¼¥Ð¤«¤é
+      <para>¤³¤ì¤é¤Î¥»¥­¥å¥ê¥Æ¥£¤Î»ÅÁȤߤǤϡ¢À©¸Â¤Î¶¯¤¤¥µ¡¼¥Ð¤«¤é
 	À©¸Â¤Î¼å¤¤¥µ¡¼¥Ð¤Ø¥í¥°¥¤¥ó¤¹¤ë¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
 	¥á¥¤¥ó¥Þ¥·¥ó¤Ç¡¢ÍÍ¡¹¤Ê¼ïÎà¤Î¥µ¡¼¥Ð¤ò¼Â¹Ô¤µ¤»¤Æ¤¤¤ë¾ì¹ç¡¢¥ï¡¼¥¯
 	¥¹¥Æ¡¼¥·¥ç¥ó¤Ç¤Ï¤½¤ì¤é¤Î¥µ¡¼¥Ð¤ò¼Â¹Ô¤µ¤»¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£¥ï¡¼¥¯
@@ -1477,13 +1456,14 @@ Enter secret pass phrase: <userinput>&lt;secret passwo
       ¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤¤¤È¹Í¤¨¤Æ¤¤¤ë¤è¤¦¤Ç¤¹¡£
       ¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤Ï¡¢Éý¹­¤¤ÍÑÅÓ¤¬¤¢¤ë°ìÊý¤Ç¡¢
       Àܳ¸µ¤ËÂФ·¥Æ¥­¥¹¥È¤òÁ÷¤ë¤È¤¤¤Ã¤¿¡¢¼è¤ê°·¤Ê¤¤ºî¶È¤¬¤¢¤ê¤Þ¤¹¡£
-      <acronym>TCP</acronym> ¥½¥Õ¥È¥¦¥§¥¢¤Ï¡¢¤³¤ì°Ê¾å¤Î¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+      <acronym>TCP</acronym> Wrappers ¥½¥Õ¥È¥¦¥§¥¢¤Ï¡¢
+      ¤³¤ì°Ê¾å¤Î¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
       °Ê²¼¤ÎÀá¤Ç¤Ï¡¢
       <acronym>TCP</acronym> Wrappers ¤Î¿¤¯¤Îµ¡Ç½¤¬ÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
       ¤½¤·¤Æ¡¢Å¬±þ¤Ç¤­¤ë¾ì¹ç¤Ë¤Ï¡¢ÀßÄê¹Ô¤ÎÎ㤬¾Ò²ð¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <para><acronym>TCP</acronym> Wrappers ¥½¥Õ¥È¥¦¥§¥¢¤Ï¡¢
-      <command>inetd</command>
+      <application>inetd</application>
       ¤Î´ÉÍý¤Î¤â¤È¤Ë¤¹¤Ù¤Æ¤Î¥µ¡¼¥Ð¥Ç¡¼¥â¥ó¤ËÂбþ¤¹¤ëµ¡Ç½¤ò³ÈÄ¥¤·¤Þ¤¹¡£
       ¤³¤ÎÊýË¡¤ò»È¤¦¤³¤È¤Ç¡¢¥í¥°¤Ø¤ÎÂбþ¡¢
       Àܳ¤ËÂФ·¤Æ¥á¥Ã¥»¡¼¥¸¤òÊÖ¤·¤¿¤ê¡¢
@@ -1498,7 +1478,7 @@ Enter secret pass phrase: <userinput>&lt;secret passwo
       ¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤ª¤è¤Ó¾¤Î¥»¥­¥å¥ê¥Æ¥£ÀßÄê¤ÈÁȤ߹ç¤ï¤»¤Æ»È¤¦¤³¤È¤¬¤Ç¤­¡¢
       ¥·¥¹¥Æ¥à¤ò¼é¤ë¤¿¤á¤ÎÄɲäΥ쥤¥ä¤È¤·¤Æ¾å¼ê¤¯µ¡Ç½¤·¤Þ¤¹¡£</para>
 
-    <para>¤³¤ÎÀßÄê¤Ï <command>inetd</command> ¤ÎÀßÄê¤Î³ÈÄ¥¤Ê¤Î¤Ç¡¢
+    <para>¤³¤ÎÀßÄê¤Ï <application>inetd</application> ¤ÎÀßÄê¤Î³ÈÄ¥¤Ê¤Î¤Ç¡¢
       <link linkend="network-inetd">inetd ¤ÎÀßÄê</link>
       ¾Ï¤ò¤¹¤Ç¤ËÆɤó¤Ç¤¤¤ë¤³¤È¤òÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£</para>
 
@@ -1516,7 +1496,8 @@ Enter secret pass phrase: <userinput>&lt;secret passwo
 	¤ò»ÈÍѤ¿¤á¤ËɬÍפȤʤë¤Î¤Ï¡¢
 	<filename>rc.conf</filename> ¤«¤é
 	<option>-Ww</option> ¥ª¥×¥·¥ç¥ó¤Ç
-	<command>inetd</command> ¥µ¡¼¥Ð¤¬µ¯Æ°¤µ¤ì¤ë¤³¤È¤ò³Îǧ¤¹¤ë¤À¤±¤Ç¤¹¡£
+	<application>inetd</application>
+	¥µ¡¼¥Ð¤¬µ¯Æ°¤µ¤ì¤ë¤³¤È¤ò³Îǧ¤¹¤ë¤À¤±¤Ç¤¹¡£
 	¤³¤ì¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤Ç¤¹¡£
 	¤â¤Á¤í¤ó¡¢
 	<filename>/etc/hosts.allow</filename>
@@ -1534,7 +1515,7 @@ Enter secret pass phrase: <userinput>&lt;secret passwo
       <para>ºÇ¤â´Êñ¤ÊÀßÄê¤Ë¤ª¤±¤ë¥Ç¡¼¥â¥ó¤ÎÀܳ¥Ý¥ê¥·¤Ï¡¢
 	<filename>/etc/hosts.allow</filename> ¤ÎÃæ¤Ç¡¢
 	¥ª¥×¥·¥ç¥ó¤´¤È¤Ëµö²Ä¤Þ¤¿¤Ï¥Ö¥í¥Ã¥¯¤¹¤ë¤è¤¦¤ËÀßÄꤹ¤ë¤È¤¤¤¦¤â¤Î¤Ç¤¹¡£
-	&os; ¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤Ç¤Ï¡¢<command>inetd</command>
+	&os; ¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤Ç¤Ï¡¢<application>inetd</application>
 	¤«¤éµ¯Æ°¤µ¤ì¤¿¤¹¤Ù¤Æ¤Î¥Ç¡¼¥â¥ó¤ÎÀܳ¤òµö²Ä¤·¤Þ¤¹¡£
 	¤³¤ÎÀßÄê¤òÊѹ¹¤¹¤ë¤³¤È¤Ë¤Ä¤¤¤Æ¤Ï¡¢
 	´ðËÜŪ¤ÊÀßÄê¤òÍý²ò¤·¤¿¸å¤ÇµÄÏÀ¤µ¤ì¤ë¤Ù¤­¤Ç¤¹¡£</para>
@@ -1547,8 +1528,9 @@ Enter secret pass phrase: <userinput>&lt;secret passwo
 	<literal>address</literal> ¤ÎÉôʬ¤Ï¡¢Í­¸ú¤Ê¥Û¥¹¥È̾¡¢
 	<acronym>IP</acronym> ¥¢¥É¥ì¥¹¤Þ¤¿¤Ï¡¢
 	³ç¸Ì ([&nbsp;]) ¤Ç°Ï¤Þ¤ì¤¿ IPv6 ¥¢¥É¥ì¥¹¤Ç¤¹¡£
-	action ¥Õ¥£¡¼¥ë¥É¤ÎÉôʬ¤Ï¡¢¥¢¥¯¥»¥¹¤òŬÀڤ˵ö²Ä¤Þ¤¿¤ÏµñÈݤò¤¹¤ë¤è¤¦¤Ë¡¢
-	allow ¤Þ¤¿¤Ï deny ¤È¤Ê¤ê¤Þ¤¹¡£
+	<literal>action</literal> ¥Õ¥£¡¼¥ë¥É¤ÎÉôʬ¤Ï¡¢
+	¥¢¥¯¥»¥¹¤òŬÀڤ˵ö²Ä¤Þ¤¿¤ÏµñÈݤò¤¹¤ë¤è¤¦¤Ë¡¢
+	<literal>allow</literal> ¤Þ¤¿¤Ï <literal>deny</literal> ¤È¤Ê¤ê¤Þ¤¹¡£
 	ºÇ½é¤Î¥Þ¥Ã¥Á¤·¤¿¥ë¡¼¥ë¤¬Å¬ÍѤµ¤ì¤ë¤È¡¢
 	ÀßÄê¤Ï¤½¤³¤Ç½ª¤ï¤ë¤³¤È¤ò³Ð¤¨¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£
 	¤³¤ì¤Ï¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤Ï¾º½ç¤Ë¥ë¡¼¥ë¤Î¥Þ¥Ã¥Á¤ò¥¹¥­¥ã¥ó¤µ¤ì¡¢
@@ -1565,7 +1547,8 @@ Enter secret pass phrase: <userinput>&lt;secret passwo
       <programlisting># This line is required for POP3 connections:
 qpopper : ALL : allow</programlisting>
 
-      <para>¤³¤Î¹Ô¤òÄɲä·¤¿¤é¡¢<command>inetd</command> ¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£
+      <para>¤³¤Î¹Ô¤òÄɲä·¤¿¤é¡¢<application>inetd</application>
+	¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£
 	¤³¤ì¤ò¹Ô¤¦¤Ë¤Ï¡¢&man.kill.1; ¥³¥Þ¥ó¥É¤ò»È¤¦¤«¡¢
 	<parameter>restart</parameter> ¥Ñ¥é¥á¡¼¥¿¤È¤È¤â¤Ë¡¢
 	<filename>/etc/rc.d/inetd</filename> ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1644,7 +1627,8 @@ ALL : .example.com \
 	  <filename>/var/log/connections.log</filename>
 	  ¥Õ¥¡¥¤¥ë¤Ëµ­Ï¿¤µ¤ì¤Þ¤¹¡£</para>
 
-	<para>¤¹¤Ç¤ËÀâÌÀ¤·¤¿ÃÖ´¹Ê¸»ú (¤¿¤È¤¨¤Ð %a) °Ê³°¤Ë¤âÃÖ´¹Ê¸»ú¤¬¤¢¤ê¤Þ¤¹¡£
+	<para>¤¹¤Ç¤ËÀâÌÀ¤·¤¿ÃÖ´¹Ê¸»ú (¤¿¤È¤¨¤Ð <literal>%a</literal>)
+	  °Ê³°¤Ë¤âÃÖ´¹Ê¸»ú¤¬¤¢¤ê¤Þ¤¹¡£
 	  ´°Á´¤Ê°ìÍ÷¤Ï
 	  &man.hosts.access.5; ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
       </sect3>
@@ -3301,10 +3285,10 @@ define(`confTLS_SRV_OPTIONS', `V')dnl</programlisting>
 	ºÇ¸å¤Ë¡¢¥í¡¼¥«¥ë¤Î <filename>.cf</filename>
 	¥Õ¥¡¥¤¥ë¤òºÆ¹½ÃÛ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 	<filename class="directory">/etc/mail</filename> ¥Ç¥£¥ì¥¯¥È¥ê¤Ç¡¢
-	<command>make</command>	<parameter>install</parameter>
+	<command>make</command> <parameter>install</parameter>
 	¤ÈÆþÎϤ¹¤ë¤ÈºÆ¹½ÃۤǤ­¤Þ¤¹¡£
-	¤½¤Î¸å¡¢<command>make</command>
-	<parameter>restart</parameter> ¤ÈÆþÎϤ·¤Æ¡¢
+	¤½¤Î¸å¡¢<command>make</command> <parameter>restart</parameter>
+	¤ÈÆþÎϤ·¤Æ¡¢
 	<application>Sendmail</application>
 	¥Ç¡¼¥â¥ó¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -4014,8 +3998,9 @@ options IPSEC_ESP
 
        <para>FreeBSD 
          ¤Ç¥»¥­¥å¥ê¥Æ¥£¥¢¥½¥·¥¨¡¼¥·¥ç¥ó¤ò´ÉÍý¤¹¤ë¥Ç¡¼¥â¥ó¤Ï¿ô¿¤¯¤¢¤ê¤Þ¤¹¡£
-         ¤³¤Îʸ½ñ¤Ç¤Ï¡¢¤½¤ÎÃæ¤Î°ì¤Ä¤Î racoon ¤Î»È¤¤Êý¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
-	 racoon ¤Ï¡¢&os; Ports Collection ¤Î
+	 ¤³¤Îʸ½ñ¤Ç¤Ï¡¢¤½¤ÎÃæ¤Î°ì¤Ä¤Î <application>racoon</application>
+	 ¤Î»È¤¤Êý¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
+	 <application>racoon</application> ¤Ï¡¢&os; Ports Collection ¤Î
 	 <filename role="package">security/ipsec-tools</filename>
 	 ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
 
@@ -4039,15 +4024,16 @@ options IPSEC_ESP
 	-- Èà¤é¤¬¥«¥®¤ò¥¯¥é¥Ã¥¯¤·¤¿¤È¤­¤Ë¤Ï¡¢
 	2 ¤Ä¤Î¥Ç¡¼¥â¥ó¤Ï¾¤Î¸°¤òÁªÂò¤·¤Æ¤¤¤ë¤³¤È¤Ç¤·¤ç¤¦¡£</para>
 
-      <para>racoon ¤ÎÀßÄê¤Ï¡¢
+      <para><application>racoon</application> ¤ÎÀßÄê¤Ï¡¢
 	<filename>${PREFIX}/etc/racoon</filename> ¤Ç¹Ô¤ï¤ì¤Þ¤¹¡£
 	¤³¤³¤Ë¤Ï¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤¬ÃÖ¤«¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢
 	¤½¤ì¤Û¤É¿¤¯Êѹ¹¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
-	¤ª¤½¤é¤¯¤¢¤Ê¤¿¤¬Êѹ¹¤¹¤Ù¤­ racoon ¤ÎÀßÄê¤Î¾¤ÎÉôʬ¤Ï¡¢
+	¤ª¤½¤é¤¯¤¢¤Ê¤¿¤¬Êѹ¹¤¹¤Ù¤­ <application>racoon</application>
+	¤ÎÀßÄê¤Î¾¤ÎÉôʬ¤Ï¡¢
 	<quote>pre-shared key</quote> ¤Ç¤¹¡£</para>
 
-       <para>¥Ç¥Õ¥©¥ë¥È¤Î racoon ¤ÎÀßÄê¤Ç¤Ï¡¢¤³¤ì¤Ï¡¢
-         <filename>${PREFIX}/etc/racoon/psk.txt</filename>
+       <para>¥Ç¥Õ¥©¥ë¥È¤Î <application>racoon</application> ¤ÎÀßÄê¤Ç¤Ï¡¢
+	¤³¤ì¤Ï¡¢<filename>${PREFIX}/etc/racoon/psk.txt</filename>
 	 ¥Õ¥¡¥¤¥ë¤Ë¤¢¤ë¤È²¾Äꤵ¤ì¤Æ¤¤¤Þ¤¹¡£
 	 pre-shared key ¤Ï¡¢VPN ¥ê¥ó¥¯¤ò·Ðͳ¤¹¤ë¥È¥é¥Õ¥£¥Ã¥¯¤Î°Å¹æ²½¤Ë¤Ï¡¢
 	 <emphasis>ÍѤ¤¤é¤ì¤Þ¤»¤ó</emphasis>¡£
@@ -4074,13 +4060,14 @@ options IPSEC_ESP
       <programlisting>A.B.C.D            secret</programlisting>
  
       <para>¤³¤ì¤Ï¡¢¥ê¥â¡¼¥Èü¤Î¸ø³« IP ¥¢¥É¥ì¥¹¤ÈÀè¤Û¤É¤ÈƱ¤¸ÈëÌ©¸°¤Ç¤¹¡£
-        racoon ¤ò¼Â¹Ô¤¹¤ëÁ°¤Ë <filename>psk.txt</filename> ¤Î¥â¡¼¥É¤Ï¡¢
+	<application>racoon</application>
+	¤ò¼Â¹Ô¤¹¤ëÁ°¤Ë <filename>psk.txt</filename> ¤Î¥â¡¼¥É¤Ï¡¢
 	<literal>0600</literal>
 	(i.e., <systemitem class="username">root</systemitem> ¤Î¤ß¤¬
 	read/write ¤Ç¤­¤Þ¤¹) ¤È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <para>ξÊý¤Î¥Û¥¹¥È¥²¡¼¥È¥¦¥§¥¤¥³¥ó¥Ô¥å¡¼¥¿¤Ç racoon
-        ¤òÁö¤é¤»¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£IKE
+      <para>ξÊý¤Î¥Û¥¹¥È¥²¡¼¥È¥¦¥§¥¤¥³¥ó¥Ô¥å¡¼¥¿¤Ç
+	<application>racoon</application> ¤òÁö¤é¤»¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£IKE
 	¥È¥é¥Õ¥£¥Ã¥¯¤òµö²Ä¤¹¤ë¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¥ë¡¼¥ë¤òÄɲ乤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 	IKE ¥È¥é¥Õ¥£¥Ã¥¯¤Ï¡¢UDP ¾å¤Ç ISAKMP (Internet Security Association
 	Key Management Protocol) port ¤ËÂФ·¤Æ¼Â¹Ô¤µ¤ì¤ë¤â¤Î¤Ç¤¹¡£
@@ -4090,9 +4077,9 @@ options IPSEC_ESP
 ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
       </programlisting>
  
-      <para>°ìÅÙ racoon ¤òÁö¤é¤»¤¿¤é¡¢
+      <para>°ìÅÙ <application>racoon</application> ¤òÁö¤é¤»¤¿¤é¡¢
         ÊÒÊý¤Î¥²¡¼¥È¥¦¥§¥¤¥Û¥¹¥È¤«¤é¡¢Â¾¤Î¥Û¥¹¥È¤Ø ping ¤ò¼Â¹Ô¤Ç¤­¤Þ¤¹¡£
-	Àܳ¤Ï¡¢¤Þ¤À°Å¹æ²½¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¤¬¡¢racoon
+	Àܳ¤Ï¡¢¤Þ¤À°Å¹æ²½¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¤¬¡¢<application>racoon</application>
 	¤Ï¤½¤Î¸å 2 ¤Ä¤Î¥Û¥¹¥È´Ö¤Î¥»¥­¥å¥ê¥Æ¥£¥¢¥½¥·¥¨¡¼¥·¥ç¥ó¤òÀßÄꤷ¤Þ¤¹¡£
 	¤³¤ì¤Ï»þ´Ö¤òÍפ·¡¢
         ping ¥³¥Þ¥ó¥É¤¬È¿±þ¤¹¤ëÁ°¤Ë¾¯¤·»þ´Ö¤ÎÃÙ¤ì¤È¤·¤Æǧ¼±¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£</para>
@@ -4298,7 +4285,8 @@ ipfw add 1 allow ipencap from W.X.Y.Z to A.B.C.D
        </screen>
 
        <para>VPN ¤Îü¤«¤é¼õ¤±¼è¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢
-         (racoon ¤Ë¤è¤ê¥Í¥´¥·¥¨¡¼¥È¤µ¤ì¤¿¥»¥­¥å¥ê¥Æ¥£¥¢¥½¥·¥¨¡¼¥·¥ç¥ó¤òÍѤ¤¤Æ)
+	 (<application>racoon</application>
+	 ¤Ë¤è¤ê¥Í¥´¥·¥¨¡¼¥È¤µ¤ì¤¿¥»¥­¥å¥ê¥Æ¥£¥¢¥½¥·¥¨¡¼¥·¥ç¥ó¤òÍѤ¤¤Æ)
 	 ºÇ½é¤ËÉü¹æ²½¤ò¹Ô¤¤¤Þ¤¹¡£
          ¤½¤Î¸å¡¢gif ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ËÆþ¤ê¤Þ¤¹¡£
 	 ¤³¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï¡¢ÆâÉô¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤ò²ó¤ë¤³¤È¤Î¤Ç¤­¤ëºÇ¤âÆ⦤Υѥ±¥Ã¥È¤Ë¤Ê¤ë¤Þ¤Ç¡¢¥»¥«¥ó¥É¥ì¥¤¥ä¤Î¥é¥Ã¥×¤ò¤Ï¤¬¤·¤Þ¤¹¡£</para>
@@ -5382,14 +5370,14 @@ VII. References<co xml:id="co-ref"/></programlisting>
 
       <para>¼Â¹Ô¤µ¤ì¤¿¥³¥Þ¥ó¥É¤Ë´Ø¤¹¤ë¾ðÊó¤ò¸«¤ë¤Ë¤Ï¡¢
 	&man.lastcomm.1; ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
-	<command>lastcomm</command> ¤ò»È¤¦¤È¡¢
+	<command>lastcomm</command> ¥³¥Þ¥ó¥É¤ò»È¤¦¤È¡¢
 	¥æ¡¼¥¶¤¬ÆÃÄê¤Î &man.ttys.5; ¤Ç¼Â¹Ô¤·¤¿¥³¥Þ¥ó¥É¤ò½ÐÎϤǤ­¤Þ¤¹¡£
 	°Ê²¼¤Ï¤½¤ÎÎã¤Ç¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>lastcomm ls
 	<systemitem class="username">trhodes</systemitem> ttyp1</userinput></screen>
 
-      <para>¤³¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢ttyp1
+      <para>¤³¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢<literal>ttyp1</literal>
 	¥¿¡¼¥ß¥Ê¥ë¾å¤Ç <systemitem class="username">trhodes</systemitem>
 	¤¬¼Â¹Ô¤·¤¿ <command>ls</command>
 	¤Î»ÈÍѤˤĤ¤¤Æ¡¢µ­Ï¿¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¼¨¤·¤Þ¤¹¡£</para>

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