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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Sat Nov 26 13:00:21 UTC 2016


Author: ryusuke
Date: Sat Nov 26 13:00:19 2016
New Revision: 49699
URL: https://svnweb.freebsd.org/changeset/doc/49699

Log:
  - Merge the following from the English version:
  
  	r17850 -> r18074	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 Nov 25 09:03:18 2016	(r49698)
+++ head/ja_JP.eucJP/books/handbook/security/chapter.xml	Sat Nov 26 13:00:19 2016	(r49699)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r17850
+     Original revision: r18074
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="security">
@@ -62,13 +62,13 @@
       </listitem>
 
       <listitem>
-	<para>IPsec ¤ª¤è¤Ó FreeBSD/Windows ¥³¥ó¥Ô¥å¡¼¥¿¤Î´Ö¤Ç VPN
+	<para>IPsec ¤ª¤è¤Ó FreeBSD/&windows; ¥³¥ó¥Ô¥å¡¼¥¿¤Î´Ö¤Ç VPN
 	  ¤ÎÀßÄêÊýË¡</para>
       </listitem>
 
       <listitem>
 	<para>FreeBSD ¤Ç»È¤ï¤ì¤Æ¤¤¤ë SSH ¼ÂÁõ¤Ç¤¢¤ë
-	  OpenSSH ¤ÎÀßÄꤪ¤è¤Ó»ÈÍÑÊýË¡</para>
+	  <application>OpenSSH</application> ¤ÎÀßÄꤪ¤è¤Ó»ÈÍÑÊýË¡</para>
       </listitem>
 <!--
       <listitem>
@@ -97,13 +97,13 @@
     <title>¤Ï¤¸¤á¤Ë</title>
 
     <para>¥»¥­¥å¥ê¥Æ¥£¤È¤Ï¡¢¥·¥¹¥Æ¥à´ÉÍý¼Ô¤ò¤¤¤Ä¤âǺ¤Þ¤»¤ë»Å»ö¤Î°ì¤Ä¤Ç¤¹¡£
-      ¤¹¤Ù¤Æ¤Î BSD Unix ¥Þ¥ë¥Á¥æ¡¼¥¶¥·¥¹¥Æ¥à¤Ï¡¢
+      ¤¹¤Ù¤Æ¤Î BSD &unix; ¥Þ¥ë¥Á¥æ¡¼¥¶¥·¥¹¥Æ¥à¤Ï¡¢
       ½¾Í褫¤é¤¤¤¯¤Ä¤«¤Î¥»¥­¥å¥ê¥Æ¥£µ¡¹½¤òÈ÷¤¨¤Æ¤¤¤Þ¤¹¤¬¡¢
       ¥æ¡¼¥¶¤òµ¿¿´°Åµ´¤Ë´Ù¤é¤»¤Ê¤¤¤è¤¦¤ËÄɲäΥ»¥­¥å¥ê¥Æ¥£µ¡¹½¤ò¹½ÃÛ¤·
       Êݼ餹¤ë»Å»ö¤Ï¤ª¤½¤é¤¯¡¢¥·¥¹¥Æ¥à´ÉÍý¼Ô¤È¤·¤Æ¤â¤Ã¤È¤âÂ礭¤ÊÀÕ̳¤Î°ì¤Ä¤Ç¤·¤ç¤¦¡£
       ¥Þ¥·¥ó¤Î°ÂÁ´À­¤ËÈ¿±Ç¤µ¤ì¤ë¤Î¤Ï¡¢´ÉÍý¼Ô¤¬ºî¶È¤·¤¿¤³¤È¤À¤±¤Ç¤¹¡£
       ¤Þ¤¿¥»¥­¥å¥ê¥Æ¥£ÌäÂê¤Ï¡¢²÷Ŭ¤Ê´Ä¶­¤ËɬÍפʤâ¤Î¤È¶¥¹ç¤·¤Þ¤¹¡£
-      °ìÈÌ¤Ë Unix ¥·¥¹¥Æ¥à¤ÏËÄÂç¤Ê¿ô¤Î¥×¥í¥»¥¹¤òƱ»þ¤ËÆ°ºî¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¡¢
+      °ìÈÌ¤Ë &unix; ¥·¥¹¥Æ¥à¤ÏËÄÂç¤Ê¿ô¤Î¥×¥í¥»¥¹¤òƱ»þ¤ËÆ°ºî¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¡¢
       ¤½¤Î¥×¥í¥»¥¹¤ÎÂçÉôʬ¤Ï¡¢¥µ¡¼¥Ð –
       ³°Éô¤«¤éÀܳ¤·¡¢ÄÌ¿®¤¹¤ë¤â¤Î¤È¤·¤ÆÆ°ºî¤·¤Þ¤¹¡£
       ¤«¤Ä¤Æ¤Î¥ß¥Ë¥³¥ó¤È¥á¥¤¥ó¥Õ¥ì¡¼¥à¤¬¥Ç¥¹¥¯¥È¥Ã¥×¤Ë¤È¤Ã¤Æ¤«¤ï¤ê¡¢
@@ -1066,7 +1066,7 @@
     <para><emphasis>Ìõ²þÄû: &a.jp.hino;,
 	12 March 2001.</emphasis></para>
 
-    <para>Unix ¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤Ï¡¢¤½¤Î¥¢¥«¥¦¥ó¥È¤ËÂбþ¤·
+    <para>&unix; ¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤Ï¡¢¤½¤Î¥¢¥«¥¦¥ó¥È¤ËÂбþ¤·
       ¤¿°ì¤Ä¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£¤½¤ì¤é¤Î¥Ñ¥¹¥ï¡¼¥É¤Ï¥æ¡¼¥¶ËÜ¿Í
       ¤ÈËÜÅö¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¤ß¤¬ÃΤäƤ¤¤ë¤Ù¤­¤Ç¤¢¤ë¤È¤¤¤¦
       ¤³¤È¤ÏÌÀ¤é¤«¤Ç¤·¤ç¤¦¡£¤½¤ì¤é¤Î¥Ñ¥¹¥ï¡¼¥É¤òÈëÌ©¤ËÊݤäƤª¤¯¤¿¤á¤Ë¡¢
