svn commit: r54607 - head/ja_JP.eucJP/books/handbook/l10n

Ryusuke SUZUKI ryusuke at FreeBSD.org
Sun Oct 18 02:40:27 UTC 2020


Author: ryusuke
Date: Sun Oct 18 02:40:26 2020
New Revision: 54607
URL: https://svnweb.freebsd.org/changeset/doc/54607

Log:
  - Merge the following from the English version:
  
  	r43880 -> r43883	head/ja_JP.eucJP/books/handbook/l10n/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/l10n/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/l10n/chapter.xml	Sat Oct 17 04:30:45 2020	(r54606)
+++ head/ja_JP.eucJP/books/handbook/l10n/chapter.xml	Sun Oct 18 02:40:26 2020	(r54607)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r43880
+     Original revision: r43883
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="l10n">
@@ -28,9 +28,9 @@
       ¥æ¡¼¥¶¡¼¤ª¤è¤Ó¹×¸¥¼Ô¤¬À¤³¦Ãæ¤Ëʬ»¶¤·¤¿¥×¥í¥¸¥§¥¯¥È¤Ç¤¹¡£
       ¤½¤Î¤¿¤á¡¢&os; ¤Ï¿¤¯¤Î¸À¸ì¤Ø¤ÎÃÏ°è²½¤ËÂбþ¤·¤Æ¤ª¤ê¡¢
       ¥æ¡¼¥¶¤Ï¡¢±Ñ¸ì°Ê³°¤Î¸À¸ì¤ò¸«¤¿¤ê¡¢ÆþÎϤ·¤¿¤ê¡¢½èÍý¤·¤¿¤ê¤Ç¤­¤Þ¤¹¡£
-      ¸½ºß¤Ç¤Ï¡¢¼çÍפʸÀ¸ì¤Î¤Û¤È¤ó¤É¤«¤éÁª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤¿¤È¤¨¤ÐÃæ¹ñ¸ì¡¢¥É¥¤¥Ä¸ì¡¢ÆüËܸ졢´Ú¹ñ¸ì¡¢¥Õ¥é¥ó¥¹¸ì¡¢¥í¥·¥¢¸ì¡¢
-      ¥Ù¥È¥Ê¥à¸ì¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¤¬¡¢¤³¤ì¤é¤Ë¸ÂÄꤵ¤ì¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
+      Ãæ¹ñ¸ì¡¢¥É¥¤¥Ä¸ì¡¢ÆüËܸ졢´Ú¹ñ¸ì¡¢¥Õ¥é¥ó¥¹¸ì¡¢¥í¥·¥¢¸ì¡¢
+      ¥Ù¥È¥Ê¥à¸ì¤Ê¤É¡¢¼çÍפʸÀ¸ì¤Î¤Û¤È¤ó¤É¤«¤éÁª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢
+      ¤³¤ì¤é¤Ë¸ÂÄꤵ¤ì¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
 
     <indexterm>
       <primary>¹ñºÝ²½ (internationalization)</primary>
@@ -40,33 +40,21 @@
 
     <para>internationalization ¤Ï¡¢<acronym>i18n</acronym>
       ¤Èû½Ì¤·¤Æɽµ­¤µ¤ì¤Þ¤¹¡£
-      ¤³¤ì¤Ï internationalization
+      ¤³¤ì¤Ï <literal>internationalization</literal>
       ¤ÎºÇ½é¤ÈºÇ¸å¤Î´Ö¤Îʸ»ú¿ô¤ËͳÍ褷¤Þ¤¹¡£
       <acronym>L10n</acronym> ¤âƱ¤¸Ì¿Ì¾Ë¡¤òÍѤ¤¤Æ
-      <quote>localization</quote> ¤ò½Ì¤á¤¿¤â¤Î¤Ç¤¹¡£
-      ¤³¤ì¤é¤ò¹ç¤ï¤»¤Æ¡¢<acronym>i18n</acronym>/<acronym>L10n</acronym>
-      ¤µ¤ì¤¿ (¤¹¤Ê¤ï¤Á¹ñºÝ²½/ÃÏ°è²½¤µ¤ì¤¿)
-      ¼êË¡¡¢¥×¥í¥È¥³¥ë¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢
+      <literal>localization</literal> ¤ò½Ì¤á¤¿¤â¤Î¤Ç¤¹¡£
+      <acronym>i18n</acronym>/<acronym>L10n</acronym> ¤µ¤ì¤¿
+      (¤¹¤Ê¤ï¤Á¹ñºÝ²½/ÃÏ°è²½¤µ¤ì¤¿) ¼êË¡¡¢¥×¥í¥È¥³¥ë¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢
       ¼«Ê¬Ã£¤Î¹¥¤ß¤Î¸À¸ì¤ò»È¤¦¤³¤È¤ò²Äǽ¤Ë¤·¤Æ¤¯¤ì¤Þ¤¹¡£</para>
 
