svn commit: r47903 - head/ja_JP.eucJP/books/handbook/boot

Ryusuke SUZUKI ryusuke at FreeBSD.org
Wed Dec 23 15:42:15 UTC 2015


Author: ryusuke
Date: Wed Dec 23 15:42:13 2015
New Revision: 47903
URL: https://svnweb.freebsd.org/changeset/doc/47903

Log:
  - Merge the following from the English version:
  
  	r39845 -> r40897	head/ja_JP.eucJP/books/handbook/boot/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/boot/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/boot/chapter.xml	Wed Dec 23 06:17:19 2015	(r47902)
+++ head/ja_JP.eucJP/books/handbook/boot/chapter.xml	Wed Dec 23 15:42:13 2015	(r47903)
@@ -3,11 +3,11 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39845
+     Original revision: r40897
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="boot">
-  <title>FreeBSD ¤Îµ¯Æ°¤Î¥×¥í¥»¥¹</title>
+  <title>&os; ¤Îµ¯Æ°¤Î¥×¥í¥»¥¹</title>
 
   <sect1 xml:id="boot-synopsis">
     <title>¤³¤Î¾Ï¤Ç¤Ï</title>
@@ -18,29 +18,29 @@
     <para>·×»»µ¡¤òµ¯Æ°¤·¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò¥í¡¼¥É¤¹¤ë¥×¥í¥»¥¹¤Ï¡¢
       <quote>¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¥×¥í¥»¥¹</quote>¡¢
       ¤â¤·¤¯¤Ïñ¤Ë <quote>µ¯Æ°</quote> ¤È¸Æ¤Ð¤ì¤Þ¤¹¡£
-      FreeBSD ¤Îµ¯Æ°¥×¥í¥»¥¹¤ò»È¤¨¤Ð¡¢
+      &os; ¤Îµ¯Æ°¥×¥í¥»¥¹¤ò»È¤¨¤Ð¡¢
       ¥·¥¹¥Æ¥à¤ò¥¹¥¿¡¼¥È¤¹¤ë¤È¤­¤Ëµ¯¤­¤ë¤³¤È¤ò¤«¤Ê¤ê½ÀÆð¤Ë¥«¥¹¥¿¥Þ¥¤¥º¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
       Ʊ¤¸·×»»µ¡¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿Ê̤Υª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤òÁªÂò¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¤·¡¢
       Ʊ¤¸¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î°ã¤¦¥Ð¡¼¥¸¥ç¥ó¤òÁªÂò¤¹¤ë¤³¤È¤â¡¢
       ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿Ê̤Υ«¡¼¥Í¥ë¤òÁªÂò¤¹¤ë¤³¤È¤µ¤¨¤Ç¤­¤Þ¤¹¡£</para>
 
-    <para>¤³¤Î¾Ï¤Ç¤Ï¡¢»ØÄê¤Ç¤­¤ëÀßÄꥪ¥×¥·¥ç¥ó¤È FreeBSD
-      ¤Îµ¯Æ°¥×¥í¥»¥¹¤Î¥«¥¹¥¿¥Þ¥¤¥ºÊýË¡¤Ë¤Ä¤¤¤Æ¾Ü¤·¤¯½Ò¤Ù¤Þ¤¹¡£
-      ¤³¤Î¾Ï¤Ç¤Ï FreeBSD ¥«¡¼¥Í¥ë¤¬¥¹¥¿¡¼¥È¤·¡¢¥Ç¥Ð¥¤¥¹¤ò¸¡½Ð¤·¡¢
-      &man.init.8; ¤òµ¯Æ°¤¹¤ë¤Þ¤Ç¤Ëµ¯¤­¤ë¤³¤È¤¹¤Ù¤Æ¤ò°·¤¤¤Þ¤¹¡£
-      ¤É¤ÎºÇÃæ¤Î¤³¤È¤À¤«¤Ï¤Ã¤­¤ê¤·¤Æ¤¤¤Ê¤¤¿Í¤Î¤¿¤á¤ËÊä­¤¹¤ë¤È¡¢
-      ¥Æ¥­¥¹¥È¤Î¿§¤¬ÌÀ¤ë¤¤Çò¤«¤é³¥¿§¤ËÊѤï¤ë¤Þ¤Ç¤Ëµ¯¤­¤Æ¤¤¤ë¤³¤È¤Ç¤¹¡£</para>
+    <para>¤³¤Î¾Ï¤Ç¤Ï¡¢»ØÄê¤Ç¤­¤ëÀßÄꥪ¥×¥·¥ç¥ó¤Ä¤¤¤Æ¾Ü¤·¤¯ÀâÌÀ¤·¤Þ¤¹¡£
+      &os; ¥«¡¼¥Í¥ë¤¬¥¹¥¿¡¼¥È¤·¡¢¥Ç¥Ð¥¤¥¹¤ò¸¡½Ð¤·¡¢
+      &man.init.8; ¤òµ¯Æ°¤¹¤ë¤Þ¤Ç¤Ëµ¯¤­¤ë¤³¤È¤¹¤Ù¤Æ¤ò´Þ¤à
+      &os; ¤Îµ¯Æ°¥×¥í¥»¥¹¤Î¥«¥¹¥¿¥Þ¥¤¥ºÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
+      ¤³¤ì¤Ï¡¢µ¯Æ°¥á¥Ã¥»¡¼¥¸¤Î¥Æ¥­¥¹¥È¤Î¿§¤¬¡¢
+      ÌÀ¤ë¤¤Çò¤«¤é³¥¿§¤ËÊѤï¤ë¤Þ¤Ç¤Ëµ¯¤­¤Æ¤¤¤Þ¤¹¡£</para>
 
     <para>¤³¤Î¾Ï¤òÆɤà¤È¡¢°Ê²¼¤Î¤³¤È¤¬Ê¬¤«¤ê¤Þ¤¹¡£</para>
 
     <itemizedlist>
       <listitem>
-	<para>¤É¤Î¤è¤¦¤Ë FreeBSD ¤Î¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¥·¥¹¥Æ¥à¤¬¹½À®¤µ¤ì¡¢
-	  ¤½¤·¤Æ¤½¤ì¤é¤¬¸ß¤¤¤Ë¤É¤¦´Ø·¸¤·¤Æ¤¤¤ë¤Î¤«</para>
+	<para>&os;
+	  ¤Î¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¥·¥¹¥Æ¥à¤Î¹½À®¤ª¤è¤Ó¤½¤ì¤é¤¬¸ß¤¤¤Ë¤É¤¦´Ø·¸¤·¤Æ¤¤¤ë¤Î¤«</para>
       </listitem>
 
       <listitem>
-	<para>µ¯Æ°¥×¥í¥»¥¹¤òÀ©¸æ¤¹¤ë¤¿¤á¤Ë FreeBSD
+	<para>µ¯Æ°¥×¥í¥»¥¹¤òÀ©¸æ¤¹¤ë¤¿¤á¤Ë &os;
 	  ¤Î¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¤Î³ÆÍ×ÁǤËÉղäǤ­¤ë¥ª¥×¥·¥ç¥ó</para>
       </listitem>
 
@@ -50,9 +50,7 @@
     </itemizedlist>
 
     <note>
-      <title>x86 ¸ÂÄê</title>
-
-      <para>¤³¤Î¾Ï¤Ç¤Ï Intel x86 ¥·¥¹¥Æ¥à¾å¤ÇÆ°ºî¤¹¤ë FreeBSD
+      <para>¤³¤Î¾Ï¤Ç¤Ï Intel x86 ¥·¥¹¥Æ¥à¾å¤ÇÆ°ºî¤¹¤ë &os;
 	¤Îµ¯Æ°¥×¥í¥»¥¹¤À¤±¤ò°·¤¤¤Þ¤¹¡£</para>
     </note>
   </sect1>
@@ -64,7 +62,7 @@
       ¤ª¤â¤·¤í¤¤¥¸¥ì¥ó¥Þ¤¬¤¢¤ê¤Þ¤¹¡£ÄêµÁ¤Ë¤è¤ê¡¢
       ·×»»µ¡¤Ï¡¢¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤¬µ¯Æ°¤¹¤ë¤Þ¤Ç¤Ï¡¢
       ¥Ç¥£¥¹¥¯¤«¤é¥×¥í¥°¥é¥à¤òÆ°¤«¤¹¤³¤È¤â´Þ¤á¤Æ¡¢
-      ²¿¤ò¤É¤¦¤¹¤ì¤Ð¤è¤¤¤«¤Þ¤Ã¤¿¤¯ÃΤê¤Þ¤»¤ó¡£¤Ç¤Ï¡¢
+      ²¿¤ò¤É¤¦¤¹¤ì¤Ð¤è¤¤¤«¤Þ¤Ã¤¿¤¯ÃΤê¤Þ¤»¤ó¡£
       ·×»»µ¡¤Ï¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ê¤·¤Ë¥Ç¥£¥¹¥¯¤«¤é¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤º¡¢
       ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¥×¥í¥°¥é¥à¤¬¥Ç¥£¥¹¥¯¾å¤Ë¤¢¤ë¤Î¤Ê¤é¡¢
       ¤É¤¦¤ä¤Ã¤Æ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤òµ¯Æ°¤¹¤ë¤Î¤Ç¤·¤ç¤¦¤«?</para>
@@ -113,7 +111,7 @@
       ¤Þ¤¿¤Ï OS ¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ë¤ª¤«¤ì¤Þ¤¹
       (¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤Ï<emphasis>¥Ö¡¼¥È¥í¡¼¥À</emphasis>
       ¤È¸Æ¤Ð¤ì¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¤¬¡¢
-      FreeBSD ¤Ï¤³¤Î¸ÀÍÕ¤òµ¯Æ°¤Î¤â¤Ã¤È¸å¤ÎÃʳ¬¤ËÂФ·¤Æ»È¤¤¤Þ¤¹)¡£
+      &os; ¤Ï¤³¤Î¸ÀÍÕ¤òµ¯Æ°¤Î¤â¤Ã¤È¸å¤ÎÃʳ¬¤ËÂФ·¤Æ»È¤¤¤Þ¤¹)¡£
       ¤è¤¯»È¤ï¤ì¤ë¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤Ë¤Ï¡¢
       <application>boot0</application> (<application>Boot Easy</application>
       ¤È¤â¸Æ¤Ð¤ì¤ë &os; ɸ½à¤Î¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã),
@@ -129,25 +127,24 @@
       ¤Ï¡¢¤³¤Î¤è¤¦¤Ê MBR ¤Ç¤¹¡£<filename>/boot/mbr</filename>
       ¤ò´ð¤Ë¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