@@ -1080,13 +1080,13 @@
       ²Äǽ¤Ê¸Â¤ê¤Î¥Ñ¥¹¥ï¡¼¥É¶õ´Ö¤ò¸¡º÷¤¹¤ë¤È¤¤¤¦ÎÏǤ¤»¤ÎÊýË¡¤Ç¤¹¡£
       </para>
 
-    <para>ÉÔ¹¬¤Ê¤³¤È¤Ë¡¢Unix ¤¬À¸¤Þ¤ì¤è¤¦¤È¤·¤Æ¤¤¤ë¤È¤­¤Ë¥Ñ¥¹¥ï¡¼¥É¤ò
+    <para>ÉÔ¹¬¤Ê¤³¤È¤Ë¡¢&unix; ¤¬À¸¤Þ¤ì¤è¤¦¤È¤·¤Æ¤¤¤ë¤È¤­¤Ë¥Ñ¥¹¥ï¡¼¥É¤ò
       °ÂÁ´¤Ê·Á¤Ç°Å¹æ²½¤Ç¤­¤ëÊý¼°¤Ï DES (Data Encryption Standard)
       ¤Ë´ð¤Å¤¤¤¿¤â¤Î¤À¤±¤Ç¤·¤¿¡£¤³¤Î¤³¤È¤ÏÊƹñ¤Ë½»¤ó¤Ç¤¤¤ë¥æ¡¼¥¶¤Ë¤È¤Ã¤Æ
       ¤ÏÂ礷¤ÆÌäÂê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿¤¬¡¢DES ¤Î¥½¡¼¥¹¥³¡¼¥É¤òÊƹñ³°¤Ë
       Í¢½Ð¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Ê¤¤¤È¤¤¤¦ÌäÂ꤬¤¢¤ê¤Þ¤·¤¿¡£¤½¤Î¤¿¤á¤Ë¡¢
       FreeBSD ¤Ï¡¢Êƹñ¤ÎˡΧ¤ò¼é¤ë¤³¤È¤È¡¢Ì¤¤À¤Ë DES ¤ò»È¤Ã¤Æ¤¤¤¿Â¾¤Î
-      Unix °ì²¤È¤Î¸ß´¹À­¤òÊݤĤ³¤È¤È¤òξΩ¤¹¤ëÊýË¡¤òõ¤·½Ð¤¹É¬Íפ¬¤¢¤ê¤Þ¤·¤¿¡£</para>
+      &unix; °ì²¤È¤Î¸ß´¹À­¤òÊݤĤ³¤È¤È¤òξΩ¤¹¤ëÊýË¡¤òõ¤·½Ð¤¹É¬Íפ¬¤¢¤ê¤Þ¤·¤¿¡£</para>
 
     <para>¤½¤Î²ò·èÊýË¡¤Ï¡¢Êƹñ¤Î¥æ¡¼¥¶¤Ï DES ¤Î¥é¥¤¥Ö¥é¥ê¤ò¥¤¥ó¥¹¥È¡¼
       ¥ë¤·¤Æ DES ¤ò»ÈÍѤǤ­¤ë¤¬¡¢Êƹñ³°¤Î¥æ¡¼¥¶¤Ï¹ñ³°¤ËÍ¢½Ð²Äǽ¤Ê¾¤Î
@@ -1157,9 +1157,9 @@
 
     <para>¤³¤³¤Ç¤Ï¡¢»°¼ïÎà¤Î°Û¤Ê¤ë¡Ö¥Ñ¥¹¥ï¡¼¥É¡×¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
       ¤Þ¤º°ì¤ÄÌܤϡ¢¤¢¤Ê¤¿¤¬ÉáÃʻȤäƤ¤¤ëÉáÄ̤Î
-      Unix ¥¹¥¿¥¤¥ë¤Î¡¢¤â¤·¤¯¤Ï Kerberos
+      &unix; ¥¹¥¿¥¤¥ë¤Î¡¢¤â¤·¤¯¤Ï Kerberos
       ¤Î¥Ñ¥¹¥ï¡¼¥É¤Ç¤¹¡£¤³¤³¤Ç¤Ï¤³¤ì¤ò
-      <quote>Unix ¥Ñ¥¹¥ï¡¼¥É</quote> ¤È¸Æ¤Ö¤³¤È¤Ë¤·¤Þ¤¹¡£Æó¤ÄÌܤϡ¢S/Key
+      <quote>&unix; ¥Ñ¥¹¥ï¡¼¥É</quote> ¤È¸Æ¤Ö¤³¤È¤Ë¤·¤Þ¤¹¡£Æó¤ÄÌܤϡ¢S/Key
       ¤Î <command>key</command> ¥×¥í¥°¥é¥à¡¢¤Þ¤¿¤Ï
       OPIE ¤Î &man.opiekey.1; ¥×¥í¥°¥é¥à¤Ë¤è¤Ã¤ÆÀ¸À®¤µ¤ì¡¢
       <command>keyinit</command> ¤Þ¤¿¤Ï &man.opiepasswd.1;
@@ -1178,9 +1178,9 @@
       º®Íð¤òÈò¤±¤ë¤¿¤á¤ËÌõʸ¤Ç¤Ï¤¹¤Ù¤Æ
       <quote>ÈëÌ©¤Î¥Ñ¥¹¥Õ¥ì¡¼¥º</quote> ¤ËÅý°ì¤·¤Æ¤¤¤Þ¤¹)¡£</para>
 
