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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Wed Dec 9 15:02:56 UTC 2015


Author: ryusuke
Date: Wed Dec  9 15:02:55 2015
New Revision: 47835
URL: https://svnweb.freebsd.org/changeset/doc/47835

Log:
  - Merge the following from the English version:
  
  	r44412 -> r44413	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	Tue Dec  8 21:51:11 2015	(r47834)
+++ head/ja_JP.eucJP/books/handbook/eresources/chapter.xml	Wed Dec  9 15:02:55 2015	(r47835)
@@ -3,10 +3,13 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44412
+     Original revision: r44413
      $FreeBSD$
 -->
-<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="eresources">
+<appendix xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="eresources">
+
   <title>¥¤¥ó¥¿¡¼¥Í¥Ã¥È¾å¤Î¥ê¥½¡¼¥¹</title>
 
   <para><emphasis>Ìõ: &a.jp.yuki;¡¢1996 ǯ 8 ·î 28 Æü</emphasis></para>
@@ -16,13 +19,13 @@
     ¤½¤ì¤À¤±¤·¤«¤Ê¤¤¡¢¤È¤¤¤¦¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢
     ºÇ¿·¾ðÊó¤òÆþ¼ê¤¹¤ëÊýË¡¤È¤·¤Æ¤ÏÅÅ»ÒŪ¤Ê¥ê¥½¡¼¥¹¤¬¥Ù¥¹¥È¤Ç¤¹¡£
     &os; ¤Ï¥Ü¥é¥ó¥Æ¥£¥¢¤ÎÅØÎϤˤè¤Ã¤Æ¡¢¥æ¡¼¥¶¥³¥ß¥å¥Ë¥Æ¥£¼«ÂΤ¬¡¢
-    °ì¼ï¤Î <quote>¥Æ¥¯¥Ë¥«¥ë¥µ¥Ý¡¼¥ÈÉôÌç</quote> ¤È¤·¤Æ¤ÎÌò³ä¤âÄ̾ï²Ì¤¿¤·¤Æ¤ª¤ê¡¢
+    °ì¼ï¤Î <quote>¥Æ¥¯¥Ë¥«¥ë¥µ¥Ý¡¼¥ÈÉôÌç</quote>
+    ¤È¤·¤Æ¤ÎÌò³ä¤âÄ̾ï²Ì¤¿¤·¤Æ¤ª¤ê¡¢
     ÅŻҥ᡼¥ë¡¢¥¦¥§¥Ö¥Õ¥©¡¼¥é¥à¤ª¤è¤Ó Usenet
     ¤Î¥Ë¥å¡¼¥¹¤¬¤³¤ì¤é¤Î¥³¥ß¥å¥Ë¥Æ¥£¤Ë¤¿¤É¤êÃ夯ºÇ¤â¸ú²ÌŪ¤ÊÊýË¡¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
 
   <para>°Ê²¼¤Ë¡¢&os;
-    ¥æ¡¼¥¶¥³¥ß¥å¥Ë¥Æ¥£¤ËÏ¢Íí¤ò¼è¤ë¾ì¹ç¤ÎºÇ¤â½ÅÍפÊÅÀ¤Ë¤Ä¤¤¤Æ¤Î
-    ³µÎ¬¤ò¼¨¤·¤Þ¤¹¡£
+    ¥æ¡¼¥¶¥³¥ß¥å¥Ë¥Æ¥£¤ËÏ¢Íí¤ò¼è¤ë¾ì¹ç¤ÎºÇ¤â½ÅÍפÊÅÀ¤Ë¤Ä¤¤¤Æ¤Î³µÎ¬¤ò¼¨¤·¤Þ¤¹¡£
     ¤³¤³¤Ë½ñ¤«¤ì¤Æ¤¤¤Ê¤¤Â¾¤Î¥ê¥½¡¼¥¹¤ò¤´Â¸ÃΤǤ¢¤ì¤Ð¡¢
     ¤½¤ì¤é¤ò¤³¤³¤Ë´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¡¢
     &a.doc; ¤Ë¤ªÃΤ餻¤¯¤À¤µ¤¤¡£</para>
@@ -37,18 +40,17 @@
       ¼ÁÌä¤òŬÀڤʥ᡼¥ê¥ó¥°¥ê¥¹¥È¤ËÅê¹Æ¤¹¤ì¤Ð¡¢
       Á᤯¡¢Åª³Î¤ÊÈ¿±þ¤¬¤¤¤Ä¤Ç¤âÆÀ¤é¤ì¤ë¤³¤È¤Ç¤·¤ç¤¦¡£</para>
 
-    <para>¤µ¤Þ¤¶¤Þ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î·û¾Ï¤ò
-      ¤³¤Î¥É¥­¥å¥á¥ó¥È¤ÎºÇ¸å¤Ëµ­ºÜ¤·¤Þ¤¹¡£<emphasis>»ä¤¿¤Á¤Ï¡¢
-	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¼Á¡¢Æä˵»½ÑÌ̤˴ؤ¹¤ë¼Á¤ò¹â¤¯ÊݤÄ
-	¤¿¤á¤ËÅØÎϤ·¤Æ¤¤¤ë¤Î¤Ç¡¢
-	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤¹¤ëÁ°¤Ë¤½¤Î·û¾Ï¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£
+    <para>¤µ¤Þ¤¶¤Þ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î·û¾Ï¤ò¤³¤Î¥É¥­¥å¥á¥ó¥È¤ÎºÇ¸å¤Ëµ­ºÜ¤·¤Þ¤¹¡£
+      <emphasis>»ä¤¿¤Á¤Ï¡¢¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¼Á¡¢
+      Æä˵»½ÑÌ̤˴ؤ¹¤ë¼Á¤ò¹â¤¯ÊݤĤ¿¤á¤ËÅØÎϤ·¤Æ¤¤¤ë¤Î¤Ç¡¢
+      ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤¹¤ëÁ°¤Ë¤½¤Î·û¾Ï¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£
       </emphasis> »ä¤¿¤Á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î»²²Ã¼Ô¤Î¤Û¤È¤ó¤É¤Ï¡¢
       Èó¾ï¤Ë¤¿¤¯¤µ¤ó¤Î &os;
       ¤Ë´ØÏ¢¤·¤¿¥á¥Ã¥»¡¼¥¸¤òËèÆü¼õ¤±¼è¤Ã¤Æ¤ª¤ê¡¢
       ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ÎÍøÍѤ˴ؤ¹¤ë·û¾Ï¤ä¥ë¡¼¥ë¤Ï¡¢
       ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î S/N Èæ¤ò¹â¤¯ÊݤĤ¿¤á¤Î¤â¤Î¤Ç¤¹¡£
-      ¤½¤¦¤·¤Ê¤¤¤È¡¢·ë²ÌŪ¤Ë¡¢¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤¬¥×¥í¥¸¥§¥¯¥È¤Ë¤È¤Ã¤Æ
-      »ö¼Â¾å¤Î¥³¥ß¥å¥Ë¥±¡¼¥·¥ç¥ó¤Î¼êÃʤˤʤäƤ·¤Þ¤¦¤Ç¤·¤ç¤¦¡£</para>
+      ¤½¤¦¤·¤Ê¤¤¤È¡¢·ë²ÌŪ¤Ë¡¢
+      ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤¬¥×¥í¥¸¥§¥¯¥È¤Ë¤È¤Ã¤Æ»ö¼Â¾å¤Î¥³¥ß¥å¥Ë¥±¡¼¥·¥ç¥ó¤Î¼êÃʤˤʤäƤ·¤Þ¤¦¤Ç¤·¤ç¤¦¡£</para>
 
     <note>
       <para><emphasis>&os;
@@ -59,19 +61,20 @@
     </note>
 
     <para>¤É¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë¼ÁÌä¤òÅê¹Æ¤¹¤Ù¤­¤«Ì¤ä¿¾ì¹ç¤Ë¤Ï¡¢
-      <link xlink:href="&url.articles.freebsd-questions.en;">How to get best
-      results from the FreeBSD-questions mailing list</link>
-      ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
-
-    <para>¤É¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÅê¹Æ¤¹¤ë¾ì¹ç¤Ç¤â¡¢¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ò
-      ºÇÂç¸Â¤Ë³èÍѤ¹¤ëÊýË¡¤òÍý²ò¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£
-      ¤¿¤È¤¨¤Ð¡¢<link xlink:href="&url.articles.mailing-list-faq.en;">Mailing
-      List Frequently Asked Questions</link> (FAQ) ʸ½ñ¤òÆɤó¤Ç¡¢
+      <link xlink:href="&url.articles.freebsd-questions.en;">How to get
+      best results from the FreeBSD-questions mailing
+      list</link> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+
+    <para>¤É¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÅê¹Æ¤¹¤ë¾ì¹ç¤Ç¤â¡¢
+      ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤òºÇÂç¸Â¤Ë³èÍѤ¹¤ëÊýË¡¤òÍý²ò¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£
+      ¤¿¤È¤¨¤Ð¡¢
+      <link xlink:href="&url.articles.mailing-list-faq.en;">Mailing List
+	Frequently Asked Questions</link> (FAQ) ʸ½ñ¤òÆɤó¤Ç¡¢
       ·«¤êÊÖ¤·¹Ô¤ï¤ì¤ëµÄÏÀ¤òÈò¤±¤ëÊýË¡¤òÍý²ò¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
     <para>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¤¤¤º¤ì¤â¥¢¡¼¥«¥¤¥Ö¤µ¤ì¤Æ¤ª¤ê¡¢¤½¤ì¤é¤Ï
