svn commit: r47821 - head/ja_JP.eucJP/books/handbook/eresources

Ryusuke SUZUKI ryusuke at FreeBSD.org
Sat Dec 5 02:33:43 UTC 2015


Author: ryusuke
Date: Sat Dec  5 02:33:42 2015
New Revision: 47821
URL: https://svnweb.freebsd.org/changeset/doc/47821

Log:
  - Merge the following from the English version:
  
  	r41722 -> r42014	head/ja_JP.eucJP/books/handbook/eresources/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/eresources/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/eresources/chapter.xml	Fri Dec  4 15:59:14 2015	(r47820)
+++ head/ja_JP.eucJP/books/handbook/eresources/chapter.xml	Sat Dec  5 02:33:42 2015	(r47821)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r41722
+     Original revision: r42014
      $FreeBSD$
 -->
 <appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="eresources">
@@ -11,28 +11,28 @@
 
   <para><emphasis>Ìõ: &a.jp.yuki;¡¢1996 ǯ 8 ·î 28 Æü</emphasis></para>
 
-  <para>FreeBSD ¤Î¿ÊÊâ¤ÏµÞ®¤Ç¤¢¤ê¡¢
+  <para>&os; ¤Î¿ÊÊâ¤ÏµÞ®¤Ç¤¢¤ê¡¢
     °õºþ¤·¤¿¥á¥Ç¥£¥¢¤ÏºÇ¿·¤Î³«È¯¤ò¥Õ¥©¥í¡¼¤¹¤ë¤Î¤Ë¼ÂÍÑŪ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
     ¤½¤ì¤À¤±¤·¤«¤Ê¤¤¡¢¤È¤¤¤¦¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢
     ºÇ¿·¾ðÊó¤òÆþ¼ê¤¹¤ëÊýË¡¤È¤·¤Æ¤ÏÅÅ»ÒŪ¤Ê¥ê¥½¡¼¥¹¤¬¥Ù¥¹¥È¤Ç¤¹¡£
-    FreeBSD ¤Ï¥Ü¥é¥ó¥Æ¥£¥¢¤ÎÅØÎϤˤè¤Ã¤Æ¡¢¥æ¡¼¥¶¥³¥ß¥å¥Ë¥Æ¥£¼«ÂΤ¬¡¢
+    &os; ¤Ï¥Ü¥é¥ó¥Æ¥£¥¢¤ÎÅØÎϤˤè¤Ã¤Æ¡¢¥æ¡¼¥¶¥³¥ß¥å¥Ë¥Æ¥£¼«ÂΤ¬¡¢
     °ì¼ï¤Î <quote>¥Æ¥¯¥Ë¥«¥ë¥µ¥Ý¡¼¥ÈÉôÌç</quote> ¤È¤·¤Æ¤ÎÌò³ä¤âÄ̾ï²Ì¤¿¤·¤Æ¤ª¤ê¡¢
     ÅŻҥ᡼¥ë¡¢¥¦¥§¥Ö¥Õ¥©¡¼¥é¥à¤ª¤è¤Ó Usenet
     ¤Î¥Ë¥å¡¼¥¹¤¬¤³¤ì¤é¤Î¥³¥ß¥å¥Ë¥Æ¥£¤Ë¤¿¤É¤êÃ夯ºÇ¤â¸ú²ÌŪ¤ÊÊýË¡¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
 
-  <para>°Ê²¼¤Ë¡¢FreeBSD
+  <para>°Ê²¼¤Ë¡¢&os;
     ¥æ¡¼¥¶¥³¥ß¥å¥Ë¥Æ¥£¤ËÏ¢Íí¤ò¼è¤ë¾ì¹ç¤ÎºÇ¤â½ÅÍפÊÅÀ¤Ë¤Ä¤¤¤Æ¤Î
     ³µÎ¬¤ò¼¨¤·¤Þ¤¹¡£
-    ¤â¤·¤³¤³¤Ë½ñ¤«¤ì¤Æ¤¤¤Ê¤¤Â¾¤Î¥ê¥½¡¼¥¹¤Ëµ¤¤¬¤Ä¤¤¤¿¾ì¹ç¤Ï¡¢¤½¤ì¤é¤ò
-    &a.doc; ¤ËÁ÷¤Ã¤Æ失¤ì¤Ð¡¢
-    ¤½¤ì¤é¤ò¤³¤³¤Ë´Þ¤á¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para>
+    ¤³¤³¤Ë½ñ¤«¤ì¤Æ¤¤¤Ê¤¤Â¾¤Î¥ê¥½¡¼¥¹¤ò¤´Â¸ÃΤǤ¢¤ì¤Ð¡¢
+    ¤½¤ì¤é¤ò¤³¤³¤Ë´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¡¢
+    &a.doc; ¤Ë¤ªÃΤ餻¤¯¤À¤µ¤¤¡£</para>
 
   <sect1 xml:id="eresources-mail">
     <title>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</title>
 
-    <para>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢FreeBSD ¤Î´Ø·¸¼Ô¤ËÂФ·¼ÁÌä¤òÅê¹Æ¤·¤¿¤ê¡¢
+    <para>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢&os; ¤Î´Ø·¸¼Ô¤ËÂФ·¼ÁÌä¤òÅê¹Æ¤·¤¿¤ê¡¢
       µ»½ÑŪ¤ÊµÄÏÀ¤ò¹Ô¤¦¤Î¤Ë¡¢ºÇ¤âľÀÜŪ¤ÊÊýË¡¤Ç¤¹¡£
-      ¤µ¤Þ¤¶¤Þ¤Ê FreeBSD ¤Î´ØÏ¢¥È¥Ô¥Ã¥¯¤ËÂФ·¡¢
+      ¤µ¤Þ¤¶¤Þ¤Ê &os; ¤Î´ØÏ¢¥È¥Ô¥Ã¥¯¤ËÂФ·¡¢
       Éý¹­¤¤¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤¬Â¸ºß¤·¤Æ¤¤¤Þ¤¹¡£
       ¼ÁÌä¤òŬÀڤʥ᡼¥ê¥ó¥°¥ê¥¹¥È¤ËÅê¹Æ¤¹¤ì¤Ð¡¢
       Á᤯¡¢Åª³Î¤ÊÈ¿±þ¤¬¤¤¤Ä¤Ç¤âÆÀ¤é¤ì¤ë¤³¤È¤Ç¤·¤ç¤¦¡£</para>
@@ -43,17 +43,16 @@
 	¤¿¤á¤ËÅØÎϤ·¤Æ¤¤¤ë¤Î¤Ç¡¢
 	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤¹¤ëÁ°¤Ë¤½¤Î·û¾Ï¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£
       </emphasis> »ä¤¿¤Á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î»²²Ã¼Ô¤Î¤Û¤È¤ó¤É¤Ï¡¢
-      ¸½ºßÈó¾ï ¤Ë¤¿¤¯¤µ¤ó¤Î FreeBSD
-      ¤Ë´ØÏ¢¤·¤¿¥á¥Ã¥»¡¼¥¸¤òËèÆü¼õ¤±¼è¤Ã¤Æ¤ª¤ê¡¢¥á¡¼¥ê¥ó
-      ¥°¥ê¥¹¥È¤ËÂФ¹¤ë¤Õ¤µ¤ï¤·¤¤
-      ÍѤ¤¤é¤ìÊý¤ò¤¹¤ë¤¿¤á¤Î·û¾Ï¤ä¥ë¡¼¥ë¤ò·è¤á¤ë¤³ ¤È¤Ë¤è¤Ã¤Æ¡¢
-      ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î S/N Èæ¤ò¹â¤¯¤¹¤ëÊݤĤ褦¤ËÎå¤ó¤Ç¤¤¤Þ¤¹¡£
+      Èó¾ï¤Ë¤¿¤¯¤µ¤ó¤Î &os;
+      ¤Ë´ØÏ¢¤·¤¿¥á¥Ã¥»¡¼¥¸¤òËèÆü¼õ¤±¼è¤Ã¤Æ¤ª¤ê¡¢
+      ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ÎÍøÍѤ˴ؤ¹¤ë·û¾Ï¤ä¥ë¡¼¥ë¤Ï¡¢
+      ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î S/N Èæ¤ò¹â¤¯ÊݤĤ¿¤á¤Î¤â¤Î¤Ç¤¹¡£
       ¤½¤¦¤·¤Ê¤¤¤È¡¢·ë²ÌŪ¤Ë¡¢¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤¬¥×¥í¥¸¥§¥¯¥È¤Ë¤È¤Ã¤Æ
       »ö¼Â¾å¤Î¥³¥ß¥å¥Ë¥±¡¼¥·¥ç¥ó¤Î¼êÃʤˤʤäƤ·¤Þ¤¦¤Ç¤·¤ç¤¦¡£</para>
 
     <note>
       <para><emphasis>&os;
-	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë¥á¡¼¥ë¤òÁ÷¿®¤Ç¤­¤ë¤«¤É¤¦¤«¤ò³Îǧ¤·¤¿¤±¤ì¤Ð¡¢
+	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë¥á¡¼¥ë¤òÁ÷¿®¤Ç¤­¤ë¤«¤É¤¦¤«¤ò³Îǧ¤¹¤ë¤Ë¤Ï¡¢
 	&a.test.name; ¤Ë¥Æ¥¹¥È¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®¤·¤Æ¤¯¤À¤µ¤¤¡£</emphasis>
 	¾¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë¤Ï¡¢
 	¥Æ¥¹¥È¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para>
@@ -71,12 +70,12 @@
       ·«¤êÊÖ¤·¹Ô¤ï¤ì¤ëµÄÏÀ¤òÈò¤±¤ëÊýË¡¤òÍý²ò¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
     <para>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¤¤¤º¤ì¤â¥¢¡¼¥«¥¤¥Ö¤µ¤ì¤Æ¤ª¤ê¡¢¤½¤ì¤é¤Ï
-      <link xlink:href="&url.base;/search/index.html">FreeBSD World Wide Web
+      <link xlink:href="&url.base;/search/index.html">&os; World Wide Web
 	server</link> ¤Ç¸¡º÷¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
       ¥­¡¼¥ï¡¼¥É¸¡º÷²Äǽ¤Ê¥¢¡¼¥«¥¤¥Ö¤ÎÄ󶡤ϡ¢
       Îɤ¯¤¢¤ë¼ÁÌä¤ËÂФ¹¤ë²óÅú¤ò¸«¤Ä¤±¤ë¤¹¤°¤ì¤¿ÊýË¡¤Ç¤¹¤«¤é¡¢
       ¼ÁÌä¤òÅê¹Æ¤¹¤ëÁ°¤ËÄ´¤Ù¤Æ¤ß¤ë¤Ù¤­¤Ç¤·¤ç¤¦¡£