-    <para>ÈëÌ©¤Î¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ï¡¢Unix
+    <para>ÈëÌ©¤Î¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ï¡¢&unix;
       ¥Ñ¥¹¥ï¡¼¥É¤È²¿¤Î´ØÏ¢À­¤â¤¢¤ê¤Þ¤»¤ó¡£
-      ξ¼Ô¤òƱ°ì¤ËÀßÄꤹ¤ë¤³¤È¤Ï²Äǽ¤Ç¤¹¤¬¡¢¤ª¾©¤á¤·¤Þ¤»¤ó¡£¸Å¤¤ Unix
+      ξ¼Ô¤òƱ°ì¤ËÀßÄꤹ¤ë¤³¤È¤Ï²Äǽ¤Ç¤¹¤¬¡¢¤ª¾©¤á¤·¤Þ¤»¤ó¡£¸Å¤¤ &unix;
       ¥Ñ¥¹¥ï¡¼¥É¤ÏŤµ¤¬ 8 ʸ»ú¤ËÀ©¸Â¤µ¤ì¤Æ¤¤¤Þ¤·¤¿
       <footnote><para>&os; ¤Ç¤Ï¡¢É¸½à¤Î¥í¥°¥¤¥ó¥Ñ¥¹¥ï¡¼¥É¤Ï¡¢128
       ʸ»ú¤Þ¤Ç¤È¤Ê¤ê¤Þ¤¹¡£</para></footnote>¡£
@@ -1327,7 +1327,7 @@ MOS MALL GOAT ARM AVID COED
       <para>¿®Íê¤Ç¤­¤Ê¤¤ÄÌ¿®Ï©¤ò»È¤Ã¤ÆÈëÌ©¤Î¥Ñ¥¹¥Õ¥ì¡¼¥º¤ò½é´ü²½¤Þ¤¿¤ÏÊѹ¹¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
 	¤½¤ì¤È¤ÏÊÌ¤Ë <command>key</command> ¤Þ¤¿¤Ï <command>opiekey</command>
 	¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Î¿®Íê¤Ç¤­¤ëÄÌ¿®Ï©¤òÍÑ°Õ¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
-	¤¿¤È¤¨¤Ð¤½¤ì¤Ï¡¢¤¢¤Ê¤¿¤¬¿®Íê¤Ç¤­¤ë Macintosh
+	¤¿¤È¤¨¤Ð¤½¤ì¤Ï¡¢¤¢¤Ê¤¿¤¬¿®Íê¤Ç¤­¤ë &macintosh;
 	¤Î¥Ç¥¹¥¯¥¢¥¯¥»¥µ¥ê¤ä¿®Íê¤Ç¤­¤ë¥Þ¥·¥ó¤Î¥·¥§¥ë¥×¥í¥ó¥×¥È¤À¤Ã¤¿¤ê
 	¤¹¤ë¤Ç¤·¤ç¤¦¡£(ÌõÃí: ¤³¤³¤Ç¤ÎÄÌ¿®Ï©¤È¤Ï¥Þ¥·¥ó¤½¤Î¤â¤Î¤Ë¤Ê¤ê¤Þ
 	¤¹¡£¿®Íê¤Ç¤­¤ë¥Þ¥·¥ó¤È¤Ï¡¢¿®Íê¤Ç¤­¤ë¿Í¤¬¤·¤Ã¤«¤ê´ÉÍý¤·¤Æ¤¤¤ë¥Þ
@@ -1444,7 +1444,7 @@ Password: </screen>
 	¤³¤Î¥í¥°¥¤¥ó¥×¥í¥ó¥×¥È¤ËÂФ·¤ÆÆþÎϤ¹¤ë¥ï¥ó¥¿¥¤¥à¥Ñ¥¹¥ï¡¼¥É¤òÀ¸À®¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
 	¤³¤ì¤Ï¡¢<command>key</command> ¤Þ¤¿¤Ï <command>opiekey</command>
 	¥×¥í¥°¥é¥à¤ò»È¤¨¤ë¿®Íê¤Ç¤­¤ë¥Þ¥·¥ó¾å¤Ç¹Ô¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-	(¤³¤ì¤é¤Î¥×¥í¥°¥é¥à¤Ë¤Ï DOS ¤ä Windows, MacOS ÈǤ¬¤¢¤ê¤Þ¤¹)¡£
+	(¤³¤ì¤é¤Î¥×¥í¥°¥é¥à¤Ë¤Ï DOS ¤ä &windows;, &macos; ÈǤ¬¤¢¤ê¤Þ¤¹)¡£
 	¤É¤Á¤é¤â¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é¥·¡¼¥±¥ó¥¹ÈÖ¹æ¤È¥·¡¼¥É¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
 	¥í¥°¥¤¥ó¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¥Þ¥·¥ó¤Î¥í¥°¥¤¥ó¥×¥í¥ó¥×¥È¤«¤éľÀÜ¥«¥Ã¥È¥¢¥ó¥É¥Ú¡¼¥¹¥È¤¹¤ë¤È³Ú¤Ç¤·¤ç¤¦¡£</para>
 
@@ -1522,11 +1522,11 @@ Enter secret pass phrase: <userinput>&lt
     </sect2>
 
     <sect2>
-      <title>Unix ¥Ñ¥¹¥ï¡¼¥É¤ÎÍøÍѤòÀ©¸Â¤¹¤ë</title>
+      <title>&unix; ¥Ñ¥¹¥ï¡¼¥É¤ÎÍøÍѤòÀ©¸Â¤¹¤ë</title>
 
       <para>S/Key ¤Ï¡¢¥í¥°¥¤¥ó¤ò¼õ¤±ÉÕ¤±¤ëºÝ¤Î¥Û¥¹¥È̾¡¢¥æ¡¼¥¶Ì¾¡¢
 	üËö¤Î¥Ý¡¼¥È¡¢IP ¥¢¥É¥ì¥¹¤Ê¤É¤òÍøÍѤ·¤Æ¡¢
-	Unix ¥Ñ¥¹¥ï¡¼¥É¤ÎÍøÍѤòÀ©¸Â¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+	&unix; ¥Ñ¥¹¥ï¡¼¥É¤ÎÍøÍѤòÀ©¸Â¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	ÀßÄê¥Õ¥¡¥¤¥ë <filename>/etc/skey.access</filename> ¤Ë¡¢
 	À©¸Â¤¬µ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Î¾ÜºÙ¤Ë´Ø¤·¤Æ¤Ï¥Þ¥Ë¥å¥¢¥ë &man.skey.access.5;
@@ -1538,13 +1538,13 @@ Enter secret pass phrase: <userinput>&lt
 
       <para>¤â¤· <filename>/etc/skey.access</filename>
 	¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤¤¤Ê¤é¤Ð (FreeBSD 4.X
-	¤Î¥Ç¥Õ¥©¥ë¥È¾õÂ֤ǤϤ½¤¦¤Ç¤¹)¡¢¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤¬ Unix
+	¤Î¥Ç¥Õ¥©¥ë¥È¾õÂ֤ǤϤ½¤¦¤Ç¤¹)¡¢¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤¬ &unix;
 	¥Ñ¥¹¥ï¡¼¥É¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	µÕ¤Ë¡¢¤â¤·¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ë¤Ê¤é¤Ð¡¢
 	<filename>skey.access</filename>
 	¥Õ¥¡¥¤¥ë¤ËÌÀ¼¨Åª¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤Ê¤¤¸Â¤ê¡¢¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤Ï S/Key
 	¤ÎÍøÍѤòÍ׵ᤵ¤ì¤Þ¤¹¡£¤É¤Á¤é¤Î¾ì¹ç¤Ë¤ª¤¤¤Æ¤â¡¢