-    <para>¹ñºÝ²½ (<acronym>i18n</acronym>)
-      ¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢¥é¥¤¥Ö¥é¥ê¤È¤·¤Æ <acronym>i18n</acronym>
-      ²½¥­¥Ã¥È¤òÍѤ¤¤Æ¥×¥í¥°¥é¥ß¥ó¥°¤µ¤ì¤Þ¤¹¡£
-      ¤³¤ì¤Ï³«È¯¼Ô¤¬Ã±½ã¤Ê¥Õ¥¡¥¤¥ë¤ò½ñ¤¤¤Æ¡¢
-      ɽ¼¨¤µ¤ì¤ë¥á¥Ë¥å¡¼¤ä¥Æ¥­¥¹¥È¤ò³Æ¹ñ¸ì¤ËËÝÌõ¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤ì¤Þ¤¹¡£</para>
-
     <para>¤³¤Î¾Ï¤Ç¤Ï¡¢&os; ¤Î¹ñºÝ²½ (internationalization)
       ¤ÈÃÏ°è²½ (localization) µ¡Ç½¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Þ¤¹¡£
-      ¥·¥¹¥Æ¥à¥ì¥Ù¥ë¤Ç¤â¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥ì¥Ù¥ë¤Ç¤â¡¢
-      ¹ñºÝ²½ (<acronym>i18n</acronym>) ¤Î¼ÂÁõ¤Ë¤ÏÍÍ¡¹¤Ê¦Ì̤¬¤¢¤ë¤Î¤Ç¡¢
-      ɬÍפ˱þ¤¸¤Æ²Äǽ¤ÊÈϰϤÇÆɼԤËÂФ·¤Æ¤è¤êÀìÌçŪ¤Êʸ½ñ¾ðÊó¤ò¼¨¤¹¤³¤È¤Ë¤·¤Þ¤¹¡£</para>
+      ¤³¤Î¾Ï¤Ç¤Ï¡¢°Ê²¼¤ÎʬÌî¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
 
-    <para>¤³¤Î¾Ï¤Ç¤Ï¡¢°Ê²¼¤ÎʬÌî¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
-
     <itemizedlist>
       <listitem>
-	<para>¶áÂåŪ¤Ê¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ç¡¢
-	  °Û¤Ê¤ë¸À¸ì¤ª¤è¤Ó¥í¥±¡¼¥ë¤¬¤É¤Î¤è¤¦¤ËÉä¹æ²½¤µ¤ì¤Æ¤¤¤ë¤«¡£</para>
+	<para>¥í¥±¡¼¥ë̾¤¬¤É¤Î¤è¤¦¤ËÄêµÁ¤µ¤ì¤ë¤«¡£</para>
       </listitem>
 
       <listitem>
@@ -78,14 +66,18 @@
       </listitem>
 
       <listitem>
-	<para>ÍÍ¡¹¤Ê¸À¸ì¤Ç¸úΨŪ¤Ë <application>Xorg</application>
-	  ¤ò»È¤¦¤Ë¤Ï¤É¤¦¤¹¤ì¤Ð¤è¤¤¤«¡£</para>
+	<para>ÍÍ¡¹¤Ê¸À¸ì¤Ç <application>Xorg</application>
+	  ¤òÀßÄꤹ¤ë¤Ë¤Ï¤É¤¦¤¹¤ì¤Ð¤è¤¤¤«¡£</para>
       </listitem>
 
       <listitem>
 	<para>¹ñºÝ²½ (<acronym>i18n</acronym>)
-	  ¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò½ñ¤¯¤¿¤á¤Î¾ðÊó¤Ï¤É¤³¤Ë¤¢¤ë¤«¡£</para>
+	  ¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¸«¤Ä¤±Êý¡£</para>
       </listitem>
+
+      <listitem>
+ 	<para>ÆÃÄê¤Î¸À¸ì¤ËÀßÄꤹ¤ë¤¿¤á¤Î¾ðÊó¤Ï¤É¤³¤Ë¤¢¤ë¤«¡£</para>
+      </listitem>
     </itemizedlist>
 
     <para>¤³¤Î¾Ï¤òÆɤàÁ°¤Ë¡¢°Ê²¼¤Î¤³¤È¤òÍý²ò¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
@@ -149,31 +141,46 @@
 	</tgroup>
       </table>
 
+      <para>ÍøÍѲÄǽ¤Ê¤¹¤Ù¤Æ¤Î¥í¥±¡¼¥ë¤òÄ´¤Ù¤ë¤Ë¤Ï¡¢
+	°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.user; <userinput>locale -a | more</userinput></screen>
+
+      <para>¸½ºß¤Î¥í¥±¡¼¥ë¤ÎÀßÄê¤òÄ´¤Ù¤ë¤Ë¤Ï¡¢
+	°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.user; <userinput>locale</userinput></screen>
+
       <indexterm><primary>¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°</primary></indexterm>
       <indexterm><primary>ASCII</primary></indexterm>
 
+      <para>¸À¸ì¸ÇÍ­¤Î¡¢C ¸À¸ì¤Î char ¤Çɽ¸½¤Ç¤­¤ë
+	ISO8859-1, ISO8859-15, KOI8-R, CP437
+	¤È¤¤¤Ã¤¿¥·¥ó¥°¥ë¥Ð¥¤¥È¤Îʸ»ú¥»¥Ã¥È¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	&man.multibyte.3; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+	¸½ºßÍ­¸ú¤Êʸ»ú¥»¥Ã¥È¤Î¥ê¥¹¥È¤Ï¡¢<link
+	xlink:href="http://www.iana.org/assignments/character-sets">IANA
+	Registry</link> ¤Ç³Îǧ¤Ç¤­¤Þ¤¹¡£</para>
+
       <para>¤¤¤¯¤Ä¤«¤Î¸À¸ì (Î㤨¤ÐÃæ¹ñ¸ì¤äÆüËܸì) ¤Ï¡¢