-      ¤³¤Î¤³¤È¤Ï¡¢FreeBSD ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÁ÷¿®¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Ï¡¢
+      ¤³¤Î¤³¤È¤Ï¡¢&os; ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÁ÷¿®¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Ï¡¢
       ¤º¤Ã¤È¥¢¡¼¥«¥¤¥Ö¤µ¤ì¤ë¤³¤È¤ò°ÕÌ£¤·¤Æ¤¤¤Þ¤¹¡£
       ¥×¥é¥¤¥Ð¥·¡¼¤ÎÊݸÌäÂê¤Ë¤Ê¤ë¤è¤¦¤Ê¾ì¹ç¤Ë¤Ï¡¢
       »È¤¤¼Î¤Æ¤Î¥á¡¼¥ë¥¢¥É¥ì¥¹¤òÍѤ¤¡¢¸ø¤Ê¾ðÊó¤Î¤ß¤òÁ÷¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -100,7 +99,7 @@
 	  <tbody>
 	    <row>
 	      <entry>&a.advocacy.name;</entry>
-	      <entry>FreeBSD ¤ÎÊ¡²»ÅÁÆ»</entry>
+	      <entry>&os; ¤ÎÊ¡²»ÅÁÆ»</entry>
 	    </row>
 
 	    <row>
@@ -116,7 +115,7 @@
 
 	    <row>
 	      <entry>&a.bugbusters.name;</entry>
-	      <entry>FreeBSD
+	      <entry>&os;
 		¾ã³²Êó¹ð¥Ç¡¼¥¿¥Ù¡¼¥¹¤ª¤è¤Ó´ØÏ¢¤¹¤ë¥Ä¡¼¥ë¤Î´ÉÍý¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
 	    </row>
 
@@ -127,13 +126,13 @@
 
 	    <row>
 	      <entry>&a.chat.name;</entry>
-	      <entry>FreeBSD
+	      <entry>&os;
 		¥³¥ß¥å¥Ë¥Æ¥£¤Ë´ØÏ¢¤¹¤ëµ»½ÑŪ¤Ç¤Ï¤Ê¤¤ÏÃÂê</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.chromium.name;</entry>
-	      <entry>FreeBSD ¤Ë¸ÇÍ­¤Î Chromium ¤ÎÌäÂê¤Ë¤Ä¤¤¤Æ</entry>
+	      <entry>&os; ¤Ë¸ÇÍ­¤Î Chromium ¤ÎÌäÂê¤Ë¤Ä¤¤¤Æ</entry>
 	    </row>
 
 	    <row>
@@ -143,13 +142,13 @@
 
 	    <row>
 	      <entry>&a.isp.name;</entry>
-	      <entry>FreeBSD ¤òÍѤ¤¤Æ¤¤¤ë
+	      <entry>&os; ¤òÍѤ¤¤Æ¤¤¤ë
 		¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À¤ÎÏÃÂê</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.jobs.name;</entry>
-	      <entry>FreeBSD ´ØÏ¢¤Î¸ÛÍѵ¡²ñ¤Ë´Ø¤¹¤ëÏÃÂê</entry>
+	      <entry>&os; ´ØÏ¢¤Î¸ÛÍѵ¡²ñ¤Ë´Ø¤¹¤ëÏÃÂê</entry>
 	    </row>
 
 	    <row>
@@ -181,7 +180,7 @@
 	¤½¤ì¤é¤ÎÍøÍѤäÆâÍƤΤ¿¤á¤Ë¤·¤Ã¤«¤ê¤È¤·¤¿¥¬¥¤¥É¥é
 	¥¤¥ó¤¬¤¢¤ë¤Î¤Ç¡¢¤³¤ì¤é¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÆþ¤Ã¤¿¤ê¡¢
 	¤É¤ì¤«°ì¤Ä¤Ë¥á¡¼¥ë ¤òÁ÷¤Ã¤¿¤ê¤¹¤ëÁ°¤Ë¤Ï¡¢
-	¤½¤ì¤é¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î·û¾Ï¤òÃí°Õ¿¼¤¯Æɤà¤Ù¤­¤Ç¤¹¡£</para>
+	¤½¤ì¤é¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î·û¾Ï¤òÃí°Õ¿¼¤¯Æɤó¤Ç¤¯¤À¤µ¤¤¡£</para>
 
       <informaltable frame="none" pgwide="1">
 	<tgroup cols="2">
@@ -200,7 +199,7 @@
 
 	    <row>
 	      <entry>&a.afs.name;</entry>
-	      <entry>FreeBSD ¤Ø¤ÎAFS¤Î°Ü¿¢</entry>
+	      <entry>&os; ¤Ø¤ÎAFS¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
@@ -210,7 +209,7 @@
 
 	    <row>
 	      <entry>&a.amd64.name;</entry>
-	      <entry>FreeBSD ¤Î AMD64 ¥·¥¹¥Æ¥à¤Ø¤Î°Ü¿¢ (¥â¥Ç¥ì¡¼¥¿À©)</entry>
+	      <entry>&os; ¤Î AMD64 ¥·¥¹¥Æ¥à¤Ø¤Î°Ü¿¢ (¥â¥Ç¥ì¡¼¥¿À©)</entry>
 	    </row>
 
 	    <row>
@@ -221,22 +220,22 @@
 
 	    <row>
 	      <entry>&a.arm.name;</entry>
-	      <entry>FreeBSD ¤Î &arm; ¥×¥í¥»¥Ã¥µ¤Ø¤Î°Ü¿¢</entry>
+	      <entry>&os; ¤Î &arm; ¥×¥í¥»¥Ã¥µ¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.atm.name;</entry>
-	      <entry>FreeBSD ¤Ç¤Î ATM ¥Í¥Ã¥È¥ï¡¼¥¯»ÈÍѤ˴ؤ¹¤ëÏÃÂê</entry>
+	      <entry>&os; ¤Ç¤Î ATM ¥Í¥Ã¥È¥ï¡¼¥¯»ÈÍѤ˴ؤ¹¤ëÏÃÂê</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.bluetooth.name;</entry>
-	      <entry>FreeBSD ¤Ç &bluetooth; µ»½Ñ¤Î»ÈÍÑ</entry>
+	      <entry>&os; ¤Ç &bluetooth; µ»½Ñ¤Î»ÈÍÑ</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.cluster.name;</entry>
-	      <entry>FreeBSD ¤Î¥¯¥é¥¹¥¿´Ä¶­¤Ç¤ÎÍøÍÑ</entry>
+	      <entry>&os; ¤Î¥¯¥é¥¹¥¿´Ä¶­¤Ç¤ÎÍøÍÑ</entry>
 	    </row>
 
 	    <row>
@@ -246,7 +245,7 @@
 
 	    <row>
 	      <entry>&a.database.name;</entry>
-	      <entry>FreeBSD
+	      <entry>&os;
 		¾å¤Ç¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÍøÍѤ䳫ȯ¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
 	    </row>
 
@@ -257,7 +256,7 @@
 
 	    <row>
 	      <entry>&a.doc.name;</entry>
-	      <entry>FreeBSD ´ØÏ¢¥É¥­¥å¥á¥ó¥È¤ÎºîÀ®</entry>
+	      <entry>&os; ´ØÏ¢¥É¥­¥å¥á¥ó¥È¤ÎºîÀ®</entry>
 	    </row>
 
 	    <row>
@@ -273,19 +272,19 @@
 	    <row>
 	      <entry>&a.eclipse.name;</entry>
 	      <entry>Eclipse IDE, ¥Ä¡¼¥ë¡¢
-		¥ê¥Ã¥Á¥¯¥é¥¤¥¢¥ó¥È¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î FreeBSD ¥æ¡¼¥¶¤ª¤è¤Ó
+		¥ê¥Ã¥Á¥¯¥é¥¤¥¢¥ó¥È¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î &os; ¥æ¡¼¥¶¤ª¤è¤Ó
 		ports</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.embedded.name;</entry>
-	      <entry>ÁȤ߹þ¤ß¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤ª¤±¤ë FreeBSD ¤ÎÍøÍÑ</entry>
+	      <entry>ÁȤ߹þ¤ß¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤ª¤±¤ë &os; ¤ÎÍøÍÑ</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.eol.name;</entry>
-	      <entry>FreeBSD ¥×¥í¥¸¥§¥¯¥È¤Ë¤è¤ë¥µ¥Ý¡¼¥È¤¬½ªÎ»¤·¤¿
-		FreeBSD ¤Ë´ØÏ¢¤·¤¿¥½¥Õ¥È¥¦¥§¥¢¤Î¥Ô¥¢¥µ¥Ý¡¼¥È</entry>
+	      <entry>&os; ¥×¥í¥¸¥§¥¯¥È¤Ë¤è¤ë¥µ¥Ý¡¼¥È¤¬½ªÎ»¤·¤¿
+		&os; ¤Ë´ØÏ¢¤·¤¿¥½¥Õ¥È¥¦¥§¥¢¤Î¥Ô¥¢¥µ¥Ý¡¼¥È</entry>
 	    </row>
 
 	    <row>
@@ -296,7 +295,7 @@
 
 	    <row>
 	      <entry>&a.firewire.name;</entry>
-	      <entry>FreeBSD &firewire; (iLink, IEEE 1394)
+	      <entry>&os; &firewire; (iLink, IEEE 1394)
 		¤Ë´Ø¤¹¤ëµ»½ÑŪ¤ÊµÄÏÀ</entry>
 	    </row>
 
@@ -329,22 +328,22 @@
 
 	    <row>
 	      <entry>&a.hardware.name;</entry>
-	      <entry>FreeBSD ¤ÎÁö¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Î°ìÈÌŪ¤ÊµÄÏÀ</entry>
+	      <entry>&os; ¤ÎÁö¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Î°ìÈÌŪ¤ÊµÄÏÀ</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.i18n.name;</entry>
-	      <entry>FreeBSD ¤Î¹ñºÝ²½</entry>
+	      <entry>&os; ¤Î¹ñºÝ²½</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.ia32.name;</entry>
-	      <entry>FreeBSD ¤Î IA-32 (&intel; x86) ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î°Ü¿¢</entry>
+	      <entry>&os; ¤Î IA-32 (&intel; x86) ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.ia64.name;</entry>
-	      <entry>FreeBSD ¤Î &intel; ¤¬³«È¯Ãæ¤Î
+	      <entry>&os; ¤Î &intel; ¤¬³«È¯Ãæ¤Î
 		IA64 ¥·¥¹¥Æ¥à¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
