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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Wed Sep 30 14:00:20 UTC 2020


Author: ryusuke
Date: Wed Sep 30 14:00:19 2020
New Revision: 54551
URL: https://svnweb.freebsd.org/changeset/doc/54551

Log:
  - Merge the following from the English version:
  
  	r40734 -> r42402	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	Wed Sep 30 11:29:07 2020	(r54550)
+++ head/ja_JP.eucJP/books/handbook/l10n/chapter.xml	Wed Sep 30 14:00:19 2020	(r54551)
@@ -3,11 +3,15 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40734
+     Original revision: r42402
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="l10n">
-  <info><title>ÃÏ°è²½ (localization) - I18N/L10N ¤ÎÍøÍѤÈÀßÄê</title>
+
+  <info>
+    <title>ÃÏ°è²½ (localization) -
+      <acronym>i18n</acronym>/<acronym>L10n</acronym> ¤ÎÍøÍѤÈÀßÄê</title>
+
     <authorgroup>
       <author><personname><firstname>Andrey</firstname><surname>Chernov</surname></personname><contrib>´ó¹Æ: </contrib></author>
     </authorgroup>
@@ -17,38 +21,47 @@
     </authorgroup>
   </info>
 
-  
-
   <sect1 xml:id="l10n-synopsis">
     <title>¤³¤Î¾Ï¤Ç¤Ï</title>
 
-    <para>FreeBSD ¤Ï¡¢¥æ¡¼¥¶¡¼¤ª¤è¤Ó¹×¸¥¼Ô¤¬À¤³¦Ãæ¤Ë¤¤¤ë¡¢Èó¾ï¤Ëʬ»¶¤·¤¿
-      ¥×¥í¥¸¥§¥¯¥È¤Ç¤¹¡£¤³¤Î¾Ï¤Ç¤Ï¡¢±Ñ¸ì°Ê³°¤Î¸À¸ì¤ò»È¤¦¥æ¡¼¥¶¡¼¤Î¼ÂÍѤË
-      ÂѤ¨¤é¤ì¤ë¤è¤¦¤Ë¤¹¤ë FreeBSD ¤Î¹ñºÝ²½ (internationalization) ¤È
-      ÃÏ°è²½ (localization) µ¡Ç½¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Þ¤¹¡£
-      ¥·¥¹¥Æ¥à¥ì¥Ù¥ë¤Ç¤â¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥ì¥Ù¥ë¤Ç¤â¡¢¹ñºÝ²½¤Î¼ÂÁõ¤Ë¤Ï
-      ÍÍ¡¹¤Ê¦Ì̤¬¤¢¤ë¤Î¤Ç¡¢É¬Íפ˱þ¤¸¤ÆÆɼԤËÂФ·¤Æ¤è¤êÀìÌçŪ¤Êʸ½ñ¾ðÊó¤ò
-      ¼¨¤¹¤³¤È¤Ë¤·¤Þ¤¹¡£</para>
+    <para>&os; ¤Ï¡¢
+      ¥æ¡¼¥¶¡¼¤ª¤è¤Ó¹×¸¥¼Ô¤¬À¤³¦Ãæ¤Ëʬ»¶¤·¤¿¥×¥í¥¸¥§¥¯¥È¤Ç¤¹¡£
+      ¤³¤Î¾Ï¤Ç¤Ï¡¢±Ñ¸ì°Ê³°¤Î¸À¸ì¤ò»È¤¦¥æ¡¼¥¶¡¼¤Î¼ÂÍѤËÂѤ¨¤é¤ì¤ë¤è¤¦¤Ë¤¹¤ë
+      &os; ¤Î¹ñºÝ²½ (internationalization)
+      ¤ÈÃÏ°è²½ (localization) µ¡Ç½¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Þ¤¹¡£
+      ¥·¥¹¥Æ¥à¥ì¥Ù¥ë¤Ç¤â¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥ì¥Ù¥ë¤Ç¤â¡¢
+      ¹ñºÝ²½ (<acronym>i18n</acronym>) ¤Î¼ÂÁõ¤Ë¤ÏÍÍ¡¹¤Ê¦Ì̤¬¤¢¤ë¤Î¤Ç¡¢
+      ɬÍפ˱þ¤¸¤Æ²Äǽ¤ÊÈϰϤÇÆɼԤËÂФ·¤Æ¤è¤êÀìÌçŪ¤Êʸ½ñ¾ðÊó¤ò¼¨¤¹¤³¤È¤Ë¤·¤Þ¤¹¡£</para>
 
     <para>¤³¤Î¾Ï¤Ç¤Ï¡¢°Ê²¼¤ÎʬÌî¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
     <itemizedlist>
-      <listitem><para>¶áÂåŪ¤Ê¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ç¡¢°Û¤Ê¤ë¸À¸ì¤ª¤è¤Ó
-	  ¥í¥±¡¼¥ë¤¬¤É¤Î¤è¤¦¤ËÉä¹æ²½¤µ¤ì¤Æ¤¤¤ë¤«¡£</para></listitem>
-      <listitem><para>¥í¥°¥¤¥ó¥·¥§¥ë¤Ç¥í¥±¡¼¥ë¤òÀßÄꤹ¤ë¤Ë¤Ï
-	  ¤É¤¦¤¹¤ë¤«¡£</para></listitem>
-      <listitem><para>¥³¥ó¥½¡¼¥ë¤ò±Ñ¸ì°Ê³°¤Î¸À¸ìÍѤËÀßÄꤹ¤ë¤Ë¤Ï
-	  ¤É¤¦¤¹¤ë¤«¡£</para></listitem>
-      <listitem><para>ÍÍ¡¹¤Ê¸À¸ì¤Ç¸úΨŪ¤Ë X Window System ¤ò»È¤¦¤Ë¤Ï
-	  ¤É¤¦¤¹¤ì¤Ð¤è¤¤¤«¡£</para></listitem>
-      <listitem><para>¹ñºÝ²½¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò½ñ¤¯¤¿¤á¤Î
-	  ¾ðÊó¤Ï¤É¤³¤Ë¤¢¤ë¤«¡£</para></listitem>
+      <listitem>
+	<para>¶áÂåŪ¤Ê¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ç¡¢
+	  °Û¤Ê¤ë¸À¸ì¤ª¤è¤Ó¥í¥±¡¼¥ë¤¬¤É¤Î¤è¤¦¤ËÉä¹æ²½¤µ¤ì¤Æ¤¤¤ë¤«¡£</para>
+      </listitem>
+      <listitem>
+	<para>¥í¥°¥¤¥ó¥·¥§¥ë¤Ç¥í¥±¡¼¥ë¤òÀßÄꤹ¤ë¤Ë¤Ï¤É¤¦¤¹¤ë¤«¡£</para>
+      </listitem>
+      <listitem>
+	<para>¥³¥ó¥½¡¼¥ë¤ò±Ñ¸ì°Ê³°¤Î¸À¸ìÍѤËÀßÄꤹ¤ë¤Ë¤Ï¤É¤¦¤¹¤ë¤«¡£</para>
+      </listitem>
+      <listitem>
+	<para>ÍÍ¡¹¤Ê¸À¸ì¤Ç¸úΨŪ¤Ë <application>Xorg</application>
+	  ¤ò»È¤¦¤Ë¤Ï¤É¤¦¤¹¤ì¤Ð¤è¤¤¤«¡£</para>
+      </listitem>
+      <listitem>
+	<para>¹ñºÝ²½ (<acronym>i18n</acronym>)
+	  ¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò½ñ¤¯¤¿¤á¤Î¾ðÊó¤Ï¤É¤³¤Ë¤¢¤ë¤«¡£</para>
+      </listitem>
     </itemizedlist>
 
     <para>¤³¤Î¾Ï¤òÆɤàÁ°¤Ë¡¢°Ê²¼¤Î¤³¤È¤òÍý²ò¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
     <itemizedlist>
-      <listitem><para>¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡
-	  (<xref linkend="ports"/>)¡£</para></listitem>
+      <listitem>
+	<para><link
+	    linkend="ports">¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡</link></para>
+      </listitem>
     </itemizedlist>
   </sect1>
 
@@ -56,41 +69,46 @@
     <title>´ðÁÃÃμ±</title>
 
     <sect2>
-      <title>I18N/L10N ¤È¤Ï?</title>
+      <title><acronym>i18n</acronym>/<acronym>L10n</acronym> ¤È¤Ï?</title>
+
       <indexterm>
 	<primary>¹ñºÝ²½ (internationalization)</primary>
 	<see>ÃÏ°è²½ (localization)</see>
       </indexterm>
       <indexterm><primary>ÃÏ°è²½(localization)</primary></indexterm>
 
-      <para>³«È¯¼Ô¤¿¤Á¤Ï¤·¤Ð¤·¤Ð¡¢internationalization ¤ò½Ì¤á¤Æ I18N
-	¤Èɽµ­¤·¤Þ¤¹¡£18 ¤Ï internationalization ¤ÎºÇ½é¤ÈºÇ¸å¤Î´Ö¤Î
-	ʸ»ú¿ô¤Ç¤¹¡£L10N ¤âƱ¤¸Ì¿Ì¾Ë¡¤òÍѤ¤¤Æ
+      <para>internationalization ¤Ï¡¢<acronym>i18n</acronym>
+	¤Èû½Ì¤·¤Æɽµ­¤µ¤ì¤Þ¤¹¡£
+	¤³¤ì¤Ï internationalization
+	¤ÎºÇ½é¤ÈºÇ¸å¤Î´Ö¤Îʸ»ú¿ô¤ËͳÍ褷¤Þ¤¹¡£
+	<acronym>L10n</acronym> ¤âƱ¤¸Ì¿Ì¾Ë¡¤òÍѤ¤¤Æ
 	<quote>localization</quote> ¤ò½Ì¤á¤¿¤â¤Î¤Ç¤¹¡£
-	¤³¤ì¤é¤ò¹ç¤ï¤»¤Æ¡¢I18N/L10N ¤µ¤ì¤¿ (¤¹¤Ê¤ï¤Á¹ñºÝ²½/ÃÏ°è²½¤µ¤ì¤¿)
-	¼êË¡¡¢¥×¥í¥È¥³¥ë¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢¼«Ê¬Ã£¤Î¹¥¤ß¤Î¸À¸ì¤ò
-	»È¤¦¤³¤È¤ò²Äǽ¤Ë¤·¤Æ¤¯¤ì¤Þ¤¹¡£</para>
+	¤³¤ì¤é¤ò¹ç¤ï¤»¤Æ¡¢<acronym>i18n</acronym>/<acronym>L10n</acronym>
+	¤µ¤ì¤¿ (¤¹¤Ê¤ï¤Á¹ñºÝ²½/ÃÏ°è²½¤µ¤ì¤¿)
+	¼êË¡¡¢¥×¥í¥È¥³¥ë¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢
+	¼«Ê¬Ã£¤Î¹¥¤ß¤Î¸À¸ì¤ò»È¤¦¤³¤È¤ò²Äǽ¤Ë¤·¤Æ¤¯¤ì¤Þ¤¹¡£</para>
 
-      <para>¹ñºÝ²½¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¥é¥¤¥Ö¥é¥ê¤È¤·¤Æ¹ñºÝ²½¥­¥Ã¥È
-	¤òÍѤ¤¤Æ¥×¥í¥°¥é¥ß¥ó¥°¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+      <para>¹ñºÝ²½ (<acronym>i18n</acronym>)
+	¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢¥é¥¤¥Ö¥é¥ê¤È¤·¤Æ <acronym>i18n</acronym>
+	²½¥­¥Ã¥È¤òÍѤ¤¤Æ¥×¥í¥°¥é¥ß¥ó¥°¤µ¤ì¤Þ¤¹¡£
 	¤³¤ì¤Ï³«È¯¼Ô¤¬Ã±½ã¤Ê¥Õ¥¡¥¤¥ë¤ò½ñ¤¤¤Æ¡¢