-	ASCII ʸ»ú¤Ç¤Ïɽ¤¹¤³¤È¤¬¤Ç¤­¤Ê¤¤¤Î¤Ç¡¢
+	<acronym>ASCII</acronym> ʸ»ú¤Ç¤Ïɽ¤¹¤³¤È¤¬¤Ç¤­¤Ê¤¤¤Î¤Ç¡¢
 	¥ï¥¤¥Éʸ»ú¤ä¿¥Ð¥¤¥Èʸ»ú¤òÍѤ¤¤¿³ÈÄ¥¤µ¤ì¤¿¸À¸ì¤Î¥¨¥ó¥³¡¼¥É¤¬É¬ÍפȤʤê¤Þ¤¹¡£
+	¥ï¥¤¥É/¿¥Ð¥¤¥È¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ÎÎã¤Ï¡¢EUC ¤ª¤è¤Ó Big5 ¤Ç¤¹¡£
 	¸Å¤¤¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎÃæ¤Ë¤Ï¡¢
 	¤³¤ì¤é¤Î¥¨¥ó¥³¡¼¥É¤ò¸í¤Ã¤Æ¥³¥ó¥È¥í¡¼¥ëʸ»ú¤È¤·¤Æǧ¼±¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤¹¤¬¡¢
-	ºÇ¶á¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢ÂçÄñ 8-bit ʸ»ú¤òǧ¼±¤·¤Þ¤¹¡£
+	ºÇ¶á¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢ÂçÄñ¤³¤ì¤é¤Îʸ»ú¤òǧ¼±¤·¤Þ¤¹¡£
 	¼ÂÁõÊýË¡¤Ë¤â°Í¤ê¤Þ¤¹¤¬¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥³¥ó¥Ñ¥¤¥ë»þ¤â¤·¤¯¤Ï
-	configure »þ¤Ë¡¢¥ï¥¤¥É/¿¥Ð¥¤¥Èʸ»ú¤Î¥µ¥Ý¡¼¥È¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ë¤«¤âÃΤì¤Þ¤»¤ó¡£
-	°Ê²¼¤Ç¤Ï¡¢&os; ¥·¥¹¥Æ¥à¤Ë¤ª¤¤¤Æ¥í¥±¡¼¥ë¤òÀßÄꤹ¤ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
-	¼¡¤ÎÀá¤Ç¤Ï¡¢i18n
-	¤ËÂбþ¤¹¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¸«¤Ä¤±Êý¤ä¥³¥ó¥Ñ¥¤¥ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
+	configure »þ¤Ë¡¢¥ï¥¤¥É/¿¥Ð¥¤¥Èʸ»ú¤Î¥µ¥Ý¡¼¥È¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ë¤«¤âÃΤì¤Þ¤»¤ó¡£</para>
 
-      <para>ÍøÍѲÄǽ¤Ê¤¹¤Ù¤Æ¤Î¥í¥±¡¼¥ë¤òÄ´¤Ù¤ë¤Ë¤Ï¡¢
-	°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <note>
+	<para>&os; ¤Ç¤Ï¡¢Xorg ¸ß´¹¤Î¥í¥±¡¼¥ëÉä¹æ¤òÍѤ¤¤Æ¤¤¤Þ¤¹¡£</para>
+      </note>
 
-      <screen>&prompt.user; <userinput>locale -a | more</userinput></screen>
+      <para>°Ê²¼¤Ç¤Ï¡¢&os;
+	¥·¥¹¥Æ¥à¤Ë¤ª¤¤¤Æ¥í¥±¡¼¥ë¤òÀßÄꤹ¤ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
+	¼¡¤ÎÀá¤Ç¤Ï¡¢<acronym>i18n</acronym>
+	¤ËÂбþ¤¹¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¸«¤Ä¤±Êý¤ª¤è¤Ó¥³¥ó¥Ñ¥¤¥ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
 
-      <para>¸½ºß¤Î¥í¥±¡¼¥ë¤ÎÀßÄê¤òÄ´¤Ù¤ë¤Ë¤Ï¡¢
-	°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <screen>&prompt.user; <userinput>locale</userinput></screen>
-
     <sect2 xml:id="setting-locale">
       <title>¥í¥°¥¤¥ó¥·¥§¥ë¤Ç¥í¥±¡¼¥ë¤òÀßÄꤹ¤ë</title>
 
@@ -196,7 +203,7 @@
 	  <indexterm><primary>MIME</primary></indexterm>
 
 	  <para><envar>MM_CHARSET</envar>: ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç»ÈÍѤµ¤ì¤ë
-	    MIME ʸ»ú¥»¥Ã¥È¤ò»ØÄꤷ¤Þ¤¹¡£</para>
+	    <acronym>MIME</acronym> ʸ»ú¥»¥Ã¥È¤ò»ØÄꤷ¤Þ¤¹¡£</para>
 	</listitem>
       </itemizedlist>
 