-    <para>¥Ç¥£¥¹¥¯¾å¤Ë¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤òÊ£¿ô¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤ë¤Ê¤é¡¢
-      Ê̤Υ֡¼¥È¥Þ¥Í¡¼¥¸¥ã
-      (Ê£¿ô¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î°ìÍ÷¤òɽ¼¨¤Ç¤­¤Æ¡¢
-      µ¯Æ°¤¹¤ë¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤òÁªÂò¤Ç¤­¤ë¤è¤¦¤Ê¤â¤Î)
-      ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤è¤¤¤Ç¤·¤ç¤¦¡£
-      ¤³¤Î¤è¤¦¤Ê¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤ÎÃ椫¤é 2 ¤Ä¤ò¼¡¤ÎÀá¤ÇÀâÌÀ¤·¤Þ¤¹¡£</para>
+    <para>¥Ç¥£¥¹¥¯¾å¤ËÊ£¿ô¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤¬Â¸ºß¤·¤Æ¤¤¤ë¤Î¤Ê¤é¡¢
+      Ê£¿ô¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î°ìÍ÷¤òɽ¼¨¤Ç¤­¤Æ¡¢
+      µ¯Æ°¤¹¤ë¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤òÁªÂò¤Ç¤­¤ë¤è¤¦¤Ê¡¢
+      Ê̤Υ֡¼¥È¥Þ¥Í¡¼¥¸¥ã¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
+      ¼¡¤ÎÀá¤Ç¤Ï 2 ¤Ä¤Î¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
 
-    <para>FreeBSD ¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¥·¥¹¥Æ¥à¤Î»Ä¤ê¤Ï 3 Ãʳ¬¤Ëʬ¤«¤ì¤Þ¤¹¡£
+    <para>&os; ¤Î¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¥·¥¹¥Æ¥à¤Î»Ä¤ê¤Ï 3 Ãʳ¬¤Ëʬ¤«¤ì¤Þ¤¹¡£
       Âè 1 ¥¹¥Æ¡¼¥¸¤Ï MBR ¤Ë¤è¤Ã¤Æµ¯Æ°¤µ¤ì¤ë¤â¤Î¤Ç¡¢
       MBR ¤Ï·×»»µ¡¤òÆÃÄê¤Î¾õÂ֤ˤ¹¤ë¤¿¤á¤ËɬÍפʤ³¤È¤À¤±ÃΤäƤ¤¤Æ¡¢
       Âè 2 ¥¹¥Æ¡¼¥¸¤òµ¯Æ°¤·¤Þ¤¹¡£
       Âè 2 ¥¹¥Æ¡¼¥¸¤Ç¤Ï¡¢Âè 3 ¥¹¥Æ¡¼¥¸¤òµ¯Æ°¤¹¤ëÁ°¤Ë¡¢
       ¤â¤¦¤Á¤ç¤Ã¤È¤ä¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
       Âè 3 ¥¹¥Æ¡¼¥¸¤Ç¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¥í¡¼¥Éºî¶È¤ò´°Î»¤·¤Þ¤¹¡£
-      µ¯Æ°ºî¶È¤¬¤³¤ì¤é¤Î 3 Ãʳ¬¤Ëʬ¤«¤ì¤Æ¤¤¤ë¤Î¤Ï¡¢
+      µ¯Æ°ºî¶È¤¬ 3 Ãʳ¬¤Ëʬ¤«¤ì¤Æ¤¤¤ë¤Î¤Ï¡¢
       PC ¤Îµ¬³Ê¤¬¥¹¥Æ¡¼¥¸ 1 ¤È¥¹¥Æ¡¼¥¸ 2
       ¤Ç¼Â¹Ô¤Ç¤­¤ë¥×¥í¥°¥é¥à¤Î¥µ¥¤¥º¤ËÀ©¸Â¤ò²Ý¤·¤Æ¤¤¤ë¤«¤é¤Ç¤¹¡£
       ¤³¤ì¤é¤Îºî¶È¤ò¤Ä¤Ê¤®¹ç¤ï¤»¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢
-      FreeBSD ¤Ï¤è¤ê½ÀÆð¤Ê¥í¡¼¥À (loader) ¤òÄ󶡤·¤Æ¤¤¤ë¤Î¤Ç¤¹¡£</para>
+      &os; ¤Ï¤è¤ê½ÀÆð¤Ê¥í¡¼¥À (loader) ¤òÄ󶡤·¤Æ¤¤¤ë¤Î¤Ç¤¹¡£</para>
 
     <indexterm><primary>¥«¡¼¥Í¥ë (kernel)</primary></indexterm>
     <indexterm><primary><command>init</command></primary></indexterm>
@@ -158,7 +155,7 @@
       ¤Ï¤Þ¤º¥Ç¥£¥¹¥¯¤¬ÍøÍѲÄǽ¤Ç¤¢¤ë¤³¤È¤ò³Î¤«¤á¡¢
       ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Þ¥¦¥ó¥È¡¢
       ¥Í¥Ã¥È¥ï¡¼¥¯¤ÇÍøÍѤ¹¤ë¥Í¥Ã¥È¥ï¡¼¥¯¥«¡¼¥É¤Î¥»¥Ã¥È¥¢¥Ã¥×¡¢
-      ¤½¤·¤ÆÄ̾ï FreeBSD ¥·¥¹¥Æ¥à¤Ç½é´ü»þ¤Ëµ¯Æ°¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¥×¥í¥»¥¹¤Îµ¯Æ°¡¢
+      ¤½¤·¤Æµ¯Æ°»þ¤Ë &os; ¥·¥¹¥Æ¥à¤Çµ¯Æ°¤µ¤ì¤ë¤è¤¦¤ËÀßÄꤵ¤ì¤¿¥×¥í¥»¥¹¤Îµ¯Æ°¡¢
       ¤È¤¤¤Ã¤¿¥æ¡¼¥¶¡¼¥ì¥Ù¥ë¤Ç¤Î¥ê¥½¡¼¥¹ (»ñ¸») ÀßÄê¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£</para>
   </sect1>
 
@@ -175,41 +172,37 @@
 
       <para>MBR ¤ä¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤Î¥³¡¼¥É¤Ïµ¯Æ°¥×¥í¥»¥¹¤Î<emphasis>Âè
 	0 ¥¹¥Æ¡¼¥¸</emphasis>¤È¸Æ¤Ð¤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-	¤³¤ÎÀá¤Ç¤ÏÁ°½Ò¤Î 2 ¤Ä¤Î¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¡¢
+	¤³¤ÎÀá¤Ç¤Ï 2 ¤Ä¤Î¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¡¢
 	<application>boot0</application> ¤È <application>LILO</application>
 	¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
 
       <formalpara><title><application>boot0</application>
 	¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã</title>
 
-	<para>FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥é¤ä &man.boot0cfg.8;
-	  ¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë
-	  MBR ¤Ï¡¢<filename>/boot/boot0</filename> ¤ò´ð¤Ë¤·¤Æ¤¤¤Þ¤¹
-	  (<filename>boot0</filename> ¤ÏÈó¾ï¤Ëñ½ã¤Ê¥×¥í¥°¥é¥à¤Ç¤¹¡£
-	  <abbrev>MBR</abbrev> ¤Ë¤¢¤ë¥×¥í¥°¥é¥à¤Ï¡¢
-	  ¥¹¥é¥¤¥¹¥Æ¡¼¥Ö¥ë¤ÈËöÈø¤Î¼±ÊÌ»Ò <literal>0x55AA</literal>
-	  ¤¬¤¢¤ë¤¿¤á¡¢446
-	  ¥Ð¥¤¥È¤ÎÂ礭¤µ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤È¤¤¤¦À©¸Â¤¬¤¢¤ë¤¿¤á¤Ç¤¹)¡£
-	  ¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤Ë <application>boot0</application>
+	<para>&os; ¤Î¥¤¥ó¥¹¥È¡¼¥é¤ä &man.boot0cfg.8;
+	  ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë MBR ¤Ï¡¢
+	  <filename>/boot/boot0</filename> ¤ò´ð¤Ë¤·¤Æ¤¤¤Þ¤¹¡£
+	  <application>boot0</application> ¤Î¥µ¥¤¥º¤Èµ¡Ç½¤Ï¡¢
+	  ¥¹¥é¥¤¥¹¥Æ¡¼¥Ö¥ë¤ª¤è¤Ó MBR ËöÈø¤Î¼±ÊÌ»Ò <literal>0x55AA</literal>
+	  ¤Î¤¿¤á¡¢446 ¥Ð¥¤¥È¤ÎÂ礭¤µ¤ËÀ©¸Â¤µ¤ì¤Þ¤¹¡£¤â¤·¡¢
+	  <application>boot0</application>
 	  ¤ÈÊ£¿ô¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¾ì¹ç¡¢
-	  µ¯Æ°»þ¤Ë°Ê²¼¤Î¤è¤¦¤Ê²èÌ̤¬½Ð¤ë¤Ç¤·¤ç¤¦¡£</para></formalpara>
+	  µ¯Æ°»þ¤Ë°Ê²¼¤Î¤è¤¦¤Ê¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£</para>
+      </formalpara>
 
       <example xml:id="boot-boot0-example">
 	<title><filename>boot0</filename> ¤Î¥¹¥¯¥ê¡¼¥ó¥·¥ç¥Ã¥È</title>
 
-	<screen>F1 DOS
+	<screen>F1 Win
 F2 FreeBSD
-F3 Linux
-F4 ??
-F5 Drive 1
 
 Default: F2</screen>
       </example>
 
       <para>¾¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¡¢ÆÃ¤Ë &windows; ¤Ï¡¢
-	´û¸¤Î MBR ¤ò¼«¤é¤Î MBR ¤Ç¾å½ñ¤­¤·¤Æ¤·¤Þ¤¦¤³¤È¤ÇÃΤé¤ì¤Æ¤¤¤Þ¤¹¡£
+	&os; ¤Î¸å¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¦¤È¡¢´û¸¤Î MBR ¤ò¾å½ñ¤­¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
 	¤â¤·¤½¤¦¤Ê¤Ã¤Æ¤·¤Þ¤Ã¤¿¤é¡¢
-	¤â¤·¤¯¤Ï´û¸¤Î MBR ¤ò FreeBSD ¤Î MBR ¤ÇÃÖ¤­´¹¤¨¤¿¤¤¤Î¤Ê¤é¡¢
+	¤â¤·¤¯¤Ï´û¸¤Î MBR ¤ò &os; ¤Î MBR ¤ÇÃÖ¤­´¹¤¨¤¿¤¤¤Î¤Ê¤é¡¢
 	¼¡¤Î¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>fdisk -B -b /boot/boot0 device</userinput></screen>
@@ -219,16 +212,16 @@ Default: F2</screen>
 	2 ÈÖÌܤΠIDE ¥³¥ó¥È¥í¡¼¥é¤ËÀܳ¤µ¤ì¤Æ¤¤¤ë 1 ÈÖÌܤΠIDE ¥Ç¥£¥¹¥¯¤Ï
 	<filename>ad2</filename>¡¢1 ÈÖÌܤΠSCSI ¥Ç¥£¥¹¥¯¤Ï
 	<filename>da0</filename> ¤Ê¤É¤È¤Ê¤ê¤Þ¤¹¡£