-      <link xlink:href="&url.base;/search/index.html">&os; World Wide Web
-	server</link> ¤Ç¸¡º÷¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+      <link xlink:href="&url.base;/search/index.html">&os; World Wide
+	Web server</link> ¤Ç¸¡º÷¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
       ¥­¡¼¥ï¡¼¥É¸¡º÷²Äǽ¤Ê¥¢¡¼¥«¥¤¥Ö¤ÎÄ󶡤ϡ¢
       Îɤ¯¤¢¤ë¼ÁÌä¤ËÂФ¹¤ë²óÅú¤ò¸«¤Ä¤±¤ë¤¹¤°¤ì¤¿ÊýË¡¤Ç¤¹¤«¤é¡¢
       ¼ÁÌä¤òÅê¹Æ¤¹¤ëÁ°¤ËÄ´¤Ù¤Æ¤ß¤ë¤Ù¤­¤Ç¤·¤ç¤¦¡£
@@ -108,7 +111,7 @@
 		(¥â¥Ç¥ì¡¼¥¿À©)</entry>
 	    </row>
 
- 	    <row>
+	    <row>
 	      <entry>&a.arch.name;</entry>
 	      <entry>¥¢¡¼¥­¥Æ¥¯¥Á¥ã¡¢À߷פ˴ؤ¹¤ëµÄÏÀ</entry>
 	    </row>
@@ -177,8 +180,8 @@
 
       <para><emphasis>µ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È:</emphasis>
 	°Ê²¼¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢µ»½ÑŪ¤Ê µÄÏÀ¤Î¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
-	¤½¤ì¤é¤ÎÍøÍѤäÆâÍƤΤ¿¤á¤Ë¤·¤Ã¤«¤ê¤È¤·¤¿¥¬¥¤¥É¥é
-	¥¤¥ó¤¬¤¢¤ë¤Î¤Ç¡¢¤³¤ì¤é¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÆþ¤Ã¤¿¤ê¡¢
+	¤½¤ì¤é¤ÎÍøÍѤäÆâÍƤΤ¿¤á¤Ë¤·¤Ã¤«¤ê¤È¤·¤¿¥¬¥¤¥É¥é¥¤¥ó¤¬¤¢¤ë¤Î¤Ç¡¢
+	¤³¤ì¤é¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÆþ¤Ã¤¿¤ê¡¢
 	¤É¤ì¤«°ì¤Ä¤Ë¥á¡¼¥ë ¤òÁ÷¤Ã¤¿¤ê¤¹¤ëÁ°¤Ë¤Ï¡¢
 	¤½¤ì¤é¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î·û¾Ï¤òÃí°Õ¿¼¤¯Æɤó¤Ç¤¯¤À¤µ¤¤¡£</para>
 
@@ -348,7 +351,8 @@
 
 	    <row>
 	      <entry>&a.ia32.name;</entry>
-	      <entry>&os; ¤Î IA-32 (&intel; x86) ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î°Ü¿¢</entry>
+	      <entry>&os; ¤Î IA-32 (&intel; x86)
+		¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
@@ -398,7 +402,7 @@
 	      <entry>¥â¡¼¥Ð¥¤¥ë¥³¥ó¥Ô¥å¡¼¥Æ¥£¥ó¥°¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ</entry>
 	    </row>
 
- 	    <row>
+	    <row>
 	      <entry>&a.mono.name;</entry>
 	      <entry>&os; ¤Ë¤ª¤±¤ë Mono ¤ª¤è¤Ó C# ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry>
 	    </row>
@@ -629,10 +633,11 @@
 
       <para><emphasis>À©¸Â¤µ¤ì¤Æ¤¤¤ë¥á¡¼¥ê¥ó¥°¥ê¥¹¥È:</emphasis>
 	°Ê²¼¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¤è¤êÆò½¤µ¤ì¤¿ (¤½¤·¤Æ¤è¤ê¸·¤·¤¤)
-	¥á¥ó¥Ð¡¼¤Î¤¿¤á¤Î¤â¤Î¤Ç¤¢¤ê¡¢°ìÈÌŪ¤Ê¶½Ì£¤ò¼æ¤¯¤è¤¦¤Ê¤â¤Î¤Ç¤Ï
-	¤¢¤ê¤Þ¤»¤ó¡£
-	¤³¤Î¤è¤¦¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤¹¤ëÁ°¤Ë¡¢µ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç
-	¼«¤é¤Î¸ºß´¶¤ò¥¢¥Ô¡¼¥ë¤¹¤ë¤Î¤ÏÎɤ¤¹Í¤¨¤Ç¤¹¡£¤½¤¦¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢
+	¥á¥ó¥Ð¡¼¤Î¤¿¤á¤Î¤â¤Î¤Ç¤¢¤ê¡¢
+	°ìÈÌŪ¤Ê¶½Ì£¤ò¼æ¤¯¤è¤¦¤Ê¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+	¤³¤Î¤è¤¦¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤¹¤ëÁ°¤Ë¡¢
+	µ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¼«¤é¤Î¸ºß´¶¤ò¥¢¥Ô¡¼¥ë¤¹¤ë¤Î¤ÏÎɤ¤¹Í¤¨¤Ç¤¹¡£
+	¤½¤¦¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢
 	µÄÏÀ¤ÎºÝ¤Î¥¨¥Á¥±¥Ã¥È¤ò³Ø¤Ö¤³¤È¤¬¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£</para>
 
       <informaltable frame="none" pgwide="1">
@@ -737,7 +742,7 @@
 		¥Õ¥Ã¥¯¤ª¤è¤Ó¾¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Ç¡¼¥¿¤ËÂФ·¤Æ²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
 	    </row>
 
- 	    <row>
+	    <row>
 	      <entry>&a.svn-src-all.name;</entry>
 	      <entry><filename>/usr/src</filename></entry>
 	      <entry>src subversion ¥ê¥Ý¥¸¥È¥ê¤Ø²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹
@@ -745,7 +750,7 @@
 		<filename>projects</filename> ¤ò½ü¤¯)</entry>
 	    </row>
 
- 	    <row>
+	    <row>
 	      <entry>&a.svn-src-head.name;</entry>
 	      <entry><filename>/usr/src</filename></entry>
 	      <entry>src subversion ¥ê¥Ý¥¸¥È¥ê¤Î <quote>head</quote>
@@ -865,8 +870,7 @@
 
       <para>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤«¤éÅÐÏ¿¤ò²ò½ü¤¹¤ë¾ì¹ç¤Ï¡¢
 	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ÇÇÛ¿®¤µ¤ì¤Æ¤¤¤ë¥á¡¼¥ë¤ÎºÇ¸å¤Ë¤¢¤ë
-	URL ¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£
-	¤Þ¤¿¤Ï¡¢
+	URL ¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¤Ï¡¢
 	<email><replaceable>listname</replaceable>-unsubscribe at FreeBSD.org</email>
 	¤Ë¥á¡¼¥ë¤òÁ÷¿®¤¹¤ë¤³¤È¤Ç¤âÅÐÏ¿¤ò²ò½ü¤Ç¤­¤Þ¤¹¡£</para>
 
@@ -881,30 +885,25 @@
       <title>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î·û¾Ï</title>
 
       <para><emphasis>¤¹¤Ù¤Æ</emphasis> &os;
-	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ïï¤Ç¤â¤½¤ì¤é¤òÍøÍѤ¹¤ë¤³¤È¤Ë
-	¸Ç¼é¤·¤Ê¤±¤ì¤Ð¤¤¤±¤Ê¤¤¤È¤¤¤¦°ìÄê¤Î´Êñ¤Ê¥ë¡¼¥ë¤¬¤¢¤ê¤Þ¤¹¡£
+	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ïï¤Ç¤â¤½¤ì¤é¤òÍøÍѤ¹¤ë¤³¤È¤Ë¸Ç¼é¤·¤Ê¤±¤ì¤Ð¤¤¤±¤Ê¤¤¤È¤¤¤¦°ìÄê¤Î´Êñ¤Ê¥ë¡¼¥ë¤¬¤¢¤ê¤Þ¤¹¡£
 	¤³¤ì¤é¤Î¥ë¡¼¥ë¤Ë½¾¤ï¤Ê¤¤¤È¡¢·ë²Ì¤È¤·¤Æ &os; ¤Î Postmaster