@@ -219,7 +226,7 @@
 	<title>¥í¥°¥¤¥ó¥¯¥é¥¹¤òÍѤ¤¤ëÊýË¡</title>
 
 	<para>ºÇ½é¤ËÀâÌÀ¤¹¤ëÊýË¡¤Ï¡¢
-	  ¤¹¤Ù¤Æ¤Î¥·¥§¥ë¤Ë¤ª¤¤¤ÆɬÍ×¤Ê¥í¥±¡¼¥ë̾¤È MIME
+	  ¤¹¤Ù¤Æ¤Î¥·¥§¥ë¤Ë¤ª¤¤¤ÆɬÍ×¤Ê¥í¥±¡¼¥ë̾¤È <acronym>MIME</acronym>
 	  ʸ»ú¥»¥Ã¥È¤ò´Ä¶­ÊÑ¿ô¤Ë³ä¤êÅö¤Æ¤Þ¤¹¡£
 	  ¤³¤ì¤Ï¿ä¾©¤µ¤ì¤ëÊýË¡¤Ç¤¹¡£
 	  ¤³¤Î³ä¤êÅö¤ÆÊýË¡¤È¤·¤Æ¤Ï¡¢³Æ¥æ¡¼¥¶¤¬¹Ô¤¦ÊýË¡¤È¡¢
@@ -262,7 +269,7 @@ me:\
 	<para>¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ç¤Ï¡¢
 	  ¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤¬¥·¥¹¥Æ¥à¾å¤Î¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤ËÂФ¹¤ëÃÏ°è²½¤òÀßÄꤷ¤Þ¤¹¡£
 	  <filename>/etc/login.conf</filename>
-	  ¤Î°Ê²¼¤ÎÊÑ¿ô¤Ë¤è¤ê¡¢¥í¥±¡¼¥ë¤ª¤è¤Ó MIME
+	  ¤Î°Ê²¼¤ÎÊÑ¿ô¤Ë¤è¤ê¡¢¥í¥±¡¼¥ë¤ª¤è¤Ó <acronym>MIME</acronym>
 	  ʸ»ú¥»¥Ã¥È¤òÀßÄꤷ¤Þ¤¹¡£</para>
 
 	<programlisting><replaceable>language_name</replaceable>|<replaceable>Account Type Description</replaceable>:\
@@ -343,7 +350,7 @@ me:\
 	<sect3 xml:id="startup-file">
 	  <title>¥·¥§¥ë¤Î½é´ü²½¥Õ¥¡¥¤¥ë¤Ë¤è¤ëÊýË¡</title>
 
-	  <para>¤³¤³¤ÇÀâÌÀ¤¹¤ëÊýË¡¤Ï¡¢
+	  <para>¤³¤Î 2 ÈÖÌܤÎÊýË¡¤Ï¡¢
 	    »ÈÍѤ¹¤ë¥·¥§¥ë¤´¤È¤Ë¼êÆ°¤Ç¤ÎÀßÄ꤬ɬÍפʤ¿¤á¡¢¿ä¾©¤µ¤ì¤Þ¤»¤ó¡£
 	    ¥·¥§¥ëËè¤ËÀßÄê¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¡¢¤½¤Î¹½Ê¸¤Ï¥·¥§¥ë¤Ë°Í¸¤·¤Þ¤¹¡£
 	    ¤¿¤È¤¨¤Ð¡¢<command>sh</command>
@@ -425,8 +432,8 @@ keychange="<replaceable>¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼ÈÖ¹æ¤ÎʤÓ</
 	<filename>/etc/rc.conf</filename> ¤Ç
 	<replaceable>¥­¡¼¥Þ¥Ã¥×̾</replaceable> ¤ò»ØÄꤹ¤ë»þ¤Ë¤Ï¡¢
 	<filename>.kbd</filename> ¤È¤¤¤¦³ÈÄ¥»Ò¤ò½ü¤¤¤Æ¤¯¤À¤µ¤¤¡£
-	¤É¤Î¥­¡¼¥Þ¥Ã¥×¤ò»È¤¦¤«¤è¤¯¤ï¤«¤é¤Ê¤¤¤Ê¤é¡¢&man.kbdmap.1;
-	¤ÇºÆµ¯Æ°¤»¤º¤Ë¥­¡¼¥Þ¥Ã¥×¤ò»î¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+	ºÆµ¯Æ°¤»¤º¤Ë¥­¡¼¥Þ¥Ã¥×¤ò»î¤¹¤Ë¤Ï¡¢
+	&man.kbdmap.1; ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <para>¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼¤ÎʤӤϥ­¡¼¥Þ¥Ã¥×¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢
 	üËö¥¿¥¤¥×¤Ë¹ç¤ï¤»¤¿¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼¤òÀßÄꤹ¤ë¤¿¤á¤Ë
@@ -524,13 +531,13 @@ keychange="<replaceable>¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼ÈÖ¹æ¤ÎʤÓ</
 	    </row>
 
 	    <row>
-	      <entry>ÆüËܸì</entry>
-	      <entry><package>chinese/kon2</package></entry>
+	      <entry>Ãæ¹ñ¸ì/ÆüËܸì/´Ú¹ñ¸ì</entry>
+	      <entry><package>chinese/zhcon</package></entry>
 	    </row>
 
 	    <row>