-	ɽ¼¨¤µ¤ì¤ë¥á¥Ë¥å¡¼¤ä¥Æ¥­¥¹¥È¤ò³Æ¹ñ¸ì¤ËËÝÌõ¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤ì¤Þ¤¹¡£
-	¥×¥í¥°¥é¥Þ¤Î¤ß¤Ê¤µ¤ó¤Ë¤Ï¡¢
-	¤³¤ì¤é¤ÎÊýË¡¤òÍøÍѤ¹¤ë¤³¤È¤ò¶¯¤¯¿ä¾©¤·¤Þ¤¹¡£</para>
+	ɽ¼¨¤µ¤ì¤ë¥á¥Ë¥å¡¼¤ä¥Æ¥­¥¹¥È¤ò³Æ¹ñ¸ì¤ËËÝÌõ¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤ì¤Þ¤¹¡£</para>
     </sect2>
 
     <sect2>
-      <title>¤Ê¤¼ I18N/L10N ¤ò»È¤ï¤Ê¤±¤ì¤Ð¤¤¤±¤Ê¤¤¤Î?</title>
+      <title>¤Ê¤¼ <acronym>i18n</acronym>/<acronym>L10n</acronym>
+	¤ò»È¤ï¤Ê¤±¤ì¤Ð¤¤¤±¤Ê¤¤¤Î?</title>
 
-      <para>±Ñ¸ì°Ê³°¤Î¸À¸ì¤ò¸«¤¿¤ê¡¢ÆþÎϤ·¤¿¤ê¡¢½èÍý¤·¤¿¤ê¤¹¤ë¾ì¹ç¤Ï¤¤¤Ä¤Ç¤â¡¢
-	I18N/L10N ¤¬»È¤ï¤ì¤Þ¤¹¡£</para>
+      <para><acronym>i18n</acronym>/<acronym>L10n</acronym> ¤ò»È¤¦¤È¡¢
+	±Ñ¸ì°Ê³°¤Î¸À¸ì¤ò¸«¤¿¤ê¡¢ÆþÎϤ·¤¿¤ê¡¢½èÍý¤·¤¿¤ê¤Ç¤­¤Þ¤¹¡£</para>
     </sect2>
 
     <sect2>
-      <title>I18N ¤Ç»È¤¨¤ë¤è¤¦¤Ë¤Ê¤ë¸À¸ì¤Ë¤Ï²¿¤¬¤¢¤ë¤Î?</title>
+      <title>¤É¤Î¤è¤¦¤Ê¸À¸ì¤¬Âбþ¤·¤Æ¤¤¤ë¤Î?</title>
 
-      <para>I18N ¤ä L10N ¤Ï FreeBSD ¤Ë¸Â¤Ã¤¿ÏÃÂê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	¸½ºß¤Ç¤Ï¡¢À¤³¦Ãæ¤Î¼çÍפʸÀ¸ì¤Î¤Û¤È¤ó¤É¤«¤éÁª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+      <para><acronym>i18n</acronym> ¤ä <acronym>L10n</acronym> ¤Ï¡¢
+	&os; ¤Ë¸Â¤Ã¤¿ÏÃÂê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+	¸½ºß¤Ç¤Ï¡¢¼çÍפʸÀ¸ì¤Î¤Û¤È¤ó¤É¤«¤éÁª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	¤¿¤È¤¨¤ÐÃæ¹ñ¸ì¡¢¥É¥¤¥Ä¸ì¡¢ÆüËܸ졢´Ú¹ñ¸ì¡¢¥Õ¥é¥ó¥¹¸ì¡¢¥í¥·¥¢¸ì¡¢
 	¥Ù¥È¥Ê¥à¸ì¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¤¬¡¢¤³¤ì¤é¤Ë¸ÂÄꤵ¤ì¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
       <indexterm><primary>¥í¥±¡¼¥ë(locale)</primary></indexterm>
@@ -100,8 +118,7 @@
   <sect1 xml:id="using-localization">
     <title>ÃÏ°è²½¤ÎÍøÍÑ</title>
 
-    <para>I18N ¤Ï FreeBSD ¤ËÆÃÍ­¤Î¤â¤Î¤Ç¤Ï¤Ê¤¯¡¢°ì¤Ä¤Î¹Í¤¨Êý¤Ç¤¹¡£
-      °Ê²¼¤Î´·½¬¤Ë¤·¤¿¤¬¤Ã¤Æ FreeBSD ¤òÍøÍѤ¹¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+    <indexterm><primary>¥í¥±¡¼¥ë</primary></indexterm>
 
     <para>ÃÏ°è²½¤ÎÀßÄê¤Ï¸À¸ì¥³¡¼¥É¡¢
       ¹ñ¥³¡¼¥É¡¢¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤È¤¤¤¦»°¤Ä¤ÎÍѸì¤ò´ðËܤȤ·¤Þ¤¹¡£
@@ -115,13 +132,10 @@
       <indexterm><primary>¸À¸ì¥³¡¼¥É</primary></indexterm>
       <indexterm><primary>¹ñ¥³¡¼¥É</primary></indexterm>
 
-      <para>FreeBSD (¤ä¤½¤Î¾¤Î¹ñºÝ²½¤ò¥µ¥Ý¡¼¥È¤·¤¿ &unix;-like ¤Ê¥·¥¹¥Æ¥à)
-	¤òÆÃÄê¤Î¸À¸ì¤ËÃÏ°è²½¤¹¤ë¤Ë¤Ï¡¢
-	¹ñ¤È¸À¸ì¤òÆÃÄꤹ¤ë¤¿¤á¤Î¥³¡¼¥É¤òÃΤëɬÍפ¬¤¢¤ê¤Þ¤¹
-	(¹ñ¥³¡¼¥É¤Ï¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë»ØÄꤵ¤ì¤¿¸À¸ì¤Î¤É¤ÎÊѼï
-	(variation) ¤òÍѤ¤¤ì¤ÐÎɤ¤¤«¤ò¶µ¤¨¤Æ¤¯¤ì¤Þ¤¹)¡£
-	²Ã¤¨¤Æ¡¢¥¦¥§¥Ö¥Ö¥é¥¦¥¶¡¢SMTP/POP ¥µ¡¼¥Ð¡¢
-	¥¦¥§¥Ö¥µ¡¼¥Ð¤Ê¤É¤â¤³¤ì¤é¤ò¸µ¤ËÍÍ¡¹¤ÊÁªÂò¤ò¹Ô¤¤¤Þ¤¹¡£
+      <para>&os; ¥·¥¹¥Æ¥à¤òÆÃÄê¤Î¸À¸ì¤ËÃÏ°è²½¤¹¤ë¤Ë¤Ï¡¢
+	¹ñ¤È¸À¸ì¤òÆÃÄꤹ¤ë¤¿¤á¤Î¥³¡¼¥É¤ò·è¤á¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+	¹ñ¥³¡¼¥É¤Ë¤è¤ê¡¢»ØÄꤵ¤ì¤¿¸À¸ì¤Î¤É¤ÎÊѼï
+	(variation) ¤ò»È¤¦¤«¤ò¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë»ØÄꤷ¤Þ¤¹¡£
 	°Ê²¼¤Ï¸À¸ì/¹ñ¥³¡¼¥É¤ÎÎã¤Ç¤¹¡£</para>
 
       <informaltable frame="none" pgwide="1">
@@ -152,8 +166,7 @@
 	</tgroup>
       </informaltable>
 
-      <para>
-	°Ê²¼¤ò¼Â¹Ô¤¹¤ë¤È¡¢
+      <para>°Ê²¼¤ò¼Â¹Ô¤¹¤ë¤È¡¢
 	ÍøÍѲÄǽ¤Ê¤¹¤Ù¤Æ¤Î¥í¥±¡¼¥ë¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£</para>
 
       <screen>&prompt.user; <userinput>locale -a</userinput></screen>
@@ -167,80 +180,75 @@
       <indexterm><primary>ASCII</primary></indexterm>
 
       <para>¤¤¤¯¤Ä¤«¤Î¸À¸ì¤Ç¤Ï¡¢8-bit ¤ä¥ï¥¤¥Éʸ»ú¡¢
-	¿¥Ð¥¤¥Èʸ»ú¤Ê¤É ASCII ¤È¤Ï°Û¤Ê¤Ã¤¿¥¨¥ó¥³¡¼¥ÉË¡¤òÍѤ¤¤Þ¤¹
-	(&man.multibyte.3; »²¾È)¡£
+	¿¥Ð¥¤¥Èʸ»ú¤Ê¤É ASCII ¤È¤Ï°Û¤Ê¤Ã¤¿¥¨¥ó¥³¡¼¥ÉË¡¤òÍѤ¤¤Þ¤¹¡£
+	¤³¤ì¤é¤Î¥¨¥ó¥³¡¼¥ÉË¡¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	&man.multibyte.3; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
 	¸Å¤¤¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¤³¤ì¤é¤òǧ¼±¤»¤º¡¢
 	¸í¤Ã¤Æ¥³¥ó¥È¥í¡¼¥ëʸ»ú¤È¤·¤Æǧ¼±¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
 	ºÇ¶á¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢ÂçÄñ 8-bit ʸ»ú¤òǧ¼±¤·¤Þ¤¹¡£
 	¼ÂÁõÊýË¡¤Ë¤â°Í¤ê¤Þ¤¹¤¬¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥³¥ó¥Ñ¥¤¥ë»þ¤â¤·¤¯¤Ï
 	configure »þ¤Ë¡¢¥ï¥¤¥É/¿¥Ð¥¤¥Èʸ»ú¤Î¥µ¥Ý¡¼¥È¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ë¤«¤âÃΤì¤Þ¤»¤ó¡£
-	¥ï¥¤¥É/¿¥Ð¥¤¥Èʸ»ú¤òÆþÎϤ·¤¿¤ê½èÍý¤·¤¿¤ê¤¹¤ë¤³¤È¤ò²Äǽ¤Ë¤¹¤ë¤¿¤á¤Ë¡¢
-	<link xlink:href="&url.base;/ja/ports/index.html">FreeBSD Ports Collection</link>
-	¤Ç¤Ï³Æ¸À¸ì¸þ¤±¤Ë°Û¤Ê¤Ã¤¿¥×¥í¥°¥é¥à¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
-	³Æ FreeBSD Port ¤Î¹ñºÝ²½Ê¸½ñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-      </para>
+	¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¡¢¥ï¥¤¥É/¿¥Ð¥¤¥Èʸ»ú¤ËÂбþ¤¹¤ë¤¿¤á¤Ë¡¢
+	<link xlink:href="&url.base;/ja/ports/index.html">&os; Ports
+	  Collection</link> ¤Ç¤Ï³Æ¸À¸ì¸þ¤±¤Î¥×¥í¥°¥é¥à¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
+	³Æ &os; port ¤Î <acronym>i18n</acronym> ʸ½ñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <para>Æäˡ¢Àµ¤·¤¯ configure ¤·¤¿¤ê¡¢configure/Makefile/
-	¥³¥ó¥Ñ¥¤¥é¤ËŬÀÚ¤ÊÃͤòÅϤ¹¤¿¤á¤Ë¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î
-	ʸ½ñ¤òÎɤ¯ÆɤàɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
+      <para>Æäˡ¢Àµ¤·¤¯ configure ¤·¤¿¤ê¡¢port
+	¤Î¹½ÃÛ»þ¤Ë»ÈÍѤ¹¤ë¥³¥ó¥Ñ¥¤¥ë¥ª¥×¥·¥ç¥ó¤ò·è¤á¤ë¤¿¤á¤Ë¡¢
+	¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Îʸ½ñ¤òÎɤ¯ÆɤàɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
       <para>¼¡¤Î¤³¤È¤ò¿´¤Ëα¤á¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>¸À¸ì¸ÇÍ­¤Î¡¢C ¸À¸ì¤Î char ¤Çɽ¸½¤Ç¤­¤ë