-	MBR ¤ÎÀßÄê¤ò¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¤¤¾ì¹ç¤Ï &man.boot0cfg.8;
-	¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
+	MBR ¤ÎÀßÄê¤ò¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¤¤¾ì¹ç¤Ï¡¢&man.boot0cfg.8;
+	¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <formalpara>
 	<title>LILO ¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã</title>
 
-	<para>¤³¤Î¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ FreeBSD
-	  ¤òµ¯Æ°¤¹¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢¤Þ¤º Linux ¤òµ¯Æ°¤·¤Æ
+	<para>¤³¤Î¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ &os;
+	  ¤òµ¯Æ°¤¹¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢Linux ¤òµ¯Æ°¤·¤Æ
 	  <filename>/etc/lilo.conf</filename>
-	  ¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ë°Ê²¼¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
+	  ¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¤Ë°Ê²¼¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
       </formalpara>
 
       <programlisting>other=/dev/hdXY
@@ -236,20 +229,19 @@ table=/dev/hdX
 loader=/boot/chain.b
 label=FreeBSD</programlisting>
 
-      <para>¾åµ­¤Ë¤ª¤¤¤Æ¡¢FreeBSD ¤Î¥×¥é¥¤¥Þ¥ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤È¥É¥é¥¤¥Ö¤ò
+      <para>&os; ¤Î¥×¥é¥¤¥Þ¥ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤È¥É¥é¥¤¥Ö¤ò
 	Linux ¤Î¼±Ê̻Ҥò»È¤Ã¤Æ»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
 	<replaceable>X</replaceable> ¤ò Linux ¤Î¥É¥é¥¤¥Öʸ»ú¤Ë¡¢¤Þ¤¿
 	<replaceable>Y</replaceable> ¤ò Linux
 	¤Î¥×¥é¥¤¥Þ¥ê¥Ñ¡¼¥Æ¥£¥·¥ç¥óÈÖ¹æ¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£
-	<acronym>SCSI</acronym> ¥É¥é¥¤¥Ö¤ò»È¤Ã¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
+	<acronym>SCSI</acronym> ¥É¥é¥¤¥Ö¤ËÂФ·¤Æ¤Ï¡¢
 	<replaceable>/dev/hd</replaceable> ¤ò
-	<replaceable>/dev/sd</replaceable>
-	¤Î¤è¤¦¤ËÆɤßÂؤ¨¤Æ¤¯¤À¤µ¤¤¡£
+	<replaceable>/dev/sd</replaceable> ¤ËÊѤ¨¤Æ¤¯¤À¤µ¤¤¡£
 	Ʊ¤¸¥É¥é¥¤¥Ö¾å¤ËξÊý¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤¬ÃÖ¤¤¤Æ¤¢¤ë¤Ê¤é¡¢
 	<option>loader=/boot/chain.b</option> ¹Ô¤ÏÉÔÍפǤ¹¡£
-	¤³¤ì¤Ç <command>/sbin/lilo -v</command>
-	¤ò¼Â¹Ô¤¹¤ë¤È¥·¥¹¥Æ¥à¤Ë¿·¤·¤¤Êѹ¹¤¬È¿±Ç¤µ¤ì¤Þ¤¹¡£
-	²èÌ̤Υá¥Ã¥»¡¼¥¸¤ò¸«¤Æ³Îǧ¤·¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡£</para>
+	¼¡¤Ë <command>/sbin/lilo -v</command>
+	¤ò¼Â¹Ô¤·¤Æ¡¢¿·¤·¤¤Êѹ¹¤òÈ¿±Ç¤·¤Æ¤¯¤À¤µ¤¤¡£
+	²èÌ̤Υá¥Ã¥»¡¼¥¸¤ò¸«¤ÆÊѹ¹¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
     </sect2>
 
     <sect2 xml:id="boot-boot1">
@@ -261,8 +253,8 @@ label=FreeBSD</programlisting>
 	¥¹¥Ú¡¼¥¹¤ÎÀ©Ìó¤Î¤¿¤á 2 ¤Ä¤Ëʬ³ä¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢
 	¤¤¤Ä¤â°ì½ï¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£
 	¥¤¥ó¥¹¥È¡¼¥é¤Þ¤¿¤Ï <application>bsdlabel</application>
-	¤Ï¡¢Î¾¼Ô¤ò 1 ¤Ä¤Ë¤Þ¤È¤á¤¿¥Õ¥¡¥¤¥ë
-	<filename>/boot/boot</filename> ¤ò¥³¥Ô¡¼¤·¤Þ¤¹ (²¼µ­»²¾È)¡£</para>
+	¤Ï¡¢Î¾¼Ô¤ò 1 ¤Ä¤Ë¤Þ¤È¤á¤¿
+	<filename>/boot/boot</filename> ¤ò¥³¥Ô¡¼¤·¤Þ¤¹¡£</para>
 
       <para>Âè 1 ¥¹¥Æ¡¼¥¸¤ÈÂè 2 ¥¹¥Æ¡¼¥¸¤Ï¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î³°Éô¡¢
 	µ¯Æ°¥¹¥é¥¤¥¹¤ÎºÇ½é¤Î¥È¥é¥Ã¥¯¤ËÃÖ¤«¤ì¡¢
@@ -277,20 +269,17 @@ label=FreeBSD</programlisting>
 	512 ¥Ð¥¤¥È¤ÎÂ礭¤µ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤È¤¤¤¦À©¸Â¤¬¤¢¤ë¤Î¤Ç¡¢
 	Èó¾ï¤Ëñ½ã¤Ê¥×¥í¥°¥é¥à¤Ç¤¹¡£
 	¤³¤Î¥×¥í¥°¥é¥à¤Ï <filename>boot2</filename> ¤ò¸¡º÷¤·¡¢
-	¼Â¹Ô¤¹¤ë¤¿¤á¡¢¤½¤Î¥¹¥é¥¤¥¹¤Î¾ðÊó¤òÊÝ»ý¤¹¤ë FreeBSD
+	¼Â¹Ô¤¹¤ë¤¿¤á¡¢¤½¤Î¥¹¥é¥¤¥¹¤Î¾ðÊó¤òÊÝ»ý¤¹¤ë &os;
 	¤Î <firstterm>BSD ¥é¥Ù¥ë</firstterm>
 	¤Ë´Ø¤¹¤ëºÇÄã¸Â¤Î¾ðÊó¤À¤±¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para><filename>boot2</filename> ¤Ï¤â¤¦¾¯¤·¹âµ¡Ç½¤Ç¤¹¡£
-	¤³¤ì¤Ï FreeBSD ¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ç¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ëǽÎϤò»ý¤Á¡¢
+	¤³¤ì¤Ï &os; ¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ç¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ëµ¡Ç½¤ò»ý¤Á¡¢
  	¼Â¹Ô¤¹¤ë¥«¡¼¥Í¥ë¤ä¥í¡¼¥À¤ò»ØÄꤹ¤ë¤¿¤á¤Î´Êñ¤Ê¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ󶡤·¤Þ¤¹¡£</para>
 
-      <para><link linkend="boot-loader">¥í¡¼¥À (loader)</link>
-	¤Ï¤µ¤é¤Ë¹âµ¡Ç½¤Ê¤â¤Î¤Ç¡¢
-	»È¤¤¤ä¤¹¤¯´Êñ¤Êµ¯Æ°ÀßÄ꤬¹Ô¤Ê¤¨¤ë¼êÃʤòÄ󶡤·¤Þ¤¹¡£
-	<filename>boot2</filename> ¤ÏÄ̾綠¤ì¤òµ¯Æ°¤·¤Þ¤¹¡£
-	°ÊÁ°¤Î <filename>boot2</filename> ¤Ë¤Ï¡¢
-	¥«¡¼¥Í¥ë¤òľÀܵ¯Æ°¤¹¤ëµ¡Ç½¤·¤«¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£</para>
+      <para><filename>boot2</filename> ¤Ë¤è¤êµ¯Æ°¤µ¤ì¤ë
+	<link linkend="boot-loader">¥í¡¼¥À (loader)</link>
+	¤Ï¤µ¤é¤Ë¹âµ¡Ç½¤Ç¡¢µ¯Æ°ÀßÄ꤬¹Ô¤Ê¤¨¤ë¼êÃʤòÄ󶡤·¤Þ¤¹¡£</para>
 
       <example xml:id="boot-boot2-example">
 	<title><filename>boot2</filename> ¤Î¥¹¥¯¥ê¡¼¥ó¥·¥ç¥Ã¥È</title>
@@ -300,9 +289,9 @@ Default: 0:ad(0,a)/boot/loader
 boot:</screen>
       </example>
 
-      <para>¤â¤·²¾¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿ <filename>boot1</filename> ¤È
-	<filename>boot2</filename> ¤òÊѹ¹¤·¤¿¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
-	&man.bsdlabel.8; ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <para>&man.bsdlabel.8; ¤òÍѤ¤¤Æ¡¢
+	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿ <filename>boot1</filename> ¤È
+	<filename>boot2</filename> ¤òÊѹ¹¤Ç¤­¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>bsdlabel -B diskslice</userinput></screen>
 
@@ -314,12 +303,13 @@ boot:</screen>
       <warning>
 	<title>Dangerously Dedicated Mode</title>
 
-	<para>&man.bsdlabel.8; ¤ò»È¤¦¤È¤­¡¢
-	  <filename>ad0</filename> ¤Î¤è¤¦¤Ë¥Ç¥£¥¹¥¯Ì¾¤À¤±¤ò»ØÄꤹ¤ë¤È¡¢
-	  ¥¹¥é¥¤¥¹¤ò»ý¤¿¤Ê¤¤´í¸±¤ÊÀìÍѥǥ£¥¹¥¯¤òºîÀ®¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
-	  ¤³¤ì¤Ï¤Þ¤º´Ö°ã¤¤¤Ê¤¯¡¢¤¢¤Ê¤¿¤¬¤ä¤ê¤¿¤¤¤³¤È¤Ç¤Ï¤Ê¤¤¤Ç¤·¤ç¤¦¤«¤é¡¢
-	  ɬ¤º <keycap>Return</keycap> ¥­¡¼¤ò²¡¤¹Á°¤Ë
-	  &man.bsdlabel.8; ¥³¥Þ¥ó¥É¤òÆó½Å¤Ë¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<para><filename>ad0</filename> ¤Î¤è¤¦¤Ë¥Ç¥£¥¹¥¯Ì¾¤À¤±¤ò»ØÄꤹ¤ë¤È¡¢
+	  &man.bsdlabel.8; ¤Ï¡¢¥¹¥é¥¤¥¹¤ò»ý¤¿¤Ê¤¤
+	  <quote>´í¸±¤ÊÀìÍѥǥ£¥¹¥¯</quote>¤òºîÀ®¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
+	  ¤³¤ì¤Ï¤ª¤½¤é¤¯¡¢¤¢¤Ê¤¿¤¬Ë¾¤ó¤Ç¤¤¤ë¤³¤È¤Ç¤Ï¤Ê¤¤¤Ç¤·¤ç¤¦¤«¤é¡¢
+	  <keycap>Return</keycap> ¥­¡¼¤ò²¡¤¹Á°¤Ë¡¢
+	  &man.bsdlabel.8; ¤ËÍ¿¤¨¤ë <replaceable>diskslice</replaceable>
+	  ¤ÎÉôʬ¤òÆó½Å¤Ë¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
       </warning>
     </sect2>
 