-	¤½¤Î¥Þ¥·¥ó¤Î¥³¥ó¥½¡¼¥ë¤«¤é¤Ï¤¤¤Ä¤Ç¤â Unix
+	¤½¤Î¥Þ¥·¥ó¤Î¥³¥ó¥½¡¼¥ë¤«¤é¤Ï¤¤¤Ä¤Ç¤â &unix;
 	¥Ñ¥¹¥ï¡¼¥É¤ò»È¤Ã¤Æ¥í¥°¥¤¥ó¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£</para>
 
       <para>°Ê²¼¤Ë¤è¤¯»È¤ï¤ì¤ë¤Ç¤¢¤í¤¦»°¼ïÎà¤ÎÀßÄê¤ò´Þ¤àÀßÄê¥Õ¥¡¥¤¥ë
@@ -1557,7 +1557,7 @@ permit port ttyd0</programlisting>
       <para>¤Ï¤¸¤á¤Î¹Ô (<literal>permit internet</literal>) ¤Ç¡¢telnet
 	¤Ê¤É¤ÇÀܳ¤¹¤ë¤È¤­¤Î IP ¤Î¥½¡¼¥¹¥¢¥É¥ì¥¹ (Ãí°Õ: ¤³¤ì¤Ïµ¶Â¤¤µ¤ì
 	¤ë¤ª¤½¤ì¤¬¤¢¤ê¤Þ¤¹) ¤¬ÆÃÄê¤ÎÃͤȥޥ¹¥¯¤Ë°ìÃפ·¤Æ¤¤¤ë¾ì¹ç¤Ë¡¢
-	Unix ¥Ñ¥¹¥ï¡¼¥É¤ÎÍøÍѤòµö²Ä¤¹¤ë¤³¤È¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹¡£
+	&unix; ¥Ñ¥¹¥ï¡¼¥É¤ÎÍøÍѤòµö²Ä¤¹¤ë¤³¤È¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹¡£
 	¤³¤ÎÀßÄ꼫ÂΤϥ»¥­¥å¥ê¥Æ¥£¤ò¹â¤á¤ë¤¿¤á¤Îµ¡Ç½¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤½¤¦¤Ç¤Ï
 	¤Ê¤¯¡¢¥í¥°¥¤¥ó¤Î¸¢Íø¤ò»ý¤Äµö²Ä¤µ¤ì¤¿¥æ¡¼¥¶¤ËÂФ·¤Æ¡¢¸½ºß¤½¤Î¥æ¡¼
 	¥¶¤¬»È¤Ã¤Æ¤¤¤ë¥Í¥Ã¥È¥ï¡¼¥¯¤¬¿®Íê¤Ç¤­¤Ê¤¤¤È¹Í¤¨¤é¤ì¤ë¤Î¤Ç S/Key
@@ -1566,7 +1566,8 @@ permit port ttyd0</programlisting>
 
       <para>Æó¹ÔÌÜ (<literal>permit user</literal>)
 	¤Ë¤è¤Ã¤Æ¡¢¤¢¤ëÆÃÄê¤Î¥æ¡¼¥¶¡¢¤³¤Î¾ì¹ç¤Ï