@@ -370,24 +369,18 @@
 
 	    <row>
 	      <entry>&a.java.name;</entry>
-	      <entry>&java; ³«È¯¼Ô¤ä¡¢FreeBSD ¤Ø &jdk;
+	      <entry>&java; ³«È¯¼Ô¤ä¡¢&os; ¤Ø &jdk;
 		¤ò°Ü¿¢¤¹¤ë¿Í¤¿¤Á</entry>
 	    </row>
 
 	    <row>
-	      <entry>&a.kde.name;</entry>
-	      <entry><application>KDE</application> ¤ª¤è¤Ó
-		<application>KDE</application> ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î°Ü¿¢</entry>
-	    </row>
-
-	    <row>
 	      <entry>&a.lfs.name;</entry>
-	      <entry>LFS ¤Î FreeBSD ¤Ø¤Î°Ü¿¢</entry>
+	      <entry>LFS ¤Î &os; ¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.mips.name;</entry>
-	      <entry>FreeBSD ¤Î &mips; ¤Ø¤Î°Ü¿¢</entry>
+	      <entry>&os; ¤Î &mips; ¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
@@ -397,7 +390,7 @@
 
  	    <row>
 	      <entry>&a.mono.name;</entry>
-	      <entry>FreeBSD ¤Ë¤ª¤±¤ë Mono ¤ª¤è¤Ó C# ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry>
+	      <entry>&os; ¤Ë¤ª¤±¤ë Mono ¤ª¤è¤Ó C# ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry>
 	    </row>
 
 	    <row>
@@ -418,7 +411,7 @@
 
 	    <row>
 	      <entry>&a.office.name;</entry>
-	      <entry>FreeBSD ¤Ç¤Î¥ª¥Õ¥£¥¹¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ</entry>
+	      <entry>&os; ¤Ç¤Î¥ª¥Õ¥£¥¹¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ</entry>
 	    </row>
 
 	    <row>
@@ -468,18 +461,18 @@
 
 	    <row>
 	      <entry>&a.ppc.name;</entry>
-	      <entry>FreeBSD ¤Î &powerpc; ¤Ø¤Î°Ü¿¢</entry>
+	      <entry>&os; ¤Î &powerpc; ¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.proliant.name;</entry>
-	      <entry>HP ProLiant ¥µ¡¼¥Ð¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¾å¤Ç¤Î FreeBSD
+	      <entry>HP ProLiant ¥µ¡¼¥Ð¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¾å¤Ç¤Î &os;
 		¤Ë´Ø¤¹¤ëµ»½ÑŪ¤ÊµÄÏÀ</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.python.name;</entry>
-	      <entry>FreeBSD ¸ÇÍ­¤Î Python ¤Ë´Ø¤¹¤ëÏÃÂê</entry>
+	      <entry>&os; ¸ÇÍ­¤Î Python ¤Ë´Ø¤¹¤ëÏÃÂê</entry>
 	    </row>
 
 	    <row>
@@ -490,12 +483,12 @@
 
 	    <row>
 	      <entry>&a.realtime.name;</entry>
-	      <entry>FreeBSD ÍѤΥꥢ¥ë¥¿¥¤¥à³ÈÄ¥¤Î³«È¯¤Ë´Ø¤¹¤ëÏÃÂê</entry>
+	      <entry>&os; ÍѤΥꥢ¥ë¥¿¥¤¥à³ÈÄ¥¤Î³«È¯¤Ë´Ø¤¹¤ëÏÃÂê</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.ruby.name;</entry>
-	      <entry>FreeBSD ¸ÇÍ­¤Î Ruby ¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
+	      <entry>&os; ¸ÇÍ­¤Î Ruby ¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
 	    </row>
 
 	    <row>
@@ -505,12 +498,12 @@
 
 	    <row>
 	      <entry>&a.security.name;</entry>
-	      <entry>¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ëÏÃÂê</entry>
+	      <entry>&os; ¤Ë±Æ¶Á¤¹¤ë¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ëÏÃÂê</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.small.name;</entry>
-	      <entry>ÁȤ߹þ¤ß¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤ª¤±¤ë FreeBSD ¤ÎÍøÍÑ
+	      <entry>ÁȤ߹þ¤ß¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤ª¤±¤ë &os; ¤ÎÍøÍÑ
 		(Çѻߤµ¤ì¤Þ¤·¤¿¡£&a.embedded.name; ¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤)</entry>
 	    </row>
 
@@ -521,12 +514,12 @@
 
 	    <row>
 	      <entry>&a.sparc.name;</entry>
-	      <entry>FreeBSD ¤Î &sparc; ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Ø¤Î°Ü¿¢</entry>
+	      <entry>&os; ¤Î &sparc; ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.standards.name;</entry>
-	      <entry>C99 ¤ª¤è¤Ó &posix; ɸ½à¤Ø¤Î FreeBSD ¤ÎŬ¹ç¤Ë¤Ä¤¤¤Æ</entry>
+	      <entry>C99 ¤ª¤è¤Ó &posix; ɸ½à¤Ø¤Î &os; ¤ÎŬ¹ç¤Ë¤Ä¤¤¤Æ</entry>
 	    </row>
 
 	    <row>
@@ -536,7 +529,7 @@
 
 	    <row>
 	      <entry>&a.tcltk.name;</entry>
-	      <entry>FreeBSD ¸ÇÍ­¤Î Tcl/Tk ¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
+	      <entry>&os; ¸ÇÍ­¤Î Tcl/Tk ¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
 	    </row>
 
 	    <row>
@@ -553,17 +546,17 @@
 
 	    <row>
 	      <entry>&a.threads.name;</entry>
-	      <entry>FreeBSD ¤Î¥¹¥ì¥Ã¥É¤Ë¤Ä¤¤¤Æ</entry>
+	      <entry>&os; ¤Î¥¹¥ì¥Ã¥É¤Ë¤Ä¤¤¤Æ</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.tilera.name;</entry>
-	      <entry>Tilera ¥Õ¥¡¥ß¥ê CPU ¤Ø¤Î FreeBSD ¤Î°Ü¿¢</entry>
+	      <entry>Tilera ¥Õ¥¡¥ß¥ê CPU ¤Ø¤Î &os; ¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.tokenring.name;</entry>
-	      <entry>FreeBSD ¤Ç¤Î¥È¡¼¥¯¥ó¥ê¥ó¥°¤Î¥µ¥Ý¡¼¥È</entry>
+	      <entry>&os; ¤Ç¤Î¥È¡¼¥¯¥ó¥ê¥ó¥°¤Î¥µ¥Ý¡¼¥È</entry>
 	    </row>
 
 	    <row>
@@ -595,7 +588,7 @@
 
 	    <row>
 	      <entry>&a.x11.name;</entry>
-	      <entry>FreeBSD ¤Ç¤Î X11 ¤Î¥á¥ó¥Æ¥Ê¥ó¥¹¤È¥µ¥Ý¡¼¥È</entry>
+	      <entry>&os; ¤Ç¤Î X11 ¤Î¥á¥ó¥Æ¥Ê¥ó¥¹¤È¥µ¥Ý¡¼¥È</entry>
 	    </row>
 
 	    <row>
@@ -624,9 +617,8 @@
 	¥á¥ó¥Ð¡¼¤Î¤¿¤á¤Î¤â¤Î¤Ç¤¢¤ê¡¢°ìÈÌŪ¤Ê¶½Ì£¤ò¼æ¤¯¤è¤¦¤Ê¤â¤Î¤Ç¤Ï
 	¤¢¤ê¤Þ¤»¤ó¡£
 	¤³¤Î¤è¤¦¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤¹¤ëÁ°¤Ë¡¢µ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç
-	¼«¤é¤Î¸ºß´¶¤ò¥¢¥Ô¡¼¥ë¤¹¤ë¤Î¤ÏÎɤ¤¹Í¤¨¤Ç¤¹¡£
-	¤½¤¦¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢µÄÏÀ¤ÎºÝ¤Î¥¨¥Á¥±¥Ã¥È¤ò³Ø¤Ö¤³¤È¤¬¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£
-      </para>
+	¼«¤é¤Î¸ºß´¶¤ò¥¢¥Ô¡¼¥ë¤¹¤ë¤Î¤ÏÎɤ¤¹Í¤¨¤Ç¤¹¡£¤½¤¦¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢
+	µÄÏÀ¤ÎºÝ¤Î¥¨¥Á¥±¥Ã¥È¤ò³Ø¤Ö¤³¤È¤¬¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£</para>
 
       <informaltable frame="none" pgwide="1">
 	<tgroup cols="2">
@@ -651,7 +643,7 @@
 
 	    <row>
 	      <entry>&a.wip-status.name;</entry>
-	      <entry>FreeBSD ¤Î¿Ê¹ÔÃæ¤Î¥×¥í¥¸¥§¥¯¥È¤Ë´Ø¤¹¤ë¾õ¶·</entry>
+	      <entry>&os; ¤Î¿Ê¹ÔÃæ¤Î¥×¥í¥¸¥§¥¯¥È¤Ë´Ø¤¹¤ë¾õ¶·</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
@@ -846,10 +838,10 @@
     <sect2 xml:id="eresources-subscribe">
       <title>»²²ÃÊýË¡</title>
 
-      <para>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤¹¤ë¤Ë¤Ï¡¢¾åµ­¤Î¥ê¥¹¥È¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤«¡¢
-	&a.mailman.lists.link;
-	¤Ë¿Ê¤ó¤Ç¶½Ì£¤ò»ý¤Ã¤Æ¤¤¤ë¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£
-	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥Ú¡¼¥¸¤Ë¤Ï¡¢ÅÐÏ¿¤ËɬÍפʼê½ç¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+      <para>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤¹¤ë¤Ë¤Ï¡¢&a.mailman.lists.link; ¤Ç¡¢
+	´õ˾¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£
+	ɽ¼¨¤µ¤ì¤ë¥Ú¡¼¥¸¤Ë¤Ï¡¢
+	³Æ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÅÐÏ¿¤¹¤ë¤¿¤á¤ËɬÍפʼê½ç¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë¥á¡¼¥ë¤òÁ÷¤ë¤Ë¤Ï¡¢
 	<email><replaceable>listname</replaceable>@FreeBSD.org</email>