@@ -334,8 +324,8 @@ boot:</screen>
 	¤È¤·¤Æ¸ºß¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para>¥í¡¼¥À¤Ï¡¢
-	¤è¤ê¤µ¤Þ¤¶¤Þ¤Ê¥³¥Þ¥ó¥É·²¤ò¥µ¥Ý¡¼¥È¤·¤¿¶¯ÎϤʥ¤¥ó¥¿¥×¥ê¥¿¤Ë¤è¤Ã¤ÆÄ󶡤µ¤ì¤ë´Ê°×ÁȤ߹þ¤ß¥³¥Þ¥ó¥É·²¤òÍøÍѤ¹¤ë¤³¤È¤Ç¡¢
-	¥æ¡¼¥¶¤¬ÍøÍѤ·¤ä¤¹¤¤ÀßÄê¼êÃʤȤʤë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+	¤è¤ê¤µ¤Þ¤¶¤Þ¤Ê¥³¥Þ¥ó¥É·²¤ò¥µ¥Ý¡¼¥È¤·¤¿¶¯ÎϤʥ¤¥ó¥¿¥×¥ê¥¿¤Ë¤è¤Ã¤ÆÄ󶡤µ¤ì¤ëÁȤ߹þ¤ß¥³¥Þ¥ó¥É·²¤òÍøÍѤ¹¤ë¤³¤È¤Ç¡¢
+	¥¤¥ó¥¿¥é¥¯¥Æ¥£¥Ö¤ÊÀßÄê¼êÃʤȤʤë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <sect3 xml:id="boot-loader-flow">
 	<title>¥í¡¼¥À¥×¥í¥°¥é¥à¤Î½èÍý¤Îή¤ì</title>
@@ -359,7 +349,7 @@ boot:</screen>
 
 	<para>¥í¡¼¥À¤ÏºÇ¸å¤Ë¡¢É¸½àÀßÄê¤Ç 10 ÉäΥ­¡¼ÆþÎÏÂÔ¤Á»þ´Ö¤òÍÑ°Õ¤·¡¢
 	  ÆþÎϤ¬¤Ê¤±¤ì¤Ð¥«¡¼¥Í¥ë¤òµ¯Æ°¤·¤Þ¤¹¡£
-	  ÆþÎϤ¬¤¢¤Ã¤¿¾ì¹ç¡¢´Ê°×¥³¥Þ¥ó¥É·²¤¬»È¤¨¤ë¥×¥í¥ó¥×¥È¤¬É½¼¨¤µ¤ì¡¢
+	  ÆþÎϤ¬¤¢¤Ã¤¿¾ì¹ç¡¢¥³¥Þ¥ó¥É·²¤¬»È¤¨¤ë¥×¥í¥ó¥×¥È¤¬É½¼¨¤µ¤ì¡¢
 	  ¥æ¡¼¥¶¤ÏÊÑ¿ô¤òÄ´À°¤·¤¿¤ê¡¢
 	  ¤¹¤Ù¤Æ¤Î¥â¥¸¥å¡¼¥ë¤ò¥¢¥ó¥í¡¼¥É¤·¤¿¤ê¡¢
 	  ¥â¥¸¥å¡¼¥ë¤ò¥í¡¼¥É¤·¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
@@ -370,7 +360,7 @@ boot:</screen>
 	<title>¥í¡¼¥À¤ÎÁȤ߹þ¤ß¥³¥Þ¥ó¥É</title>
 
 	<para>¤â¤Ã¤È¤â¤è¤¯»È¤ï¤ì¤ë¥í¡¼¥À¤Î¥³¥Þ¥ó¥É¤ò°Ê²¼¤Ë¼¨¤·¤Þ¤¹¡£
-	  ÍøÍѲÄǽ¤Ê¥³¥Þ¥ó¥É¤ò¤¹¤Ù¤ÆÃΤꤿ¤¤¾ì¹ç¡¢
+	  ÍøÍѲÄǽ¤Ê¥³¥Þ¥ó¥É¤ò¤¹¤Ù¤ÆÃΤꤿ¤¤¾ì¹ç¤Ë¤Ï¡¢
 	  &man.loader.8; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<variablelist>
@@ -406,10 +396,12 @@ boot:</screen>
 
 	    <listitem>
 	      <para>¤¹¤Ù¤Æ¤Î¥â¥¸¥å¡¼¥ë¤ÎÀßÄê¤ò¡¢
-		µ¯Æ°»þ¤ÈƱ¤¸¤è¤¦¤ËÊÑ¿ô¤Ë¤â¤È¤Å¤¤¤Æ¼«Æ°Åª¤Ë¹Ô¤Ê¤¤¤Þ¤¹¡£
-		¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¤Þ¤º <command>unload</command> ¤ò¹Ô¤Ê¤Ã¤Æ¡¢
-		ÊÑ¿ô—ÉáÄÌ <envar>kernel</envar>
-		¤Ê¤É—¤òÊѹ¹¤·¤¿¾ì¹ç¤Ë¤Î¤ßÍ­¸ú¤ËƯ¤­¤Þ¤¹¡£</para>
+		µ¯Æ°»þ¤ÈƱ¤¸¤è¤¦¤Ë»ØÄꤵ¤ì¤¿ÊÑ¿ô
+		(ºÇ¤â¿¤¤¤Î¤Ï <envar>kernel</envar>)
+		¤Ë¤â¤È¤Å¤¤¤Æ¼«Æ°Åª¤Ë¹Ô¤Ê¤¤¤Þ¤¹¡£
+		¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢ÊÑ¿ô¤òÊѹ¹¤¹¤ëÁ°¤Ë¡¢
+		ºÇ½é¤Ë <command>unload</command>
+		¤ò¹Ô¤Ê¤Ã¤¿¾ì¹ç¤Ë¤Î¤ßÍ­¸ú¤ËƯ¤­¤Þ¤¹¡£</para>
 	    </listitem>
 	  </varlistentry>
 
@@ -420,9 +412,8 @@ boot:</screen>
 	    <listitem>
 	      <para><filename>/boot/loader.help</filename>
 		¤òÆɤ߹þ¤ß¡¢¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Þ¤¹¡£
-		<replaceable>topic</replaceable> ¤Ë
-		<literal>index</literal> ¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢ÍøÍѲÄǽ¤Ê
-		<replaceable>topic</replaceable> ¤òɽ¼¨¤·¤Þ¤¹¡£</para>
+		topic ¤Ë <literal>index</literal> ¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢
+		ÍøÍѲÄǽ¤Ê topic ¤Î°ìÍ÷¤òɽ¼¨¤·¤Þ¤¹¡£</para>
 	    </listitem>
 	  </varlistentry>
 
@@ -446,7 +437,8 @@ boot:</screen>
 	      <para>»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤Î¥«¡¼¥Í¥ë¡¢
 		¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¡¢¤¢¤ë¤¤¤Ï
 		type ¤Ë»ØÄꤵ¤ì¤¿¼ïÎà¤Î¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É¤·¤Þ¤¹¡£
-		¥Õ¥¡¥¤¥ë̾°Ê¹ß¤Ë»ØÄꤵ¤ì¤¿°ú¿ô¤Ï¥Õ¥¡¥¤¥ë¤Ø¤ÈÅϤµ¤ì¤Þ¤¹¡£</para>
+		<replaceable>filename</replaceable>
+		°Ê¹ß¤Ë»ØÄꤵ¤ì¤¿°ú¿ô¤Ï¥Õ¥¡¥¤¥ë¤Ø¤ÈÅϤµ¤ì¤Þ¤¹¡£</para>
 	    </listitem>
 	  </varlistentry>
 
@@ -528,9 +520,11 @@ boot:</screen>
 
 	<para>¼¡¤Ë¤¢¤²¤ë¤Î¤Ï¡¢¥í¡¼¥À¤Î¼ÂÁ©Åª¤Ê»ÈÍÑÎã¤Ç¤¹¡£</para>
 
+	<indexterm><primary>¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É</primary></indexterm>
+
 	<itemizedlist>
 	  <listitem>
-	    <para>ÉáÃʻȤäƤ¤¤ë¥«¡¼¥Í¥ë¤ò¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É<indexterm><primary>¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É</primary></indexterm>¤Çµ¯Æ°¤·¤Þ¤¹¡£</para>
+	    <para>ÉáÃʻȤäƤ¤¤ë¥«¡¼¥Í¥ë¤ò¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Çµ¯Æ°¤·¤Þ¤¹¡£</para>
 
 	    <screen><userinput>boot -s</userinput></screen>
 	  </listitem>
@@ -543,16 +537,15 @@ boot:</screen>
 <userinput>load kernel.old</userinput></screen>
 
 	    <para><filename>kernel.GENERIC</filename> ¤È¤¹¤ë¤È¡¢
-	      ¥¤¥ó¥¹¥È¡¼¥ë¥Ç¥£¥¹¥¯¤ËÆþ¤Ã¤Æ¤¤¤¿
-	      generic ¥«¡¼¥Í¥ë¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	      ¤Þ¤¿¡¢Ä¾Á°¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤¿¥«¡¼¥Í¥ë (¤¿¤È¤¨¤Ð¡¢
-	      ¥«¡¼¥Í¥ë¤ò¼«Ê¬¤ÇÀßÄꤷ¤¿¤ê¡¢
-	      ¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤¿¤ê¤·¤¿¾ì¹ç) ¤ò»ØÄꤹ¤ë¤Ë¤Ï
-	      <filename>kernel.old</filename><indexterm><primary><filename>kernel.old</filename></primary></indexterm> ¤È¤·¤Þ¤¹¡£</para>
+	      ¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¥Ç¥Õ¥©¥ë¥È¥«¡¼¥Í¥ë¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
+	      ¤Þ¤¿¡¢¥·¥¹¥Æ¥à¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤¿¤ê¡¢
+	      ¤â¤·¤¯¤Ï¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤òÀßÄꤷ¤¿¾ì¹ç¤Ë¡¢
+	      ľÁ°¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤¿¥«¡¼¥Í¥ë¤Ï¡¢
+	      <filename>kernel.old</filename><indexterm><primary><filename>kernel.old</filename></primary></indexterm> ¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£</para>
 
 	    <note>
-	      <para>ÉáÃʤΥ«¡¼¥Í¥ë¤Ç»È¤Ã¤Æ¤¤¤ë¥â¥¸¥å¡¼¥ë¤ò
-		»ØÄꤷ¤¿¥«¡¼¥Í¥ë¤Ç¥í¡¼¥É¤¹¤ë¾ì¹ç¤Ï¡¢²¼¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
+	      <para>ÉáÃʤΥ«¡¼¥Í¥ë¤Ç»È¤Ã¤Æ¤¤¤ë¥â¥¸¥å¡¼¥ë¤ò»ØÄꤷ¤¿¥«¡¼¥Í¥ë¤Ç¥í¡¼¥É¤¹¤ë¾ì¹ç¤Ï¡¢
+		¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
 
 	      <screen><userinput>unload</userinput>
 <userinput>set kernel="kernel.old"</userinput>