-	<systemitem class="username">fnord</systemitem>¡¢¤ËÂФ·¤Æ¡¢¤¤¤Ä¤Ç¤â Unix
+	<systemitem class="username">fnord</systemitem>¡¢¤ËÂФ·¤Æ¡¢
+	¤¤¤Ä¤Ç¤â &unix;
 	¥Ñ¥¹¥ï¡¼¥É¤ÎÍøÍѤòµö²Ä¤¹¤ë¤è¤¦¤Ë»ØÄꤷ¤Æ¤¤¤Þ¤¹¡£
 	°ìÈÌŪ¤Ë¤Ï¤³¤ÎÀßÄê¤ò¤ª¤³¤Ê¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
 	<command>key</command> ¥×¥í¥°¥é¥à¤¬¤É¤¦¤·¤Æ¤â»È¤¨¤Ê¤¤´Ä¶­¤Ë¤¤
@@ -1576,11 +1577,11 @@ permit port ttyd0</programlisting>
 
       <para>»°¹ÔÌÜ (<literal>permit port</literal>) ¤Ë¤è¤Ã¤Æ¡¢¤¢¤ëÆÃÄê
 	¤ÎüËö¥Ý¡¼¥È¤«¤é¥í¥°¥¤¥ó¤·¤è¤¦¤È¤¹¤ë¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤ËÂФ·¤Æ
-	Unix ¥Ñ¥¹¥ï¡¼¥É¤ÎÍøÍѤòµö²Ä¤¹¤ë¤è¤¦¤Ë»ØÄꤷ¤Æ¤¤¤Þ¤¹¡£¤³¤ÎÀßÄê
+	&unix; ¥Ñ¥¹¥ï¡¼¥É¤ÎÍøÍѤòµö²Ä¤¹¤ë¤è¤¦¤Ë»ØÄꤷ¤Æ¤¤¤Þ¤¹¡£¤³¤ÎÀßÄê
 	¤Ï¥À¥¤¥ä¥ë¥¢¥Ã¥×²óÀþ¤ËÂФ¹¤ëÀßÄê¤È¤·¤ÆÍøÍѤǤ­¤ë¤Ç¤·¤ç¤¦¡£</para>
 
       <para>OPIE ¤Ï S/Key ¤¬¹Ô¤¦¤è¤¦¤Ê¡¢¥í¥°¥¤¥ó¥»¥Ã¥·¥ç¥ó¤Î IP
-	¥¢¥É¥ì¥¹¤ò¥Ù¡¼¥¹¤È¤·¤¿ Unix ¥Ñ¥¹¥ï¡¼¥É¤Î»ÈÍѤòÀ©¸Â¤Ç¤­¤Þ¤¹¡£
+	¥¢¥É¥ì¥¹¤ò¥Ù¡¼¥¹¤È¤·¤¿ &unix; ¥Ñ¥¹¥ï¡¼¥É¤Î»ÈÍѤòÀ©¸Â¤Ç¤­¤Þ¤¹¡£
 	´ØÏ¢¥Õ¥¡¥¤¥ë¤Ï¡¢<filename>/etc/opieaccess</filename> ¤Ç¤¹¡£
 	FreeBSD 5.0 °Ê¹ß¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¥Ç¥ª¥Õ¥©¥ë¥È¤ÇÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	¤³¤Î¥Õ¥¡¥¤¥ë¤Î¾ÜºÙ¤ä¡¢
@@ -1593,7 +1594,7 @@ permit port ttyd0</programlisting>
 
       <para>¤³¤Î¹Ô¤Ç¤Ï¡¢(¤Ê¤ê¤¹¤Þ¤·¤µ¤ì¤ä¤¹¤¤) IP ¥½¡¼¥¹¥¢¥É¥ì¥¹¤¬¡¢
 	¤¢¤ëÃͤä¥Þ¥¹¥¯¤Ë¥Þ¥Ã¥Á¤¹¤ë¥æ¡¼¥¶¤ËÂФ·¤Æ¡¢
-	Unix ¥Ñ¥¹¥ï¡¼¥É¤ò¤¤¤Ä¤Ç¤âµö²Ä¤·¤Þ¤¹¡£</para>
+	&unix; ¥Ñ¥¹¥ï¡¼¥É¤ò¤¤¤Ä¤Ç¤âµö²Ä¤·¤Þ¤¹¡£</para>
 	
       <para>¤â¤· <filename>opieaccess</filename>
 	¤Î¤É¤Î¥ë¡¼¥ë¤Ë¤â°ìÃפ·¤Ê¤±¤ì¤Ð¡¢
@@ -3214,7 +3215,7 @@ FreeBSD BUILT-19950429 (GR386) #0: Sat A
       </info>
 
       <para>¤³¤ÎÀá¤Ç¤Ï¡¢FreeBSD ¤È
-	<application>Microsoft Windows 2000/XP</application>
+	<application>&microsoft.windows; 2000/XP</application>
 	¤«¤é¤Ê¤ë´Ä¶­¤Ë¤ª¤¤¤Æ¡¢IPsec ¤òÀßÄꤷ¡¢ÍøÍѤ¹¤ë²áÄø¤òÄ̤¸¤Æ¡¢
 	IPsec ¤ò»È¤Ã¤¿°ÂÁ´¤ÊÄÌ¿®¤Î¼Â¸½ÊýË¡¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Þ¤¹¡£
 	IPsec ¤òÀßÄꤹ¤ë¤¿¤á¤Ë¤Ï¡¢
@@ -3231,7 +3232,7 @@ FreeBSD BUILT-19950429 (GR386) #0: Sat A
 	¼ÂÁõ¤ò¥Ù¡¼¥¹¤È¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
       <note>
-        <para>FreeBSD 5.0 ¤Ç¤Ï <quote>hardware
+        <para>FreeBSD 5.X ¤Ç¤Ï <quote>hardware
           accelerated</quote> IPsec ¥¹¥¿¥Ã¥¯¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
 	  ¤³¤ì¤Ï¡¢<quote>Fast IPsec</quote> ¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤ë¤â¤Î¤Ç¡¢
 	  OpenBSD ¤«¤é°Ü¿¢¤µ¤ì¤Þ¤·¤¿¡£