@@ -863,23 +855,23 @@
 	<email><replaceable>listname</replaceable>-unsubscribe at FreeBSD.org</email>
 	¤Ë¥á¡¼¥ë¤òÁ÷¿®¤¹¤ë¤³¤È¤Ç¤âÅÐÏ¿¤ò²ò½ü¤Ç¤­¤Þ¤¹¡£</para>
 
-      <para>ºÆÅÙ¸À¤¤¤Þ¤¹¤¬¡¢
-	»ä¤¿¤Á¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤Ïµ»½ÑŪ¤ÊµÄÏÀ¤òÊݤĤ褦
-	Í׵ᤷ¤Þ¤¹¡£¤â¤·¡¢½ÅÍפʥ¢¥Ê¥¦¥ó¥¹¤Ë¤Î¤ß¶½Ì£¤¬¤¢¤ë¤Ê¤é¡¢
+      <para>µ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤Ï¡¢
+	µ»½ÑŪ¤ÊµÄÏÀ¤òÊݤĤ褦¤Ë¤¹¤ë¤³¤È¤¬½ÅÍפǤ¹¡£
+	¤â¤·¡¢½ÅÍפʥ¢¥Ê¥¦¥ó¥¹¤Î¤ß¤ò¼õ¤±¼è¤ê¤¿¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
         &a.announce; ¤Ø¤Î»²²Ã¤ò¤ª´«¤á¤·¤Þ¤¹¡£
-	¤³¤ì¤Ë¤Ï¡¢¤¢¤Þ¤ê¤¿¤¯¤µ¤ó¤Î¥á¡¼¥ë¤Ïή¤ì¤Þ¤»¤ó¡£</para>
+	¤³¤³¤Ë¤Ï¡¢¤¢¤Þ¤ê¤¿¤¯¤µ¤ó¤Î¥á¡¼¥ë¤Ïή¤ì¤Þ¤»¤ó¡£</para>
     </sect2>
 
     <sect2 xml:id="eresources-charters">
       <title>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î·û¾Ï</title>
 
-      <para><emphasis>¤¹¤Ù¤Æ</emphasis> FreeBSD
+      <para><emphasis>¤¹¤Ù¤Æ</emphasis> &os;
 	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ïï¤Ç¤â¤½¤ì¤é¤òÍøÍѤ¹¤ë¤³¤È¤Ë
 	¸Ç¼é¤·¤Ê¤±¤ì¤Ð¤¤¤±¤Ê¤¤¤È¤¤¤¦°ìÄê¤Î´Êñ¤Ê¥ë¡¼¥ë¤¬¤¢¤ê¤Þ¤¹¡£
-	¤³¤ì¤é¤Î¥ë¡¼¥ë¤Ë½¾¤ï¤Ê¤¤¤È¡¢·ë²Ì¤È¤·¤Æ FreeBSD ¤Î Postmaster
-	<email>postmaster at FreeBSD.org</email>¤«¤é 2 ²ó¤Þ¤Ç¤Ï·Ù
+	¤³¤ì¤é¤Î¥ë¡¼¥ë¤Ë½¾¤ï¤Ê¤¤¤È¡¢·ë²Ì¤È¤·¤Æ &os; ¤Î Postmaster
+	<email>postmaster at FreeBSD.org</email> ¤«¤é 2 ²ó¤Þ¤Ç¤Ï·Ù
 	¹ð¤ò¼õ¤±¤Þ¤¹¡£3 ²ó°ãÈ¿¤¹¤ë¤È¡¢
-	Åê¹Æ¼Ô¤Ï¤¹¤Ù¤Æ¤Î FreeBSD ¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤«¤éºï½ü¤µ¤ì¡¢
+	Åê¹Æ¼Ô¤Ï¤¹¤Ù¤Æ¤Î &os; ¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤«¤éºï½ü¤µ¤ì¡¢
 	¤½¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ø¤Î¤µ¤é¤Ê¤ëÅê¹Æ¤«¤éÄù¤á½Ð¤µ¤ì¤ë¤Ç¤·¤ç¤¦¡£
 	¤³¤ì¤é¤Î¥ë¡¼¥ë¤äÂкö¤¬É¬ÍפʤΤϻÄÇ°¤Ç¤¹¡£
 	¤·¤«¤·¡¢º£Æü¤Î¥¤¥ó¥¿¡¼¥Í¥Ã
@@ -892,7 +884,7 @@
       <itemizedlist>
 	<listitem>
 	  <para>¤¤¤«¤Ê¤ëÅê¹Æµ­»ö¤â¤½¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î
-	    ´ðËÜŪ¤Ê·û¾Ï¤ò¼é¤ë¤Ù¤­¤Ç¤¹¡£¤¿¤È¤¨¤Ð¡¢
+	    ´ðËÜŪ¤Ê·û¾Ï¤ò¼é¤ë¤Ù¤­¤Ç¤¹¡£
 	    ¤½¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤¬µ»½ÑŪ¤ÊÌäÂê¤Ë´Ø¤¹¤ë¤â¤Î¤Ç¤¢¤ì¤Ð¡¢
 	    µ»½ÑŪ¤ÊµÄÏÀ¤ò´Þ¤àÅê¹Æ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¸½ºß·Ñ³Ãæ¤Î
 	    ÉÔŬÀڤʷû¾Ï¤ä¥Õ¥ì¥¤¥à¤Ï¡¢
@@ -912,14 +904,15 @@
 	    Åê¹Æ¤¹¤Ù¤­¤Ç¤¹¡£¤É¤Î¥ê¥¹¥È¤ËÂФ·¤Æ¤â¡¢
 	    (¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î)»²²Ã¼Ô¤Ï (Ê£¿ô¤Î¥á¡¼¥ê¥ó¥°¥ê
 	    ¥¹¥È¤Ë)½ÅÊ£¤·¤Æ»²²Ã¤·¤Æ¤ª¤ê¡¢´ØÏ¢¤¹¤ëÉôʬ¤¬¾¯¤Ê¤¤ (¤¿¤È¤¨¤Ð¡¢
-	    <quote>-stable</quote> ¤È <quote>-scsi</quote>) ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ò½ü¤¤¤Æ¤Ï¡¢
-	    °ìÅÙ¤ËÊ£¿ô¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÅê¹Æ¤¹¤ëÍýͳ¤ÏÁ´¤¯¤¢¤ê¤Þ¤»¤ó¡£¤â¤·¡¢
-	    <literal>Cc</literal> ¤ËÊ£¿ô¤Î ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤¬¤½¤Î¤è¤¦¤Ê·Á¤Ç¸½¤ì¤Æ¡¢
-	    ¤¢¤Ê¤¿¤ËÆϤ¤¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢ºÆ¤Ó¤½¤Î¥á¡¼¥ë¤ËÊÖ»ö¤ò½Ð¤¹Á°¤Ë¡¢
-	    <literal>Cc</literal> ¤ÎÉôʬ¤â¤Þ¤¿ÊÔ½¸¤¹¤ë¤Ù¤­¤Ç¤¹¡£
+	    <quote>-stable</quote> ¤È <quote>-scsi</quote>)
+	    ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ò½ü¤¤¤Æ¤Ï¡¢
+	    °ìÅÙ¤ËÊ£¿ô¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÅê¹Æ¤¹¤ëÍýͳ¤ÏÁ´¤¯¤¢¤ê¤Þ¤»¤ó¡£
+	    <literal>Cc</literal>
+	    ¤ËÊ£¿ô¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤¬´Þ¤Þ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò¼õ¿®¤·¤¿¾ì¹ç¤Ë¤Ï¡¢
+	    ¤½¤Î¥á¡¼¥ë¤ËÊÖ»ö¤ò½Ð¤¹Á°¤Ë¡¢
+	    <literal>Cc</literal> ¤ÎÉôʬ¤òÊÔ½¸¤·¤Æ¤¯¤À¤µ¤¤¡£
 	    <emphasis>¸µµ­»ö¤ò½ñ¤¤¤¿¤Î¤¬Ã¯¤Ç¤¢¤Ã¤Æ¤â¡¢
-	      ¤¢¤Ê¤¿¼«¿È¤Î¥¯¥í¥¹¥Ý¥¹¥È¤Ë¤Þ¤ÀÀÕǤ¤¬¤¢¤ê¤Þ¤¹¡£
-	    </emphasis></para>
+	      ÊÖ¿®¤¹¤ëÊý¤Ë¤â¥¯¥í¥¹¥Ý¥¹¥È¤ÎÀÕǤ¤¬¤¢¤ê¤Þ¤¹¡£</emphasis></para>
 	</listitem>
 
 	<listitem>
@@ -939,7 +932,7 @@
 	</listitem>
 
 	<listitem>
-	  <para>FreeBSD °Ê³°¤Î´ØÏ¢¤¹¤ëÀ½Éʤ䥵¡¼¥Ó¥¹¤Î¹­¹ð¤Ï¡¢
+	  <para>&os; °Ê³°¤Î´ØÏ¢¤¹¤ëÀ½Éʤ䥵¡¼¥Ó¥¹¤Î¹­¹ð¤Ï¡¢
 	    ÀäÂФ˶ػߤ·¡¢spam
 	    ¤Ë¤è¤ë°ãÈ¿¼Ô¤¬ÀëÅÁ¤·¤Æ¤¤¤ë¤³¤È¤¬ÌÀ³Î¤Ç¤¢¤Ã¤¿¤é¡¢
 	    ¤¹¤°¤Ë¶Ø»ß¤·¤Þ¤¹¡£</para>
@@ -970,13 +963,13 @@
 	<varlistentry>
 	  <term>&a.announce.name;</term>
 	  <listitem>
-	    <para><filename>½ÅÍפʥ¤¥Ù¥ó¥È/¥Þ¥¤¥ë¥¹¥È¥ó</filename></para>
-	    <para>¤³¤ì¤Ï¡¢Ã±¤Ë¤¿¤Þ¤Ëȯɽ¤µ¤ì¤ë½ÅÍ×¤Ê freebsd
-	      ¤Î¥¤¥Ù¥ó¥È¤Ë´Ø¿´¤¬¤¢¤ë¿Í¤Î¤¿ ¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
+	    <para><emphasis>½ÅÍפʥ¤¥Ù¥ó¥È/¥Þ¥¤¥ë¥¹¥È¥ó</emphasis></para>
+
+	    <para>¤³¤ì¤Ï¡¢Ã±¤Ë¤¿¤Þ¤Ëȯɽ¤µ¤ì¤ë½ÅÍ×¤Ê &os;
+	      ¤Î¥¤¥Ù¥ó¥È¤Ë´Ø¿´¤¬¤¢¤ë¿Í¤Î¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
 	      ¤³¤ì¤Ï¡¢¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ä¤½¤Î¾¤Î¥ê¥ê¡¼¥¹¤Ë
 	      ¤Ä¤¤¤Æ¤Î¥¢¥Ê¥¦¥ó¥¹¤ò´Þ¤ß¤Þ¤¹¡£