@@ -560,9 +553,7 @@ boot:</screen>
 	  </listitem>
 
 	  <listitem>
-	    <para>¥«¡¼¥Í¥ë¤ÎÀßÄꥹ¥¯¥ê¥×¥È (Ä̾
-	      ¥«¡¼¥Í¥ëµ¯Æ°»þ¤ËÀßÄꤵ¤ì¤ëÆâÍƤò¼«Æ°²½¤¹¤ë¥¹¥¯¥ê¥×¥È)
-	      ¤ò¥í¡¼¥É¤·¤Þ¤¹¡£</para>
+	    <para>¥«¡¼¥Í¥ë¤Î¼«Æ°ÀßÄꥹ¥¯¥ê¥×¥È¤ò¥í¡¼¥É¤·¤Þ¤¹¡£</para>
 
 	    <screen><userinput>load -t userconfig_script /boot/kernel.conf</userinput></screen>
 	  </listitem>
@@ -582,46 +573,20 @@ boot:</screen>
 	  </authorgroup>
 	</info>
 
-	<para>¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤Ï¡¢¥ª¥ê¥¸¥Ê¥ë¤Î¥Ö¡¼¥È¥á¥Ã¥»¡¼¥¸¤ËÈæ¤Ù¡¢
-	  ¥Ó¥¸¥å¥¢¥ëŪ¤Ë¤è¤êÌ¥ÎÏŪ¤Ê²èÌ̤òÄ󶡤·¤Þ¤¹¡£
-	  ¤³¤Î²èÌ̤ϡ¢¥³¥ó¥½¡¼¥ë¥í¥°¥¤¥ó¥×¥í¥ó¥×¥È¤Þ¤¿¤Ï X 
-	  ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤Î¥í¥°¥¤¥ó¥×¥í¥ó¥×¥È¤¬½Ð¤ë¤Þ¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£</para>
+	<para>¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤Ï¡¢
+	  ¤³¤ì¤Þ¤Ç¤È¤ÏÊ̤ε¯Æ°²èÌ̤òɽ¼¨¤·¤Þ¤¹¡£
+	  ¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤Ï¡¢
+	  ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Þ¤¿¤Ï¥°¥é¥Õ¥£¥«¥ë¤Ê¥í¥°¥¤¥ó¥×¥í¥ó¥×¥È¤¬É½¼¨¤µ¤ì¤ë¤Þ¤Ç¡¢
+	  µ¯Æ°»þ¤Î¸¡½Ð¥á¥Ã¥»¡¼¥¸¤ä¥µ¡¼¥Ó¥¹¤Î¥¹¥¿¡¼¥È¥¢¥Ã¥×¥á¥Ã¥»¡¼¥¸¤ò±£¤·¤Þ¤¹¡£</para>
 
 	<para>&os; ¤Ë¤Ï¡¢2 ¤Ä¤Î´ðËܴĶ­¤¬¤¢¤ê¤Þ¤¹¡£
 	  ¤Ò¤È¤Ä¤Ï¡¢¥ì¥¬¥·¡¼¤Ê¥Ð¡¼¥Á¥ã¥ë¥³¥ó¥½¡¼¥ë¥³¥Þ¥ó¥É¥é¥¤¥ó´Ä¶­¤Ç¤¹¡£
 	  ¥·¥¹¥Æ¥à¤Îµ¯Æ°¤¬½ª¤ï¤Ã¤¿¤é¡¢
 	  ¥³¥ó¥½¡¼¥ë¤Ë¥í¥°¥¤¥ó¥×¥í¥ó¥×¥È¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
-	  2 ¤ÄÌܤδĶ­¤Ï¡¢X11 ¥Ç¥¹¥¯¥È¥Ã¥×¤Î¥°¥é¥Õ¥£¥«¥ë´Ä¶­¤Ç¤¹¡£<link
-	  linkend="x-install">X11</link> ¤È
-	  <application>GNOME</application>,
-	  <application>KDE</application> ¤Þ¤¿¤Ï
-	  <application>XFce</application> ¤Î¤è¤¦¤Ê
-	  <link linkend="x11-wm">¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­</link>
-	  ¤Î¤É¤ì¤«¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¡¢<command>startx</command>
-	  ¥³¥Þ¥ó¥É¤Ç X11 ¥Ç¥¹¥¯¥È¥Ã¥×¤¬µ¯Æ°¤·¤Þ¤¹¡£</para>
-
-	<para>¥æ¡¼¥¶¤Ë¤è¤Ã¤Æ¤Ï¡¢
-	  ÅÁÅýŪ¤Ê¥Æ¥­¥¹¥È¥Ù¡¼¥¹¤Î¥í¥°¥¤¥ó¥×¥í¥ó¥×¥È¤è¤ê¡¢
-	  X11 ¥°¥é¥Õ¥£¥«¥ë¥í¥°¥¤¥ó¥¹¥¯¥ê¡¼¥ó¤¬¹¥¤Þ¤ì¤Þ¤¹¡£
-	  &xorg; ¤Î <application>XDM</application>,
-	  <application>GNOME</application> ¤Î
-	  <application>gdm</application> ¤ª¤è¤Ó
-	  <application>KDE</application> ¤Î
-	  <application>kdm</application> ¤Î¤è¤¦¤Ê
-	  (¤½¤·¤Æ Ports Collection ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë²Äǽ¤Ê¾¤Î)
-	  ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤Ï¡¢
-	  ¥³¥ó¥½¡¼¥ë¤Ë¥í¥°¥¤¥ó¥×¥í¥ó¥×¥È¤òɽ¼¨¤¹¤ë¤«¤ï¤ê¤Ë¡¢
-	  ¥°¥é¥Õ¥£¥«¥ë¤Ê¥í¥°¥¤¥ó¥¹¥¯¥ê¡¼¥ó¤òÄ󶡤·¤Þ¤¹¡£
-	  ¥í¥°¥¤¥ó¸å¡¢¥°¥é¥Õ¥£¥«¥ë¤Ê¥Ç¥¹¥¯¥È¥Ã¥×¤ò¥æ¡¼¥¶¤ËÄ󶡤·¤Þ¤¹¡£</para>
-
-	<para>¥³¥Þ¥ó¥É¥é¥¤¥ó¤Î´Ä¶­¤Ç¤Ï¡¢
-	  ¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤Ï¡¢
-	  ¥Ö¡¼¥È»þ¤Î¸¡½Ð·ë²Ì¤Î¥á¥Ã¥»¡¼¥¸¤ä¡¢
-	  ¥¿¥¹¥¯¤Î¥¹¥¿¡¼¥È¥¢¥Ã¥×¥á¥Ã¥»¡¼¥¸¤ò¡¢
-	  ¥í¥°¥¤¥ó¥×¥í¥ó¥×¥È¤¬É½¼¨¤µ¤ì¤ë¤Þ¤Ç±£¤·¤Þ¤¹¡£
-	  X11 ¤Î´Ä¶­¤Ç¤Ï¡¢¥æ¡¼¥¶¤Ï¡¢¥Ó¥¸¥å¥¢¥ëŪ¤Ë¤è¤ê¤­¤ì¤¤¤Ê
-	  (µsoft; &windows; ¤Þ¤¿¤Ï¡¢Èó unix ·¿¤Î¥·¥¹¥Æ¥à)
-	  ¤Î¥¹¥¿¡¼¥È¥¢¥Ã¥×¤Ë»÷¤¿¤è¤¦¤Ê¡¢¥¹¥¿¡¼¥È¥¢¥Ã¥×¤ò·Ð¸³¤·¤Þ¤¹¡£</para>
+	  2 ¤ÄÌܤδĶ­¤Ï¡¢<link linkend="x11">Xorg</link>
+	  ¤Ë¤è¤êÄ󶡤µ¤ì¤ë¥°¥é¥Õ¥£¥«¥ë´Ä¶­¤Ç¤¹¡£
+	  <link linkend="x11">Xorg</link> ¤Î¾Ï¤Ç¤Ï¡¢
+	  ¥°¥é¥Õ¥£¥«¥ë¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤ä¥°¥é¥Õ¥£¥«¥ë¥í¥°¥¤¥ó¥Þ¥Í¡¼¥¸¥ã¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ª¤è¤ÓÀßÄêÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
 	<sect4 xml:id="boot-splash-function">
 	  <title>¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥óµ¡Ç½</title>
@@ -629,21 +594,19 @@ boot:</screen>
 	  <para>¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥óµ¡Ç½¤Ï¡¢
 	    256 ¿§¤Î¥Ó¥Ã¥È¥Þ¥Ã¥× (<filename>.bmp</filename>),
 	    ZSoft <acronym>PCX</acronym> (<filename>.pcx</filename>) ¤Þ¤¿¤Ï
-	    TheDraw (<filename>.bin</filename>)
-	    ¥Õ¥¡¥¤¥ë¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
-	    ¤µ¤é¤Ë¡¢É¸½à¤Î VGA ¥¢¥À¥×¥¿¤ÇÆ°¤«¤¹¤Ë¤Ï¡¢
-	    ¥¹¥×¥é¥Ã¥·¥å¥¤¥á¡¼¥¸¤Ï 320x200
+	    TheDraw (<filename>.bin</filename>) ·Á¼°¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+	    ɸ½à¤Î VGA ¥¢¥À¥×¥¿¤ÇÆ°¤«¤¹¤Ë¤Ï¡¢
+	    ¥¹¥×¥é¥Ã¥·¥å¥¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤Ï 320x200
 	    ¥Ô¥¯¥»¥ë°Ê²¼¤Î²òÁüÅ٤Ǥ¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
 	  <para>(ºÇÂç²òÁüÅÙ 1024x768 ¥Ô¥¯¥»¥ë¤Þ¤Ç¤Î)