-	      <entry>Ãæ¹ñ¸ì/ÆüËܸì/´Ú¹ñ¸ì</entry>
-	      <entry><package>chinese/zhcon</package></entry>
+	      <entry>ÆüËܸì</entry>
+	      <entry><package>chinese/kon2</package></entry>
 	    </row>
 
 	    <row>
@@ -554,9 +561,8 @@ keychange="<replaceable>¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼ÈÖ¹æ¤ÎʤÓ</
 	<literal>0xd0</literal>-<literal>0xd3</literal>
 	¤ÎÈϰϤòÀê¤á¤Æ¤¤¤Þ¤¹¡£¤½¤Î¤¿¤á¡¢
 	ÍøÍѤ·¤Æ¤¤¤ë¸À¸ì¤¬¤³¤ÎÈϰϤΥ­¥ã¥é¥¯¥¿¥»¥Ã¥È¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢
-	¥«¡¼¥½¥ë¤ÎÀê¤á¤ëÈϰϤò°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£
-	&os; ¤Ç¤³¤ì¤ò²óÈò¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¹Ô¤ò
-	<filename>/etc/rc.conf</filename> ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
+	¼¡¤Î¹Ô¤ò <filename>/etc/rc.conf</filename> ¤ËÄɲä·¤Æ
+	¥«¡¼¥½¥ë¤ÎÀê¤á¤ëÈϰϤò°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <programlisting>mousechar_start=3</programlisting>
     </sect2>
@@ -582,7 +588,7 @@ keychange="<replaceable>¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼ÈÖ¹æ¤ÎʤÓ</
 	ÄɲäΠFcitx ¤ª¤è¤Ó Uim ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤âÍøÍѤǤ­¤Þ¤¹¡£</para>
 
       <table xml:id="locale-xim" frame="none" pgwide="1">
-	<title>ÍøÍѤʲÄǽ¤Ê¥¤¥ó¥×¥Ã¥È¥á¥½¥Ã¥É</title>
+	<title>ÍøÍѲÄǽ¤Ê¥¤¥ó¥×¥Ã¥È¥á¥½¥Ã¥É</title>
 
 	<tgroup cols="2">
 	  <thead>
@@ -770,8 +776,9 @@ Comment out for now. If needed, can be added as note i
 	¸À¸ì¸ÇÍ­¤Î¥³¥ó¥Ð¡¼¥¿¤òÍѤ¤¤Æ¡¢Ê¸½ñ¤ò &postscript; ¤ä PDF
 	¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë¥³¥ó¥Ð¡¼¥È¤Ç¤­¤Þ¤¹¡£</para>
     </sect2>
--->
 
+Not sure where to put this section, perhaps as a note in the File system chapter?
+
     <sect2>
       <title>¥«¡¼¥Í¥ë¤È¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à</title>
 
@@ -797,68 +804,38 @@ Comment out for now. If needed, can be added as note i
 	¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Îʸ»ú¥»¥Ã¥È¤Î´Ö¤ÇÊÑ´¹¤ò¹Ô¤¦¤³¤È¤¬²Äǽ¤Ç¤¹¡£
 	¾ÜºÙ¤Ï &man.mount.msdosfs.8; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
     </sect2>
+        -->
   </sect1>
 
   <sect1 xml:id="l10n-compiling">
     <title>¹ñºÝ²½ (<acronym>i18n</acronym>)
-      ¤ËÂбþ¤·¤¿¥×¥í¥°¥é¥à¤Î¥³¥ó¥Ñ¥¤¥ë</title>
+      ¤ËÂбþ¤·¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¸«¤Ä¤±¤ë</title>
 
-    <para>¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¥ï¥¤¥É/¿¥Ð¥¤¥Èʸ»ú¤ËÂбþ¤¹¤ë¤¿¤á¤Ë¡¢
-      <link xlink:href="&url.base;/ja/ports/index.html">&os; Ports
-	Collection</link> ¤Ç¤Ï³Æ¸À¸ì¸þ¤±¤Î¥×¥í¥°¥é¥à¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
-      ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÀµ¤·¤¯ configure ¤¹¤ëÊýË¡¤ä¡¢port
-      ¤Î¹½ÃÛ»þ¤Ë»ÈÍѤ¹¤ë¥³¥ó¥Ñ¥¤¥ë¥ª¥×¥·¥ç¥ó¤ò·è¤á¤ë¤¿¤á¤Î¡¢
-      ¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-      ³Æ &os; port ¤Î <acronym>i18n</acronym> ʸ½ñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+    <para>¹ñºÝ²½ (<acronym>i18n</acronym>)
+      ¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢¥é¥¤¥Ö¥é¥ê¤È¤·¤Æ <acronym>i18n</acronym>
+      ²½¥­¥Ã¥È¤òÍѤ¤¤Æ¥×¥í¥°¥é¥ß¥ó¥°¤µ¤ì¤Þ¤¹¡£
+      ¤³¤ì¤Ï³«È¯¼Ô¤¬Ã±½ã¤Ê¥Õ¥¡¥¤¥ë¤ò½ñ¤¤¤Æ¡¢
+      ɽ¼¨¤µ¤ì¤ë¥á¥Ë¥å¡¼¤ä¥Æ¥­¥¹¥È¤ò³Æ¹ñ¸ì¤ËËÝÌõ¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤ì¤Þ¤¹¡£</para>
 