-	      ¤½¤Î¥¢¥Ê¥¦¥ó¥¹¤Ï¿·¤·¤¤ FreeBSD ¤Îµ¡Ç½¤Î¥¢
-	      ¥Ê¥¦¥ó¥¹¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
+	      ¤½¤Î¥¢¥Ê¥¦¥ó¥¹¤Ï¿·¤·¤¤ &os; ¤Îµ¡Ç½¤Î¥¢¥Ê¥¦¥ó¥¹¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
 	      ¥Ü¥é¥ó¥Æ¥£¥¢Åù¤Î¸Æ¤Ó¤«¤±¤¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
 	      ¤³¤ì¤ÏήÄÌÎ̤ξ¯¤Ê¤¤¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¡¢
 	      ´°Á´¤Ê¥â¥Ç¥ì¡¼¥È¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£</para>
@@ -988,7 +981,7 @@
 
 	  <listitem>
 	    <para><emphasis>¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤ÈÀ߷פεÄÏÀ</emphasis></para>
-	    <para>¤³¤ì¤Ï¡¢FreeBSD
+	    <para>¤³¤ì¤Ï¡¢&os;
               ¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë´Ø¤¹¤ëµÄÏÀ¤ò¹Ô¤Ê¤¦¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
               ÅöÁ³¡¢¤½¤ÎÆâÍƤϸ¶Â§Åª¤Ëµ»½ÑŪ¤Ê¤â¤Î¤Ë¸ÂÄꤵ¤ì¤Þ¤¹¡£
               ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë¤Õ¤µ¤ï¤·¤¤ÏÃÂê¤Ï°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¹¡£
@@ -1023,9 +1016,9 @@
 	  <term>&a.bluetooth.name;</term>
 
 	  <listitem>
-	    <para><emphasis>FreeBSD ¾å¤Ç¤Î &bluetooth;</emphasis></para>
+	    <para><emphasis>&os; ¾å¤Ç¤Î &bluetooth;</emphasis></para>
 
-	    <para>FreeBSD ¤Î &bluetooth; ¥æ¡¼¥¶¤¬½¸¤Þ¤ë¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£
+	    <para>&os; ¤Î &bluetooth; ¥æ¡¼¥¶¤¬½¸¤Þ¤ë¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£
 	      ¥Ç¥¶¥¤¥ó¡¢¼ÂÁõ¤Î¾ÜºÙ¡¢¥Ñ¥Ã¥Á¡¢¾ã³²Êó¹ð¡¢³«È¯¿ÊĽ¥ì¥Ý¡¼¥È¡¢
 	      µ¡Ç½¤ÎÍ׵ᡢ&bluetooth; ¤Ë´ØÏ¢¤·¤¿¤¹¤Ù¤Æ¤Î»öÊÁ¤¬ÂоݤǤ¹¡£</para>
 	  </listitem>
@@ -1048,7 +1041,7 @@
 
 	  <listitem>
 	    <para><emphasis>¥Ð¥°¥ì¥Ý¡¼¥È</emphasis></para>
-	    <para>¤³¤ì¤Ï¡¢FreeBSD
+	    <para>¤³¤ì¤Ï¡¢&os;
 	      ¤Î¥Ð¥°¥ì¥Ý¡¼¥È¤Î¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£²Äǽ¤Ç¤¢¤ë
 	      ¾ì¹ç¤Ï¤¤¤Ä¤Ç¤â¡¢¥Ð¥°¤Ï &man.send-pr.1;
 	      ¤ò»È¤¦¤«¡¢<link xlink:href="&url.base;/send-pr.html">WEB
@@ -1061,8 +1054,9 @@
 	  <term>&a.chat.name;</term>
 
 	  <listitem>
-	    <para><emphasis>FreeBSD ¤Î¥³¥ß¥å¥Ë¥Æ¥£¤Ë´Ø¤¹¤ë
+	    <para><emphasis>&os; ¤Î¥³¥ß¥å¥Ë¥Æ¥£¤Ë´Ø¤¹¤ë
 		µ»½ÑŪ¤Ç¤Ï¤Ê¤¤ÏÃÂê</emphasis></para>
+
 	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ïµ»½ÑŪ¤Ç¤Ï¤Ê¤¯¡¢
 	      ¼Ò²ñŪ¤Ê¾ðÊó¤Ë¤Ä¤¤¤Æ¡¢
 	      ¾¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤Ï¼è¤ê°·¤ï¤Ê¤¤ÏÃÂê¤ò´Þ¤ß¤Þ¤¹¡£
@@ -1083,9 +1077,9 @@
 	  <term>&a.chromium.name;</term>
 
 	  <listitem>
-	    <para><emphasis>FreeBSD ¸ÇÍ­¤Î Chromium ¤ÎÌäÂê</emphasis></para>
+	    <para><emphasis>&os; ¸ÇÍ­¤Î Chromium ¤ÎÌäÂê</emphasis></para>
 
-	    <para>FreeBSD ¤Ë¤ª¤±¤ë Chromium
+	    <para>&os; ¤Ë¤ª¤±¤ë Chromium
 	      ¤Î¥µ¥Ý¡¼¥È¤Ë¤Ä¤¤¤ÆµÄÏÀ¤ò¹Ô¤¦¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
 	      Chromium
 	      ¤Î³«È¯¤ª¤è¤Ó¥¤¥ó¥¹¥È¡¼¥ë¤Ë´Ø¤·¤ÆµÄÏÀ¤ò¹Ô¤¦µ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£</para>
@@ -1096,9 +1090,9 @@
 	  <term>&a.core.name;</term>
 
 	  <listitem>
-	    <para><emphasis>FreeBSD ¥³¥¢¥Á¡¼¥à</emphasis></para>
+	    <para><emphasis>&os; ¥³¥¢¥Á¡¼¥à</emphasis></para>
 	    <para>¤³¤ì¤Ï¡¢¥³¥¢¥á¥ó¥Ð¤¬»È¤¦ÆâÉô¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
-	      FreeBSD ¤Ë´ØÏ¢¤¹¤ë¿¼¹ï¤Ê¤ä¤Ã¤«¤¤»ö¤ÎºÛÄê¤ä
+	      &os; ¤Ë´ØÏ¢¤¹¤ë¿¼¹ï¤Ê¤ä¤Ã¤«¤¤»ö¤ÎºÛÄê¤ä
 	      ¥Ï¥¤¥ì¥Ù¥ë¤ÊÌÊÌ©¤ÊÄ´ºº¤òÍ׵᤹¤ë¤È¤­¤Ë¡¢¤³¤Î¥á¡¼
 	      ¥ê¥ó¥°¥ê¥¹¥È¤Ë¥á¥Ã¥»¡¼¥¸¤òÁ÷¤ë»ö¤¬½ÐÍè¤Þ¤¹¡£</para>
 	  </listitem>
@@ -1129,9 +1123,9 @@
 	  <term>&a.cvsweb.name;</term>
 
 	  <listitem>
-	    <para><emphasis>FreeBSD CVSweb ¥×¥í¥¸¥§¥¯¥È</emphasis></para>
+	    <para><emphasis>&os; CVSweb ¥×¥í¥¸¥§¥¯¥È</emphasis></para>
 
-	    <para>FreeBSD-CVSweb
+	    <para>&os;-CVSweb
 	      ¤ÎÍøÍÑ¡¢³«È¯¤ª¤è¤Ó´ÉÍý¤Ë¤Ä¤¤¤Æ¤Îµ»½ÑŪ¤ÊµÄÏÀ¤Î¾ì¤Ç¤¹¡£</para>
  	  </listitem>
  	</varlistentry>
@@ -1156,10 +1150,10 @@
 	  <listitem>
 	    <para><emphasis>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</emphasis></para>
 
-	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï FreeBSD
+	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï &os;
               ¸þ¤±¤Îʸ½ñ¤ÎºîÀ®¤Ë´ØÏ¢¤¹¤ë»öÊÁ¤ä¥×¥í¥¸¥§¥¯¥È¤Ë¤Ä¤¤¤ÆµÄÏÀ¤ò¹Ô¤Ê¤¦¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
 	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤·¤Æ¤¤¤ë¥á¥ó¥Ð¤Ï¡¢
-              <quote>FreeBSD ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</quote>
+              <quote>&os; ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</quote>
 	      ¤Ë»²²Ã¤·¤Æ¤¤¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
 	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¸ø³«¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢
               »²²Ã¤äÅê¹Æ¤Ï¼«Í³¤Ë¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
@@ -1227,16 +1221,16 @@
 
 	  <listitem>
 	    <para><emphasis>ÁȤ߹þ¤ß¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤ª¤±¤ë
-	      FreeBSD ¤ÎÍøÍÑ</emphasis></para>
+	      &os; ¤ÎÍøÍÑ</emphasis></para>
 
-            <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢ÁȤ߹þ¤ß¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë FreeBSD
+            <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢ÁȤ߹þ¤ß¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë &os;
 	      ¤ÎÍøÍѤ˴ؤ¹¤ë¥È¥Ô¥Ã¥¯¤òµÄÏÀ¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ´°Á´¤Ëµ»½ÑŪ¤ÊÆâÍƤòÍ׵ᤷ¤Þ¤¹¡£
-	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ÎÌÜŪ¤Î¤¿¤á¤Ë¡¢
-	      ÁȤ߹þ¤ß¥·¥¹¥Æ¥à¤ò¡¢
+	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë¤ª¤¤¤Æ¡¢
+	      ÁȤ߹þ¤ß¥·¥¹¥Æ¥à¤Ï¡¢
 	      ¥Ç¥¹¥¯¥È¥Ã¥×¤äÄ̾ï¤Î°ìÈÌŪ¤Ê¥³¥ó¥Ô¥å¡¼¥¿´Ä¶­¤Ç¤Ï¤Ê¤¯¡¢