-	<email>postmaster at FreeBSD.org</email> ¤«¤é 2 ²ó¤Þ¤Ç¤Ï·Ù
-	¹ð¤ò¼õ¤±¤Þ¤¹¡£3 ²ó°ãÈ¿¤¹¤ë¤È¡¢
-	Åê¹Æ¼Ô¤Ï¤¹¤Ù¤Æ¤Î &os; ¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤«¤éºï½ü¤µ¤ì¡¢
+	<email>postmaster at FreeBSD.org</email> ¤«¤é 2 ²ó¤Þ¤Ç¤Ï·Ù¹ð¤ò¼õ¤±¤Þ¤¹¡£
+	3 ²ó°ãÈ¿¤¹¤ë¤È¡¢Åê¹Æ¼Ô¤Ï¤¹¤Ù¤Æ¤Î &os; ¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤«¤éºï½ü¤µ¤ì¡¢
 	¤½¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ø¤Î¤µ¤é¤Ê¤ëÅê¹Æ¤«¤éÄù¤á½Ð¤µ¤ì¤ë¤Ç¤·¤ç¤¦¡£
 	¤³¤ì¤é¤Î¥ë¡¼¥ë¤äÂкö¤¬É¬ÍפʤΤϻÄÇ°¤Ç¤¹¡£
-	¤·¤«¤·¡¢º£Æü¤Î¥¤¥ó¥¿¡¼¥Í¥Ã
-	¥È¤Ï¤º¤¤¤Ö¤ó¤¤¤ä¤é¤·¤¤´Ä¶­¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢°ìÈ̤ο͡¹¤Ï¡¢
-	¤½¤Î (Âкö¤Î) ¥á¥«¥Ë¥º¥à¤¬¤¤¤«¤Ë¤â¤í¤¤¤«¤È¤¤¤¦»ö¤¹¤é
-	ǧ¼±¤¹¤ë»ö¤¬½ÐÍè¤Æ¤¤¤Ê¤¤¤È»×¤ï¤ì¤Þ¤¹¡£</para>
+	¤·¤«¤·¡¢º£Æü¤Î¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Ï¤º¤¤¤Ö¤ó¤¤¤ä¤é¤·¤¤´Ä¶­¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢
+	°ìÈ̤ο͡¹¤Ï¡¢¤½¤Î (Âкö¤Î)
+	¥á¥«¥Ë¥º¥à¤¬¤¤¤«¤Ë¤â¤í¤¤¤«¤È¤¤¤¦»ö¤¹¤éǧ¼±¤¹¤ë»ö¤¬½ÐÍè¤Æ¤¤¤Ê¤¤¤È»×¤ï¤ì¤Þ¤¹¡£</para>
 
       <para>ƻɸ</para>
 
       <itemizedlist>
 	<listitem>
-	  <para>¤¤¤«¤Ê¤ëÅê¹Æµ­»ö¤â¤½¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î
-	    ´ðËÜŪ¤Ê·û¾Ï¤ò¼é¤ë¤Ù¤­¤Ç¤¹¡£
+	  <para>¤¤¤«¤Ê¤ëÅê¹Æµ­»ö¤â¤½¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î´ðËÜŪ¤Ê·û¾Ï¤ò¼é¤ë¤Ù¤­¤Ç¤¹¡£
 	    ¤½¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤¬µ»½ÑŪ¤ÊÌäÂê¤Ë´Ø¤¹¤ë¤â¤Î¤Ç¤¢¤ì¤Ð¡¢
-	    µ»½ÑŪ¤ÊµÄÏÀ¤ò´Þ¤àÅê¹Æ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¸½ºß·Ñ³Ãæ¤Î
-	    ÉÔŬÀڤʷû¾Ï¤ä¥Õ¥ì¥¤¥à¤Ï¡¢
-	    ½ê°¤·¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¿Í¤ËÂФ·¤Æ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È
-	    ¤Î²ÁÃͤò²¼¤²¤Æ¤·¤Þ¤¦¤À¤±¤Ç¤¹¤·¡¢
+	    µ»½ÑŪ¤ÊµÄÏÀ¤ò´Þ¤àÅê¹Æ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
+	    ¸½ºß·Ñ³Ãæ¤ÎÉÔŬÀڤʷû¾Ï¤ä¥Õ¥ì¥¤¥à¤Ï¡¢
+	    ½ê°¤·¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¿Í¤ËÂФ·¤Æ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î²ÁÃͤò²¼¤²¤Æ¤·¤Þ¤¦¤À¤±¤Ç¤¹¤·¡¢
 	    µö¤µ¤ì¤ë¹Ô°Ù¤Ç¤Ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£
 	    ¤È¤¯¤ËÏÃÂê¤Î¤Ê¤¤¼«Í³·Á¼°¤ÎµÄÏÀ¤ËÂФ·¤Æ¤Ï &a.chat;
 	    ¤¬¼«Í³¤Ëǧ²Ä¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢
@@ -913,12 +912,11 @@
 
 	<listitem>
 	  <para>°ìÅÙ¤Ë 3