@@ -3369,7 +3370,7 @@ options   IPSEC_DEBUG  #debug for IP sec
       <screen>
 Network #1            [ Internal Hosts ]    Private Net, 192.168.1.2-254
                       [   Win9x/NT/2K  ]
-                      [      Unix      ]
+                      [      UNIX      ]
                                |
                                |
                         .---[fxp1]---.      Private IP, 192.168.1.1
@@ -3387,7 +3388,7 @@ Network #1            [ Internal Hosts ]
                                |
 Network #2            [ Internal Hosts ]
                       [   Win9x/NT/2K  ]    Private Net, 192.168.2.2-254
-                      [      Unix      ]
+                      [      UNIX      ]
       </screen>
 
       <para>¤Õ¤¿¤Ä¤Î¥Ñ¥Ö¥ê¥Ã¥¯ IP ¥¢¥É¥ì¥¹¤ËÃíÌܤ·¤Æ¤¯¤À¤µ¤¤¡£
@@ -3417,7 +3418,7 @@ Network #2            [ Internal Hosts ]
       <programlisting>ping 192.168.2.34</programlisting>
  
       <para>Æ©²áŪ¤Ë¤³¤ì¤ÏÆ°¤¯¤Ï¤º¤Ç¤¹¡£
-        Windows ¥³¥ó¥Ô¥å¡¼¥¿¤Ï¡¢Â¾¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤Î¥³¥ó¥Ô¥å¡¼¥¿¤ò¡¢
+        &windows; ¥³¥ó¥Ô¥å¡¼¥¿¤Ï¡¢Â¾¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤Î¥³¥ó¥Ô¥å¡¼¥¿¤ò¡¢
 	¥í¡¼¥«¥ë¥Í¥Ã¥È¥ï¡¼¥¯¤Î¥³¥ó¥Ô¥å¡¼¥¿¤ò¸«¤ë¤Î¤È¤Þ¤Ã¤¿¤¯Æ±¤¸¤è¤¦¤Ë¡¢
         ¸«¤ë¤³¤È¤¬¤Ç¤­¡¢¶¦Í­¥Õ¥¡¥¤¥ë¤ò¸«¤¿¤ê¤Ç¤­¤Þ¤¹¡£</para>
 
@@ -3445,13 +3446,12 @@ Network #2            [ Internal Hosts ]
 	    ÄÌ¿®¤¬°Å¹æ²½¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Þ¤¹¡£</para>
         </listitem>
         <listitem>
-          <para>FreeBSD ¥²¡¼¥È¥¦¥§¥¤¤Ë¤Æ¡¢Windows ¤Î¥³¥ó¥Ô¥å¡¼¥¿¤¬ VPN
+          <para>FreeBSD ¥²¡¼¥È¥¦¥§¥¤¤Ë¤Æ¡¢&windows; ¤Î¥³¥ó¥Ô¥å¡¼¥¿¤¬ VPN
 	    ¤òÄ̤·¤Æ¾¤Î¥³¥ó¥Ô¥å¡¼¥¿¤ò¸«¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤ËÄɲäΥ½¥Õ¥È¥¦¥§¥¢¤òÀßÄꤷ¤Þ¤¹¡£</para>
         </listitem>
       </orderedlist>
-    </sect2>
 
-   <sect2>
+    <sect3>
       <title>¥¹¥Æ¥Ã¥× 1: <quote>virtual</quote>
         ¥Í¥Ã¥È¥ï¡¼¥¯¥ê¥ó¥¯¤ÎºîÀ®</title>
 
@@ -3489,7 +3489,7 @@ Network #2            [ Internal Hosts ]
 	    <systemitem class="ipaddress">W.X.Y.Z</systemitem>
 	    ¤Ø¤ÈÁ÷¤é¤ì¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 	    ¤³¤Î¥×¥í¥»¥¹¤Ï¡¢
-            <systemitem class="ipaddress">¥«¥×¥»¥ë²½</systemitem>
+            <firstterm>¥«¥×¥»¥ë²½</firstterm>
 	    ¤È¸Æ¤Ð¤ì¤Þ¤¹¡£</para>
         </listitem>
         <listitem>
@@ -3555,7 +3555,7 @@ ifconfig gif0 inet 192.168.2.1 192.168.1
       <para>¤¿¤È¤¨¤Ð¡¢¥Í¥Ã¥È¥ï¡¼¥¯ #1 ¤Î¥²¡¼¥È¥¦¥§¥¤¤Ë¤ª¤¤¤Æ¤Ï¡¢
         °Ê²¼¤Î¤è¤¦¤Ë³Îǧ¤Ç¤­¤Þ¤¹¡£</para>
  
-      <screen>&prompt.root; gifconfig gif0
+      <screen>&prompt.root; <userinput>gifconfig gif0</userinput>
 gif0: flags=8011<UP,POINTTOPOINT,MULTICAST> mtu 1280
 inet 192.168.1.1 --> 192.168.2.1 netmask 0xffffffff
 physical address inet A.B.C.D --> W.X.Y.Z
@@ -3575,7 +3575,7 @@ physical address inet A.B.C.D --> W.X
 	¥Í¥Ã¥È¥ï¡¼¥¯ #1
         ¤Î¥²¡¼¥È¥¦¥§¥¤¥Û¥¹¥È¤Ç¤Î½ÐÎϤϰʲ¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
  
-      <screen>&prompt.root; netstat -rn
+      <screen>&prompt.root; <userinput>netstat -rn</userinput>
 Routing tables
  
 Internet:
@@ -3710,9 +3710,9 @@ route_vpn="192.168.2.0 192.168.2.1 netma
 	    ¤³¤³¤Ç¡¢IP ¥¢¥É¥ì¥¹¤Î½çÈ֤ϵդˤ·¤Þ¤¹¡£</para>
         </listitem>
       </itemizedlist>
-    </sect2>
+    </sect3>
 
-    <sect2>
+    <sect3>
       <title>¥¹¥Æ¥Ã¥× 2: ¥ê¥ó¥¯¤ò°ÂÁ´¤Ë¤¹¤ë¡£</title>
 
       <para>¥ê¥ó¥¯¤ò°ÂÁ´¤Ë¤¹¤ë¤¿¤á¤Ë¡¢IPsec ¤òÍѤ¤¤Þ¤¹¡£
@@ -3830,14 +3830,16 @@ options IPSEC_ESP
       <programlisting>A.B.C.D            secret</programlisting>
  
       <para>¤³¤ì¤Ï¡¢¥ê¥â¡¼¥Èü¤Î¸ø³« IP ¥¢¥É¥ì¥¹¤ÈÀè¤Û¤É¤ÈƱ¤¸ÈëÌ©¸°¤Ç¤¹¡£
-        racoon ¤ò¼Â¹Ô¤¹¤ëÁ°¤Ë <filename>psk.txt</filename> ¤Î¥â¡¼¥É¤Ï¡¢0600
-        (i.e., ¥ë¡¼¥È¤Î¤ß¤¬ read/write ¤Ç¤­¤Þ¤¹) ¤È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+        racoon ¤ò¼Â¹Ô¤¹¤ëÁ°¤Ë <filename>psk.txt</filename> ¤Î¥â¡¼¥É¤Ï¡¢
+	<literal>0600</literal>
+	(i.e., <systemitem class="username">root</systemitem> ¤Î¤ß¤¬
+	read/write ¤Ç¤­¤Þ¤¹) ¤È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <para>ξÊý¤Î¥Û¥¹¥È¥²¡¼¥È¥¦¥§¥¤¥³¥ó¥Ô¥å¡¼¥¿¤Ç racoon
         ¤òÁö¤é¤»¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£IKE
 	¥È¥é¥Õ¥£¥Ã¥¯¤òµö²Ä¤¹¤ë¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¥ë¡¼¥ë¤òÄɲ乤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	IKE ¥È¥é¥Õ¥£¥Ã¥¯¤Ï¡¢UDP ¾å¤Ç isakmp (kmp == key
-        management protocol) port ¤ËÂФ·¤Æ¼Â¹Ô¤µ¤ì¤ë¤â¤Î¤Ç¤¹¡£
+	IKE ¥È¥é¥Õ¥£¥Ã¥¯¤Ï¡¢UDP ¾å¤Ç ISAKMP (Internet Security Association
+	Key Management Protocol) port ¤ËÂФ·¤Æ¼Â¹Ô¤µ¤ì¤ë¤â¤Î¤Ç¤¹¡£
 	¤³¤Î¥ë¡¼¥ë¤Ï¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¥ë¡¼¥ë¥»¥Ã¥È¤Î¶Ë¤á¤ÆºÇ½é¤Ëµ­½Ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
  
       <programlisting>ipfw add 1 allow udp from A.B.C.D to W.X.Y.Z isakmp
@@ -3904,7 +3906,8 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B
   | `----------------------' |
   `--------------------------'</screen>
 
-       <para>¤³¤Î¥«¥×¥»¥ë²½¤Ï gif ¥Ç¥Ð¥¤¥¹¤Ë¤è¤ê¹Ô¤ï¤ì¤Þ¤¹¡£³Îǧ¤Ç¤­¤ë¤è¤¦¤Ë¡¢
+       <para>¤³¤Î¥«¥×¥»¥ë²½¤Ï gif
+	 ¥Ç¥Ð¥¤¥¹¤Ë¤è¤ê¹Ô¤ï¤ì¤Þ¤¹¡£³Îǧ¤Ç¤­¤ë¤è¤¦¤Ë¡¢
          ¥Ñ¥±¥Ã¥È¤Ï³°Â¦¤ËËÜÍè¤Î IP ¥¢¥É¥ì¥¹¤ò»ý¤Ã¤Æ¤ª¤ê¡¢
 	 ¥ª¥ê¥¸¥Ê¥ë¥Ñ¥±¥Ã¥È¤Ï¡¢
          ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Ë³°¸þ¤­¤ËÁ÷¤é¤ì¤ë¥Ñ¥±¥Ã¥È¤ÎÃæ¤Ë¥Ç¡¼¥¿¤È¤·¤Æ¥é¥Ã¥×¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
@@ -3970,7 +3973,7 @@ spdadd A.B.C.D/32 W.X.Y.Z/32 ipencap -P 
          <filename>/etc/ipsec.conf</filename>) ¤ËÄɲä·¡¢
          °Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-       <screen>&prompt.root; setkey -f /etc/ipsec.conf</screen>
+       <screen>&prompt.root; <userinput>setkey -f /etc/ipsec.conf</userinput></screen>
 
        <para><option>spdadd</option> ¤Ï¡¢&man.setkey.8; ¤ËÂФ·¡¢
          °ÂÁ´¤Ê¥Ý¥ê¥·¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¥ë¡¼¥ë¤òÄɲ乤뤳¤È¤òÅÁ¤¨¤Þ¤¹¡£
@@ -4057,7 +4060,8 @@ ipfw add 1 allow ipencap from W.X.Y.Z to
 	 ¤³¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï¡¢ÆâÉô¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤ò²ó¤ë¤³¤È¤Î¤Ç¤­¤ëºÇ¤âÆ⦤Υѥ±¥Ã¥È¤Ë¤Ê¤ë¤Þ¤Ç¡¢¥»¥«¥ó¥É¥ì¥¤¥ä¤Î¥é¥Ã¥×¤ò¤Ï¤¬¤·¤Þ¤¹¡£</para>
 
        <para>Àè¤Û¤É¤ÈƱ¤¸¤¯ &man.ping.8; »î¸³¤Ç¥»¥­¥å¥ê¥Æ¥£¤ò³Îǧ¤Ç¤­¤Þ¤¹¡£