-	      ñ°ì¤ÎÌÜŪ¤Î¤¿¤á¤Ë»È¤ï¤ì¤ë¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥Ð¥¤¥¹¤ÈÄêµÁ¤·¤Þ¤¹¡£
+	      ñ°ì¤ÎÌÜŪ¤Î¤¿¤á¤Ë»È¤ï¤ì¤ë¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥Ð¥¤¥¹¤ò°ÕÌ£¤·¤Þ¤¹¡£
 	      ¤³¤ì¤é¤ÎÎã¤Ï¡¢
 	      ·ÈÂÓÅÅÏᢥ롼¥¿¤ä¥¹¥¤¥Ã¥Á¤ª¤è¤Ó PBX ¤È¤¤¤Ã¤¿¥Í¥Ã¥È¥ï¡¼¥¯µ¡´ï¡¢
 	      PDA, POS ¥·¥¹¥Æ¥à¤È¤¤¤Ã¤¿¤â¤Î¤Ç¤¹¡£</para>
@@ -1260,12 +1254,12 @@
 	  <term>&a.eol.name;</term>
 
 	  <listitem>
-	    <para><emphasis>FreeBSD ¥×¥í¥¸¥§¥¯¥È¤Ë¤è¤ë¥µ¥Ý¡¼¥È¤¬½ªÎ»¤·¤¿
-	      FreeBSD ¤Ë´ØÏ¢¤·¤¿¥½¥Õ¥È¥¦¥§¥¢¤Î¥Ô¥¢¥µ¥Ý¡¼¥È</emphasis></para>
+	    <para><emphasis>&os; ¥×¥í¥¸¥§¥¯¥È¤Ë¤è¤ë¥µ¥Ý¡¼¥È¤¬½ªÎ»¤·¤¿
+	      &os; ¤Ë´ØÏ¢¤·¤¿¥½¥Õ¥È¥¦¥§¥¢¤Î¥Ô¥¢¥µ¥Ý¡¼¥È</emphasis></para>
 
-	    <para>FreeBSD ¥×¥í¥¸¥§¥¯¥È¤Ë¤è¤ë (¤¿¤È¤¨¤Ð¡¢
-	      ¥»¥­¥å¥ê¥Æ¥£¥¢¥É¥Ð¥¤¥¶¥ê¤ª¤è¤Ó¥Ñ¥Ã¥Á·Á¼°¤Ë¤è¤ë)
-	      ¸ø¼°¥µ¥Ý¡¼¥È¤ò½ª¤¨¤¿ FreeBSD
+	    <para>&os; ¥×¥í¥¸¥§¥¯¥È¤Ë¤è¤ë¡¢
+	      ¥»¥­¥å¥ê¥Æ¥£¥¢¥É¥Ð¥¤¥¶¥ê¤ª¤è¤Ó¥Ñ¥Ã¥Á¤Î¸ø¼°¥µ¥Ý¡¼¥È¤¬½ªÎ»¤·¤¿
+	      &os;
 	      ´ØÏ¢¥½¥Õ¥È¥¦¥§¥¢¤Î¥Ô¥¢¥µ¥Ý¡¼¥È¤òÄ󶡤·¤¿¤êÍøÍѤ¹¤ë¤³¤È¤Ë¶½Ì£¤ò»ý¤Ã¤Æ¤¤¤ë¿Íã¤Î¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
@@ -1276,7 +1270,7 @@
 	  <listitem>
 	    <para><emphasis>&firewire; (iLink, IEEE 1394)</emphasis></para>
 
-	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢FreeBSD ¤Ë¤ª¤±¤ë
+	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢&os; ¤Ë¤ª¤±¤ë
 	      &firewire; (IEEE 1394, iLink)
 	      ¥µ¥Ö¥·¥¹¥Æ¥à¤ÎÀ߷פȼÂÁõ¤Ë¤Ä¤¤¤ÆµÄÏÀ¤ò¹Ô¤¦¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
 	      ɸ½à²½¡¢¥Ð¥¹¥Ç¥Ð¥¤¥¹¤È¤½¤Î¥×¥í¥È¥³¥ë¡¢
@@ -1290,7 +1284,8 @@
 
 	  <listitem>
 	    <para><emphasis>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à</emphasis></para>
-	    <para>FreeBSD ¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë´Ø¤¹¤ëµÄÏÀ
+
+	    <para>&os; ¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë´Ø¤¹¤ëµÄÏÀ
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ´°Á´¤Ëµ»½ÑŪ¤ÊÆâÍƤòÍ׵ᤷ¤Þ¤¹¡£</para>
 	  </listitem>
@@ -1329,7 +1324,7 @@
 	  <listitem>
 	    <para><emphasis>GNOME</emphasis></para>
 
-	    <para>FreeBSD ¤Î <application>GNOME</application>
+	    <para>&os; ¤Î <application>GNOME</application>
 	      Desktop Environment ¤Ë´Ø¤¹¤ëµÄÏÀ¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ´°Á´¤Ëµ»½ÑŪ¤ÊÆâÍƤòÍ׵ᤷ¤Þ¤¹¡£</para>
@@ -1353,7 +1348,7 @@
 	  <listitem>
 	    <para><emphasis>IP Firewall</emphasis></para>
 
-	    <para>¤³¤ì¤Ï FreeBSD ¤Î IP firewall ¥³¡¼¥É¤ÎºÆÀ߷פ˴ؤ¹¤ë
+	    <para>¤³¤ì¤Ï &os; ¤Î IP firewall ¥³¡¼¥É¤ÎºÆÀ߷פ˴ؤ¹¤ë
 	      µ»½ÑŪ¤ÊµÄÏÀ¤Î¤¿¤á¤Î¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ´°Á´¤Ëµ»½ÑŪ¤ÊÆâÍƤòÍ׵ᤷ¤Þ¤¹¡£</para>
@@ -1364,9 +1359,9 @@
 	  <term>&a.ia64.name;</term>
 
 	  <listitem>
-	    <para><emphasis>FreeBSD ¤Î IA64 ¤Ø¤Î°Ü¿¢</emphasis></para>
+	    <para><emphasis>&os; ¤Î IA64 ¤Ø¤Î°Ü¿¢</emphasis></para>
 
-	    <para>¤³¤ì¤Ï FreeBSD ¤Î &intel; ¤Î IA-64 ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î
+	    <para>¤³¤ì¤Ï &os; ¤Î &intel; ¤Î IA-64 ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î
 	    °Ü¿¢¤Ë»²²Ã¤·¤Æ¤¤¤ë¿Íã¤Î¤¿¤á¤Îµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¡¢
 	    ÌäÂê¤òÄ󵯤·²ò·èºö¤òµÄÏÀ¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
 	    ¤³¤Î¤è¤¦¤Êµ»½ÑŪ¤ÊµÄÏÀ¤Ë¶½Ì£¤ò»ý¤Ä¸Ä¿Í¤Ï´¿·Þ¤·¤Þ¤¹¡£</para>
@@ -1379,7 +1374,7 @@
 	  <listitem>
 	    <para><emphasis>ISDN ¥³¥ß¥å¥Ë¥±¡¼¥·¥ç¥ó</emphasis></para>
 	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢
-	      FreeBSD ¤ËÂФ¹¤ë ISDN ¥µ¥Ý¡¼¥È¤Î³«È¯¤ÎµÄÏÀ¤ò
+	      &os; ¤ËÂФ¹¤ë ISDN ¥µ¥Ý¡¼¥È¤Î³«È¯¤ÎµÄÏÀ¤ò
 	      ¤ª¤³¤Ê¤¦¿Í¤Î¤¿¤á¤Î¤â¤Î¤Ç¤¹¡¥</para>
 	  </listitem>
 	</varlistentry>
@@ -1389,7 +1384,7 @@
 
 	  <listitem>
 	    <para><emphasis>&java; ¤Î³«È¯</emphasis></para>
-	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢FreeBSD
+	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢&os;
 	      ¸þ¤±¤Î½ÅÍ×¤Ê &java; ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î³«È¯¤ä¡¢&jdk;
 	      ¤Î°Ü¿¢¤ä¥á¥ó¥Æ¥Ê¥ó¥¹¤Î
 	      µÄÏÀ¤ò¤¹¤ë¿Í¤Î¤¿¤á¤Î¤â¤Î¤Ç¤¹¡¥</para>
@@ -1403,10 +1398,8 @@
 	    <para><emphasis>µá¿Í¾ðÊ󤪤è¤Ó½¢¿¦´õ˾¾ðÊó</emphasis></para>
 
 	    <para>&os;
-	      ¤Ë´ØÏ¢¤·¤¿½¢¿¦¾ðÊ󤪤è¤ÓÍúÎò½ñ¤òÅê¹Æ¤¹¤ë¤¿¤á¤Î¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£
-	      Î㤨¤Ð¡¢¤â¤·¡¢&os; ¤Ë´ØÏ¢¤·¤¿¿¦¶È¤òõ¤·¤Æ¤¤¤¿¤ê¡¢
-	      &os; ¤Ë´ØÏ¢¤·¤¿»Å»ö¤ò¤ª»ý¤Á¤Ç¡¢
-	      ÀëÅÁ¤·¤¿¤¤¤È¹Í¤¨¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢¤³¤³¤ËÅê¹Æ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	      ¤Ë´ØÏ¢¤·¤¿½¢¿¦¾ðÊ󡢤ª¤è¤Ó &os;
+	      ¤Ë´ØÏ¢¤·¤¿¿¦¶È¤òõ¤·¤Æ¤¤¤ëÊý¤¬ÍúÎò½ñ¤òÅê¹Æ¤¹¤ë¤¿¤á¤Î¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£
 	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï°ìÈÌŪ¤Ê½¢¿¦¾ðÊó¤Î¤¿¤á¤Î¤â¤Î¤Ç¤Ï
 	      <emphasis>¤¢¤ê¤Þ¤»¤ó</emphasis>¡£
 	      °ìÈÌŪ¤Ê½¢¿¦¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢
@@ -1417,8 +1410,8 @@
 		class="fqdomainname">FreeBSD.org</systemitem>
 	      ¥á¡¼¥ê¥ó¥°¥ê¥¹¥ÈƱÍͤˡ¢
 	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ÏÁ´À¤³¦¤ËÇÛ¿®¤µ¤ì¤Þ¤¹¡£