-	    ¤Ä°Ê¾å¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë¤Ï·è¤·¤ÆÅê¹Æ¤¹¤Ù¤­¤Ç¤Ï
-	    ¤¢¤ê¤Þ¤»¤ó¡£2
-	    ¤Ä¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë¤ÏÁÐÊý¤ËÌÀ³Î¤ÊɬÍ×À­¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ß
-	    Åê¹Æ¤¹¤Ù¤­¤Ç¤¹¡£¤É¤Î¥ê¥¹¥È¤ËÂФ·¤Æ¤â¡¢
-	    (¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î)»²²Ã¼Ô¤Ï (Ê£¿ô¤Î¥á¡¼¥ê¥ó¥°¥ê
-	    ¥¹¥È¤Ë)½ÅÊ£¤·¤Æ»²²Ã¤·¤Æ¤ª¤ê¡¢´ØÏ¢¤¹¤ëÉôʬ¤¬¾¯¤Ê¤¤ (¤¿¤È¤¨¤Ð¡¢
+	    ¤Ä°Ê¾å¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë¤Ï·è¤·¤ÆÅê¹Æ¤¹¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+	    2 ¤Ä¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë¤ÏÁÐÊý¤ËÌÀ³Î¤ÊɬÍ×À­¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ßÅê¹Æ¤¹¤Ù¤­¤Ç¤¹¡£
+	    ¤É¤Î¥ê¥¹¥È¤ËÂФ·¤Æ¤â¡¢
+	    (¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î)»²²Ã¼Ô¤Ï (Ê£¿ô¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë)
+	    ½ÅÊ£¤·¤Æ»²²Ã¤·¤Æ¤ª¤ê¡¢´ØÏ¢¤¹¤ëÉôʬ¤¬¾¯¤Ê¤¤ (¤¿¤È¤¨¤Ð¡¢
 	    <quote>-stable</quote> ¤È <quote>-scsi</quote>)
 	    ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ò½ü¤¤¤Æ¤Ï¡¢
 	    °ìÅÙ¤ËÊ£¿ô¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÅê¹Æ¤¹¤ëÍýͳ¤ÏÁ´¤¯¤¢¤ê¤Þ¤»¤ó¡£
@@ -933,16 +931,15 @@
 	<listitem>
 	  <para>¥æ¡¼¥¶¤Ç¤¢¤ì³«È¯¼Ô¤Ç¤¢¤ì¡¢(µÄÏÀ¤ÎÃæ¤Ç)
 	    ¸Ä¿Í¤ò¹¶·â¤·¤¿¤êËÁƤ·¤¿¤ê¤¹¤ë¤³¤È¤Ïµö¤µ¤ì¤Þ¤»¤ó¡£
-	    ¸Ä¿ÍŪ¤Ê¥á¡¼¥ë¤ò°úÍѤ·¤¿¤êºÆÅê¹Æ¤·¤¿¤ê
-	    ¤¹¤ëµö²Ä¤ò¤â¤é¤¨¤Ê¤«¤Ã¤¿¤ê¡¢¤â¤é¤¨¤½¤¦¤Ë¤Ê¤¤»þ¤Ë¡¢
-	    ¤½¤ì¤ò¤ª¤³¤Ê¤¦ ¤è¤¦¤Ê¥Í¥Á¥±¥Ã¥È (ÌõÃí:
-	    ¥Í¥Ã¥È¥ï¡¼¥¯¤Ë¤ª¤±¤ë¥¨¥Á¥±¥Ã¥È) ¤ËÂФ¹¤ë
-	    ¤Ò¤É¤¤°ãÈ¿¤Ï¹¥¤Þ¤ì¤Þ¤»¤ó¤¬¡¢
+	    ¸Ä¿ÍŪ¤Ê¥á¡¼¥ë¤ò°úÍѤ·¤¿¤êºÆÅê¹Æ¤·¤¿¤ê¤¹¤ëµö²Ä¤ò¤â¤é¤¨¤Ê¤«¤Ã¤¿¤ê¡¢
+	    ¤â¤é¤¨¤½¤¦¤Ë¤Ê¤¤»þ¤Ë¡¢
+	    ¤½¤ì¤ò¤ª¤³¤Ê¤¦ ¤è¤¦¤Ê¥Í¥Á¥±¥Ã¥È
+	    (ÌõÃí: ¥Í¥Ã¥È¥ï¡¼¥¯¤Ë¤ª¤±¤ë¥¨¥Á¥±¥Ã¥È)
+	    ¤ËÂФ¹¤ë¤Ò¤É¤¤°ãÈ¿¤Ï¹¥¤Þ¤ì¤Þ¤»¤ó¤¬¡¢
 	    ¤·¤Æ¤Ï¤Ê¤é¤Ê¤¤¤ÈÆÃÊ̤ËÄê¤á¤é¤ì¤Æ¤¤¤ë ¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	    <emphasis>¤·¤«¤·¤Ê¤¬¤é</emphasis>¡¢¤½¤Î¤è¤¦¤ÊÆâÍƤ¬¥á¡¼
-	    ¥ê¥ó¥°¥ê¥¹¥È¤Î·û¾Ï¤Ë±è¤¦¾ì¹ç¤Ï¤Û¤È¤ó¤É¤¢¤ê¤Þ¤»¤ó¡£
-	    ¤³¤Î¤¿¤á¡¢¥á¡¼
-	    ¥ê¥ó¥°¥ê¥¹¥È¤Î·û¾Ï¤Ë°ãÈ¿¤·¤Æ¤¤¤ë¤È¤¤¤¦¤³¤È¤À¤±¤Ç·Ù¹ð
+	    <emphasis>¤·¤«¤·¤Ê¤¬¤é</emphasis>¡¢
+	    ¤½¤Î¤è¤¦¤ÊÆâÍƤ¬¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î·û¾Ï¤Ë±è¤¦¾ì¹ç¤Ï¤Û¤È¤ó¤É¤¢¤ê¤Þ¤»¤ó¡£
+	    ¤³¤Î¤¿¤á¡¢¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î·û¾Ï¤Ë°ãÈ¿¤·¤Æ¤¤¤ë¤È¤¤¤¦¤³¤È¤À¤±¤Ç·Ù¹ð
 	    (¤Þ¤¿¤Ï¶Ø»ß) ¤ËÃͤ¹¤ë¤â¤Î¤È¹Í¤¨¤Æ¤¤¤¤¤Ç¤·¤ç¤¦¡£</para>
 	</listitem>
 
@@ -958,7 +955,7 @@
 
       <variablelist>
 
- 	<varlistentry>
+	<varlistentry>
 	  <term>&a.acpi.name;</term>
 
 	  <listitem>
@@ -996,8 +993,8 @@
 
 	    <para>¤³¤ì¤Ï¡¢Ã±¤Ë¤¿¤Þ¤Ëȯɽ¤µ¤ì¤ë½ÅÍ×¤Ê &os;
 	      ¤Î¥¤¥Ù¥ó¥È¤Ë´Ø¿´¤¬¤¢¤ë¿Í¤Î¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
-	      ¤³¤ì¤Ï¡¢¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ä¤½¤Î¾¤Î¥ê¥ê¡¼¥¹¤Ë
-	      ¤Ä¤¤¤Æ¤Î¥¢¥Ê¥¦¥ó¥¹¤ò´Þ¤ß¤Þ¤¹¡£
+	      ¤³¤ì¤Ï¡¢
+	      ¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ä¤½¤Î¾¤Î¥ê¥ê¡¼¥¹¤Ë¤Ä¤¤¤Æ¤Î¥¢¥Ê¥¦¥ó¥¹¤ò´Þ¤ß¤Þ¤¹¡£
 	      ¤½¤Î¥¢¥Ê¥¦¥ó¥¹¤Ï¿·¤·¤¤ &os; ¤Îµ¡Ç½¤Î¥¢¥Ê¥¦¥ó¥¹¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
 	      ¥Ü¥é¥ó¥Æ¥£¥¢Åù¤Î¸Æ¤Ó¤«¤±¤¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
 	      ¤³¤ì¤ÏήÄÌÎ̤ξ¯¤Ê¤¤¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¡¢
@@ -1060,8 +1057,10 @@
 	    <para><emphasis>¾ã³²Êó¹ð¤Î¼è¤ê°·¤¤¤Ë´Ø¤¹¤ëÄ´À°</emphasis></para>
 
 	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢
-	      ¥Ð¥°¥Þ¥¤¥¹¥¿¡¼¡¢¥Ð¥°¥Ð¥¹¥¿¡¼¡¢¤ª¤è¤Ó¾¤Î¾ã³²Êó¹ð¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë½ã¿è¤Ë¶½Ì£¤ò»ý¤Ã¤Æ¤¤¤ë¥°¥ë¡¼¥×¤ÎÄ´À°¤äµÄÏÀ¤Ë¤Ä¤¤¤Æ¤Î¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£
-	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢¸ÄÊ̤ΥХ°¡¢¥Ñ¥Ã¥Á¡¢¾ã³²Êó¹ð¤Ë¤Ä¤¤¤ÆµÄÏÀ¤ò¹Ô¤¦¤¿¤á¤Î¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
+	      ¥Ð¥°¥Þ¥¤¥¹¥¿¡¼¡¢¥Ð¥°¥Ð¥¹¥¿¡¼¡¢
+	      ¤ª¤è¤Ó¾¤Î¾ã³²Êó¹ð¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë½ã¿è¤Ë¶½Ì£¤ò»ý¤Ã¤Æ¤¤¤ë¥°¥ë¡¼¥×¤ÎÄ´À°¤äµÄÏÀ¤Ë¤Ä¤¤¤Æ¤Î¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£
+	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢¸ÄÊ̤ΥХ°¡¢¥Ñ¥Ã¥Á¡¢
+	      ¾ã³²Êó¹ð¤Ë¤Ä¤¤¤ÆµÄÏÀ¤ò¹Ô¤¦¤¿¤á¤Î¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
 	  </listitem>
 	</varlistentry>
 
@@ -1070,12 +1069,12 @@
 
 	  <listitem>
 	    <para><emphasis>¥Ð¥°¥ì¥Ý¡¼¥È</emphasis></para>
+
 	    <para>¤³¤ì¤Ï¡¢&os;
-	      ¤Î¥Ð¥°¥ì¥Ý¡¼¥È¤Î¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£²Äǽ¤Ç¤¢¤ë
-	      ¾ì¹ç¤Ï¤¤¤Ä¤Ç¤â¡¢¥Ð¥°¤Ï &man.send-pr.1;
+	      ¤Î¥Ð¥°¥ì¥Ý¡¼¥È¤Î¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
+	      ²Äǽ¤Ç¤¢¤ë¾ì¹ç¤Ï¤¤¤Ä¤Ç¤â¡¢¥Ð¥°¤Ï &man.send-pr.1;
 	      ¤ò»È¤¦¤«¡¢<link xlink:href="&url.base;/send-pr.html">WEB
-		interface</link>¤òÍѤ¤
-	      ¤ÆÁ÷¤é¤ì¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
+		interface</link>¤òÍѤ¤¤ÆÁ÷¤é¤ì¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
 
@@ -1083,8 +1082,8 @@
 	  <term>&a.chat.name;</term>
 
 	  <listitem>
-	    <para><emphasis>&os; ¤Î¥³¥ß¥å¥Ë¥Æ¥£¤Ë´Ø¤¹¤ë
-		µ»½ÑŪ¤Ç¤Ï¤Ê¤¤ÏÃÂê</emphasis></para>
+	    <para><emphasis>&os;
+		¤Î¥³¥ß¥å¥Ë¥Æ¥£¤Ë´Ø¤¹¤ëµ»½ÑŪ¤Ç¤Ï¤Ê¤¤ÏÃÂê</emphasis></para>
 
 	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ïµ»½ÑŪ¤Ç¤Ï¤Ê¤¯¡¢
 	      ¼Ò²ñŪ¤Ê¾ðÊó¤Ë¤Ä¤¤¤Æ¡¢
@@ -1096,7 +1095,7 @@
 	      ¤Ê¤É¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ¤ò´Þ¤ß¤Þ¤¹¡£»þ¡¹½ÅÍפʥ¤¥Ù¥ó¥È
 	      (¾­Í賫ºÅ¤µ¤ì¤ë¥Ñ¡¼¥Æ¥£¡¼¤ä¡¢·ëº§¼°¡¢ÃÂÀ¸Æü¡¢
 	      ¿·¤·¤¤»Å»ö¤Ê¤É) ¤Î¤ªÃΤ餻¤¬¡¢
-	      µ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤«¤é ¤Ç¤Æ¤­¤Þ¤¹¡£¤·¤«¤·¡¢
+	      µ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤«¤é¤Ç¤Æ¤­¤Þ¤¹¡£¤·¤«¤·¡¢
 	      ¥Õ¥©¥í¡¼¤ÏľÀÜ
 	      -chat¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë¤¹¤ë¤Ù¤­¤Ç¤¹¡£</para>
 	  </listitem>
@@ -1121,9 +1120,8 @@
 	  <listitem>
 	    <para><emphasis>&os; ¥³¥¢¥Á¡¼¥à</emphasis></para>
 	    <para>¤³¤ì¤Ï¡¢¥³¥¢¥á¥ó¥Ð¤¬»È¤¦ÆâÉô¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
-	      &os; ¤Ë´ØÏ¢¤¹¤ë¿¼¹ï¤Ê¤ä¤Ã¤«¤¤»ö¤ÎºÛÄê¤ä
-	      ¥Ï¥¤¥ì¥Ù¥ë¤ÊÌÊÌ©¤ÊÄ´ºº¤òÍ׵᤹¤ë¤È¤­¤Ë¡¢¤³¤Î¥á¡¼
-	      ¥ê¥ó¥°¥ê¥¹¥È¤Ë¥á¥Ã¥»¡¼¥¸¤òÁ÷¤ë»ö¤¬½ÐÍè¤Þ¤¹¡£</para>
+	      &os; ¤Ë´ØÏ¢¤¹¤ë¿¼¹ï¤Ê¤ä¤Ã¤«¤¤»ö¤ÎºÛÄê¤ä¥Ï¥¤¥ì¥Ù¥ë¤ÊÌÊÌ©¤ÊÄ´ºº¤òÍ׵᤹¤ë¤È¤­¤Ë¡¢
+	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë¥á¥Ã¥»¡¼¥¸¤òÁ÷¤ë»ö¤¬½ÐÍè¤Þ¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
 
@@ -1131,8 +1129,8 @@
 	  <term>&a.current.name;</term>
 
 	  <listitem>
-	    <para><emphasis>&os.current; ¤Î»ÈÍѤ˴ؤ¹¤ëµÄÏÀ
-	      </emphasis></para>
+	    <para><emphasis>&os.current; ¤Î»ÈÍѤ˴ؤ¹¤ëµÄÏÀ</emphasis></para>
+
 	    <para>¤³¤ì¤Ï &os.current;
 	      ¤Î¥æ¡¼¥¶¤Î¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
 	      ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤ÎÏÃÂê¤Ï¡¢-CURRENT
@@ -1141,8 +1139,7 @@
 	      ¤ª¤è¤Ó -CURRENT
 	      ¤Î¤Þ¤Þ¤Ç¤¤¤ë¤¿¤á¤ËɬÍפʼê½ç¤Ë¤Ä¤¤¤Æ¤ÎÀâÌÀ¤ò´Þ¤ß¤Þ¤¹¡£
 	      <quote>CURRENT</quote>
-	      ¤òÁö¤é¤»¤Æ¤¤¤ë¿Í¤Ï¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë
-	      ÅÐÏ¿¤·¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£
+	      ¤òÁö¤é¤»¤Æ¤¤¤ë¿Í¤Ï¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÅÐÏ¿¤·¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ´°Á´¤Ëµ»½ÑŪ¤ÊÆâÍƤòÍ׵ᤷ¤Þ¤¹¡£</para>
 	  </listitem>
@@ -1156,8 +1153,8 @@
 
 	    <para>&os;-CVSweb
 	      ¤ÎÍøÍÑ¡¢³«È¯¤ª¤è¤Ó´ÉÍý¤Ë¤Ä¤¤¤Æ¤Îµ»½ÑŪ¤ÊµÄÏÀ¤Î¾ì¤Ç¤¹¡£</para>
- 	  </listitem>
- 	</varlistentry>
+	  </listitem>
+	</varlistentry>
 
 	<varlistentry>
 	  <term>&a.desktop.name;</term>
@@ -1170,8 +1167,8 @@
 	      ¤Ë¤Ä¤¤¤ÆµÄÏÀ¤ò¹Ô¤¦¤¿¤á¤Î¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£
 	      ¼ç¤È¤·¤Æ¡¢¥Ç¥¹¥¯¥È¥Ã¥×¤Î°Ü¿¢¼Ô¤ä¥æ¡¼¥¶¤¬ &os;
 	      ¤Î¥Ç¥¹¥¯¥È¥Ã¥×¥µ¥Ý¡¼¥È¤Ë´Ø¤¹¤ëÌäÂêÅÀ¤ä²þÎɤˤĤ¤¤ÆµÄÏÀ¤¹¤ë¾ì¤Ç¤¹¡£</para>
- 	  </listitem>
- 	</varlistentry>
+	  </listitem>
+	</varlistentry>
 
 	<varlistentry>
 	  <term>&a.doc.name;</term>
@@ -1270,9 +1267,8 @@
 	  <term>&a.emulation.name;</term>
 
 	  <listitem>
-	    <para><emphasis>Emulation of other systems such as
-		Linux/&ms-dos;/&windows;
-		Åù¤Î¥·¥¹¥Æ¥à¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó</emphasis></para>
+	    <para><emphasis>Linux/&ms-dos;/&windows;
+		Åù¤Î¾¤Î¥·¥¹¥Æ¥à¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó</emphasis></para>
 
 		<para>¾¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ë½ñ¤«¤ì¤¿¥×¥í¥°¥é¥à¤ò¡¢
 		  &os; ¤ÇÁö¤é¤»¤ë¤³¤È¤Ë´ØÏ¢¤·¤¿µ»½ÑŪ¤ÊµÄÏÀ¤Î¤¿¤á¤Î¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£</para>
@@ -1314,7 +1310,7 @@
 	  <listitem>
 	    <para><emphasis>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à</emphasis></para>
 
-	    <para>&os; ¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë´Ø¤¹¤ëµÄÏÀ
+	    <para>&os; ¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë´Ø¤¹¤ëµÄÏÀ¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ´°Á´¤Ëµ»½ÑŪ¤ÊÆâÍƤòÍ׵ᤷ¤Þ¤¹¡£</para>
 	  </listitem>
@@ -1382,7 +1378,7 @@
 	    <para><emphasis>&os; ¤Ç¤Î Infiniband ¤Î»ÈÍÑ</emphasis></para>
 
 	    <para>&os; ¤Ë¤ª¤±¤ë Infiniband, OFED ¤ª¤è¤Ó OpenSM
-	    ¤Ë´Ø¤¹¤ëµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£</para>
+	      ¤Ë´Ø¤¹¤ëµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
 
@@ -1392,8 +1388,8 @@
 	  <listitem>
 	    <para><emphasis>IP Firewall</emphasis></para>
 
-	    <para>¤³¤ì¤Ï &os; ¤Î IP firewall ¥³¡¼¥É¤ÎºÆÀ߷פ˴ؤ¹¤ë
-	      µ»½ÑŪ¤ÊµÄÏÀ¤Î¤¿¤á¤Î¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£
+	    <para>¤³¤ì¤Ï &os; ¤Î IP firewall
+	      ¥³¡¼¥É¤ÎºÆÀ߷פ˴ؤ¹¤ëµ»½ÑŪ¤ÊµÄÏÀ¤Î¤¿¤á¤Î¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ´°Á´¤Ëµ»½ÑŪ¤ÊÆâÍƤòÍ׵ᤷ¤Þ¤¹¡£</para>
 	  </listitem>
@@ -1405,10 +1401,10 @@
 	  <listitem>
 	    <para><emphasis>&os; ¤Î IA64 ¤Ø¤Î°Ü¿¢</emphasis></para>
 
-	    <para>¤³¤ì¤Ï &os; ¤Î &intel; ¤Î IA-64 ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î
-	    °Ü¿¢¤Ë»²²Ã¤·¤Æ¤¤¤ë¿Íã¤Î¤¿¤á¤Îµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¡¢
-	    ÌäÂê¤òÄ󵯤·²ò·èºö¤òµÄÏÀ¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
-	    ¤³¤Î¤è¤¦¤Êµ»½ÑŪ¤ÊµÄÏÀ¤Ë¶½Ì£¤ò»ý¤Ä¸Ä¿Í¤Ï´¿·Þ¤·¤Þ¤¹¡£</para>
+	    <para>¤³¤ì¤Ï &os; ¤Î &intel; ¤Î IA-64
+	      ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î°Ü¿¢¤Ë»²²Ã¤·¤Æ¤¤¤ë¿Íã¤Î¤¿¤á¤Îµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¡¢
+	      ÌäÂê¤òÄ󵯤·²ò·èºö¤òµÄÏÀ¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
+	      ¤³¤Î¤è¤¦¤Êµ»½ÑŪ¤ÊµÄÏÀ¤Ë¶½Ì£¤ò»ý¤Ä¸Ä¿Í¤Ï´¿·Þ¤·¤Þ¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
 
@@ -1417,9 +1413,10 @@
 
 	  <listitem>
 	    <para><emphasis>ISDN ¥³¥ß¥å¥Ë¥±¡¼¥·¥ç¥ó</emphasis></para>
+
 	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢
-	      &os; ¤ËÂФ¹¤ë ISDN ¥µ¥Ý¡¼¥È¤Î³«È¯¤ÎµÄÏÀ¤ò
-	      ¤ª¤³¤Ê¤¦¿Í¤Î¤¿¤á¤Î¤â¤Î¤Ç¤¹¡¥</para>
+	      &os; ¤ËÂФ¹¤ë ISDN
+	      ¥µ¥Ý¡¼¥È¤Î³«È¯¤ÎµÄÏÀ¤ò¤ª¤³¤Ê¤¦¿Í¤Î¤¿¤á¤Î¤â¤Î¤Ç¤¹¡¥</para>
 	  </listitem>
 	</varlistentry>
 
@@ -1428,10 +1425,10 @@
 
 	  <listitem>
 	    <para><emphasis>&java; ¤Î³«È¯</emphasis></para>
+
 	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢&os;
 	      ¸þ¤±¤Î½ÅÍ×¤Ê &java; ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î³«È¯¤ä¡¢&jdk;
-	      ¤Î°Ü¿¢¤ä¥á¥ó¥Æ¥Ê¥ó¥¹¤Î
-	      µÄÏÀ¤ò¤¹¤ë¿Í¤Î¤¿¤á¤Î¤â¤Î¤Ç¤¹¡¥</para>
+	      ¤Î°Ü¿¢¤ä¥á¥ó¥Æ¥Ê¥ó¥¹¤ÎµÄÏÀ¤ò¤¹¤ë¿Í¤Î¤¿¤á¤Î¤â¤Î¤Ç¤¹¡¥</para>
 	  </listitem>
 	</varlistentry>
 
@@ -1487,8 +1484,7 @@
 	  <listitem>
 	    <para><emphasis>µ»½ÑŪ¤ÊµÄÏÀ</emphasis></para>
 
-	    <para>¤³¤ì¤Ï &os; ¤Ë´Ø¤¹¤ëµ»½ÑŪ¤ÊµÄÏÀ¤Î¤¿¤á¤Î
-	      ¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£
+	    <para>¤³¤ì¤Ï &os; ¤Ë´Ø¤¹¤ëµ»½ÑŪ¤ÊµÄÏÀ¤Î¤¿¤á¤Î¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£
 	      ¤³¤ì¤ÏºÇ¤â¥Æ¥¯¥Ë¥«¥ë¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
 	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢&os;
 	      ¾å¤Ç¥¢¥¯¥Æ¥£¥Ö¤Ë³èÆ°¤ò¤·¤Æ¤¤¤ë¿Í¤Î¤¿¤á¤Î¤â¤Î¤Ç¡¢
@@ -1503,8 +1499,8 @@
 	  <term>&a.hardware.name;</term>
 
 	  <listitem>
-	    <para><emphasis>&os; ¤Î¥Ï¡¼¥É¥¦¥§¥¢¤Î°ìÈÌŪ¤ÊµÄÏÀ
-	      </emphasis></para>
+	    <para><emphasis>&os;
+		¤Î¥Ï¡¼¥É¥¦¥§¥¢¤Î°ìÈÌŪ¤ÊµÄÏÀ</emphasis></para>
 
 	    <para>&os; ¤¬Áö¤Ã¤Æ¤¤¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Î¥¿¥¤¥×¤ä¡¢
 	      ²¿¤òÇã¤Ã¤¿¤êÈò¤±¤¿¤ê¤¹¤ë¤«¤Ë´Ø¤¹¤ëÍÍ¡¹¤ÊÌäÂê¤ä¡¢
@@ -1529,8 +1525,7 @@
 
 	  <listitem>
 	    <para><emphasis>
-		¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À¤Î¤Ë¤Ä¤¤¤Æ¤ÎÏÃÂê
-	      </emphasis></para>
+		¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À¤Î¤Ë¤Ä¤¤¤Æ¤ÎÏÃÂê</emphasis></para>
 
 	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢
 	      &os; ¤òÍѤ¤¤¿¥¤¥ó¥¿¡¼¥Í¥Ã¥È ¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À (ISP)
@@ -1657,8 +1652,8 @@
 	  <term>&a.platforms.name;</term>
 
 	  <listitem>
-	    <para><emphasis>&intel; °Ê³°¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î°Ü¿¢
-	      </emphasis></para>
+	    <para><emphasis>&intel;
+		°Ê³°¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î°Ü¿¢</emphasis></para>
 
 	    <para>¥¯¥í¥¹¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î &os; ¤ÎÌäÂê¡£&intel;
 	      °Ê³°¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î &os;
@@ -1702,10 +1697,10 @@
 	  </listitem>
 	</varlistentry>
 
- 	<varlistentry>
+	<varlistentry>
 	  <term>&a.ports-bugs.name;</term>
 
- 	  <listitem>
+	  <listitem>
 	    <para><emphasis><quote>ports</quote>
 		¤Î¥Ð¥°¤Ë´Ø¤¹¤ëµÄÏÀ</emphasis></para>
 
@@ -1714,8 +1709,8 @@
 	      ¤Î¾ã³²Êó¹ð¤ä¿·¤¿¤Ê ports ¤äÊѹ¹¤Ë¤Ä¤¤¤Æ¤ÎÄó°Æ¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ¸·Ì©¤Ëµ»½ÑŪ¤ÊÆâÍƤΤߤ¬°·¤ï¤ì¤Þ¤¹¡£</para>
- 	  </listitem>
- 	</varlistentry>
+	  </listitem>
+	</varlistentry>
 
 	<varlistentry>
 	  <term>&a.proliant.name;</term>
@@ -1805,8 +1800,8 @@
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ´°Á´¤Ëµ»½ÑŪ¤ÊµÄÏÀ¤òÍ׵ᤷ¤Þ¤¹¡£
 	      ¤³¤ì¤Ï¡¢Q and A ¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	      FAQ ¤ËÂФ¹¤ë Q and A (¼ÁÌä¤ÈÅú¤¨¤ÎξÊý) ¤Î¹×¸¥¤Ï¡¢´¿·Þ¤µ¤ì¤Þ¤¹¡£
-	    </para>
+	      FAQ ¤ËÂФ¹¤ë Q and A (¼ÁÌä¤ÈÅú¤¨¤ÎξÊý)
+	      ¤Î¹×¸¥¤Ï¡¢´¿·Þ¤µ¤ì¤Þ¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
 
@@ -1818,8 +1813,7 @@
 
 	    <para>&os; ¤Î¥»¥­¥å¥ê¥Æ¥£ÌäÂê¤ä¡¢
 	      ½¤Àµ¤Ë´Ø¤¹¤ëÄÌÃΤò¹Ô¤Ê¤¤¤Þ¤¹¡£
-	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ÏµÄÏÀ¤ò¹Ô¤Ê¤¦¤¿¤á¤Î
-	      ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ÏµÄÏÀ¤ò¹Ô¤Ê¤¦¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
               µÄÏÀ¤Ï &os;-security ¤Ç¹Ô¤Ê¤¤¤Þ¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
@@ -1862,16 +1856,16 @@
 	    <para><emphasis>&os.stable; ¤Î»ÈÍѤ˴ؤ¹¤ëµÄÏÀ
 	      </emphasis></para>
 
-	    <para>¤³¤ì¤Ï &os.stable; ¤Î¥æ¡¼¥¶ÍѤΥ᡼¥ê¥ó¥°¥ê¥¹¥È
-	      ¤Ç¤¹¡£¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤ÎÏÃÂê¤Ï¡¢-STABLE
+	    <para>¤³¤ì¤Ï &os.stable; ¤Î¥æ¡¼¥¶ÍѤΥ᡼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
+	      ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤ÎÏÃÂê¤Ï¡¢-STABLE
 	      ¤ÇÅо줷¤¿¿·¤·¤¤µ¡Ç½¤Ë¤Ä¤¤¤Æ¡¢
 	      ¤½¤Î¿·µ¡Ç½¤Ë¤è¤Ã¤Æ¥æ¡¼¥¶¤Ë±Æ¶Á¤¹¤ë¤³¤È¤Ë¤Ä¤¤¤Æ¤ÎÃí°Õ¡¢
 	      ¤ª¤è¤Ó -STABLE
 	      ¤Î¤Þ¤Þ¤Ç¤¤¤ë¤¿¤á¤ËɬÍפʼê½ç¤Ë¤Ä¤¤¤Æ¤ÎÀâÌÀ¤ò´Þ¤ß¤Þ¤¹¡£
-	      <quote>STABLE</quote> ¤òÁö¤é¤»¤Æ¤¤¤ë¿Í¤Ï¤³¤Î
-	      ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÅÐÏ¿¤¹¤Ù¤­¤Ç¤¹¡£
-	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢´°Á´¤Ëµ»½ÑŪ¤Ê
-	      ÆâÍƤòÍ׵ᤷ¤Þ¤¹¡£</para>
+	      <quote>STABLE</quote>
+	      ¤òÁö¤é¤»¤Æ¤¤¤ë¿Í¤Ï¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÅÐÏ¿¤¹¤Ù¤­¤Ç¤¹¡£
+	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
+	      ´°Á´¤Ëµ»½ÑŪ¤ÊÆâÍƤòÍ׵ᤷ¤Þ¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
 
@@ -1879,7 +1873,8 @@
 	  <term>&a.standards.name;</term>
 
 	  <listitem>
-	    <para><emphasis>C99 & POSIX ¤Ø¤ÎŬ¹ç</emphasis></para>
+	    <para><emphasis>C99 & POSIX
+		¤Ø¤ÎŬ¹ç</emphasis></para>
 
 	    <para>C99 ¤ª¤è¤Ó POSIX ɸ½à¤Ø¤Î &os;
 	      ¤ÎŬ¹ç¤Ë´ØÏ¢¤·¤¿µ»½ÑŪ¤ÊµÄÏÀ¤ò¹Ô¤¦¤¿¤á¤Î¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£</para>
@@ -1894,8 +1889,8 @@
 
 	    <para>ATF/Kyua¡¢¥Ó¥ë¥É»î¸³¤Î¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¡¢
 	      ¾¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à (NetBSD, ...) ¤«¤é &os;
-	      ¤Ø¤Î°Ü¿¢¤Ë´Ø¤¹¤ë»î¸³¤Ê¤É¡¢
-	      &os; ¤Î»î¸³¤Ë´Ø¤·¤ÆµÄÏÀ¤ò¹Ô¤¦µ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£</para>
+	      ¤Ø¤Î°Ü¿¢¤Ë´Ø¤¹¤ë»î¸³¤Ê¤É¡¢&os;
+	      ¤Î»î¸³¤Ë´Ø¤·¤ÆµÄÏÀ¤ò¹Ô¤¦µ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
 
@@ -1923,10 +1918,10 @@
 
 	    <para>&os;
 	      ¤Î¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤Î¥á¥ó¥Æ¥Ê¥ó¥¹¤Ë´ØÏ¢¤·¤¿µÄÏÀ¤ò¹Ô¤¦¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
-	      Clang ¤ª¤è¤Ó GCC ¤Î¾õ¶·¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ¤Î¾¤Ë¡¢
-	      ¥¢¥»¥ó¥Ö¥é¡¢¥ê¥ó¥«¤ª¤è¤Ó¥Ç¥Ð¥Ã¥¬Åù¤Î¥½¥Õ¥È¥¦¥§¥¢¤ÎµÄÏÀ¤â¹Ô¤ï¤ì¤Þ¤¹¡£</para>
-          </listitem>
-        </varlistentry>
+	      Clang ¤ª¤è¤Ó GCC ¤Î¾õ¶·¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ¤Î¾¤Ë¡¢¥¢¥»¥ó¥Ö¥é¡¢
+	      ¥ê¥ó¥«¤ª¤è¤Ó¥Ç¥Ð¥Ã¥¬Åù¤Î¥½¥Õ¥È¥¦¥§¥¢¤ÎµÄÏÀ¤â¹Ô¤ï¤ì¤Þ¤¹¡£</para>
+	  </listitem>
+	</varlistentry>
 
 	<varlistentry>
 	  <term>&a.usb.name;</term>
@@ -1943,15 +1938,12 @@
 	  <term>&a.usergroups.name;</term>
 
 	  <listitem>
-	    <para><emphasis>¥æ¡¼¥¶¥°¥ë¡¼¥×¤ÎÄ´À°¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È
-	      </emphasis></para>
+	    <para><emphasis>¥æ¡¼¥¶¥°¥ë¡¼¥×¤ÎÄ´À°¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</emphasis></para>
+
 	    <para>¤³¤ì¤Ï¡¢¥í¡¼¥«¥ë¤Ê¥æ¡¼¥¶¥°¥ë¡¼¥×¤¬¤ª¸ß¤¤¤Ë¡¢¤Þ¤¿¤Ï¡¢
 	      ¥³¥¢¥Á¡¼¥à¤¬»ØÄꤷ¤¿¸Ä¿Í¤ÈÌäÂê¤òµÄÏÀ¤¹¤ë¡¢
-	      ¤½¤ì¤¾¤ì¤Î¥í¡¼¥«¥ë¥¨¥ê¥¢¤Î¥æ¡¼¥¶¥°¥ë¡¼¥×¤«¤é¤Î
-	      Ä´À°¿Í¸þ¤±¤Î ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
-	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¥æ¡¼¥¶¥°¥ë¡¼¥×´Ö¤Î
-	      ¥ß¡¼¥Æ¥£¥ó¥°¤Î³µÍפä¥×¥í¥¸¥§¥¯¥È¤ÎÄ´À°¤Ë
-	      À©¸Â¤µ¤ì¤ë¤Ù¤­¤Ç¤¹¡£</para>
+	      ¤½¤ì¤¾¤ì¤Î¥í¡¼¥«¥ë¥¨¥ê¥¢¤Î¥æ¡¼¥¶¥°¥ë¡¼¥×¤«¤é¤ÎÄ´À°¿Í¸þ¤±¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
+	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¥æ¡¼¥¶¥°¥ë¡¼¥×´Ö¤Î¥ß¡¼¥Æ¥£¥ó¥°¤Î³µÍפä¥×¥í¥¸¥§¥¯¥È¤ÎÄ´À°¤ËÀ©¸Â¤µ¤ì¤ë¤Ù¤­¤Ç¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
 
@@ -2018,8 +2010,9 @@
 
 	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ø¤Î¥á¥Ã¥»¡¼¥¸¤ÎÊÔ½¸¥À¥¤¥¸¥§¥¹¥ÈÈǤ¬¡¢
 	      ¿ÊĽ¾õ¶·¥ì¥Ý¡¼¥È
-	      <footnote><para><link xlink:href="http://www.freebsd.org/news/status/"></link></para></footnote> ¤È¤·¤Æ¡¢
-	      ¿ô¥ö·î¤ª¤­¤Ë &os; ¥¦¥§¥Ö¥µ¥¤¥È¤Ë¸ø³«¤µ¤ì¤Þ¤¹¡£
+	      <footnote><para><link
+		    xlink:href="http://www.freebsd.org/news/status/"></link></para></footnote>
+	      ¤È¤·¤Æ¡¢¿ô¥ö·î¤ª¤­¤Ë &os; ¥¦¥§¥Ö¥µ¥¤¥È¤Ë¸ø³«¤µ¤ì¤Þ¤¹¡£
 	      ²áµî¤Î¥ì¥Ý¡¼¥È¤â¥¢¡¼¥«¥¤¥Ö¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
@@ -2118,8 +2111,10 @@
       </itemizedlist>
 
       <note>
-	<para>¾¤Î MIME content type ¤ÎźÉÕ¤òµö²Ä¤¹¤ë¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤â¤¢¤ê¤Þ¤¹¤¬¡¢
-	  ¾å¤Î°ìÍ÷¤Ë´Þ¤Þ¤ì¤ë¤â¤Î¤Ç¤¢¤ì¤Ð¡¢¤Û¤È¤ó¤É¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ÇŬÍѤǤ­¤Þ¤¹¡£</para>
+	<para>¾¤Î MIME content type
+	  ¤ÎźÉÕ¤òµö²Ä¤¹¤ë¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤â¤¢¤ê¤Þ¤¹¤¬¡¢
+	  ¾å¤Î°ìÍ÷¤Ë´Þ¤Þ¤ì¤ë¤â¤Î¤Ç¤¢¤ì¤Ð¡¢
+	  ¤Û¤È¤ó¤É¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ÇŬÍѤǤ­¤Þ¤¹¡£</para>
       </note>
 
       <para>HTML ¤È plain ¥Æ¥­¥¹¥È¤òξÊý´Þ¤à¥á¡¼¥ë¤Ç¤Ï¡¢
@@ -2140,24 +2135,31 @@
 
       <itemizedlist>
 	<listitem>
-	  <para><link xlink:href="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</link></para>
+	  <para><link
+	      xlink:href="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.unix.bsd.freebsd.misc">comp.unix.bsd.freebsd.misc</link></para>
+	  <para><link
+	      xlink:href="news:comp.unix.bsd.freebsd.misc">comp.unix.bsd.freebsd.misc</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:de.comp.os.unix.bsd">de.comp.os.unix.bsd</link> (¥É¥¤¥Ä)</para>
+	  <para><link
+	      xlink:href="news:de.comp.os.unix.bsd">de.comp.os.unix.bsd</link>
+	    (¥É¥¤¥Ä)</para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:fr.comp.os.bsd">fr.comp.os.bsd</link> (¥Õ¥é¥ó¥¹)</para>
+	  <para><link
+	      xlink:href="news:fr.comp.os.bsd">fr.comp.os.bsd</link>
+	    (¥Õ¥é¥ó¥¹)</para>
 	</listitem>
 
 	<listitem>
 	  <para><link
-	    xlink:href="news:it.comp.os.freebsd">it.comp.os.freebsd</link> (¥¤¥¿¥ê¥¢)</para>
+	      xlink:href="news:it.comp.os.freebsd">it.comp.os.freebsd</link>
+	    (¥¤¥¿¥ê¥¢)</para>
 	</listitem>
       </itemizedlist>
     </sect2>
@@ -2167,47 +2169,58 @@
 
       <itemizedlist>
 	<listitem>
-	  <para><link xlink:href="news:comp.unix">comp.unix</link></para>
+	  <para><link
+	      xlink:href="news:comp.unix">comp.unix</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.unix.questions">comp.unix.questions</link></para>
+	  <para><link
+	      xlink:href="news:comp.unix.questions">comp.unix.questions</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.unix.admin">comp.unix.admin</link></para>
+	  <para><link
+	      xlink:href="news:comp.unix.admin">comp.unix.admin</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.unix.programmer">comp.unix.programmer</link></para>
+	  <para><link
+	      xlink:href="news:comp.unix.programmer">comp.unix.programmer</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.unix.shell">comp.unix.shell</link></para>
+	  <para><link
+	      xlink:href="news:comp.unix.shell">comp.unix.shell</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.unix.user-friendly">comp.unix.user-friendly</link></para>
+	  <para><link
+	      xlink:href="news:comp.unix.user-friendly">comp.unix.user-friendly</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.security.unix">comp.security.unix</link></para>
+	  <para><link
+	      xlink:href="news:comp.security.unix">comp.security.unix</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.sources.unix">comp.sources.unix</link></para>
+	  <para><link
+	      xlink:href="news:comp.sources.unix">comp.sources.unix</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.unix.advocacy">comp.unix.advocacy</link></para>
+	  <para><link
+	      xlink:href="news:comp.unix.advocacy">comp.unix.advocacy</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.unix.misc">comp.unix.misc</link></para>
+	  <para><link
+	      xlink:href="news:comp.unix.misc">comp.unix.misc</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.unix.bsd">comp.unix.bsd</link></para>
+	  <para><link
+	      xlink:href="news:comp.unix.bsd">comp.unix.bsd</link></para>
 	</listitem>
       </itemizedlist>
     </sect2>
@@ -2217,35 +2230,43 @@
 
       <itemizedlist>
 	<listitem>
-	  <para><link xlink:href="news:comp.windows.x.i386unix">comp.windows.x.i386unix</link></para>
+	  <para><link
+	      xlink:href="news:comp.windows.x.i386unix">comp.windows.x.i386unix</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.windows.x">comp.windows.x</link></para>
+	  <para><link
+	      xlink:href="news:comp.windows.x">comp.windows.x</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.windows.x.apps">comp.windows.x.apps</link></para>
+	  <para><link
+	      xlink:href="news:comp.windows.x.apps">comp.windows.x.apps</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.windows.x.announce">comp.windows.x.announce</link></para>
+	  <para><link
+	      xlink:href="news:comp.windows.x.announce">comp.windows.x.announce</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.windows.x.intrinsics">comp.windows.x.intrinsics</link></para>
+	  <para><link
+	      xlink:href="news:comp.windows.x.intrinsics">comp.windows.x.intrinsics</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.windows.x.motif">comp.windows.x.motif</link></para>
+	  <para><link
+	      xlink:href="news:comp.windows.x.motif">comp.windows.x.motif</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.windows.x.pex">comp.windows.x.pex</link></para>
+	  <para><link
+	      xlink:href="news:comp.windows.x.pex">comp.windows.x.pex</link></para>
 	</listitem>
 
 	<listitem>
-	  <para><link xlink:href="news:comp.emulators.ms-windows.wine">comp.emulators.ms-windows.wine</link></para>
+	  <para><link
+	      xlink:href="news:comp.emulators.ms-windows.wine">comp.emulators.ms-windows.wine</link></para>
 	</listitem>
       </itemizedlist>
     </sect2>
@@ -2258,23 +2279,26 @@
       <title>¥Õ¥©¡¼¥é¥à¡¢¥Ö¥í¥°¤ª¤è¤Ó¥½¡¼¥·¥ã¥ë¥Í¥Ã¥È¥ï¡¼¥¯</title>
 
       <itemizedlist>
-	<listitem><para><link xlink:href="http://forums.freebsd.org/">The
-	    &os; Forums</link> ¤Ï¡¢&os;
-	  ¤Î¼ÁÌ䤪¤è¤Óµ»½ÑŪ¤ÊµÄÏÀ¤Î¤¿¤á¤Î¥¦¥§¥Ö¥Ù¡¼¥¹¤Î¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£</para></listitem>
-
-	<listitem><para><link
-	  xlink:href="http://planet.freebsdish.org/">Planet &os;</link>
-	  ¤Ï¡¢&os;
-	  ³«È¯¼Ô¤Ë¤è¤ê½ñ¤«¤ì¤¿¿ô¿¤¯¤Î¥Ö¥í¥°¤Î¥Õ¥£¡¼¥É°ìÍ÷¤òÄ󶡤·¤Þ¤¹¡£
-	  ¿¤¯¤Î³«È¯¼Ô¤Ï¡¢¼«Ê¬¤¿¤Á¤¬¼è¤êÁȤó¤Ç¤¤¤ë¤³¤È¤ä¿·¤·¤¤¥Ñ¥Ã¥Á¡¢
-	  ¾¤Î¿Ê¹ÔÃæ¤Îºî¶È¤Ë´Ø¤¹¤ë¥ê¥¢¥ë¥¿¥¤¥à¤Îµ­Ï¿¤È¤·¤ÆÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£</para></listitem>
-
-	<listitem><para><link
-	  xlink:href="http://www.youtube.com/bsdconferences">BSDConferences
-	  YouTube Channel</link> ¤Ï¡¢À¤³¦Ãæ¤Ç³«ºÅ¤µ¤ì¤Æ¤¤¤ë BSD
-	  ¥«¥ó¥Õ¥¡¥ì¥ó¥¹¤Ç¤Î¥×¥ì¥¼¥ó¥Æ¡¼¥·¥ç¥ó¤Î¹âÉʼÁ¤Î¥Ó¥Ç¥ª¤Ç¤¹¡£
-	  ¼çÍפʳ«È¯¼Ô¤Ë¤è¤ë &os;
-	  ¤Î¿·¤·¤¤¿ÊŸ¤Ë¤Ä¤¤¤Æ¤Î¥×¥ì¥¼¥ó¥Æ¡¼¥·¥ç¥ó¤ò¤¼¤Ò¤È¤â¤´Í÷¤¯¤À¤µ¤¤¡£</para></listitem>
+	<listitem>
+	  <para><link xlink:href="http://forums.freebsd.org/">The
+	      &os; Forums</link> ¤Ï¡¢&os;
+	    ¤Î¼ÁÌ䤪¤è¤Óµ»½ÑŪ¤ÊµÄÏÀ¤Î¤¿¤á¤Î¥¦¥§¥Ö¥Ù¡¼¥¹¤Î¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£</para></listitem>
+
+	<listitem>
+	  <para><link
+	      xlink:href="http://planet.freebsdish.org/">Planet &os;</link>
+	    ¤Ï¡¢&os;
+	    ³«È¯¼Ô¤Ë¤è¤ê½ñ¤«¤ì¤¿¿ô¿¤¯¤Î¥Ö¥í¥°¤Î¥Õ¥£¡¼¥É°ìÍ÷¤òÄ󶡤·¤Þ¤¹¡£
+	    ¿¤¯¤Î³«È¯¼Ô¤Ï¡¢¼«Ê¬¤¿¤Á¤¬¼è¤êÁȤó¤Ç¤¤¤ë¤³¤È¤ä¿·¤·¤¤¥Ñ¥Ã¥Á¡¢
+	    ¾¤Î¿Ê¹ÔÃæ¤Îºî¶È¤Ë´Ø¤¹¤ë¥ê¥¢¥ë¥¿¥¤¥à¤Îµ­Ï¿¤È¤·¤ÆÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£</para></listitem>
+
+	<listitem>
+	  <para><link
+	      xlink:href="http://www.youtube.com/bsdconferences">BSDConferences
+	      YouTube Channel</link> ¤Ï¡¢À¤³¦Ãæ¤Ç³«ºÅ¤µ¤ì¤Æ¤¤¤ë BSD
+	    ¥«¥ó¥Õ¥¡¥ì¥ó¥¹¤Ç¤Î¥×¥ì¥¼¥ó¥Æ¡¼¥·¥ç¥ó¤Î¹âÉʼÁ¤Î¥Ó¥Ç¥ª¤Ç¤¹¡£
+	    ¼çÍפʳ«È¯¼Ô¤Ë¤è¤ë &os;
+	    ¤Î¿·¤·¤¤¿ÊŸ¤Ë¤Ä¤¤¤Æ¤Î¥×¥ì¥¼¥ó¥Æ¡¼¥·¥ç¥ó¤ò¤¼¤Ò¤È¤â¤´Í÷¤¯¤À¤µ¤¤¡£</para></listitem>
       </itemizedlist>
     </sect2>
 
@@ -2301,13 +2325,13 @@ Comment out for now as only one address
 
     <informaltable frame="none" pgwide="1">
       <tgroup cols="4">
-        <thead>
+	<thead>
 	  <row>
 	    <entry>¥É¥á¥¤¥ó</entry>
 	    <entry>ÆâÍÆ</entry>
 	    <entry>¥æ¡¼¥¶¡¼¥°¥ë¡¼¥×</entry>
 	    <entry>´ÉÍý¼Ô</entry>
-          </row>
+	  </row>
 	</thead>
 
 	<tbody>


More information about the svn-doc-head mailing list