-    <para>¼¡¤Î¤³¤È¤ò¿´¤Ëα¤á¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-    <itemizedlist>
-      <listitem>
-	<para>¸À¸ì¸ÇÍ­¤Î¡¢C ¸À¸ì¤Î char ¤Çɽ¸½¤Ç¤­¤ë
-	  ISO8859-1, ISO8859-15, KOI8-R, CP437
-	  ¤È¤¤¤Ã¤¿¥·¥ó¥°¥ë¥Ð¥¤¥È¤Îʸ»ú¥»¥Ã¥È¡£
-	  &man.multibyte.3; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-      </listitem>
-
-      <listitem>
-	<para>EUC ¤ª¤è¤Ó Big5 ¤È¤¤¤Ã¤¿¡¢
-	  ¥ï¥¤¥É/¿¥Ð¥¤¥È¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¡£</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>¸½ºßÍ­¸ú¤Êʸ»ú¥»¥Ã¥È¤Î¥ê¥¹¥È¤Ï¡¢<link
-	xlink:href="http://www.iana.org/assignments/character-sets">IANA
-	Registry</link> ¤Ç³Îǧ¤Ç¤­¤Þ¤¹¡£</para>
-
-    <note>
-      <para>&os; ¤Ç¤Ï¡¢Xorg ¸ß´¹¤Î¥í¥±¡¼¥ëÉä¹æ¤òÍѤ¤¤Æ¤¤¤Þ¤¹¡£</para>
-    </note>
-
-    <para>&os; Ports Collection ¤Ç¤Ï¡¢¹ñºÝ²½
-      (<acronym>i18n</acronym>) ¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î̾Á°¤Ë¤Ï
+    <para><link xlink:href="&url.base;/ja/ports/index.html">&os; Ports
+      Collection </link> ¤Î¿¤¯¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢
+      ¤¤¤¯¤Ä¤«¤Î¸À¸ì¸þ¤±¤Î¥ï¥¤¥É/¿¥Ð¥¤¥Èʸ»ú¤Ø¤ÎÂбþ¤òÁȤ߹þ¤ó¤Ç¤¤¤Þ¤¹¡£
+      ¤½¤Î¤è¤¦¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î̾Á°¤Ë¤Ï¡¢
       ÍưפËǧ¼±¤Ç¤­¤ë¤è¤¦¤Ë¡¢<literal>-i18n</literal>
       ¤ÈÉÕ¤¤¤Æ¤¤¤Þ¤¹¡£¤·¤«¤·¤Ê¤¬¤é¡¢
-      ¤ËɬÍפȤ¹¤ë¸À¸ì¤ËÂбþ¤·¤Æ¤¤¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£</para>
+      ¤½¤ì¤é¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬É¬ÍפȤ¹¤ë¸À¸ì¤ËÂбþ¤·¤Æ¤¤¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£</para>
 
-    <para>&os; Ports Collection ¤Î¿¤¯¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¤¹¤Ç¤Ë¹ñºÝ²½
-      (<acronym>i18n</acronym>) ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-      ¤¤¤¯¤Ä¤«¤Î port ¤Î̾Á°¤Ë¤Ï¡¢<literal>-i18n</literal>
-      ¤ÈÉÕ¤¤¤Æ¤¤¤Þ¤¹¡£
-      ¤³¤ì¤é¤Ï¤â¤Á¤í¤ó¤Î¤³¤È¡¢
-      ¾¤Î¥×¥í¥°¥é¥à¤â¹ñºÝ²½ (<acronym>i18n</acronym>)
-      ¤Ø¤ÎÂбþ¤òÁȤ߹þ¤ó¤À¤â¤Î¤¬¤¢¤ê¡¢
-      ¥³¥ó¥Ñ¥¤¥ë¤ËºÝ¤·¤ÆÆÃÊ̤ÊÃí°Õ¤òʧ¤¦É¬ÍפϤ¢¤ê¤Þ¤»¤ó¡£</para>
-
-    <indexterm>
-      <primary><application>MySQL</application></primary>
-    </indexterm>
-    <para>¤·¤«¤·¡¢<application>MySQL</application> ¤Î¤è¤¦¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤Ï¡¢
-      ÆÃÄê¤Îʸ»ú¥»¥Ã¥È¤ò»È¤¦¤è¤¦¤Ë port ¤Î <filename>Makefile</filename>
-      ¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+    <para>¤¤¤¯¤Ä¤«¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤Ï¡¢
+      ÆÃÄê¤Îʸ»ú¥»¥Ã¥È¤ò»È¤¦¤è¤¦¤Ë¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤Þ¤¹¡£
       ¤³¤ì¤ÏÂçÄñ <filename>Makefile</filename> ¤ÎÃæ¤Ç