-	      ¤½¤Î¤¿¤á¡¢Ãϰ褪¤è¤ÓºßÂð¶Ð̳¤Ê¤Î¤«¡¢
-	      °Üž¤Î¤¿¤á¤Î»Ù±ç¤ò¼õ¤±¤é¤ì¤ë¤«¤É¤¦¤«¤òÌÀ³Î¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	      ÃÏ°è¤Ë´Ø¤¹¤ë¾ðÊó¤ä¡¢
+	      ºßÂð¶Ð̳¤Ê¤Î¤«°Üž¤Î¤¿¤á¤Î»Ù±ç¤ò¼õ¤±¤é¤ì¤ë¤«¤É¤¦¤«¤òÌÀ³Î¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	    <para>¥á¡¼¥ë¤Ç¤Ï¡¢¥ª¡¼¥×¥ó¥Õ¥©¡¼¥Þ¥Ã¥È¤Î¤ß¤ò»È¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
 	      — ¥×¥ì¥¤¥ó¥Æ¥­¥¹¥È¤¬¹¥¤Þ¤·¤¤¤Î¤Ç¤¹¤¬¡¢
@@ -1437,7 +1430,7 @@
 	  <listitem>
 	    <para><emphasis>KDE</emphasis></para>
 
-	    <para>FreeBSD ¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë <application>KDE</application>
+	    <para>&os; ¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë <application>KDE</application>
 	      ¤Ë´Ø¤¹¤ëµÄÏÀ¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ´°Á´¤Ëµ»½ÑŪ¤ÊÆâÍƤòÍ׵ᤷ¤Þ¤¹¡£</para>
@@ -1449,10 +1442,11 @@
 
 	  <listitem>
 	    <para><emphasis>µ»½ÑŪ¤ÊµÄÏÀ</emphasis></para>
-	    <para>¤³¤ì¤Ï FreeBSD ¤Ë´Ø¤¹¤ëµ»½ÑŪ¤ÊµÄÏÀ¤Î¤¿¤á¤Î
+
+	    <para>¤³¤ì¤Ï &os; ¤Ë´Ø¤¹¤ëµ»½ÑŪ¤ÊµÄÏÀ¤Î¤¿¤á¤Î
 	      ¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£
 	      ¤³¤ì¤ÏºÇ¤â¥Æ¥¯¥Ë¥«¥ë¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
-	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢FreeBSD
+	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢&os;
 	      ¾å¤Ç¥¢¥¯¥Æ¥£¥Ö¤Ë³èÆ°¤ò¤·¤Æ¤¤¤ë¿Í¤Î¤¿¤á¤Î¤â¤Î¤Ç¡¢
 	      ÌäÂê¤ò»ý¤Á½Ð¤·¤¿¤ê¡¢Âå¤ï¤ê¤Î²ò·èË¡¤òµÄÏÀ¤·¤Þ¤¹¡£
 	      µ»½ÑŪ¤ÊµÄÏÀ¤ò¥Õ¥©¥í¡¼¤¹¤ë¤Î¤Ë¶½Ì£¤¬¤¢¤ë¿Í¤â´¿·Þ¤·¤Þ¤¹¡£
@@ -1465,9 +1459,10 @@
 	  <term>&a.hardware.name;</term>
 
 	  <listitem>
-	    <para><emphasis>FreeBSD ¤Î¥Ï¡¼¥É¥¦¥§¥¢¤Î°ìÈÌŪ¤ÊµÄÏÀ
+	    <para><emphasis>&os; ¤Î¥Ï¡¼¥É¥¦¥§¥¢¤Î°ìÈÌŪ¤ÊµÄÏÀ
 	      </emphasis></para>
-	    <para>FreeBSD ¤¬Áö¤Ã¤Æ¤¤¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Î¥¿¥¤¥×¤ä¡¢
+
+	    <para>&os; ¤¬Áö¤Ã¤Æ¤¤¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Î¥¿¥¤¥×¤ä¡¢
 	      ²¿¤òÇã¤Ã¤¿¤êÈò¤±¤¿¤ê¤¹¤ë¤«¤Ë´Ø¤¹¤ëÍÍ¡¹¤ÊÌäÂê¤ä¡¢
 	      Äó°Æ¤Ë´Ø¤¹¤ëµÄÏÀ¡£</para>
 	  </listitem>
@@ -1478,7 +1473,8 @@
 
 	  <listitem>
 	    <para><emphasis>¥ß¥é¡¼¥µ¥¤¥È</emphasis></para>
-	    <para>FreeBSD ¥ß¥é¡¼¥µ¥¤¥È¤ò±¿ÍѤ·¤Æ¤¤¤ë¿Íã¸þ¤±¤Î¡¢
+
+	    <para>&os; ¥ß¥é¡¼¥µ¥¤¥È¤ò±¿ÍѤ·¤Æ¤¤¤ë¿Íã¸þ¤±¤Î¡¢
               ¥¢¥Ê¥¦¥ó¥¹¤ÈµÄÏÀ¤ò¹Ô¤Ê¤¦¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
             </para>
 	  </listitem>
@@ -1491,8 +1487,9 @@
 	    <para><emphasis>
 		¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À¤Î¤Ë¤Ä¤¤¤Æ¤ÎÏÃÂê
 	      </emphasis></para>
+
 	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢
-	      FreeBSD ¤òÍѤ¤¤¿¥¤¥ó¥¿¡¼¥Í¥Ã¥È ¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À (ISP)
+	      &os; ¤òÍѤ¤¤¿¥¤¥ó¥¿¡¼¥Í¥Ã¥È ¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À (ISP)
 	      ¤Ë´Ø¤¹¤ëÏÃÂê¤ÎµÄÏÀ¤Î¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ´°Á´¤Ëµ»½ÑŪ¤ÊÆâÍƤòÍ׵ᤷ¤Þ¤¹¡£</para>
@@ -1503,7 +1500,7 @@
 	  <term>&a.mono.name;</term>
 
 	  <listitem>
-	    <para><emphasis>FreeBSD ¤Ë¤ª¤±¤ë Mono ¤ª¤è¤Ó C#
+	    <para><emphasis>&os; ¤Ë¤ª¤±¤ë Mono ¤ª¤è¤Ó C#
 		¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</emphasis></para>
 
 	    <para>&os; ¾å¤Ç¤Î Mono
@@ -1520,10 +1517,10 @@
 	  <term>&a.office.name;</term>
 
 	  <listitem>
-	    <para><emphasis>FreeBSD
+	    <para><emphasis>&os;
 	        ¤Ç¤Î¥ª¥Õ¥£¥¹¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</emphasis></para>
 
-	    <para>FreeBSD ¤Ë¤ª¤±¤ë¥ª¥Õ¥£¥¹¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢
+	    <para>&os; ¤Ë¤ª¤±¤ë¥ª¥Õ¥£¥¹¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢
 	      ³«È¯¤ª¤è¤Ó¥µ¥Ý¡¼¥È¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ¤Î¾ì¤Ç¤¹¡£</para>
 	   </listitem>
 	</varlistentry>
@@ -1547,19 +1544,20 @@
 	  <term>&a.performance.name;</term>
 
 	  <listitem>
-	    <para><emphasis>FreeBSD
+	    <para><emphasis>&os;
 		¤Î¥Á¥å¡¼¥Ë¥ó¥°¤ä®ÅÙ¸þ¾å¤Ë´Ø¤¹¤ëµÄÏÀ</emphasis></para>
 
-	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢¥Ï¥Ã¥«¡¼¡¢´ÉÍý¼Ô¤ª¤è¤Ó´ØÏ¢¥°¥ë¡¼¥×¤¬¡¢
-	      FreeBSD ¤Î¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤Ë´Ø¤¹¤ë¥È¥Ô¥Ã¥¯¤òµÄÏÀ¤¹¤ë¾ì¤Ç¤¹¡£
+	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢¥Ï¥Ã¥«¡¼¡¢
+	      ´ÉÍý¼Ô¤ª¤è¤Ó´ØÏ¢¥°¥ë¡¼¥×¤¬¡¢
+	      &os; ¤Î¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤Ë´Ø¤¹¤ë¥È¥Ô¥Ã¥¯¤òµÄÏÀ¤¹¤ë¾ì¤Ç¤¹¡£
 	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ÇµÄÏÀ¤µ¤ì¤ë¤Ù¤­¥È¥Ô¥Ã¥¯¤Ï¡¢
-	      ¹âÉé²Ù¤Ë¤ª¤±¤ë FreeBSD ¤ÎƳÆþ¤Ë¤ª¤¤¤Æ·Ð¸³¤¹¤ë¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤ÎÌäÂê¤ä
-	      FreeBSD ¤Î¸Â³¦¤ËÄ©¤à¤è¤¦¤ÊÏÃÂê¤ò´Þ¤ß¤Þ¤¹¡£
-	      FreeBSD ¤Î¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤ò²þÁ±¤·¤¿¤¤¤È¹Í¤¨¤Æ¤¤¤ëÊý¤Ï¡¢
+	      ¹âÉé²Ù¤Ë¤ª¤±¤ë &os; ¤ÎƳÆþ¤Ë¤ª¤¤¤Æ·Ð¸³¤¹¤ë¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤ÎÌäÂê¤ä
+	      &os; ¤Î¸Â³¦¤ËÄ©¤à¤è¤¦¤ÊÏÃÂê¤ò´Þ¤ß¤Þ¤¹¡£
+	      &os; ¤Î¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤ò²þÁ±¤·¤¿¤¤¤È¹Í¤¨¤Æ¤¤¤ëÊý¤Ï¡¢
 	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÅÐÏ¿¤·¤Æ¤¯¤À¤µ¤¤¡£
-	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢FreeBSD ¤Î¹â®²½¡¢
+	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢&os; ¤Î¹â®²½¡¢
 	      ·øÏ´¤µ¡¢³ÈÄ¥À­¤Ë¶½Ì£¤ò¤â¤Ã¤Æ¤¤¤ë¡¢·Ð¸³¤Î¤¢¤ë
-	      FreeBSD ¥æ¡¼¥¶¡¢¥Ï¥Ã¥«¡¼¡¢´ÉÍý¼Ô¸þ¤±¤Î¹âÅ٤ʵ»½ÑŪ¥á¡¼¥ê¥ó¥°¤Ç¤¹¡£
+	      &os; ¥æ¡¼¥¶¡¢¥Ï¥Ã¥«¡¼¡¢´ÉÍý¼Ô¸þ¤±¤Î¹âÅ٤ʵ»½ÑŪ¥á¡¼¥ê¥ó¥°¤Ç¤¹¡£
 	      ¥É¥­¥å¥á¥ó¥È¤ËÌܤòÄ̤µ¤º¤Ë¼ÁÌ䤷¤ÆÅú¤¨¤òµá¤á¤ë¤è¤¦¤Ê
 	      Q and A ¥¿¥¤¥×¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤Ï¤Ê¤¯¡¢
 	      ̤²ò·è¤ÇÅú¤¨¤Î¤Ê¤¤¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤Ë´ØÏ¢¤·¤¿¥È¥Ô¥Ã¥¯¤Ø¤Î¹×¸¥¤äÌ䤤¹ç¤ï¤»¤Î¾ì¤Ç¤¹¡£</para>