-         ºÇ½é¤Ë¡¢A.B.C.D ¥²¡¼¥È¥¦¥§¥¤¥³¥ó¥Ô¥å¡¼¥¿¤Ë¥í¥°¥¤¥ó¤·¤Æ¡¢
+         ºÇ½é¤Ë¡¢<systemitem class="ipaddress">A.B.C.D</systemitem>
+	 ¥²¡¼¥È¥¦¥§¥¤¥³¥ó¥Ô¥å¡¼¥¿¤Ë¥í¥°¥¤¥ó¤·¤Æ¡¢
          °Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
        <programlisting>tcpdump dst host 192.168.2.1</programlisting>
@@ -4142,6 +4146,7 @@ ipfw add 1 allow ipencap from W.X.Y.Z to
         ³Æ¥Í¥Ã¥È¥ï¡¼¥¯¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Ï¡¢IP
 	¥¢¥É¥ì¥¹¤ò»È¤Ã¤Æ¾¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤Î¥³¥ó¥Ô¥å¡¼¥¿¤ò»²¾È¤Ç¤­¤Þ¤¹¤·¡¢
 	¤¹¤Ù¤Æ¤Î¥ê¥ó¥¯¤ò²£ÀÚ¤ë¥È¥é¥Õ¥£¥Ã¥¯¤Ï¼«Æ°Åª¤Ë¤½¤·¤Æ°ÂÁ´¤Ë°Å¹æ²½¤µ¤ì¤Þ¤¹¡£</para>
+    </sect3>
     </sect2>
  </sect1>
 
@@ -4330,7 +4335,7 @@ Your identification has been saved in /h
       <note><para>The <option>-t rsa1</option> ¥ª¥×¥·¥ç¥ó¤Ï¡¢
 	SSH ¥×¥í¥È¥³¥ë¥Ð¡¼¥¸¥ç¥ó 1 ¤ÇÍѤ¤¤é¤ì¤ë RSA ¸°¤òÀ¸À®¤·¤Þ¤¹¡£
 	SSH ¥×¥í¥È¥³¥ë¥Ð¡¼¥¸¥ç¥ó 2 ¤ÇÍѤ¤¤é¤ì¤ë RSA ¸°¤òÀ¸À®¤¹¤ë¤Ë¤Ï¡¢
-	<option>ssh-keygen -t rsa</option> ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para></note>
+	<command>ssh-keygen -t rsa</command> ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para></note>
 
       <para>&man.ssh-keygen.1; ¤Ç¥Ñ¥¹¥Õ¥ì¡¼¥º¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
 	¥æ¡¼¥¶¤ÏÈëÌ©¸°¤ò»È¤¦¤¿¤á¤ËËè²ó¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎÆþÎϤò¹Ô¤Ê¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
@@ -4807,8 +4812,8 @@ user at unfirewalled-system.example.org's p
       FreeBSD 5.0 °Ê¹ß¤Ç¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¢¥¯¥»¥¹À©¸æ¥ê¥¹¥È
       (<acronym>ACLs</acronym>) ¤Ë¤è¤ë¥»¥­¥å¥ê¥Æ¥£¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£</para>
 
-    <para>¥¢¥¯¥»¥¹À©¸æ¥ê¥¹¥È¤Ï¡¢É¸½àŪ¤Ê UNIX ¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¥â¥Ç¥ë¤ò¡¢
-      Èó¾ï¤Ë¸ß´¹À­¤Î¹â¤¤ (POSIX.1e) ¤ä¤êÊý¤Ç³ÈÄ¥¤·¤Æ¤¤¤Þ¤¹¡£
+    <para>¥¢¥¯¥»¥¹À©¸æ¥ê¥¹¥È¤Ï¡¢É¸½àŪ¤Ê &unix; ¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¥â¥Ç¥ë¤ò¡¢
+      Èó¾ï¤Ë¸ß´¹À­¤Î¹â¤¤ (&posix;.1e) ¤ä¤êÊý¤Ç³ÈÄ¥¤·¤Æ¤¤¤Þ¤¹¡£
       ¤³¤Îµ¡Ç½¤Ï¡¢´ÉÍý¼Ô¤¬¤è¤êÀöÎý¤µ¤ì¤¿¥»¥­¥å¥ê¥Æ¥£¥â¥Ç¥ë¤òÍøÍѤ·¡¢
       ¤½¤Î²¸·Ã¤ò¼õ¤±¤é¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
 
@@ -4823,7 +4828,7 @@ user at unfirewalled-system.example.org's p
       ·Ù¹ð¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï <filename>GENERIC</filename>
       ¥«¡¼¥Í¥ë¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£<acronym>ACLs</acronym>
       ¤Ï¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î³Èĥ°À­¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£
-      ³Èĥ°À­¤Ï¡¢¼¡À¤Âå UNIX ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ç¤¢¤ë <acronym>UFS2</acronym>
+      ³Èĥ°À­¤Ï¡¢¼¡À¤Âå &unix; ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ç¤¢¤ë <acronym>UFS2</acronym>
       ¤Ç¥Í¥¤¥Æ¥£¥ÖÂбþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <note><para><acronym>UFS1</acronym> ¤Ë³Èĥ°À­¤òÉÕ¤¹¤è¤¦¤ËÀßÄꤹ¤ë¤Î¤Ï¡¢


More information about the svn-doc-all mailing list