-      Âн褵¤ì¤Æ¤¤¤ë¤«¡¢¥½¡¼¥¹Ãæ¤Î <application>configure</application>
-      ¤ËÃͤòÅϤ¹¤³¤È¤ÇÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+      Âн褵¤ì¤Æ¤¤¤ë¤«¡¢<application>configure</application>
+      ¤ËÃͤòÅϤ¹¤³¤È¤ÇÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+      ɬÍ×¤Ê <application>configure</application> ¤ÎÃͤä
+      port ¤Î¹½ÃÛ»þ¤Ë»ÈÍѤ¹¤ë¥³¥ó¥Ñ¥¤¥ë¥ª¥×¥·¥ç¥ó¤ò·è¤á¤ë¤¿¤á¤Î
+      port ¤Î <filename>Makefile</filename>
+      ¤Ë´Ø¤¹¤ë¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+      ³Æ &os; port ¤Î¥½¡¼¥¹¤Ë¤¢¤ë
+      <acronym>i18n</acronym> ʸ½ñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
   </sect1>
 
   <sect1 xml:id="lang-setup">
@@ -882,6 +859,12 @@ Comment out for now. If needed, can be added as note i
 	<secondary>¥í¥·¥¢¸ì</secondary>
       </indexterm>
 
+    <para>¤³¤ÎÀá¤Ç¤Ï¡¢&os;
+      ¥·¥¹¥Æ¥à¤ò¥í¥·¥¢¸ì¤ØÃÏ°è²½¤¹¤ë¤¿¤á¤ÎÀßÄêÎã¤ò¼¨¤·¤Þ¤¹¡£
+      ³ÆÀßÄê¤Ë´Ø¤¹¤ë¤è¤ê¾Ü¤·¤¤ÀâÌÀ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+      <link linkend="using-localization">ÃÏ°è²½¤ÎÍøÍÑ</link>
+      ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
       <para>¤³¤Î¥í¥±¡¼¥ë¤ò¥í¥°¥¤¥ó¥·¥§¥ë¤ËÀßÄꤹ¤ë¤Ë¤Ï¡¢
 	°Ê²¼¤Î¹Ô¤ò³Æ¥æ¡¼¥¶¤Î <filename>~/.login_conf</filename>
 	¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
@@ -981,24 +964,27 @@ Option "XkbOptions"  "grp:toggle"</programlisting>
 
       <note>
 	<para>¥í¥·¥¢¸ì¤Î XKB ¥­¡¼¥Ü¡¼¥É¤Ï¡¢
-	  ÃÏ°è²½¤µ¤ì¤Æ¤¤¤Ê¤¤¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤Ï¤¦¤Þ¤¯Æ°¤«¤Ê¤¤¤«¤âÃΤì¤Þ¤»¤ó¡£</para>
+	  ÃÏ°è²½¤µ¤ì¤Æ¤¤¤Ê¤¤¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤Ï¤¦¤Þ¤¯Æ°¤«¤Ê¤¤¤«¤âÃΤì¤Þ¤»¤ó¡£
+	  ÃÏ°è²½¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¾¯¤Ê¤¯¤È¤â¥×¥í¥°¥é¥à¤ÎºÇ½é¤ÎÊý¤Ç
+	  <function>XtSetLanguageProc (NULL, NULL, NULL);</function>
+	  ¤ò¸Æ¤Ó½Ð¤¹¤Ù¤­¤Ç¤¹¡£</para>
       </note>
 
-      <para>ÃÏ°è²½¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¾¯¤Ê¤¯¤È¤â¥×¥í¥°¥é¥à¤ÎºÇ½é¤ÎÊý¤Ç
-	<function>XtSetLanguageProc (NULL, NULL, NULL);</function>
-	¤ò¸Æ¤Ó½Ð¤¹¤Ù¤­¤Ç¤¹¡£
-	<application>Xorg</application>
+      <para><application>Xorg</application>
 	¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÃÏ°è²½¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-	<link xlink:href="http://koi8.pp.ru/xwin.html">
-	  KOI8-R for X Window</link> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+	<uri xlink:href="http://koi8.pp.ru/xwin.html">http://koi8.pp.ru/xwin.html</uri>
+	¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
 	KOI8-R ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-	<link xlink:href="http://koi8.pp.ru/">KOI8-R -
-	  Russian Net Character Set</link> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<uri xlink:href="http://koi8.pp.ru/">http://koi8.pp.ru/</uri>
+	¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
     </sect2>
 
     <sect2>
       <title>¸À¸ì¸ÇÍ­¤Î¥ê¥½¡¼¥¹</title>
 
+      <para>¤³¤ÎÀá¤Ç¤Ï¡¢
+	¾¸À¸ì¤Ø¤Î¥í¥±¡¼¥ë¤ÎÀßÄê¤Ë´Ø¤¹¤ë¥ê¥½¡¼¥¹¤Î°ìÍ÷¤ò¼¨¤·¤Þ¤¹¡£</para>
+
       <indexterm>
 	<primary>ÃÏ°è²½</primary>
 	<secondary>ÈËÂλúÃæ¹ñ¸ì</secondary>
@@ -1025,13 +1011,10 @@ Option "XkbOptions"  "grp:toggle"</programlisting>
 	  <term>ÂæÏѸþ¤±¤ÎÈËÂλúÃæ¹ñ¸ì¤Ø¤ÎÃÏ°è²½</term>
 
 	  <listitem>