@@ -1592,7 +1590,7 @@
 	  <listitem>
 	    <para><emphasis>¥Ñ¥±¥Ã¥È¥Õ¥£¥ë¥¿¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¥·¥¹¥Æ¥à¤Ë´Ø¤¹¤ëµÄÏÀ¤ª¤è¤Ó¼ÁÌä</emphasis></para>
 
-	    <para>FreeBSD ¤Î¥Ñ¥±¥Ã¥È¥Õ¥£¥ë¥¿ (pf)
+	    <para>&os; ¤Î¥Ñ¥±¥Ã¥È¥Õ¥£¥ë¥¿ (pf)
 	      ¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¥·¥¹¥Æ¥à¤Ë´ØÏ¢¤·¤¿µÄÏÀ¡£
 	      µ»½ÑŪ¤ÊµÄÏÀ¤ª¤è¤Ó¥æ¡¼¥¶¤Ë¤è¤ë¼ÁÌä¤ÎξÊý¤¬´¿·Þ¤µ¤ì¤Þ¤¹¡£
 	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢ALTQ QoS
@@ -1606,8 +1604,9 @@
 	  <listitem>
 	    <para><emphasis>&intel; °Ê³°¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î°Ü¿¢
 	      </emphasis></para>
-	    <para>¥¯¥í¥¹¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î FreeBSD ¤ÎÌäÂê¡£&intel;
-	      °Ê³°¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î FreeBSD
+
+	    <para>¥¯¥í¥¹¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î &os; ¤ÎÌäÂê¡£&intel;
+	      °Ê³°¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î &os;
 	      ¤Î°Ü¿¢¤Ë¤Ä¤¤¤Æ¤Î°ìÈÌŪ¤ÊµÄÏÀ¤äÄó°Æ¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ´°Á´¤Ëµ»½ÑŪ¤ÊÆâÍƤòÍ׵ᤷ¤Þ¤¹¡£</para>
@@ -1619,10 +1618,12 @@
 
 	  <listitem>
 	    <para><emphasis><quote>ports</quote> ¤ÎµÄÏÀ</emphasis></para>
-	    <para>FreeBSD <quote>Ports Collection</quote>
+
+	    <para>&os; <quote>Ports Collection</quote>
 	      (<filename>/usr/ports</filename>)
               ¤Ë´ØÏ¢¤¹¤ëÏÃÂê¤ä¡¢
-              Ports Collection ¤Î´ðÈפª¤è¤Ó ports ¤Î°ìÈÌŪ¤Ê¹½À®¤ÎÀ°È÷³èÆ°¤Ë´Ø¤¹¤ëµÄÏÀ¡£
+              Ports Collection ¤Î´ðÈפª¤è¤Ó ports
+	      ¤Î°ìÈÌŪ¤Ê¹½À®¤ÎÀ°È÷³èÆ°¤Ë´Ø¤¹¤ëµÄÏÀ¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ¸·Ì©¤Ëµ»½ÑŪ¤ÊÆâÍƤΤߤ¬°·¤ï¤ì¤Þ¤¹¡£</para>
 	  </listitem>
@@ -1653,8 +1654,9 @@
 	    <para><emphasis><quote>ports</quote>
 		¤Î¥Ð¥°¤Ë´Ø¤¹¤ëµÄÏÀ</emphasis></para>
 
-	    <para><quote>Ports Collection</quote> (<filename>/usr/ports</filename>) ¤Î¾ã³²Êó¹ð¤ä
-	      ¿·¤¿¤Ê ports ¤äÊѹ¹¤Ë¤Ä¤¤¤Æ¤ÎÄó°Æ¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ¡£
+	    <para><quote>Ports Collection</quote>
+	      (<filename>/usr/ports</filename>)
+	      ¤Î¾ã³²Êó¹ð¤ä¿·¤¿¤Ê ports ¤äÊѹ¹¤Ë¤Ä¤¤¤Æ¤ÎÄó°Æ¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ¸·Ì©¤Ëµ»½ÑŪ¤ÊÆâÍƤΤߤ¬°·¤ï¤ì¤Þ¤¹¡£</para>
  	  </listitem>
@@ -1664,10 +1666,10 @@
 	  <term>&a.proliant.name;</term>
 
 	  <listitem>
-	    <para><emphasis>HP ProLiant ¥µ¡¼¥Ð¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¾å¤Ç¤Î FreeBSD
+	    <para><emphasis>HP ProLiant ¥µ¡¼¥Ð¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¾å¤Ç¤Î &os;
 		¤Ë´Ø¤¹¤ëµ»½ÑŪ¤ÊµÄÏÀ</emphasis></para>
 
-	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢HP ProLiant ¥µ¡¼¥Ð¾å¤Ç¤Î FreeBSD
+	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢HP ProLiant ¥µ¡¼¥Ð¾å¤Ç¤Î &os;
 	      ¤ÎÍøÍѤ˴ؤ·¤¿µ»½ÑŪ¤ÊµÄÏÀ¤ËÍѤ¤¤é¤ì¤Þ¤¹¡£
 	      ProLiant ¤ËÆÃÍ­¤Î¥É¥é¥¤¥Ð¡¢´ÉÍý¥½¥Õ¥È¥¦¥§¥¢¡¢ÀßÄê¥Ä¡¼¥ë¡¢¤ª¤è¤Ó
 	      BIOS ¥¢¥Ã¥×¥Ç¡¼¥È¤Ê¤É¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
@@ -1680,14 +1682,14 @@
 	  <term>&a.python.name;</term>
 
 	  <listitem>
-	    <para><emphasis>FreeBSD ¤Ë¤ª¤±¤ë Python</emphasis></para>
+	    <para><emphasis>&os; ¤Ë¤ª¤±¤ë Python</emphasis></para>
 
-	    <para>FreeBSD ¤Ë¤ª¤±¤ë Python
+	    <para>&os; ¤Ë¤ª¤±¤ë Python
 	      ¥µ¥Ý¡¼¥È¤Î²þÎɤ˴ØÏ¢¤·¤¿µÄÏÀ¤ò¹Ô¤¦¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
 	      Python ¤Î°Ü¿¢¤Ë´Ø¤¹¤ëºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëÊý¤ä¡¢
 	      ¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥â¥¸¥å¡¼¥ë¤ª¤è¤Ó
-	      <application>Zope</application> ¤ò FreeBSD
+	      <application>Zope</application> ¤ò &os;
 	      ¤Ë°Ü¿¢¤·¤Æ¤¤¤ëÊý¤òÂоݤȤ·¤¿¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
 	      µ»½ÑŪ¤ÊµÄÏÀ¤Ë¶½Ì£¤ò»ý¤Ã¤Æ¤¤¤ëÊý¤Î»²²Ã¤â´¿·Þ¤µ¤ì¤Þ¤¹¡£</para>
 	  </listitem>
@@ -1699,10 +1701,11 @@
 	  <listitem>
 	    <para><emphasis>¥æ¡¼¥¶¤«¤é¤Î¼ÁÌä</emphasis></para>
 
-	    <para>FreeBSD ¤Ë´Ø¤¹¤ë¼ÁÌä¤Î¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
-	      ¤½¤Î¼ÁÌ䤬¤«¤Ê¤êµ»½ÑŪ¤À¤È»×¤ï¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
+	    <para>&os; ¤Ë´Ø¤¹¤ë¼ÁÌä¤Î¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
+	      µ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÂФ·¤Æ¤Ï¡¢
+	      ¶Ë¤á¤Æµ»½ÑŪ¤Ê¼ÁÌä¤Ç¤Ê¤±¤ì¤Ð¡¢
 	      <quote>¤É¤Î¤è¤¦¤Ë¤·¤Æ</quote>
-	      ¤È¤¤¤¦¼ÁÌä¤òµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÁ÷¤ë¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
+	      ¤È¤¤¤¦¼ÁÌä¤òÁ÷¤ë¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
 	  </listitem>
 	</varlistentry>
 
@@ -1710,10 +1713,10 @@
 	  <term>&a.ruby.name;</term>
 
 	  <listitem>
-	    <para><emphasis>FreeBSD ¸ÇÍ­¤Î Ruby
+	    <para><emphasis>&os; ¸ÇÍ­¤Î Ruby
 	      ¤Ë´Ø¤¹¤ëµÄÏÀ</emphasis></para>
 
-	    <para>FreeBSD ¤Ç¤Î Ruby
+	    <para>&os; ¤Ç¤Î Ruby
 	      ¥µ¥Ý¡¼¥È¤Ë´ØÏ¢¤·¤¿µÄÏÀ¤ò¹Ô¤¦¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£Ruby ports,
 	      ¥µ¡¼¥É¥Ñ¡¼¥Æ¥£¥é¥¤¥Ö¥é¥ê¤ª¤è¤Ó¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤Ë¤Ä¤¤¤Æºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ë¿Íã¤òÂоݤȤ·¤Æ¤¤¤Þ¤¹¡£</para>
@@ -1727,7 +1730,8 @@
 
 	  <listitem>
 	    <para><emphasis>SCSI ¥µ¥Ö¥·¥¹¥Æ¥à</emphasis></para>
-	    <para>¤³¤ì¤Ï FreeBSD ¤Î¤¿¤á¤Î SCSI
+
+	    <para>¤³¤ì¤Ï &os; ¤Î¤¿¤á¤Î SCSI
 	      ¥µ¥Ö¥·¥¹¥Æ¥à¤Ë¤Ä¤¤¤Æºî¶È¤·¤Æ¤¤¤ë¿Í¸þ¤±¤Ç¤¹¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ´°Á´¤Ëµ»½ÑŪ¤ÊÆâÍƤòÍ׵ᤷ¤Þ¤¹¡£</para>
@@ -1739,7 +1743,8 @@
 
 	  <listitem>
 	    <para><emphasis>¥»¥­¥å¥ê¥Æ¥£¤Î´ØÏ¢¤ÎÏÃÂê</emphasis></para>
-	    <para>FreeBSD ¥³¥ó¥Ô¥å¡¼¥¿¤Î¥»¥­¥å¥ê¥Æ¥£¤ÎÏÃÂê (DES,
+

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-doc-all mailing list