-	    ¤â¤¦¾¯¤·Â礭¤Ê¥¤¥á¡¼¥¸¤ò»È¤¤¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢&os; ¤Ë
-	    <acronym>VESA</acronym> ¥µ¥Ý¡¼¥È¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£
-	    µ¯Æ°»þ¤Ë <acronym>VESA</acronym> ¥â¥¸¥å¡¼¥ë¤òÆɤ߹þ¤à¤«¡¢
-	    ¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ë
-	    <literal>VESA</literal> ¥ª¥×¥·¥ç¥ó¤òÄɲ䷤ơ¢
-	    ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ (<xref
-	      linkend="kernelconfig"/> ¤ò»²¾È) ¤¹¤ë¤³¤È¤ÇÍ­¸ú¤Ë¤Ç¤­¤Þ¤¹¡£
-	    <acronym>VESA</acronym> ¤Î¥µ¥Ý¡¼¥È¤Ë¤è¤ê¡¢
+	    ¤â¤¦¾¯¤·Â礭¤Ê¥¤¥á¡¼¥¸¤ò»È¤¤¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢
+	    ¥·¥¹¥Æ¥à¤Îµ¯Æ°»þ¤Ë
+	    <acronym>VESA</acronym> ¥â¥¸¥å¡¼¥ë¤ò¥í¡¼¥É¤·¤Æ¤¯¤À¤µ¤¤¡£
+	    <link linkend="kernelconfig">¥«¥¹¥¿¥à¥«¡¼¥Í¥ë</link>
+	    ¤ËÂФ·¤Æ¤Ï¡¢<acronym>VESA</acronym>
+	    ¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥ª¥×¥·¥ç¥ó¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£
+	    <acronym>VESA</acronym> ¤Î¥µ¥Ý¡¼¥È¤ò¥í¡¼¥É¤¹¤ë¤³¤È¤Ç¡¢
 	    ¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¤Ç¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤òɽ¼¨¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
 
 	  <para>¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤Ï¡¢µ¯Æ°¥×¥í¥»¥¹¤Î´Ö¡¢
@@ -652,25 +615,19 @@ boot:</screen>
 	    ¤¤¤Ä¤Ç¤â¤ä¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
 	  <para>¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤Ï¡¢
-	    X11 ¤Î³°¤Ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ç¤â¤¢¤ê¤Þ¤¹¡£
+	    ¥¹¥¯¥ê¡¼¥ó¥»¡¼¥Ð¤Î¥Ç¥Õ¥©¥ë¥È¤Ç¤â¤¢¤ê¤Þ¤¹¡£
 	    °ìÄê´ü´Ö»È¤ï¤ì¤Ê¤¤¤È¡¢
-	    ²èÌ̤¬¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤ËÊѤï¤ê¡¢
-	    ¥¤¥á¡¼¥¸¤Î¶¯¤µ¤¬¡¢ÌÀ¤ë¤¯¤«¤é°Å¤¯¤Ê¤ë¤è¤¦¤ËÊѲ½¤·¡¢
-	    ¤½¤ì¤¬·«¤êÊÖ¤µ¤ì¤Þ¤¹¡£
-	    ¤³¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó
-	    (¥¹¥¯¥ê¡¼¥ó¥»¡¼¥Ð) ¤Î¿¶¤ëÉñ¤¤¤Ï¡¢
+	    ¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤¬É½¼¨¤µ¤ì¡¢
+	    ¥¤¥á¡¼¥¸¤Îµ±ÅÙ¤¬¡¢ÌÀ¤ë¤¯¤«¤é°Å¤¯¤Ê¤ë¤è¤¦¤ËÊѲ½¤·¡¢
+	    ¤½¤Î¥µ¥¤¥¯¥ë¤¬·«¤êÊÖ¤µ¤ì¤Þ¤¹¡£
+	    ¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¥»¡¼¥Ð¤ÎÀßÄê¤Ï¡¢
 	    <filename>/etc/rc.conf</filename> ¤Ë
 	    <literal>saver=</literal> ¹Ô¤òÄɲ乤뤳¤È¤ÇÊѹ¹¤Ç¤­¤Þ¤¹¡£
+	    ¤¤¤¯¤Ä¤«¤Î¥Ó¥ë¥È¥¤¥ó¤Î¥¹¥¯¥ê¡¼¥ó¥»¡¼¥Ð¤¬ÍÑ°Õ¤µ¤ì¤Æ¤ª¤ê¡¢
+	    &man.splash.4; ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	    <literal>saver=</literal> ¥ª¥×¥·¥ç¥ó¤Ï¡¢
-	    ¤¤¤¯¤Ä¤«¤Î¥Ó¥ë¥È¥¤¥ó¤Î¥¹¥¯¥ê¡¼¥ó¥»¡¼¥Ð¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Æ¡¢
-	    Áª¤Ö¤³¤È¤¬½ÐÍè¤Þ¤¹¡£
-	    ´°Á´¤Ê°ìÍ÷¤Ï¡¢&man.splash.4; ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ç¸«¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	    ¥Ç¥Õ¥©¥ë¥È¤Î¥¹¥¯¥ê¡¼¥ó¥»¡¼¥Ð¡¼¤Ï
-	    <quote>warp</quote> ¤È¸Æ¤Ð¤ì¤ë¤â¤Î¤Ç¤¹¡£ 
-	    <filename>/etc/rc.conf</filename> ¤Ç»ØÄꤹ¤ë
-	    <literal>saver=</literal> ¥ª¥×¥·¥ç¥ó¤Ï¡¢
-	    ¤Ï²¾ÁÛ¥³¥ó¥½¡¼¥ë¤Ë¤Î¤ß ŬÍѤµ¤ì¤ë¤È¤¤¤¦¤³¤È¤Ëµ¤¤ò¤Ä¤±¤Æ¤¯¤À¤µ¤¤¡£
-	    X11 ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤Ë¤Ï±Æ¶Á¤·¤Þ¤»¤ó¡£</para>
+	    ²¾ÁÛ¥³¥ó¥½¡¼¥ë¤Ë¤Î¤ßŬÍѤµ¤ì¡¢
+	    ¥°¥é¥Õ¥£¥«¥ë¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤Ë¤Ï±Æ¶Á¤·¤Þ¤»¤ó¡£</para>
 
 	  <para>¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤òÍ­¸ú¤ËÀßÄꤷ¤Æ¤¤¤Æ¤â¡¢µ¯Æ°»þ¤Ë¤Ï¡¢
 	    ¥Ö¡¼¥È¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤ä¡¢
@@ -689,14 +646,14 @@ boot:</screen>
 	<sect4 xml:id="boot-splash-enable">
 	  <title>¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥óµ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë</title>
 
-	  <para>¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó (<filename>.bmp</filename>,
-	    <filename>.pcx</filename> ¤Þ¤¿¤Ï <filename>.bin</filename>)
-	    ¥Õ¥¡¥¤¥ë¤Ï¡¢¥ë¡¼¥È¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¡¢¤¿¤È¤¨¤Ð
+	  <para>¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó <filename>.bmp</filename>,
+	    <filename>.pcx</filename> ¤Þ¤¿¤Ï <filename>.bin</filename>
+	    ¥¤¥á¡¼¥¸¤Ï¡¢¥ë¡¼¥È¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¡¢¤¿¤È¤¨¤Ð
 	    <filename class="directory">/boot</filename>
-	    ¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
+	    ¤ËÃÖ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
 	  <para>¥Ç¥Õ¥©¥ë¥È¤Î¥Ö¡¼¥È¥Ç¥£¥¹¥×¥ì¥¤¤Î²òÁüÅÙ
-	    (256 ¿§¡¢320x200 ¥Ô¥¯¥»¥ë°Ê²¼) ¤Î¾ì¹ç¤Ë¤Ï¡¢
+	    256 ¿§¡¢320x200 ¥Ô¥¯¥»¥ë°Ê²¼¤Î¾ì¹ç¤Ë¤Ï¡¢
 	    °Ê²¼¤ò´Þ¤à¤è¤¦¤Ë
 	    <filename>/boot/loader.conf</filename> ¤òÊÔ½¸¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -725,9 +682,9 @@ bitmap_name="<replaceable>/boot/splash.b
 bitmap_load="YES"
 bitmap_name="<replaceable>/boot/splash.pcx</replaceable>"</programlisting>
 
-	  <para>¥Ð¡¼¥¸¥ç¥ó 8.3 ¤Ç¤Ï¡¢
-	    <link xlink:href="https://en.wikipedia.org/wiki/TheDraw">TheDraw</link>
-	    ·Á¼°¤Ë¤è¤ë¥¢¥¹¥­¡¼¥¢¡¼¥È¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+	  <para>&os; 8.3 ¤«¤é¤Ï¡¢<link
+	      xlink:href="https://en.wikipedia.org/wiki/TheDraw">TheDraw</link>
+	    ·Á¼°¤Ë¤è¤ë¥¢¥¹¥­¡¼¥¢¡¼¥È¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</para>
 
 	  <programlisting>splash_txt="YES"
 bitmap_load="YES"
@@ -735,7 +692,7 @@ bitmap_name="<replaceable>/boot/splash.b
 
 	  <para>¥Õ¥¡¥¤¥ë̾¤Ï¾åµ­¤Î¤è¤¦¤Ê
 	    <quote>splash</quote> ¤Ë¸Â¤é¤ì¤Æ¤¤¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	    Àè¤Û¤É¾Ò²ð¤·¤¿¥Õ¥¡¥¤¥ë·Á¼°¤Ç¤¢¤ì¤Ð¡¢
+	    Âбþ¤·¤Æ¤¤¤ë·Á¼°¤Ç¤¢¤ì¤Ð¡¢
 	    <filename><replaceable>splash_640x400</replaceable>.bmp</filename>
 	    ¤ä <filename><replaceable>bluewave</replaceable>.pcx</filename>
 	    ¤È¤¤¤Ã¤¿¡¢¤É¤Î¤è¤¦¤Ê̾Á°¤Ç¤â¹½¤¤¤Þ¤»¤ó¡£</para>
@@ -760,17 +717,15 @@ bitmap_name="<replaceable>/boot/splash.b
 	      <term><literal>loader_logo="beastie"</literal></term>
 
 	      <listitem>
-		<para>¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢
-		  ¤³¤ì¤Þ¤Ç¤Î¥ê¥ê¡¼¥¹¤Î¤è¤¦¤Ë¥«¥é¡¼¤Î beastie ¥í¥´¤È¶¦¤Ë¡¢
-		  ¥Ö¡¼¥È¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤Î±¦Â¦¤Ëɽ¼¨¤µ¤ì¤Æ¤¤¤ëñ¸ì
+		<para>¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥«¥é¡¼¤Î beastie
+		  ¥í¥´¤È¶¦¤Ë¥Ö¡¼¥È¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤Î±¦Â¦¤Ëɽ¼¨¤µ¤ì¤Æ¤¤¤ëñ¸ì
 		  (¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï <quote>&os;</quote>) ¤òÃÖ¤­´¹¤¨¤Þ¤¹¡£</para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
 
 	  <para>¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢&man.splash.4;,
-	    &man.loader.conf.5; ¤ª¤è¤Ó &man.vga.4;
-	    ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+	    &man.loader.conf.5; ¤ª¤è¤Ó &man.vga.4; ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 	</sect4>
       </sect3>
     </sect2>
@@ -784,11 +739,11 @@ bitmap_name="<replaceable>/boot/splash.b
       <secondary>µ¯Æ°»þ¤Î±þÅú</secondary>
     </indexterm>
 