-	    ¥·¥ó¥°¥ë¥Ð¥¤¥È¤Îʸ»ú¥»¥Ã¥È
-	    (&man.multibyte.3; ¤ò»²¾È)¡¢¤¿¤È¤¨¤Ð
-	    ISO8859-1, ISO8859-15, KOI8-R, CP437¡£</para>
+	    ISO8859-1, ISO8859-15, KOI8-R, CP437
+	    ¤È¤¤¤Ã¤¿¥·¥ó¥°¥ë¥Ð¥¤¥È¤Îʸ»ú¥»¥Ã¥È¡£
+	    &man.multibyte.3; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 	</listitem>
 
 	<listitem>
-	  <para>¥ï¥¤¥É¡¢Â¿¥Ð¥¤¥È¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¡¢¤¿¤È¤¨¤Ð EUC, Big5¡£
-	  </para>
+	  <para>EUC ¤ª¤è¤Ó Big5 ¤È¤¤¤Ã¤¿¡¢
+	    ¥ï¥¤¥É¡¢Â¿¥Ð¥¤¥È¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¡£</para>
 	</listitem>
       </itemizedlist>
 
       <para>¸½ºßÍ­¸ú¤Êʸ»ú¥»¥Ã¥È¤Î¥ê¥¹¥È¤Ë´Ø¤·¤Æ¤Ï
 	<link
-	  xlink:href="http://www.iana.org/assignments/character-sets">IANA Registry</link>
-	¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	  xlink:href="http://www.iana.org/assignments/character-sets">IANA
+	    Registry</link>
+	¤ò³Îǧ¤¯¤À¤µ¤¤¡£</para>
 
       <note>
-	<para>&os; ¤Ç¤Ï¡¢X11 ¸ß´¹¤Î¥í¥±¡¼¥ëÉä¹æ¤òÍѤ¤¤Æ¤¤¤Þ¤¹¡£</para>
+	<para>&os; ¤Ç¤Ï¡¢Xorg ¸ß´¹¤Î¥í¥±¡¼¥ëÉä¹æ¤òÍѤ¤¤Æ¤¤¤Þ¤¹¡£</para>
       </note>
 
+      <para>&os; Ports Collection ¤Ç¤Ï¡¢
+	¤Ò¤ÈÌܤǤ½¤ì¤È¤ï¤«¤ë¤è¤¦¤Ë¹ñºÝ²½¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î̾Á°¤Ë
+	<literal>i18n</literal> ¤È¤¤¤¦Ê¸»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
+	¤¿¤À¤·¡¢¤½¤ì¤é¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¾ï¤Ë¤¢¤Ê¤¿¤Î˾¤à¸À¸ì¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£</para>
     </sect2>
 
-    <sect2>
-      <title>¹ñºÝ²½¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</title>
-
-      <para>FreeBSD ¤Î ports/packages ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
-	¤½¤ì¤È¤Ò¤ÈÌܤǤ狼¤ë¤è¤¦¤Ë¹ñºÝ²½¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ï̾Á°¤Ë
-	<literal>I18N</literal> ¤È¤¤¤¦Ê¸»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-	¤¿¤À¤·¡¢¤½¤ì¤é¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¾ï¤Ë¤¢¤Ê¤¿¤Î˾¤à¸À¸ì¤ò
-	¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£</para>
-    </sect2>
-
     <sect2 xml:id="setting-locale">
       <title>¥í¥±¡¼¥ë¤ÎÀßÄê</title>
 
       <para>Ä̾ï¤Ï¡¢¥í¥°¥¤¥ó¥·¥§¥ë¤Ç´Ä¶­ÊÑ¿ô <envar>LANG</envar> ¤Ë
 	¥í¥±¡¼¥ë̾¤òÀßÄꤷ export ¤¹¤ì¤Ð½½Ê¬¤Ç¤¹¡£¤³¤ì¤Ï¡¢¥æ¡¼¥¶¡¼¤Î
-	<filename>~/.login_conf</filename> ¥Õ¥¡¥¤¥ë¡¢¤Þ¤¿¤Ï¥æ¡¼¥¶¡¼¤Î
-	¥·¥§¥ë¤Î½é´üÀßÄê¥Õ¥¡¥¤¥ë (<filename>~/.profile</filename>,
-	<filename>~/.bashrc</filename>, <filename>~/.cshrc</filename>)
+	<filename>~/.login_conf</filename>¡¢
+	¤Þ¤¿¤Ï¥æ¡¼¥¶¡¼¤Î¥·¥§¥ë¤Î½é´üÀßÄê¥Õ¥¡¥¤¥ë
+	(<filename>~/.profile</filename>,
+	<filename>~/.bashrc</filename> ¤Þ¤¿¤Ï <filename>~/.cshrc</filename>)
 	¤Ç¤Ç¤­¤Þ¤¹¡£
-	<envar>LC_CTYPE</envar> ¤ä <envar>LC_CTIME</envar> ¤Î¤è¤¦¤Ê
-	¥í¥±¡¼¥ë¤Î¥µ¥Ö¥»¥Ã¥È¤òÀßÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
-	¾ÜºÙ¤Ë´Ø¤·¤Æ¤Ï¡¢³Æ¸À¸ì¸þ¤±¤Î FreeBSD ʸ½ñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<envar>LC_CTYPE</envar> ¤ä <envar>LC_CTIME</envar>
+	¤Î¤è¤¦¤Ê¥í¥±¡¼¥ë¤Î¥µ¥Ö¥»¥Ã¥È¤òÀßÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
+	¾ÜºÙ¤Ë´Ø¤·¤Æ¤Ï¡¢³Æ¸À¸ì¸þ¤±¤Î &os; ʸ½ñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <para>°Ê²¼¤ÎÆó¤Ä¤Î´Ä¶­ÊÑ¿ô¤òÀßÄê¥Õ¥¡¥¤¥ë¤Ç»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
       <itemizedlist>
 	<listitem>
-	  <indexterm><primary>POSIX</primary></indexterm>
-	  <para>&posix; &man.setlocale.3; ´ØÏ¢¤Î´Ø¿ô¤Î¤¿¤á¤Î
-	    <envar>LANG</envar></para>
+	  <para>&posix;<indexterm><primary>POSIX</primary></indexterm> &man.setlocale.3;
+	    ´ØÏ¢¤Î´Ø¿ô¤Î¤¿¤á¤Î <envar>LANG</envar></para>
 	</listitem>
 
 	<listitem>
@@ -251,8 +259,10 @@
 	</listitem>
       </itemizedlist>
 
-      <para>¤³¤ì¤Ë¤Ï¥æ¡¼¥¶¤Î¥·¥§¥ë¤ÎÀßÄê¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¸ÇÍ­¤ÎÀßÄê¡¢
-	X11 ¤ÎÀßÄê¤Ê¤É¤¬´Þ¤Þ¤ì¤Þ¤¹¡£</para>
+      <para>¤³¤ì¤é¤Ï¡¢¥æ¡¼¥¶¤Î¥·¥§¥ë¤ÎÀßÄê¥Õ¥¡¥¤¥ë¡¢
+	¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¸ÇÍ­¤ÎÀßÄê¥Õ¥¡¥¤¥ë¡¢
+	¤½¤·¤Æ <application>Xorg</application>
+	¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Ë¤ª¤¤¤Æ»ØÄꤵ¤ì¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
       <sect3>
 	<title>¥í¥±¡¼¥ë¤òÀßÄꤹ¤ëÊýË¡</title>
@@ -260,10 +270,11 @@
 	<indexterm><primary>¥í¥±¡¼¥ë (locale)</primary></indexterm>
 	<indexterm><primary>¥í¥°¥¤¥ó¥¯¥é¥¹</primary></indexterm>
 
-	<para>¥í¥±¡¼¥ë¤òÀßÄꤹ¤ë¤Ë¤Ï°Ê²¼¤ÇÀâÌÀ¤¹¤ë¤è¤¦¤Ë¡¢Æó¤Ä¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
-	  °ì¤Ä¤Ï¿ä¾©¤µ¤ì¤ëÊýË¡¤Ç¡¢<link linkend="login-class">¥í¥°¥¤¥ó¥¯¥é¥¹ (login
-	  class)</link> ¤Ë¤ª¤¤¤Æ´Ä¶­ÊÑ¿ô¤Ë³ä¤êÅö¤Æ¤ëÊýË¡¡£
-	  ¤â¤¦°ì¤Ä¤Ï¥·¥¹¥Æ¥à¤Î¥·¥§¥ë
+	<para>¤³¤ÎÀá¤Ç¤Ï¡¢¥í¥±¡¼¥ë¤òÀßÄꤹ¤ëÆó¤Ä¤ÎÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
+	  °ì¤Ä¤Ï¿ä¾©¤µ¤ì¤ëÊýË¡¤Ç¡¢<link
+	    linkend="login-class">¥í¥°¥¤¥ó¥¯¥é¥¹</link>
+	  ¤Ë¤ª¤¤¤Æ´Ä¶­ÊÑ¿ô¤Ë³ä¤êÅö¤Æ¤ëÊýË¡¤Ç¤¹¡£
+	  ¤â¤¦°ì¤Ä¤Ï¥·¥¹¥Æ¥à¤Î¥·¥§¥ë¤Î
 	  <link linkend="startup-file">½é´ü²½¥Õ¥¡¥¤¥ë</link>
 	  ¤Ë¤ª¤¤¤Æ´Ä¶­ÊÑ¿ô¤Î»ØÄê¤òÄɲ乤ëÊýË¡¤Ç¤¹¡£</para>
 
@@ -274,16 +285,16 @@
 	    ³Æ¥·¥§¥ë¤Î½é´ü²½¥Õ¥¡¥¤¥ë¤ËÆÃÄê¤Î¥·¥§¥ëÀßÄê¤òÄɲ乤ëÂå¤ï¤ê¤Ë¡¢
 	    ¤¹¤Ù¤Æ¤Î¥·¥§¥ë¤Ë¤ª¤¤¤Æ°ìÅÙ¤ËɬÍ×¤Ê¥í¥±¡¼¥ë̾¤È MIME
 	    ʸ»ú¥»¥Ã¥È¤ò´Ä¶­ÊÑ¿ô¤Ë³ä¤êÅö¤Æ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	    <link linkend="usr-setup">¥æ¡¼¥¶¤ÎÀßÄê</link>¤Ï¥æ¡¼¥¶¼«¿È¤Ç¹Ô¤Ê¤¨¤Þ¤¹¤¬¡¢
-	    <link linkend="adm-setup">´ÉÍý¼Ô¤ÎÀßÄê</link>¤Ë¤Ï¥¹¡¼¥Ñ¥æ¡¼¥¶¤Î¸¢¸Â¤¬É¬ÍפȤʤê¤Þ¤¹¡£</para>
+	    <link linkend="usr-setup">¥æ¡¼¥¶¥ì¥Ù¥ë¤ÎÀßÄê</link>¤Ï¥æ¡¼¥¶¤¬¼Â¹Ô¤Ç¤­¤Þ¤¹¤¬¡£
+	    <link linkend="adm-setup">´ÉÍý¼Ô¥ì¥Ù¥ë¤ÎÀßÄê</link>¤Ë¤Ï¥¹¡¼¥Ñ¥æ¡¼¥¶¤Î¸¢¸Â¤¬É¬ÍפȤʤê¤Þ¤¹¡£</para>
 
 	  <sect5 xml:id="usr-setup">