-	    <para>&os;-Taiwan ¥×¥í¥¸¥§¥¯¥È¤Ï¡¢Â¿¤¯¤ÎÃæ¹ñ¸ì ports ¤òÍøÍѤ·¤¿¡¢
+	    <para>&os;-Taiwan ¥×¥í¥¸¥§¥¯¥È¤Ï¡¢
 	      &os; ¤òÃæ¹ñ¸ì²½¤¹¤ë¤¿¤á¤Î¼ê°ú¤­ <uri
 		xlink:href="http://netlab.cse.yzu.edu.tw/~statue/freebsd/zh-tut/">http://netlab.cse.yzu.edu.tw/~statue/freebsd/zh-tut/</uri>
-	      ¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
-	      <literal>&os; Chinese HOWTO</literal> ¤Î¸½ºß¤ÎÊÔ½¸¼Ô¤Ï
-	      Shen Chuan-Hsing <email>statue at freebsd.sinica.edu.tw</email>
-	      ¤Ç¤¹¡£</para>
+	      ¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
   
@@ -1039,11 +1022,10 @@ Option "XkbOptions"  "grp:toggle"</programlisting>
 	  <term>¥É¥¤¥Ä¸ì¤Ø¤ÎÃÏ°è²½ (¤¹¤Ù¤Æ¤Î ISO 8859-1 ¸À¸ì¸þ¤±)</term>
 
 	  <listitem>
-	    <para>Slaven Rezic <email>eserte at cs.tu-berlin.de</email> ¤Ï
-	      &os; ¥Þ¥·¥ó¾å¤Ç¥¦¥à¥é¥¦¥È¤ò»È¤¦¤¿¤á¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤ò½ñ¤­¤Þ¤·¤¿¡£
-	      ¥Á¥å¡¼¥È¥ê¥¢¥ë¤Ï¥É¥¤¥Ä¸ì¤Ç½ñ¤«¤ì¤Æ¤ª¤ê¡¢<uri
+	    <para>&os; ¾å¤Ç¥¦¥à¥é¥¦¥È¤ò»È¤¦¤¿¤á¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤Ï¡¢
+	      <uri
 		xlink:href="http://user.cs.tu-berlin.de/~eserte/FreeBSD/doc/umlaute/umlaute.html">http://user.cs.tu-berlin.de/~eserte/FreeBSD/doc/umlaute/umlaute.html</uri>
-	      ¤«¤éÆþ¼ê¤Ç¤­¤Þ¤¹¡£</para>
+	      ¤«¤éÆþ¼ê¤Ç¤­¤Þ¤¹¡£¤³¤Îʸ½ñ¤Ï¥É¥¤¥Ä¸ì¤Ç½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
     
@@ -1051,9 +1033,8 @@ Option "XkbOptions"  "grp:toggle"</programlisting>
 	  <term>¥®¥ê¥·¥ã¸ì¤Ø¤ÎÃÏ°è²½</term>
 
 	  <listitem>
-	    <para>Nikos Kokkalis <email>nickkokkalis at gmail.com</email> ¤Ï¡¢
-	      &os; ¤Ë¤ª¤±¤ë¥®¥ê¥·¥ã¸ì¤Î¥µ¥Ý¡¼¥È¤Ë¤Ä¤¤¤Æ¤Îµ­»ö¤ò½ñ¤­¤Þ¤·¤¿¡£
-	      ¤³¤ì¤Ï¡¢¸ø¼°¤Î &os; ¥®¥ê¥·¥ã¸ì¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤Î°ìÉô¤È¤·¤Æ
+	    <para>&os; ¤Ë¤ª¤±¤ë¥®¥ê¥·¥ã¸ì¤Î¥µ¥Ý¡¼¥È¤Ë¤Ä¤¤¤Æ¤Îµ­»ö¤Ï¡¢
+	      ¸ø¼°¤Î &os; ¥®¥ê¥·¥ã¸ì¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤Î°ìÉô¤È¤·¤Æ
 	      <link
 		xlink:href="&url.doc.base;/el_GR.ISO8859-7/articles/greek-language-support/index.html">¤³¤³</link> ¤ÇÆɤळ¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	      ¤³¤Îʸ½ñ¤Ï¡¢¥®¥ê¥·¥ã¸ì¤Ç½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para>
@@ -1079,7 +1060,7 @@ Option "XkbOptions"  "grp:toggle"</programlisting>
 	    <para>&os;
 	      ¤Îʸ½ñ¤Î°ìÉô¤ò¾¤Î¸À¸ì¤ËËÝÌõ¤·¤Æ¤¯¤ì¤Æ¤¤¤ë¹×¸¥¼Ô¤¿¤Á¤¬¤¤¤Þ¤¹¡£
 	      ¤³¤ì¤é¤Ï <link
-		xlink:href="&url.base;/ja/index.html">¥á¥¤¥ó¥µ¥¤¥È</link>
+		xlink:href="&url.base;/ja/index.html">&os; ¥¦¥§¥Ö¥µ¥¤¥È</link>
 	      ¤Î¥ê¥ó¥¯¤òé¤ë¤«
 	      <filename class="directory">/usr/share/doc</filename>
 	      ¤«¤éÆþ¼ê¤Ç¤­¤Þ¤¹¡£</para>


More information about the svn-doc-all mailing list