-    <para>¥«¡¼¥Í¥ë¤¬<link linkend="boot-loader">¥í¡¼¥À</link> (Ä̾ï¤Ï)
-      ¤«<link linkend="boot-boot1">boot2</link>
-      (¥í¡¼¥À¤ò±ª²ó¤·¤Æ) ¤Ë¤è¤Ã¤Æ¥í¡¼¥É¤µ¤ì¤ë¤È¡¢
-      µ¯Æ°¥Õ¥é¥°¤òÄ´¤Ù¤Þ¤¹¡£
-      ¤â¤·µ¯Æ°¥Õ¥é¥°¤¬¤¢¤ì¤Ð¡¢¤½¤ì¤Ë±þ¤¸¤ÆÆ°ºî¤òÄ´À°¤·¤Þ¤¹¡£</para>
+    <para>¥«¡¼¥Í¥ë¤¬¥Ç¥Õ¥©¥ë¥È¤Î
+      <link linkend="boot-loader">¥í¡¼¥À</link>
+      ¤â¤·¤¯¤Ï¥í¡¼¥À¤ò±ª²ó¤·¤Æ <link linkend="boot-boot1">boot2</link>
+      ¤Ë¤è¤Ã¤ÆÆɤ߹þ¤Þ¤ì¤ë¤È¡¢µ¯Æ°¥Õ¥é¥°¤¬Ä´¤Ù¤é¤ì¤Þ¤¹¡£
+      ¤â¤·µ¯Æ°¥Õ¥é¥°¤¬¤¢¤ì¤Ð¡¢¤½¤ì¤Ë±þ¤¸¤ÆÆ°ºî¤¬Ä´À°¤µ¤ì¤Þ¤¹¡£</para>
 
     <sect2 xml:id="boot-kernel-bootflags">
       <title>¥«¡¼¥Í¥ëµ¯Æ°¥Õ¥é¥°</title>
@@ -844,8 +799,8 @@ bitmap_name="<replaceable>/boot/splash.b
       </variablelist>
 
       <note>
-	<para>µ¯Æ°¥Õ¥é¥°¤Ï¤³¤Î¾¤Ë¤â¤¢¤ê¤Þ¤¹¡£
-	  ¤½¤ì¤é¤Ë¤Ä¤¤¤Æ¤Ï &man.boot.8; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+	<para>¾åµ­°Ê³°¤Îµ¯Æ°¥Õ¥é¥°¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	  &man.boot.8; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
 	</para>
       </note>
     </sect2>
@@ -868,7 +823,7 @@ bitmap_name="<replaceable>/boot/splash.b
       <primary>device.hints</primary>
     </indexterm>
 
-    <para>µ¯Æ°¥×¥í¥»¥¹¤Î´Ö¤Ë &man.loader.8; ¤Ï
+    <para>¥·¥¹¥Æ¥à¤ÎºÇ½é¤Î¥¹¥¿¡¼¥È¥¢¥Ã¥×»þ¤Ë¡¢&man.loader.8; ¤Ï
       &man.device.hints.5; ¤òÆɤ߹þ¤ß¤Þ¤¹¡£
       ¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¥«¡¼¥Í¥ëµ¯Æ°¤Î´Ä¶­ÊÑ¿ô¤¬³ÊǼ¤µ¤ì¤Æ¤ª¤ê¡¢
       ¤³¤ì¤é¤Î´Ä¶­ÊÑ¿ô¤Ï <quote>device hints</quote>
@@ -876,17 +831,17 @@ bitmap_name="<replaceable>/boot/splash.b
       ¤Ï¥Ç¥Ð¥¤¥¹¤òÀßÄꤹ¤ë¤¿¤á¤Ë¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤¬»ÈÍѤ·¤Þ¤¹¡£</para>
 
     <para>device hints ¤Ï <link linkend="boot-loader">¥¹¥Æ¡¼¥¸ 3
-      ¥Ö¡¼¥È¥í¡¼¥À</link> ¤Ç¤âÀßÄê¤Ç¤­¤Þ¤¹¡£ÊÑ¿ô¤Ï
-      <command>set</command> ¥³¥Þ¥ó¥É¤òÍѤ¤¤ÆÄɲä·¤¿¤ê¡¢
-      <command>unset</command> ¥³¥Þ¥ó¥É¤òÍѤ¤¤Æºï½ü¤Ç¤­¤Þ¤¹¡£
-      <command>show</command> ¥³¥Þ¥ó¥É¤òÍѤ¤¤Æ°ìÍ÷¤ò¸«¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-      <filename>/boot/device.hints</filename> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ëÊÑ¿ô¤Ï
-      ¤³¤Î¤È¤­¤Ë¾å½ñ¤­¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¥í¡¼¥À¤ÇÀßÄꤷ¤¿ device hints ¤Î¸ú²Ì¤Ï°ì»þŪ¤Ê¤â¤Î¤Ç¤¢¤ë¤¿¤á¡¢
+	¥Ö¡¼¥È¥í¡¼¥À</link> ¥×¥í¥ó¥×¥È¤Ç¤âÀßÄê¤Ç¤­¤Þ¤¹¡£ÊÑ¿ô¤Ï
+      <command>set</command> ¤òÍѤ¤¤ÆÄɲä·¤¿¤ê¡¢
+      <command>unset</command> ¤òÍѤ¤¤Æºï½ü¤Ç¤­¤Þ¤¹¡£
+      <command>show</command> ¤òÍѤ¤¤Æ°ìÍ÷¤ò¸«¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
+      <filename>/boot/device.hints</filename> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ëÊÑ¿ô¤Ï¡¢
+      ¾å½ñ¤­¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
+      ¥Ö¡¼¥È¥í¡¼¥À¤ÇÀßÄꤷ¤¿ device hints ¤Î¸ú²Ì¤Ï°ì»þŪ¤Ê¤â¤Î¤Ç¤¢¤ë¤¿¤á¡¢
       ¼¡²óµ¯Æ°¤¹¤ë¤È¤­¤Ë¤Ï̵¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
 
     <para>¥·¥¹¥Æ¥à¤¬µ¯Æ°¤¹¤ë¤È¡¢&man.kenv.1;
-      ¥³¥Þ¥ó¥É¤Ç¥«¡¼¥Í¥ë´Ä¶­ÊÑ¿ô¤ò¥À¥ó¥×¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+      ¥³¥Þ¥ó¥É¤Ç¤¹¤Ù¤Æ¤Î¥«¡¼¥Í¥ë´Ä¶­ÊÑ¿ô¤ò¥À¥ó¥×¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
     <para><filename>/boot/device.hints</filename>
       ¤Ï 1 ¹Ô¤Ë¤Ä¤­°ì¤Ä¤ÎÊÑ¿ô¤òÀßÄê¤Ç¤­¡¢¹ÔƬ¤Î <quote>#</quote>
@@ -899,7 +854,7 @@ bitmap_name="<replaceable>/boot/splash.b
 
     <screen><userinput>set hint.driver.unit.keyword=value</userinput></screen>
 
-    <para><literal>driver</literal> ¤Ï¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤Î̾Á°¡¢
+    <para>¤³¤³¤Ç¡¢<literal>driver</literal> ¤Ï¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤Î̾Á°¡¢
       <literal>unit</literal> ¤Ï¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤Î¥æ¥Ë¥Ã¥ÈÈֹ桢
       <literal>keyword</literal> ¤Ï¥Ò¥ó¥È¥­¡¼¥ï¡¼¥É¤Ç¤¹¡£
       ¥­¡¼¥ï¡¼¥É¤Ï¼¡¤ÎÀßÄê¤ò»ØÄꤷ¤Þ¤¹:</para>
@@ -942,11 +897,11 @@ bitmap_name="<replaceable>/boot/splash.b
     </itemizedlist>
 
     <para>¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤Ï¤³¤Î¥ê¥¹¥È°Ê³°¤ÎÊÑ¿ô¤òÀßÄê¤Ç¤­¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¤·¡¢
-      ¤³¤Î¥ê¥¹¥È°Ê³°¤ÎÊÑ¿ô¤òɬÍפȤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-      ¤·¤¿¤¬¤Ã¤Æ¡¢¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤Î¥Þ¥Ë¥å¥¢¥ë¤òÆɤळ¤È¤ò¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£
+      ¤³¤Î¥ê¥¹¥È°Ê³°¤ÎÊÑ¿ô¤òɬÍפȤ¹¤ë¤«¤â¤·¤ì¤Ê¤¤¤Î¤Ç¡¢
+      ¥É¥é¥¤¥Ð¤Î¥Þ¥Ë¥å¥¢¥ë¤òÆɤळ¤È¤ò¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£
       ¤è¤ê¿¤¯¤Î¾ðÊó¤òÃΤꤿ¤±¤ì¤Ð¡¢&man.device.hints.5;,
-      &man.kenv.1;, &man.loader.conf.5;, &man.loader.8;
-      ¤Ê¤É¤Î¥Þ¥Ë¥å¥¢¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      &man.kenv.1;, &man.loader.conf.5; ¤ª¤è¤Ó &man.loader.8;
+      ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
   </sect1>
 
   <sect1 xml:id="boot-init">
@@ -968,7 +923,8 @@ bitmap_name="<replaceable>/boot/splash.b
       <para>¼«Æ°ºÆµ¯Æ°¤Ç¤Ï¡¢
 	¥·¥¹¥Æ¥à¾å¤ÇÍøÍѤǤ­¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î°ì´·À­¤ò³Îǧ¤·¤Þ¤¹¡£
 	¤â¤·¤½¤ì¤ËÌäÂ꤬¤¢¤Ã¤Æ &man.fsck.8;
-	¤¬¤½¤ÎÉÔ°ìÃפò½¤Éü¤Ç¤­¤Ê¤±¤ì¤Ð¡¢´ÉÍý¼Ô¤ËľÀÜÂн褵¤»¤ë¤¿¤á
+	¤¬ UFS ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÉÔ°ìÃפò½¤Éü¤Ç¤­¤Ê¤±¤ì¤Ð¡¢
+	´ÉÍý¼Ô¤¬ÌäÂê¤òľÀܲò·è¤Ç¤­¤ë¤è¤¦¤Ë¡¢
 	&man.init.8; ¤Ï¥·¥¹¥Æ¥à¤ò
 	<link linkend="boot-singleuser">¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É</link>
 	¤Ø¤È°Ü¹Ô¤µ¤»¤Þ¤¹¡£</para>
@@ -980,18 +936,16 @@ bitmap_name="<replaceable>/boot/splash.b
       <indexterm><primary>¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É</primary></indexterm>
       <indexterm><primary>¥³¥ó¥½¡¼¥ë (console)</primary></indexterm>
 
-      <para>¤³¤Î¥â¡¼¥É¤Ë¤Ï¡¢
-	<link linkend="boot-autoreboot">¼«Æ°ºÆµ¯Æ°</link>¤Î½èÍýÃ椫¡¢
-	¥æ¡¼¥¶¤¬µ¯Æ°»þ¤Ë <option>-s</option> ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢
+      <para>¤³¤Î¥â¡¼¥É¤Ë¤Ï¡¢<link
+	  linkend="boot-autoreboot">¼«Æ°ºÆµ¯Æ°</link>¤Î½èÍýÃ椫¡¢
+	¥æ¡¼¥¶¤¬µ¯Æ°»þ¤Ë <option>-s</option> ¤ò»ØÄꤷ¤¿¾ì¹ç¡¢
 	¤¢¤ë¤¤¤Ï <command>loader</command> ¤Ç
 	<envar>boot_single</envar>
 	ÊÑ¿ô¤òÀßÄꤹ¤ë¤³¤È¤Ë¤è¤Ã¤Æ°Ü¹Ô¤·¤Þ¤¹¡£</para>
 