-	    <title>¥æ¡¼¥¶¤ÎÀßÄê</title>
+	    <title>¥æ¡¼¥¶¥ì¥Ù¥ë¤ÎÀßÄê</title>
 
-	    <para>¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Î
-	      <filename>.login_conf</filename> ¥Õ¥¡¥¤¥ë¤òÍѤ¤¤Æ¡¢
-	      ξÊý¤ÎÊÑ¿ô¤Ë Latin-1 ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤òÀßÄꤹ¤ë
-	      ´Êñ¤ÊÎã¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹¡£</para>
+	    <para>°Ê²¼¤Ï¡¢
+	      ¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Î
+	      <filename>.login_conf</filename> ¤òÍѤ¤¤Æ¡¢
+	      ξÊý¤ÎÊÑ¿ô¤Ë Latin-1 ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤òÀßÄꤹ¤ë´Êñ¤ÊÎã¤Ç¤¹¡£</para>
 
 	    <programlisting>me:\
 	:charset=ISO-8859-1:\
@@ -292,11 +303,10 @@
 	    <indexterm><primary>ÈËÂλúÃæ¹ñ¸ì (Traditional Chinese)</primary>
 	      <secondary>BIG-5 ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°</secondary></indexterm>
 	    <para>¤³¤ì¤Ï¡¢BIG-5
-	      ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤µ¤ì¤¿ÈËÂλúÃæ¹ñ¸ìÍѤδĶ­ÊÑ¿ô¤òÀßÄꤹ¤ë
+	      ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤µ¤ì¤¿ÈËÂλúÃæ¹ñ¸ìÍѤδĶ­ÊÑ¿ô¤òÀßÄꤹ¤ë¥æ¡¼¥¶¤Î
 	      <filename>.login_conf</filename> ¤Î°ìÎã¤Ç¤¹¡£
-	      Ãæ¹ñ¸ì¡¢ÆüËܸ졢´Ú¹ñ¸ìÍÑ¤Î¥í¥±¡¼¥ëÊÑ¿ô¤ò
-	      Àµ¤·¤¯Ç§¼±¤·¤Ê¤¤¥½¥Õ¥È¥¦¥§¥¢¤ËÂн褹¤ë¤¿¤á¡¢
-	      ¤è¤ê¤¿¤¯¤µ¤ó¤ÎÊÑ¿ô¤òÀßÄꤷ¤Æ¤¤¤ë¤³¤È¤ËÃíÌܤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	      Ãæ¹ñ¸ì¡¢ÆüËܸ졢´Ú¹ñ¸ìÍÑ¤Î¥í¥±¡¼¥ëÊÑ¿ô¤òÀµ¤·¤¯Ç§¼±¤·¤Ê¤¤¥½¥Õ¥È¥¦¥§¥¢¤ËÂбþ¤¹¤ë¤¿¤á¡¢
+	      ¤è¤ê¤¿¤¯¤µ¤ó¤ÎÊÑ¿ô¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
 	    <programlisting>#Users who do not wish to use monetary units or time formats
 #of Taiwan can manually change each variable
@@ -318,28 +328,25 @@ me:\
 	  </sect5>
 
 	  <sect5 xml:id="adm-setup">
-	    <title>´ÉÍý¼Ô¤ÎÀßÄê</title>
+	    <title>´ÉÍý¼Ô¥ì¥Ù¥ë¤ÎÀßÄê</title>
 
 	    <para><filename>/etc/login.conf</filename> ¤Ë¤ª¤¤¤Æ¡¢
-	      Àµ¤·¤¤¸À¸ì¤¬¥æ¡¼¥¶¤Î¥¯¥é¥¹¤Ë»ØÄꤵ¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
-	      <filename>/etc/login.conf</filename> ¤Ï¡¢¤³¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
+	      Àµ¤·¤¤¸À¸ì¤¬¥æ¡¼¥¶¤Î¥¯¥é¥¹¤Ë»ØÄꤵ¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	    <programlisting><replaceable>language_name</replaceable>|<replaceable>Account Type Description</replaceable>:\
 	:charset=<replaceable>MIME_charset</replaceable>:\
 	:lang=<replaceable>locale_name</replaceable>:\
 	:tc=default:</programlisting>
 
-	    <para>Àè¤Û¤É¤ÎÎã¤Î¤è¤¦¤Ë Latin-1
-	      ¤Ç¤ÎÀßÄê¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
+	    <para>Àè¤Û¤É¤Î Latin-1 ¤ÎÎã¤ÎÀßÄê¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
 
 	    <programlisting>german|German Users Accounts:\
 	:charset=ISO-8859-1:\
 	:lang=de_DE.ISO8859-1:\
 	:tc=default:</programlisting>
 
-	    <para>¥æ¡¼¥¶¤Î¥í¥°¥¤¥ó¥¯¥é¥¹¤òÊѹ¹¤¹¤ëÁ°¤Ë¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¡¢
-	      <filename>/etc/login.conf</filename>
-	      ¤Î¿·¤¿¤ÊÀßÄ꤬¥·¥¹¥Æ¥à¤Ë¸«¤¨¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    <para>¤³¤Î¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤¿¤é¡¢
+	      °Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¥±¥¤¥Ñ¥Ó¥ê¥Æ¥£¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	    <screen>&prompt.root; <userinput>cap_mkdb /etc/login.conf</userinput></screen>
 
@@ -350,8 +357,10 @@ me:\
 	      <primary><command>vipw</command></primary>
 	    </indexterm>
 
-	    <para>¿·¤·¤¤¥æ¡¼¥¶¤òÄɲ乤뤿¤á¤Ë <command>vipw</command>
-	      ¤òÍѤ¤¤Þ¤¹¡£¤½¤·¤Æ°Ê²¼¤Î¤è¤¦¤Ê¥¨¥ó¥È¥ê¤òºîÀ®¤·¤Þ¤¹¡£</para>
+	    <para><command>vipw</command>
+	      ¤ò»È¤Ã¤Æ¿·¤·¤¤¥æ¡¼¥¶¤òÄɲ乤ëºÝ¤Ë¤Ï¡¢
+	      <replaceable>language</replaceable>
+	      ¤Ç»ÈÍѤ¹¤ë¸À¸ì¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	    <programlisting>user:password:1111:11:<replaceable>language</replaceable>:0:0:User Name:/home/user:/bin/sh</programlisting>
 
@@ -363,28 +372,32 @@ me:\
 	    </indexterm>
 	    <indexterm><primary>¥í¥°¥¤¥ó¥¯¥é¥¹</primary></indexterm>
 
-	    <para>¿·¤·¤¤¥æ¡¼¥¶¤òÄɲ乤뤿¤á¤Ë <command>adduser</command>
-	      ¤òÍѤ¤¤Þ¤¹¡£¤½¤·¤Æ°Ê²¼¤Î¼ê½ç¤òƧ¤ß¤Þ¤¹¡£</para>
+	    <para><command>adduser</command> ¤ò»È¤Ã¤Æ¡¢
+	      ¿·¤·¤¤¥æ¡¼¥¶¤òÄɲ乤ëºÝ¤Ë¤Ï¡¢
+	      °Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¡¢¸À¸ì¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	    <itemizedlist>
 	      <listitem>
-		<para><filename>/etc/adduser.conf</filename> ¤Ç
-		  <literal>defaultclass = language</literal>
-		  ¤ÈÀßÄꤷ¤Þ¤¹¡£
-		  ¤³¤Î¾ì¹ç¡¢Â¾¤Î¸À¸ì¤Î¥æ¡¼¥¶¤Ë¤Ï
-		  <literal>default</literal> ¥¯¥é¥¹¤ò»ØÄꤹ¤ë¤³¤È¤ò
-		  ˺¤ì¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para>
+		<para>¿·¤·¤¯Äɲ乤뤹¤Ù¤Æ¤Î¥æ¡¼¥¶¤¬Æ±¤¸¸À¸ì¤ò»È¤¦¾ì¹ç¤Ë¤Ï¡¢
+		  <filename>/etc/adduser.conf</filename> ¤Ç
+		  <literal>defaultclass =
+ 		    <replaceable>language</replaceable></literal>
+		  ¤ÈÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
 	      </listitem>
 
 	      <listitem>
-		<para>¤â¤¦¤Ò¤È¤Ä¤ÎÊýË¡¤Ï¡¢&man.adduser.8; ¤¬
+		<para>¤â¤¦¤Ò¤È¤Ä¤ÎÊýË¡¤Ï¡¢&man.adduser.8;
+		  ¤ò»È¤Ã¤Æ¿·¤·¤¤¥æ¡¼¥¶¤òºîÀ®¤¹¤ë¤È¤­¤Ë¡¢
+		  °Ê²¼¤Î¥×¥í¥ó¥×¥È¤Ë¤ª¤¤¤Æ¸À¸ì¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
+
 		  <screen><prompt>Enter login class: default []: </prompt></screen>
-		  ¤Èʹ¤¤¤Æ¤­¤¿¤È¤­¤Ë¡¢Ëè²ó¸À¸ì¤ò»ØÄꤹ¤ë¤ä¤êÊý¤Ç¤¹¡£</para>
+		</para>
 	      </listitem>
 
 	      <listitem>
-		<para>¤µ¤é¤ËÊ̤ÎÊýË¡¤Ï¡¢°Û¤Ê¤ë¸À¸ì¤òÍøÍѤ¹¤ë¥æ¡¼¥¶¤ò
-		  Äɲ乤ëºÝ¤Ë¡¢°Ê²¼¤Î¤è¤¦¤Ë¤¹¤ë¤ä¤êÊý¤Ç¤¹¡£</para>
+		<para>¤µ¤é¤ËÊ̤ÎÊýË¡¤Ï¡¢<filename>/etc/adduser.conf</filename>
+		  ¤ÇÀßÄꤵ¤ì¤Æ¤¤¤ë¸À¸ì¤È¤Ï°Û¤Ê¤ë¸À¸ì¤òÍøÍѤ¹¤ë¥æ¡¼¥¶¤òÄɲ乤ëºÝ¤Ë¡¢
+		  °Ê²¼¤ò¼Â¹Ô¤¹¤ëÊýË¡¤Ç¤¹¡£</para>
 
 		<screen>&prompt.root; <userinput>adduser -class language</userinput></screen>
 	      </listitem>
@@ -397,8 +410,8 @@ me:\
 	      <primary><command>pw</command></primary>
 	    </indexterm>
 
-	    <para>¿·¤·¤¤¥æ¡¼¥¶¤òÄɲ乤뤿¤á¤Ë &man.pw.8; ¤ò
-	      ÍѤ¤¤ë¾ì¹ç¡¢°Ê²¼¤Î·Á¼°¤Ç¼Â¹Ô¤·¤Þ¤¹¡£</para>
+	    <para>&man.pw.8; ¤ò»È¤Ã¤Æ¿·¤·¤¤¥æ¡¼¥¶¤òÄɲ乤ë¾ì¹ç¤Ë¤Ï¡¢
+	      °Ê²¼¤Î·Á¼°¤Ç¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	    <screen>&prompt.root; <userinput>pw useradd user_name -L language</userinput></screen>
 	  </sect5>
@@ -410,16 +423,17 @@ me:\
 	  <note>
 	    <para>¥·¥§¥ë¤´¤È¤Ë°Û¤Ê¤Ã¤¿ÀßÄ꤬ɬÍפʤ¿¤á¡¢
 	      ¤³¤ÎÊýË¡¤Ï¿ä¾©¤µ¤ì¤Þ¤»¤ó¡£
-	      Âå¤ï¤ê¤Ë <link linkend="login-class">¥í¥°¥¤¥ó¥¯¥é¥¹¤òÍѤ¤¤ëÊýË¡</link>¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
+	      Âå¤ï¤ê¤Ë <link
+		linkend="login-class">¥í¥°¥¤¥ó¥¯¥é¥¹¤òÍѤ¤¤ëÊýË¡</link>¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 	  </note>
 
 	  <indexterm><primary>MIME</primary></indexterm>
 	  <indexterm><primary>¥í¥±¡¼¥ë(locale)</primary></indexterm>
 	  <para>¥í¥±¡¼¥ë̾¤È MIME ʸ»ú¥³¡¼¥É¤òÄɲ乤ë¤Ë¤Ï¡¢
 	    <filename>/etc/profile</filename> ¤ä
-	    <filename>/etc/csh.login</filename> ¤Ê¤É¤Î¥·¥§¥ë½é´ü²½¥Õ¥¡¥¤¥ë
-	    ¤Ë°Ê²¼¤ÎÆó¤Ä¤Î´Ä¶­ÊÑ¿ô¤òÀßÄꤷ¤Þ¤¹¡£
-	    °Ê²¼¤Ë¼¨¤¹Îã¤Ï¡¢¥É¥¤¥Ä¸ì¤ÎÀßÄê¤Ç¤¹¡£</para>
+	    <filename>/etc/csh.login</filename>
+	    ¤Ê¤É¤Î¥·¥§¥ë½é´ü²½¥Õ¥¡¥¤¥ë¤Ë°Ê²¼¤ÎÆó¤Ä¤Î´Ä¶­ÊÑ¿ô¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
+	    °Ê²¼¤ÎÎã¤Ç¤Ï¡¢¥É¥¤¥Ä¸ì¤òÀßÄꤷ¤Þ¤¹¡£</para>
 
 	  <para><filename>/etc/profile</filename> ¤Ç¤Ï
             ¼¡¤Î¤è¤¦¤ËÀßÄꤷ¤Þ¤¹¡£</para>
@@ -433,25 +447,20 @@ me:\
 	  <programlisting><envar>setenv LANG de_DE.ISO8859-1</envar>
 <envar>setenv MM_CHARSET ISO-8859-1</envar></programlisting>
 
-	  <para>¤â¤·¤¯¤Ï¡¢¾åµ­¤Î¤ä¤êÊý¤ò
+	  <para>¤â¤·¤¯¤Ï¡¢¾åµ­¤ÎÀßÄê¤ò
 	    <filename>/usr/share/skel/dot.profile</filename>
-	    (<filename>/etc/profile</filename> ¤ÈƱ·Á¼°) ¤ä
 	    <filename>/usr/share/skel/dot.login</filename>
-	    (<filename>/etc/csh.login</filename> ¤ÈƱ·Á¼°)
-	    ¤ËÄɲ乤뤳¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
+	    ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
-	  <para>X11 ¤Ç¤Ï¡¢
-	    <filename>$HOME/.xinitrc</filename> ¤Ë
-	    »ÈÍѤ·¤Æ¤¤¤ë¥·¥§¥ë¤Ë¹ç¤Ã¤¿·Á¼°¤Ç</para>
+	  <para><application>Xorg</application> ¤òÀßÄꤹ¤ë¤Ë¤Ï¡¢
+	    »ÈÍѤ·¤Æ¤¤¤ë¥·¥§¥ë¤Ë¹ç¤Ã¤¿·Á¼°¤Ç°Ê²¼¤Î
+	    <emphasis>¤É¤Á¤é¤«¤ò</emphasis>
+	    <filename>~/.xinitrc</filename> ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
 	  <programlisting><envar>LANG=de_DE.ISO8859-1; export LANG</envar></programlisting>
 
-	  <para>¤â¤·¤¯¤Ï¡¢</para>
-
 	  <programlisting><envar>setenv LANG de_DE.ISO8859-1</envar></programlisting>
 
-	  <para>¤È»ØÄꤷ¤Þ¤¹¡£</para>
-
 	</sect4>
       </sect3>
     </sect2>
@@ -467,8 +476,9 @@ me:\
 font8x14=<replaceable>¥Õ¥©¥ó¥È̾</replaceable>
 font8x8=<replaceable>¥Õ¥©¥ó¥È̾</replaceable></programlisting>
 
-      <para>¤³¤³¤Ç <replaceable>¥Õ¥©¥ó¥È̾</replaceable>
-	¤Ï <filename>/usr/share/syscons/fonts</filename> ¥Ç¥£¥ì¥¯¥È¥ê
+      <para>¤³¤³¤Ç <replaceable>¥Õ¥©¥ó¥È̾</replaceable> ¤Ï
+	<filename
+	  class="directory">/usr/share/syscons/fonts</filename>
 	¤Ë¤¢¤ë¥Õ¥©¥ó¥È¥Õ¥¡¥¤¥ë¤«¤é <filename>.fnt</filename>
 	¤È¤¤¤¦³ÈÄ¥»Ò¤ò½ü¤¤¤¿¤â¤Î¤Ç¤¹¡£</para>
 
@@ -477,11 +487,11 @@ font8x8=<replaceable>¥Õ¥©¥ó¥È̾</replaceable></program
       </indexterm>
       <indexterm><primary>keymap</primary></indexterm>
       <indexterm><primary>screenmap</primary></indexterm>
-      <para>ɬÍפ˱þ¤¸¤Æ¡¢<command>sysinstall</command>
-	¤ò»È¤Ã¤Æ¡¢C ¸À¸ì¤Î char
-	¤Çɽ¸½¤Ç¤­¤ë¥·¥ó¥°¥ë¥Ð¥¤¥È¤Îʸ»ú¥»¥Ã¥ÈÍѤΥ­¡¼¥Þ¥Ã¥×¤È¥¹¥¯¥ê¡¼¥ó¥Þ¥Ã¥×¤ò»ØÄꤹ¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-	<application>sysinstall</application> ¤Ç¤Ï¡¢<guimenuitem>Configure</guimenuitem>
-	¤òÁªÂò¤·¡¢<guimenuitem>Console</guimenuitem> ¤òÁªÂò¤·¤Þ¤¹¡£
+      <para><command>sysinstall</command> ¤ò»È¤Ã¤Æ¡¢C ¸À¸ì¤Î char
+	¤Çɽ¸½¤Ç¤­¤ë¥·¥ó¥°¥ë¥Ð¥¤¥È¤Îʸ»ú¥»¥Ã¥ÈÍѤΥ­¡¼¥Þ¥Ã¥×¤È¥¹¥¯¥ê¡¼¥ó¥Þ¥Ã¥×¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
+	<application>sysinstall</application> ¤Ç¡¢
+	<guimenuitem>Configure</guimenuitem> ¤òÁªÂò¤·¡¢
+	<guimenuitem>Console</guimenuitem> ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
 	¤â¤·¤¯¤Ï¡¢<filename>/etc/rc.conf</filename>
 	¤Ë°Ê²¼¤Î¹Ô¤ò²Ã¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -490,37 +500,36 @@ keymap=<replaceable>¥­¡¼¥Þ¥Ã¥×̾</replaceable>
 keychange="<replaceable>¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼ÈÖ¹æ¤ÎʤÓ</replaceable>"</programlisting>
 
       <para>¤³¤³¤Ç <replaceable>¥¹¥¯¥ê¡¼¥ó¥Þ¥Ã¥×̾</replaceable>
-	¤Ï <filename>/usr/share/syscons/scrnmaps</filename> ¥Ç¥£¥ì¥¯¥È¥ê
+	¤Ï <filename
+	  class="directory">/usr/share/syscons/scrnmaps</filename>
 	¤Ë¤¢¤ë¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤«¤é <filename>.scm</filename>
 	¤È¤¤¤¦³ÈÄ¥»Ò¤ò½ü¤¤¤¿¤â¤Î¤Ç¤¹¡£
-	VGA ¥¢¥À¥×¥¿¤¬µ¿»÷¥°¥é¥Õ¥£¥¯¥¹Îΰè¤Î¥Õ¥©¥ó¥Èʸ»ú¥Þ¥È¥ê¥¯¥¹¤Ç
-	bit 8 ¤ò bit 9 ¤Ë³ÈÄ¥¤¹¤ë¤³¤È¤ËÂн褹¤ë¤¿¤á¤Ë
-	(Î㤨¤Ð¥¹¥¯¥ê¡¼¥ó¥Õ¥©¥ó¥È¤¬
-	bit 8 Îó¤ò»È¤Ã¤Æ¤¤¤ë»þ¤Ëʸ»ú¤ò¤½¤ÎÎΰ褫¤é³°¤Ë°ÜÆ°¤¹¤ë¾ì¹ç)¡¢
+	VGA ¥¢¥À¥×¥¿¤¬¥Õ¥©¥ó¥Èʸ»ú¥Þ¥È¥ê¥¯¥¹¤Ç
+	bit 8 ¤ò bit 9 ¤Ë³ÈÄ¥¤¹¤ë¤³¤È¤ËÂн褹¤ë¤¿¤á¤Ë¡¢
 	¥Õ¥©¥ó¥È¤ËŬÀڤ˥ޥåפµ¤ì¤¿¥¹¥¯¥ê¡¼¥ó¥Þ¥Ã¥×¤¬É¬ÍפȤʤê¤Þ¤¹¡£
-      </para>
+	¥¹¥¯¥ê¡¼¥ó¥Õ¥©¥ó¥È¤¬ bit 8
+	Îó¤ò»È¤Ã¤Æ¤¤¤ë»þ¤Ëʸ»ú¤òµ¿»÷¥°¥é¥Õ¥£¥¯¥¹Îΰ褫¤é³°¤Ë°ÜÆ°¤·¤Þ¤¹¡£</para>
 
-      <para>¤â¤·¡¢<filename>/etc/rc.conf</filename> ¤ò°Ê²¼¤Î¤è¤¦¤ËÀßÄꤷ¤Æ¡¢
-	<application>moused</application> ¥Ç¡¼¥â¥ó¤òÍ­¸ú²½¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
+      <para><filename>/etc/rc.conf</filename> ¤Ë¤ª¤¤¤Æ¡¢
+	<application>moused</application> ¤òÍ­¸ú¤Ë¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
 	¼¡¤ÎÃÊÍî¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¥Þ¥¦¥¹¥«¡¼¥½¥ë¤Ë´Ø¤¹¤ë¾ðÊó¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-<programlisting>moused_enable="YES"</programlisting>
-
       <indexterm>
 	<primary><application>moused</application></primary>
       </indexterm>
-      <para>ÀßÄê¾Êά»þ¤Ë¤Ï¡¢&man.syscons.4; ¥É¥é¥¤¥Ð¤Î¥Þ¥¦¥¹¥«¡¼¥½¥ë¤Ï
-	¥­¥ã¥é¥¯¥¿¥»¥Ã¥ÈÃæ¤Î 0xd0-0xd3 ¤ÎÈϰϤòÀê¤á¤Æ¤¤¤Þ¤¹¡£¤½¤Î¤¿¤á¡¢
+      <para>ÀßÄê¾Êά»þ¤Ë¤Ï¡¢&man.syscons.4;
+	¥É¥é¥¤¥Ð¤Î¥Þ¥¦¥¹¥«¡¼¥½¥ë¤Ï¥­¥ã¥é¥¯¥¿¥»¥Ã¥ÈÃæ¤Î
+	0xd0-0xd3 ¤ÎÈϰϤòÀê¤á¤Æ¤¤¤Þ¤¹¡£¤½¤Î¤¿¤á¡¢
 	ÍøÍѤ·¤Æ¤¤¤ë¸À¸ì¤¬¤³¤ÎÈϰϤΥ­¥ã¥é¥¯¥¿¥»¥Ã¥È¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢
-	¥«¡¼¥½¥ë¤ÎÀê¤á¤ëÈϰϤò½Å¤Ê¤é¤Ê¤¤¤è¤¦¤Ë°ÜÆ°¤µ¤»¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
+	¥«¡¼¥½¥ë¤ÎÀê¤á¤ëÈϰϤò°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£
 	&os; ¤Ç¤³¤ì¤ò²óÈò¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¹Ô¤ò
 	<filename>/etc/rc.conf</filename> ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
       <programlisting>mousechar_start=3</programlisting>
 
-      <para><replaceable>¥­¡¼¥Þ¥Ã¥×̾</replaceable> ¤Ï
-	<filename>/usr/share/syscons/keymaps</filename>
-	¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë¥­¡¼¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤«¤é <filename>.kbd</filename>
+      <para>¾åµ­¤ÎÎã¤Î <replaceable>¥­¡¼¥Þ¥Ã¥×̾</replaceable> ¤Ï
+	<filename class="directory">/usr/share/syscons/keymaps</filename>
+	¤Ë¤¢¤ë¥­¡¼¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤«¤é <filename>.kbd</filename>
 	¤È¤¤¤¦³ÈÄ¥»Ò¤ò½ü¤¤¤¿¤â¤Î¤Ç¤¹¡£
 	¤É¤Î¥­¡¼¥Þ¥Ã¥×¤ò»È¤¦¤«¤è¤¯¤ï¤«¤é¤Ê¤¤¤Ê¤é¡¢&man.kbdmap.1;
 	¤ÇºÆµ¯Æ°¤»¤º¤Ë¥­¡¼¥Þ¥Ã¥×¤ò»î¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
@@ -529,8 +538,8 @@ keychange="<replaceable>¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼ÈÖ¹æ¤ÎʤÓ</
 	üËö¥¿¥¤¥×¤Ë¹ç¤ï¤»¤¿¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼¤òÀßÄꤹ¤ë¤¿¤á¤Ë
 	<literal>keychange</literal> ¤¬É¬ÍפȤʤê¤Þ¤¹¡£</para>
 
-      <para>¤Þ¤¿¡¢<filename>/etc/ttys</filename> ¤ÎÃæ¤Î¤¹¤Ù¤Æ¤Î
-	<literal>ttyv*</literal> ¤Ë¤ª¤¤¤Æ¡¢
+      <para><filename>/etc/ttys</filename>
+	¤ÎÃæ¤Î¤¹¤Ù¤Æ¤Î²¾ÁÛüËö¤Î¥¨¥ó¥È¥ê¤ËÂФ·¤Æ¡¢
 	Àµ¤·¤¤¥³¥ó¥½¡¼¥ëüËö¥¿¥¤¥×¤òÀßÄꤹ¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
 	¸½ºß¤ÎÄêµÁºÑ¤ÎÃͤϰʲ¼¤ÎÄ̤ê¤Ç¤¹¡£</para>
 
@@ -582,15 +591,15 @@ keychange="<replaceable>¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼ÈÖ¹æ¤ÎʤÓ</
 	</tgroup>
       </informaltable>
 
-      <para>¥ï¥¤¥É/¿¥Ð¥¤¥Èʸ»ú¤Î¸À¸ì¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-	<filename>/usr/ports/language</filename>
-	Æâ¤ÎŬÀÚ¤Ê FreeBSD port ¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
-	¤¤¤¯¤Ä¤«¤Î ports ¤Ï¥·¥¹¥Æ¥à¤«¤é¥·¥ê¥¢¥ë¤Î vtty
-	¤Î¤è¤¦¤Ë¸«¤¨¤ë¤è¤¦¤Ë¥³¥ó¥½¡¼¥ë¤È¤·¤Æ¿¶¤ëÉñ¤¤¤Þ¤¹¡£
-	¤·¤¿¤¬¤Ã¤Æ¡¢X11 ¤Èµ¿»÷¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ëÍѤ˽¼Ê¬¤Ê
-	vtty ¤ò³ÎÊݤ·¤Æ¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-	¥³¥ó¥½¡¼¥ë¤Ç¾¤Î¸À¸ì¤ò»È¤¦¤¿¤á¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥ê¥¹¥È¤Î
-	°ìÉô¤Ç¤¹¡£</para>
+      <para>¥ï¥¤¥É/¿¥Ð¥¤¥Èʸ»ú¤Î¸À¸ì¤Ë¤Ä¤¤¤Æ¤Ï¡¢<filename
+	  class="directory">/usr/ports/<replaceable>language</replaceable></filename>
+	Æâ¤ÎŬÀÚ¤Ê &os; port ¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
+	¤¤¤¯¤Ä¤«¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢
+	¥·¥¹¥Æ¥à¤ËÂФ·¥·¥ê¥¢¥ë¥¿¡¼¥ß¥Ê¥ë¤È¤·¤Æ¿¶¤ëÉñ¤¤¤Þ¤¹¡£
+	<filename>/etc/ttys</filename> ¤Ë¤ª¤¤¤Æ¡¢
+	<application>Xorg</application>
+	¤Èµ¿»÷¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ëÍѤ˽¼Ê¬¤Ê¥¿¡¼¥ß¥Ê¥ë¤òÍÑ°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ 
+	°Ê²¼¤Ï¥³¥ó¥½¡¼¥ë¤Ç¾¤Î¸À¸ì¤ò»È¤¦¤¿¤á¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥ê¥¹¥È¤Î°ìÉô¤Ç¤¹¡£</para>
 
       <informaltable frame="none" pgwide="1">
 	<tgroup cols="2">
@@ -623,37 +632,42 @@ keychange="<replaceable>¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼ÈÖ¹æ¤ÎʤÓ</
     </sect2>
 
     <sect2>
-      <title>X11 ¤ÎÀßÄê</title>
+      <title>Xorg ¤ÎÀßÄê</title>
 
-      <para>X11 ¤Ï FreeBSD ¥×¥í¥¸¥§¥¯¥È¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢
-	FreeBSD ¥æ¡¼¥¶¤Î¤¿¤á¤Î¾ðÊó¤òµ­¤·¤Æ¤ª¤­¤Þ¤¹¡£
-	¾ÜºÙ¤Ë´Ø¤·¤Æ¤Ï¡¢<link xlink:href="http://www.x.org/">&xorg;
-	  ¥¦¥§¥Ö¥µ¥¤¥È</link>¤ä¡¢¤¢¤Ê¤¿¤Î»È¤Ã¤Æ¤¤¤ë
-	X11 ¥µ¡¼¥Ð¤Î¥µ¥¤¥È¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <para><application>Xorg</application> ¤Ï &os;
+	¤È¤È¤â¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤»¤ó¤¬¡¢
+	Ports Collection ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£
+	¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Î¾ÜºÙ¤Ï¡¢
+	<xref linkend="x11"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+	¤³¤ÎÀá¤Ç¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿ <application>Xorg</application>
+	¤ò¤É¤Î¤è¤¦¤ËÃÏ°è²½¤¹¤ë¤«¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
 
-      <para><filename>~/.Xresources</filename> ¤ò»È¤¦¤³¤È¤Ç¡¢
-	¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¸ÇÍ­¤Î¹ñºÝ²½¤ÎÀßÄê (¥Õ¥©¥ó¥È¡¢¥á¥Ë¥å¡¼¤Ê¤É)
-	¤òÄɲ乤뤳¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+      <para>¥Õ¥©¥ó¥È¡¢¥á¥Ë¥å¡¼¤Ê¤É¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¸ÇÍ­¤Î¹ñºÝ²½
+	 (<acronym>i18n</acronym>) ¤ÎÀßÄê¤Ï¡¢
+	 <filename>~/.Xresources</filename> ¤Ë¤ª¤¤¤Æ»ØÄê¤Ç¤­¤Þ¤¹¡£</para>
 
       <sect3>
 	<title>¥Õ¥©¥ó¥È¤Îɽ¼¨</title>
-	<indexterm><primary>X11 True Type
+	<indexterm><primary>Xorg True Type
 	    ¥Õ¥©¥ó¥È¥µ¡¼¥Ð</primary></indexterm>
 
-	<para><application>&xorg;</application> ¥µ¡¼¥Ð
-	  (<package>x11-servers/xorg-server</package>)
-	  ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¡¢¸À¸ì¤Î &truetype; ¥Õ¥©¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
+	<para><package>x11-servers/xorg-server</package>
+	  ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢¸À¸ì¤Î
+	  &truetype; ¥Õ¥©¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
 	  ¥í¥±¡¼¥ë¤òÀµ¤·¤¯ÀßÄꤹ¤ì¤Ð¡¢
-	  Áª¤ó¤À¸À¸ì¤¬¥á¥Ë¥å¡¼¤Ê¤É¤Ëɽ¼¨¤µ¤ì¤ë¤Ï¤º¤Ç¤¹¡£</para>
+	  Áª¤ó¤À¸À¸ì¤¬¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥á¥Ë¥å¡¼¤Ëɽ¼¨¤µ¤ì¤ë¤Ï¤º¤Ç¤¹¡£</para>
       </sect3>
 
       <sect3>
 	<title>Èó±Ñ¸ì¤Îʸ»ú¤òÆþÎϤ¹¤ë</title>
 
-	<indexterm><primary>X11 Input Method (XIM)</primary></indexterm>
-	<para>X11 Input Method (XIM) ¥×¥í¥È¥³¥ë¤Ï¤¹¤Ù¤Æ¤Î X11
-	  ¥¯¥é¥¤¥¢¥ó¥ÈÍѤο·¤¿¤Êɸ½àµ¬³Ê¤Ç¤¹¡£
-	  ¤¹¤Ù¤Æ¤Î X11 ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï XIM ÆþÎÏ¥µ¡¼¥Ð¤«¤é¤ÎÆþÎϤò¼õ¤±¼è¤ë
+	<indexterm><primary>X Input Method (XIM)</primary></indexterm>
+
+	<para>X Input Method (<acronym>XIM</acronym>)
+	  ¥×¥í¥È¥³¥ë¤Ï <application>Xorg</application>
+	  ¥¯¥é¥¤¥¢¥ó¥ÈÍѤÎɸ½àµ¬³Ê¤Ç¤¹¡£
+	  ¤¹¤Ù¤Æ¤Î <application>Xorg</application> ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï
+	  XIM ÆþÎÏ¥µ¡¼¥Ð¤«¤é¤ÎÆþÎϤò¼õ¤±¼è¤ë
 	  XIM ¥¯¥é¥¤¥¢¥ó¥È¤È¤·¤Æ½ñ¤«¤ì¤ë¤Ù¤­¤Ç¤¹¡£
 	  ÍÍ¡¹¤Ê¸À¸ìÍѤΠXIM ¥µ¡¼¥Ð¤¬Â¸ºß¤·¤Þ¤¹¡£</para>
       </sect3>
@@ -664,52 +678,57 @@ keychange="<replaceable>¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼ÈÖ¹æ¤ÎʤÓ</
 
       <para>¥×¥ê¥ó¥¿¤Ë¤Ï¤¤¤¯¤Ä¤«¤Î C ¸À¸ì¤Î char ¤Çɽ¸½¤Ç¤­¤ë
 	¥·¥ó¥°¥ë¥Ð¥¤¥È¤Îʸ»ú¥»¥Ã¥È¤¬¥Ï¡¼¥É¥¦¥§¥¢¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-	¥ï¥¤¥É/¿¥Ð¥¤¥È¤Îʸ»ú¥»¥Ã¥È¤Ç¤ÏÆüì¤ÊÀßÄ꤬ɬÍפǤ¢¤ê¡¢