-      <para>¤Þ¤¿¡¢
-	<link linkend="boot-multiuser">¥Þ¥ë¥Á¥æ¡¼¥¶¥â¡¼¥É</link>¤«¤é
-	ºÆµ¯Æ°¥ª¥×¥·¥ç¥ó (<option>-r</option>)
-	¤äÄä»ß (halt) ¥ª¥×¥·¥ç¥ó (<option>-h</option>) ¤Ê¤·¤Ç
-	&man.shutdown.8; ¤ò¸Æ¤Ó½Ð¤¹¤È¤³¤Î¥â¡¼¥É¤Ë°Ü¹Ô¤·¤Þ¤¹¡£</para>
+      <para><link linkend="boot-multiuser">¥Þ¥ë¥Á¥æ¡¼¥¶¥â¡¼¥É</link>
+	¤«¤é <option>-r</option> ¤Þ¤¿¤Ï <option>-h</option> ¤Ê¤·¤Ç
+	&man.shutdown.8; ¤ò¸Æ¤Ó½Ð¤¹¤³¤È¤Ç¤â¤³¤Î¥â¡¼¥É¤Ë°Ü¹Ô¤Ç¤­¤Þ¤¹¡£</para>
 
       <para><filename>/etc/ttys</filename>
 	¤Ç¥·¥¹¥Æ¥à¥³¥ó¥½¡¼¥ë <literal>console</literal>
@@ -1017,12 +971,11 @@ console none                            
 
       <note>
 	<para><literal>insecure</literal> ¥³¥ó¥½¡¼¥ë¤È¤Ï¡¢
-	  ¤¢¤Ê¤¿¼«¿È¡¢¥³¥ó¥½¡¼¥ë¤¬ÊªÍýŪ¤Ë°ÂÁ´¤Ç¤Ê¤¤¤È¹Í¤¨¤Æ¤¤¤Æ¡¢
+	  ¥³¥ó¥½¡¼¥ë¤¬ÊªÍýŪ¤Ë°ÂÁ´¤Ç¤Ê¤¤¤È¹Í¤¨¤é¤ì¤ë¤¿¤á¡¢
 	  <systemitem class="username">root</systemitem>
-	  ¤Î¥Ñ¥¹¥ï¡¼¥É¤òÃΤë¿Í¤À¤±¤¬¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤ò»È¤¨¤ë¤è¤¦¤Ë¤·¤¿¤¤¤È¤¤¤¦°ÕÌ£¤Ç¤¢¤ê¡¢
-	  ¥³¥ó¥½¡¼¥ë¤ò°ÂÁ´¤Ç¤Ê¤¤¾õÂ֤ǻȤ¤¤¿¤¤¤È¤¤¤¦°ÕÌ£¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	  ¤½¤Î¤¿¤á¡¢°ÂÁ´À­¤òµá¤á¤ë¤Ê¤é¤Ð
-	  <literal>secure</literal> ¤Ç¤Ê¤¯
+	  ¤Î¥Ñ¥¹¥ï¡¼¥É¤òÃΤë¿Í¤À¤±¤¬¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤ò»È¤¨¤ë¤È¤¤¤¦°ÕÌ£¤Ç¤¹¡£
+	  ¤½¤Î¤¿¤á¡¢¤³¤Î°ÂÁ´À­¤òµá¤á¤ë¤Ê¤é¤Ð¡¢
+	  ¥Ç¥Õ¥©¥ë¥È¤Î <literal>secure</literal> ¤Ç¤Ê¤¯
 	  <literal>insecure</literal> ¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£</para>
       </note>
     </sect2>
@@ -1034,7 +987,8 @@ console none                            
 
       <para>&man.init.8; ¤¬¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤¬Àµ¾ï¤Ç¤¢¤ë¤ÈȽÃǤ¹¤ë¤«¡¢
 	¥æ¡¼¥¶¤¬<link
-	  linkend="boot-singleuser">¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É</link>¤ò½ªÎ»¤¹¤ë¤È¡¢
+	  linkend="boot-singleuser">¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É</link>
+	¤Ç¤Î¥³¥Þ¥ó¥É¤ò½ªÎ»¤¹¤ë¤È¡¢
 	¥·¥¹¥Æ¥à¤Ï¥Þ¥ë¥Á¥æ¡¼¥¶¥â¡¼¥É¤Ø°Ü¹Ô¤·¡¢
 	¥ê¥½¡¼¥¹¤ÎÀßÄê¤ò»Ï¤á¤Þ¤¹¡£</para>
 
@@ -1047,14 +1001,15 @@ console none                            
 	  ¤½¤Î¥·¥¹¥Æ¥àÆȼ«¤ÎºÙ¤«¤ÊÀßÄê¤ò
 	  <filename>/etc/rc.conf</filename> ¤«¤éÆɤ߹þ¤ß¤Þ¤¹¡£
 	  ¤½¤·¤Æ <filename>/etc/fstab</filename>
-	  ¤Ëµ­½Ò¤µ¤ì¤ë¥·¥¹¥Æ¥à¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¥Þ¥¦¥ó¥È¤·¡¢
-	  ¥Í¥Ã¥È¥ï¡¼¥¯¥µ¡¼¥Ó¥¹¤Î³«»Ï¡¢
-	  ¤µ¤Þ¤¶¤Þ¤Ê¥·¥¹¥Æ¥à¥Ç¡¼¥â¥ó¤Î³«»Ï¡¢
+	  ¤Ëµ­½Ò¤µ¤ì¤ë¥·¥¹¥Æ¥à¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¥Þ¥¦¥ó¥È¤·¤Þ¤¹¡£
+	  ¤½¤Î¸å¡¢¥Í¥Ã¥È¥ï¡¼¥¯¥µ¡¼¥Ó¥¹¡¢
+	  ¤µ¤Þ¤¶¤Þ¤Ê¥·¥¹¥Æ¥à¥Ç¡¼¥â¥ó¡¢
 	  ¤½¤·¤ÆºÇ¸å¤Ë¡¢¥í¡¼¥«¥ë¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿ package
-	  ¤Îµ¯Æ°¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ø¤È¿Ê¤ß¤Þ¤¹¡£</para>
+	  ¤Îµ¯Æ°¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤¹¡£</para>
 
-	<para>¥ê¥½¡¼¥¹ÀßÄꥷ¥¹¥Æ¥à¤Ë´Ø¤¹¤ë»²¹Í»ñÎÁ¤Ï¡¢&man.rc.8; ¤Ë¤¢¤ê¤Þ¤¹¡£
-	  ¤³¤ì¤Ï¥¹¥¯¥ê¥×¥È¤½¤Î¤â¤Î¤òÄ´¤Ù¤ë¤³¤È¤ÈƱ¤¸¤¯¤é¤¤Í¥¤ì¤¿¤â¤Î¤Ç¤¹¡£</para>
+	<para>¥ê¥½¡¼¥¹ÀßÄꥷ¥¹¥Æ¥à¤Ë¤Ä¤¤¤Æ¤â¤Ã¤ÈÃΤꤿ¤¤¾ì¹ç¤Ë¤Ï¡¢
+	  &man.rc.8; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢
+	  ¥¹¥¯¥ê¥×¥È¤½¤Î¤â¤Î¤ò¼Â¹Ô¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£</para>
       </sect3>
     </sect2>
   </sect1>
@@ -1075,22 +1030,22 @@ console none                            
       ¥·¥°¥Ê¥ë¤òÁ÷¤ê¡¢Â³¤¤¤Æ¤¦¤Þ¤¯½ªÎ»¤Ç¤­¤Ê¤«¤Ã¤¿¥×¥í¥»¥¹¤Ø
       <literal>KILL</literal> ¥·¥°¥Ê¥ë¤òÁ÷¤ê¤Þ¤¹¡£</para>
 
-    <para>ÅŸ»´ÉÍýµ¡Ç½¤ò»ý¤Ã¤¿¥·¥¹¥Æ¥à¤Ç²ÔƯ¤·¤Æ¤¤¤ë FreeBSD
-      ¤Ç¤Ï <command>shutdown -p now</command> ¥³¥Þ¥ó¥É¤Ë¤è¤Ã¤Æ¡¢
-      ľ¤Á¤ËÅŸ»¤òÍî¤È¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£FreeBSD ¤òºÆµ¯Æ°¤¹¤ë¤Ë¤Ï¡¢
-      <command>shutdown -r now</command> ¤ò¼Â¹Ô¤¹¤ë¤À¤±¤Ç¤¹¡£
+    <para>ÅŸ»´ÉÍýµ¡Ç½¤ò»ý¤Ã¤¿¥·¥¹¥Æ¥à¤Ç²ÔƯ¤·¤Æ¤¤¤ë &os;
+      ¤Ç¤Ï <command>shutdown -p now</command> ¤Ë¤è¤Ã¤Æ¡¢
+      ľ¤Á¤ËÅŸ»¤òÍî¤È¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£&os; ¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤¹¤ë¤Ë¤Ï¡¢
+      <command>shutdown -r now</command> ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£
       &man.shutdown.8; ¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢
       <systemitem class="username">root</systemitem>
       ¤Ç¤¢¤ë¤«¡¢<systemitem class="groupname">operator</systemitem>
       ¥°¥ë¡¼¥×¤Î¥á¥ó¥Ð¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£&man.halt.8; ¤ä
-      &man.reboot.8; ¥³¥Þ¥ó¥É¤òÍøÍѤ¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¤¬¡¢
-      ¤è¤ê¿¤¯¤Î¾ðÊó¤òÃΤ뤿¤á¤Ë¡¢¤½¤ì¤é¤È &man.shutdown.8;
-      ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      &man.reboot.8; ¤òÍøÍѤ¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
+      ¤è¤ê¿¤¯¤Î¾ðÊó¤òÃΤ뤿¤á¤Ë¡¢¤½¤ì¤é¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ä
+      &man.shutdown.8; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
     <note>
       <para>ÅŸ»´ÉÍýµ¡Ç½¤Ë¤Ï &man.acpi.4;
-	¤¬¥«¡¼¥Í¥ë¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë¤«¡¢
-	¥â¥¸¥å¡¼¥ë¤¬Æɤ߹þ¤Þ¤ì¤Æ¤¤¤ë¤³¤È¤¬É¬ÍפǤ¹¡£</para>
+	¤¬¥â¥¸¥å¡¼¥ë¤È¤·¤ÆÆɤ߹þ¤Þ¤ì¤ë¤«¡¢
+	¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Ë¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ÆÀÅŪ¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
     </note>
   </sect1>
 </chapter>


More information about the svn-doc-all mailing list