-	<application>apsfilter</application> ¤ò»È¤¦¤³¤È¤ò¤ª´«¤á¤·¤Þ¤¹¡£
-	¸À¸ì¸ÇÍ­¤Î¥³¥ó¥Ð¡¼¥¿¤òÍѤ¤¤Æ¡¢&postscript; ¤« PDF ¥Õ¥©¡¼¥Þ¥Ã¥È
-	¤Ëʸ½ñ¤ò¥³¥ó¥Ð¡¼¥È¤¹¤ë¾ì¹ç¤â¤¢¤ë¤Ç¤·¤ç¤¦¡£</para>
+	¥ï¥¤¥É/¿¥Ð¥¤¥È¤Îʸ»ú¥»¥Ã¥È¤Ç¤Ï¡¢<application>apsfilter</application>
+	¤È¤¤¤Ã¤¿¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»ÈÍѤ¹¤ëÆüì¤ÊÀßÄ꤬ɬÍפǤ¹¡£
+	¸À¸ì¸ÇÍ­¤Î¥³¥ó¥Ð¡¼¥¿¤òÍѤ¤¤Æ¡¢Ê¸½ñ¤ò &postscript; ¤ä PDF
+	¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë¥³¥ó¥Ð¡¼¥È¤Ç¤­¤Þ¤¹¡£</para>
     </sect2>
 
     <sect2>
       <title>¥«¡¼¥Í¥ë¤È¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à</title>
 
-      <para>FreeBSD ¤Î¹â®¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à (FFS) ¤Ï 8-bit Æ©²á¤Ç¤¢¤ê¡¢
+      <para>&os; ¤Î¹â®¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à (<acronym>FFS</acronym>)
+	¤Ï 8-bit Æ©²á¤Ç¤¢¤ê¡¢
 	C ¸À¸ì¤Î char ¤Çɽ¸½¤Ç¤­¤ë¤¤¤«¤Ê¤ëʸ»ú¥»¥Ã¥È¤â»È¤¦¤³¤È¤¬
-	¤Ç¤­¤Þ¤¹ (&man.multibyte.3; ¤ò»²¾È)¡£
+	¤Ç¤­¤Þ¤¹¡£
 	¤·¤«¤·¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥àÃæ¤Ë¤Ïʸ»ú¥»¥Ã¥È¤Î̾Á°¤Ïµ­Ï¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
 	¤·¤¿¤¬¤Ã¤Æ¡¢¤³¤ì¤Ïñ¤Ê¤ë 8-bit ¤Ç¤¢¤ê¡¢
 	¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ë´Ø¤·¤Æ¤Ï²¿¤Î¾ðÊó¤â¤Ê¤¤¤Î¤Ç¤¹¡£
-	¸ø¼°¤Ë¤Ï¡¢FFS
-	¤Ï¤Þ¤À¤¤¤«¤Ê¤ë¥ï¥¤¥É/¥Þ¥ë¥Á¥Ð¥¤¥È¤Îʸ»ú¥»¥Ã¥È¤â¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£
-	¤·¤«¤· FFS ¤Ç¤½¤Î¤è¤¦¤Ê¥µ¥Ý¡¼¥È¤ò¹Ô¤¦¤¿¤á¤Î¥Ñ¥Ã¥Á¤¬¡¢
+	¸ø¼°¤Ë¤Ï¡¢<acronym>FFS</acronym>
+	¤Ï¤¤¤«¤Ê¤ë¥ï¥¤¥É/¥Þ¥ë¥Á¥Ð¥¤¥È¤Îʸ»ú¥»¥Ã¥È¤â¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£
+	¤·¤«¤· <acronym>FFS</acronym>
+	¤Ç¤½¤Î¤è¤¦¤Ê¥µ¥Ý¡¼¥È¤ò¹Ô¤¦¤¿¤á¤Î¥Ñ¥Ã¥Á¤¬¡¢
 	¿¤¯¤Î¥ï¥¤¥É/¥Þ¥ë¥Á¥Ð¥¤¥È¤Îʸ»ú¥»¥Ã¥È¤Ë¸ºß¤·¤Þ¤¹¡£
-	¤½¤ì¤é¤Ïñ¤Ë°ì»þŪ¤ÇÈÆÍÑÀ­¤Î¤Ê¤¤²ò·èºö¤Ç¤¢¤ê¡¢
-	¤ï¤¿¤·¤¿¤Á¤Ï¤½¤ì¤é¤ò¥½¡¼¥¹¥Ä¥ê¡¼¤Ë´Þ¤á¤Ê¤¤¤³¤È¤ò·è¤á¤Æ¤¤¤Þ¤¹¡£
 	¤³¤ì¤é¤Î¥Ñ¥Ã¥Á¤Ë´Ø¤·¤Æ¤Ï¡¢³Æ¸À¸ì¤Î¥¦¥§¥Ö¥µ¥¤¥È¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
       </para>
 
       <indexterm><primary>DOS</primary></indexterm>
       <indexterm><primary>Unicode</primary></indexterm>
-      <para>FreeBSD ¤Î &ms-dos; ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
-	&ms-dos;, Unicode ʸ»ú¥»¥Ã¥È¡¢FreeBSD ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î
-	ʸ»ú¥»¥Ã¥È¤Î´Ö¤ÇÊÑ´¹¤ò¹Ô¤¦¤³¤È¤¬²Äǽ¤Ç¤¹¡£
+      <para>&os; ¤Î &ms-dos; ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ËÂФ¹¤ëÂбþ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	&ms-dos;, Unicode ʸ»ú¥»¥Ã¥È¡¢&os;
+	¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Îʸ»ú¥»¥Ã¥È¤Î´Ö¤ÇÊÑ´¹¤ò¹Ô¤¦¤³¤È¤¬²Äǽ¤Ç¤¹¡£
 	¾ÜºÙ¤Ï &man.mount.msdosfs.8; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
     </sect2>
   </sect1>
 
   <sect1 xml:id="l10n-compiling">
-    <title>¹ñºÝ²½¤ËÂбþ¤·¤¿¥×¥í¥°¥é¥à¤Î¥³¥ó¥Ñ¥¤¥ë</title>
+    <title>¹ñºÝ²½ (<acronym>i18n</acronym>)
+      ¤ËÂбþ¤·¤¿¥×¥í¥°¥é¥à¤Î¥³¥ó¥Ñ¥¤¥ë</title>
 
-    <para>FreeBSD ports ¤Î¿¤¯¤Ï¤¹¤Ç¤Ë¹ñºÝ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-      ¤¤¤¯¤Ä¤«¤Ë¤Ï port ¤Î̾Á°¤Ë -I18N ¤ÈÉÕ¤¤¤Æ¤¤¤Þ¤¹¡£
-      ¤³¤ì¤é¤Ï¤â¤Á¤í¤ó¤Î¤³¤È¡¢Â¾¤Î¥×¥í¥°¥é¥à¤â¹ñºÝ²½¤Ø¤ÎÂбþ¤òÁȤ߹þ¤ó¤À¤â¤Î¤¬¤¢¤ê¡¢
+    <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> ¤Î¤è¤¦¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤Ï¡¢
-      ÆÃÄê¤Îʸ»ú¥»¥Ã¥È¤ò»È¤¦¤è¤¦¤Ë <filename>Makefile</filename>
+      ÆÃÄê¤Îʸ»ú¥»¥Ã¥È¤ò»È¤¦¤è¤¦¤Ë port ¤Î <filename>Makefile</filename>
       ¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
       ¤³¤ì¤ÏÂçÄñ <filename>Makefile</filename> ¤ÎÃæ¤Ç
       Âн褵¤ì¤Æ¤¤¤ë¤«¡¢¥½¡¼¥¹Ãæ¤Î <application>configure</application>
@@ -717,7 +736,7 @@ keychange="<replaceable>¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼ÈÖ¹æ¤ÎʤÓ</
   </sect1>
 
   <sect1 xml:id="lang-setup">
-    <title>FreeBSD ¤òÆÃÄê¤Î¸À¸ì¤ËÃÏ°è²½¤¹¤ë</title>
+    <title>&os; ¤òÆÃÄê¤Î¸À¸ì¤ËÃÏ°è²½¤¹¤ë</title>
 
     <sect2 xml:id="ru-localize">
       <info>
@@ -740,16 +759,13 @@ keychange="<replaceable>¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼ÈÖ¹æ¤ÎʤÓ</
       <sect3>
 	<title>¥í¥±¡¼¥ë¤ÎÀßÄê</title>
 
-	<para>°Ê²¼¤Î¹Ô¤ò
+	<para>¤³¤Î¥í¥±¡¼¥ë¤ËÀßÄꤹ¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤ò³Æ¥æ¡¼¥¶¤Î
 	  <filename>~/.login_conf</filename> ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
 	<programlisting>me:My Account:\
 	:charset=KOI8-R:\
 	:lang=ru_RU.KOI8-R:</programlisting>
 
-	<para><link linkend="setting-locale">¥í¥±¡¼¥ë</link> ¤ò
-	  ÀßÄꤹ¤ëºÝ¤ÎÎã¤Ë¤Ä¤¤¤Æ¤Ï¡¢¤³¤Î¾Ï¤ÎÁ°¤ÎÊý¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-	</para>
       </sect3>
 
       <sect3>
@@ -758,33 +774,24 @@ keychange="<replaceable>¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼ÈÖ¹æ¤ÎʤÓ</
 	<itemizedlist>
 	  <listitem>
 	    <para><filename>/etc/rc.conf</filename>
-	      ¥Õ¥¡¥¤¥ë¤Ë¼¡¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
+	      ¤Ë°Ê²¼¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
-	    <programlisting>mousechar_start=3</programlisting>
-	  </listitem>
-
-	  <listitem>
-	    <para>¤Þ¤¿¡¢<filename>/etc/rc.conf</filename>
-	      ¤Ç°Ê²¼¤ÎÀßÄê¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
-
 	    <programlisting>keymap="ru.koi8-r"
 scrnmap="koi8-r2cp866"
 font8x16="cp866b-8x16"
 font8x14="cp866-8x14"
-font8x8="cp866-8x8"</programlisting>
+font8x8="cp866-8x8"
+mousechar_start=3</programlisting>
 
 	  </listitem>
 
 	  <listitem>
 	    <para><filename>/etc/ttys</filename> ¤Î³Æ
-	      <literal>ttyv*</literal> ¥¨¥ó¥È¥ê¤Ë¤ª¤¤¤Æ¡¢
+	      <literal>ttyv</literal> ¥¨¥ó¥È¥ê¤Ë¤ª¤¤¤Æ¡¢
 	      üËö¥¿¥¤¥×¤È¤·¤Æ <literal>cons25r</literal>
 	      ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
 	  </listitem>
 	</itemizedlist>
-
-	<para><link linkend="setting-console">¥³¥ó¥½¡¼¥ë</link>¤òÀßÄꤹ¤ëºÝ¤ÎÎã¤Ë¤Ä¤¤¤Æ¤Ï¡¢¤³¤Î¾Ï¤ÎÁ°¤ÎÊý¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-	</para>
       </sect3>
 
       <sect3>
@@ -794,9 +801,9 @@ font8x8="cp866-8x8"</programlisting>
 	<para>¥í¥·¥¢¸ìÍѤÎʸ»ú¤òÅëºÜ¤·¤¿¥×¥ê¥ó¥¿¤Ï¤Û¤È¤ó¤É
 	  ¥Ï¡¼¥É¥¦¥§¥¢¥³¡¼¥É¥Ú¡¼¥¸ CP866 ¤ò»È¤Ã¤Æ¤¤¤ë¤¿¤á¡¢
 	  KOI8-R ¤ò CP866 ¤ËÊÑ´¹¤¹¤ëÀìÍѤνÐÎÏ¥Õ¥£¥ë¥¿¤¬É¬ÍפȤʤê¤Þ¤¹¡£
-	  ¤³¤Î¥Õ¥£¥ë¥¿¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç
-	  <filename>/usr/libexec/lpr/ru/koi2alt</filename> ¤Ë
-	  ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+	  &os; ¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¥Õ¥£¥ë¥¿¤ò
+	  <filename>/usr/libexec/lpr/ru/koi2alt</filename>
+	  ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
 	  ¥í¥·¥¢¸ìÍѤΥץê¥ó¥¿¤Î <filename>/etc/printcap</filename>
 	  ¥¨¥ó¥È¥ê¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
 
@@ -804,43 +811,38 @@ font8x8="cp866-8x8"</programlisting>
 	:sh:of=/usr/libexec/lpr/ru/koi2alt:\
 	:lp=/dev/lpt0:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs:</programlisting>
 
-	<para>µ­½Ò¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï &man.printcap.5;
+	<para>µ­½Ò¤Î¤è¤ê¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï &man.printcap.5;
 	  ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
       </sect3>
 
       <sect3>
-	<title>&ms-dos; ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤È¥í¥·¥¢¸ì¥Õ¥¡¥¤¥ë̾</title>
+	<title>&ms-dos; ¤ª¤è¤Ó¥í¥·¥¢¸ì¥Õ¥¡¥¤¥ë̾</title>
 
 	<para>°Ê²¼¤Î &man.fstab.5; ¥¨¥ó¥È¥ê¤ÎÎã¤Ï¡¢¥Þ¥¦¥ó¥È¤µ¤ì¤¿
 	  &ms-dos; ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¤ª¤¤¤Æ¥í¥·¥¢¸ì¥Õ¥¡¥¤¥ë̾¤ò
 	  »È¤¨¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
 
-	<programlisting>/dev/ad0s2      /dos/c  msdos   rw,-Wkoi2dos,-Lru_RU.KOI8-R 0 0</programlisting>
+	<programlisting>/dev/ad0s2      /dos/c  msdos   rw,-Lru_RU.KOI8-R 0 0</programlisting>
 
-	<para><option>-L</option> ¥ª¥×¥·¥ç¥ó¤ÏÍøÍѤ¹¤ë¥í¥±¡¼¥ë̾¤òÁªÂò¤·¡¢
-	  <option>-W</option> ¥ª¥×¥·¥ç¥ó¤Ïʸ»úÊÑ´¹É½¤òÀßÄꤷ¤Þ¤¹¡£
-	  <option>-W</option> ¥ª¥×¥·¥ç¥ó¤ò»È¤¦»þ¤Ï¡¢ÊÑ´¹É½¤¬
-	  <filename>/usr/libdata/msdosfs</filename> ¤Ë¤¢¤ë¤Î¤Ç¡¢
-	  <filename>/usr</filename> ¤ò &ms-dos; ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤è¤êÁ°¤Ë
-	  ¥Þ¥¦¥ó¥È¤¹¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£¾Ü¤·¤¯¤Ï¡¢
-	  &man.mount.msdosfs.8; ¤Î¥Þ¥Ë¥å¥¢¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<para><option>-L</option> ¤Ï¥í¥±¡¼¥ë̾¤òÁªÂò¤·¤Þ¤¹¡£
+	  ¾Ü¤·¤¯¤Ï¡¢&man.mount.msdosfs.8; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
       </sect3>
 
       <sect3>
-	<title>X11 ¤ÎÀßÄê</title>
+	<title><application>Xorg</application> ¤ÎÀßÄê</title>
 
 	<orderedlist>
 	  <listitem>
 	    <para>¤Þ¤º <link linkend="setting-locale">X
-	      °Ê³°¤Î¥í¥±¡¼¥ë¤ÎÀßÄê</link>¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
+	      °Ê³°¤Î¥í¥±¡¼¥ë¤ÎÀßÄê</link> ¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 	  </listitem>
 
 	  <listitem>
-	    <para><application>&xorg;</application> ¤ò»È¤Ã¤Æ¤¤¤ë¤Ê¤é¡¢
+	    <para><application>&xorg;</application> ¤ò»È¤¦ºÝ¤Ë¤Ï¡¢
 	      <package>x11-fonts/xorg-fonts-cyrillic</package>
 	      ¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-	    <para><filename>/etc/X11/xorg.conf</filename> ¥Õ¥¡¥¤¥ë¤Î
+	    <para><filename>/etc/X11/xorg.conf</filename> ¤Î
 	      <literal>"Files"</literal>
 	      ¥»¥¯¥·¥ç¥ó¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£
 	      ´û¸¤Î <literal>FontPath</literal>
@@ -849,44 +851,43 @@ font8x8="cp866-8x8"</programlisting>
 	    <programlisting>FontPath   "/usr/local/lib/X11/fonts/cyrillic"</programlisting>
 
 	    <note>
-	      <para>¾¤Î cyrillic ¥Õ¥©¥ó¥È¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-		ports ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	      <para>¾¤Î Cyrillic ¥Õ¥©¥ó¥È¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+		Ports Collection ¤ò¸¡º÷¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 	    </note>
 	  </listitem>
 
 	  <listitem>
 	    <para>¥í¥·¥¢¸ì¤Î¥­¡¼¥Ü¡¼¥É¤ò»È¤¨¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢
-	      °Ê²¼¤Î¹Ô¤ò <filename>xorg.conf</filename> ¥Õ¥¡¥¤¥ë¤Î
+	      °Ê²¼¤Î¹Ô¤ò <filename>xorg.conf</filename> ¤Î
 	      <literal>"Keyboard"</literal> ¥»¥¯¥·¥ç¥ó¤ËÄɲä·¤Þ¤¹¡£</para>
 
 	    <programlisting>Option "XkbLayout"   "us,ru"
 Option "XkbOptions"  "grp:toggle"</programlisting>
 
-	    <para>¤Þ¤¿¡¢<literal>XkbDisable</literal> ¤¬Ìµ¸ú
-	      (¥³¥á¥ó¥È¥¢¥¦¥È) ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	    <para>¤³¤Î¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ç <literal>XkbDisable</literal>
+	      ¤¬¥³¥á¥ó¥È¥¢¥¦¥È¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
 	    </para>
 
 	    <para><literal>grp:toggle</literal>
-	      ¤Ë¤Ä¤¤¤Æ¤Ï¡¢¥í¥·¥¢¸ì/¥é¥Æ¥óʸ»ú¤ÎÀÚ¤êÂؤ¨¤Ï
-	      <keycap>Right Alt</keycap> ¤Ç¹Ô¤¤¤Þ¤¹¡£
+	      ¤Ç¤Ï <keycap>Right Alt</keycap> ¤ò»È¤¤¡¢
 	      <literal>grp:ctrl_shift_toggle</literal>
-	      ¤ÎÀÚ¤êÂؤ¨¤Ï <keycombo
+	      ¤Ç¤Ï <keycombo
 		action="simul"><keycap>Ctrl</keycap><keycap>Shift</keycap></keycombo>
-	      ¤Ç¹Ô¤¤¤Þ¤¹¡£
-	      <literal>grp:caps_toggle</literal>
-	      ¤Ë¤Ä¤¤¤Æ¤Ï¡¢¥í¥·¥¢¸ì/¥é¥Æ¥óʸ»ú¤ÎÀÚ¤êÂؤ¨¤Ï
-	      <keycap>CapsLock</keycap> ¤Ç¹Ô¤¤¤Þ¤¹¡£
-	      ½¾Íè¤Î <keycap>CapsLock</keycap> ¤Îµ¡Ç½¤Ï
+	      ¤ò»È¤¤¤Þ¤¹¡£
+	      <literal>grp:caps_toggle</literal> ¤Ç¤Ï¡¢
+	      <keycap>CapsLock</keycap> ¤ò»È¤¤¤Þ¤¹¡£
+	      ½¾Íè¤Î <keycap>CapsLock</keycap> ¤Îµ¡Ç½¤Ï¡¢
+	      ¥é¥Æ¥óʸ»ú¥â¡¼¥É¤Î»þ¤Î¤ß
 	      <keycombo
 		action="simul"><keycap>Shift</keycap><keycap>CapsLock</keycap></keycombo>
-	      ¤Ç»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹ (¥é¥Æ¥óʸ»ú¥â¡¼¥É¤Î»þ¤Î¤ß)¡£
+	      ¤Ç»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	      <application>&xorg;</application> ¤Ç¤Ï¡¢Íýͳ¤ÏÉÔÌÀ¤Ç¤¹¤¬
 	      <literal>grp:caps_toggle</literal> ¤ÏÆ°ºî¤·¤Þ¤»¤ó¡£</para>
 
 	    <para>¥­¡¼¥Ü¡¼¥É¤Ë <quote>&windows;</quote> ¥­¡¼¤¬¤¢¤ê¡¢
-	      ¥í¥·¥¢¸ì¥â¡¼¥É¤Ç¤½¤Î¥­¡¼¤Ë¤¤¤¯¤Ä¤«¤ÎÈó±Ñ»ú¥­¡¼¤¬
-	      ³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤ë¤è¤¦¤Ê¤é¡¢<filename>xorg.conf</filename>
-	      ¥Õ¥¡¥¤¥ë¤Ë°Ê²¼¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
+	      ¤½¤Î¥­¡¼¤Ë¤¤¤¯¤Ä¤«¤ÎÈó±Ñ»ú¥­¡¼¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤ë¤è¤¦¤Ê¤é¡¢
+	      <filename>xorg.conf</filename>
+	      ¤Ë°Ê²¼¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
 	    <programlisting>Option "XkbVariant" ",winkeys"</programlisting>
 
@@ -900,7 +901,8 @@ Option "XkbOptions"  "grp:toggle"</programlisting>
 	  <para>ÃÏ°è²½¤¬¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¾¯¤Ê¤¯¤È¤â¥×¥í¥°¥é¥à¤ÎºÇ½é¤ÎÊý¤Ç
 	    <function>XtSetLanguageProc (NULL, NULL, NULL);</function>
 	    ¤ò¸Æ¤Ó½Ð¤¹¤Ù¤­¤Ç¤¹¡£
-	    X11 ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÃÏ°è²½¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	    <application>Xorg</application>
+	    ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÃÏ°è²½¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
 	    <link xlink:href="http://koi8.pp.ru/xwin.html">
 	      KOI8-R for X Window</link>
 	    ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -916,21 +918,13 @@ Option "XkbOptions"  "grp:toggle"</programlisting>
 	<secondary>ÈËÂλúÃæ¹ñ¸ì</secondary>
       </indexterm>
 
-      <para>FreeBSD-Taiwan ¥×¥í¥¸¥§¥¯¥È¤Ï¡¢Â¿¤¯¤Î
+      <para>&os;-Taiwan ¥×¥í¥¸¥§¥¯¥È¤Ï¡¢Â¿¤¯¤Î
 	Ãæ¹ñ¸ì ports ¤òÍøÍѤ·¤¿¡¢
-	FreeBSD ¤òÃæ¹ñ¸ì²½¤¹¤ë¤¿¤á¤Î¼ê°ú¤­ <uri
+	&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>FreeBSD Chinese HOWTO</literal> ¤Î¸½ºß¤ÎÊÔ½¸¼Ô¤Ï

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


More information about the svn-doc-all mailing list