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

Ryusuke SUZUKI <[email protected]>
Newsgroups gmane.os.freebsd.devel.cvs.doc
Message-ID <[email protected]>
Author: ryusuke
Date: Fri Dec 25 12:17:36 2015
New Revision: 47907
URL: https://svnweb.freebsd.org/changeset/doc/47907

Log:
  - Merge the following from the English version:
  
  	r44247 -> r44300	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	Fri Dec 25 09:53:58 2015	(r47906)
+++ head/ja_JP.eucJP/books/handbook/boot/chapter.xml	Fri Dec 25 12:17:36 2015	(r47907)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44247
+     Original revision: r44300
      $FreeBSD$
 -->
 
@@ -165,14 +165,11 @@
       ¤È¤¤¤Ã¤¿¥æ¡¼¥¶¡¼¥ì¥Ù¥ë¤Ç¤Î¥ê¥½¡¼¥¹ (»ñ¸») ÀßÄê¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£</para>
   </sect1>
 
-  <sect1 xml:id="boot-blocks">
+  <sect1 xml:id="boot-boot0">
     <title>¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤Èµ¯Æ°¥¹¥Æ¡¼¥¸</title>
 
     <indexterm><primary>¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã</primary></indexterm>
 
-    <sect2 xml:id="boot-boot0">
-      <title>¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã</title>
-
       <indexterm><primary>¥Þ¥¹¥¿¡¼¥Ö¡¼¥È¥ì¥³¡¼¥É
 	  (<acronym>MBR</acronym>)</primary></indexterm>
 
@@ -255,11 +252,9 @@ label=FreeBSD</programlisting>
 	¼¡¤Ë <command>/sbin/lilo&nbsp;-v</command>
 	¤ò¼Â¹Ô¤·¤Æ¡¢¿·¤·¤¤Êѹ¹¤òÈ¿±Ç¤·¤Æ¤¯¤À¤µ¤¤¡£
 	²èÌ̤Υá¥Ã¥»¡¼¥¸¤ò¸«¤ÆÊѹ¹¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-    </sect2>
 
     <sect2 xml:id="boot-boot1">
-      <title>µ¯Æ°¥¹¥Æ¡¼¥¸ 1 <filename>/boot/boot1</filename>
-	¤Èµ¯Æ°¥¹¥Æ¡¼¥¸ 2 <filename>/boot/boot2</filename></title>
+      <title>µ¯Æ°¥¹¥Æ¡¼¥¸ 1 ¤Èµ¯Æ°¥¹¥Æ¡¼¥¸ 2</title>
 
       <para>³µÇ°¾å¡¢Âè 1 ¥¹¥Æ¡¼¥¸¤ÈÂè 2
 	¥¹¥Æ¡¼¥¸¤Ï¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤ÎƱ¤¸Îΰè¾å¤ÎƱ°ì¤Î¥×¥í¥°¥é¥à¤ÎÉôʬÉôʬ¤Ç¤¹¡£
@@ -326,7 +321,7 @@ boot:</screen>
     </sect2>
 
     <sect2 xml:id="boot-loader">
-      <title>µ¯Æ°¥¹¥Æ¡¼¥¸ 3 <filename>/boot/loader</filename></title>
+      <title>µ¯Æ°¥¹¥Æ¡¼¥¸ 3</title>
 
       <indexterm><primary>¥Ö¡¼¥È¥í¡¼¥À (boot-loader)</primary></indexterm>
 
@@ -339,9 +334,6 @@ boot:</screen>
 	¤è¤ê¤µ¤Þ¤¶¤Þ¤Ê¥³¥Þ¥ó¥É·²¤ò¥µ¥Ý¡¼¥È¤·¤¿¶¯ÎϤʥ¤¥ó¥¿¥×¥ê¥¿¤Ë¤è¤Ã¤ÆÄ󶡤µ¤ì¤ëÁȤ߹þ¤ß¥³¥Þ¥ó¥É·²¤òÍøÍѤ¹¤ë¤³¤È¤Ç¡¢
 	¥¤¥ó¥¿¥é¥¯¥Æ¥£¥Ö¤ÊÀßÄê¼êÃʤȤʤë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
-      <sect3 xml:id="boot-loader-flow">
-	<title>¥í¡¼¥À¥×¥í¥°¥é¥à¤Î½èÍý¤Îή¤ì</title>
-
 	<para>¥í¡¼¥À¤Ï½é´ü²½¤ÎºÝ¤Ë¥³¥ó¥½¡¼¥ë¤È¥Ç¥£¥¹¥¯¤Î¸¡½Ð¤ò¹Ô¤Ê¤¤¡¢
 	  ¤É¤Î¥Ç¥£¥¹¥¯¤«¤éµ¯Æ°¤·¤Æ¤¤¤ë¤«¤òÄ´¤Ù¤Þ¤¹¡£
 	  ¤½¤·¤ÆÉ¬ÍפÊÊÑ¿ô¤òÀßÄꤷ¤Æ¤«¤é¥¤¥ó¥¿¥×¥ê¥¿¤òµ¯Æ°¤·¡¢
@@ -366,7 +358,6 @@ boot:</screen>
 	  ¤¹¤Ù¤Æ¤Î¥â¥¸¥å¡¼¥ë¤ò¥¢¥ó¥í¡¼¥É¤·¤¿¤ê¡¢
 	  ¥â¥¸¥å¡¼¥ë¤ò¥í¡¼¥É¤·¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	  ¤½¤Î¸å¡¢ºÇ½ªÅª¤Êµ¯Æ°¤äºÆµ¯Æ°¤Ø°Ü¹Ô¤·¤Þ¤¹¡£</para>
-      </sect3>
 
       <sect3 xml:id="boot-loader-commands">
 	<title>¥í¡¼¥À¤ÎÁȤ߹þ¤ß¥³¥Þ¥ó¥É</title>
@@ -574,10 +565,87 @@ boot:</screen>
 	  </listitem>
 	</itemizedlist>
       </sect3>
+    </sect2>
+
+  <sect2 xml:id="boot-kernel">
+    <title>¥«¡¼¥Í¥ëµ¯Æ°»þ¤Î±þÅú</title>
+
+    <indexterm>
+      <primary>¥«¡¼¥Í¥ë (kernel)</primary>
+      <secondary>µ¯Æ°»þ¤Î±þÅú</secondary>
+    </indexterm>
+
+    <para>¥«¡¼¥Í¥ë¤¬¥Ç¥Õ¥©¥ë¥È¤Î¥í¡¼¥À¤â¤·¤¯¤Ï¥í¡¼¥À¤ò±ª²ó¤·¤Æ
+      boot2 ¤Ë¤è¤Ã¤ÆÆÉ¤ß¹þ¤Þ¤ì¤ë¤È¡¢µ¯Æ°¥Õ¥é¥°¤¬Ä´¤Ù¤é¤ì¡¢
+      ¤½¤ì¤Ë±þ¤¸¤ÆÆ°ºî¤¬Ä´À°¤µ¤ì¤Þ¤¹¡£</para>
+
+      <indexterm>
+	<primary>¥«¡¼¥Í¥ë (kernel)</primary>
+	<secondary>µ¯Æ°¥Õ¥é¥°</secondary>
+      </indexterm>
+
+      <para>Îɤ¯»È¤ï¤ì¤ëµ¯Æ°¥Õ¥é¥°¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£</para>
+
+      <variablelist xml:id="boot-kernel-bootflags-list">
+	<varlistentry>
+	  <term><option>-a</option></term>
+
+	  <listitem>
+	    <para>¥«¡¼¥Í¥ë½é´ü²½Ãæ¤Ë¡¢
+	      ¥ë¡¼¥È¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤È¤·¤Æ¥Þ¥¦¥ó¥È¤¹¤ë¥Ç¥Ð¥¤¥¹¤ò¿Ò¤Í¤Þ¤¹¡£</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><option>-C</option></term>
+
+	  <listitem>
+	    <para>CDROM ¤«¤éµ¯Æ°¤·¤Þ¤¹¡£</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><option>-c</option></term>
+
+	  <listitem>
+	    <para>µ¯Æ°»þ¤Ë¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¤ò¹Ô¤Ê¤¦
+	      UserConfig ¤ò¼Â¹Ô¤·¤Þ¤¹¡£</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><option>-s</option></term>
+
+	  <listitem>
+	    <para>¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Çµ¯Æ°¤·¤Þ¤¹¡£</para>
+	  </listitem>
+	</varlistentry>
 
-      <sect3 xml:id="boot-splash">
+	<varlistentry>
+	  <term><option>-v</option></term>
+
+	  <listitem>
+	    <para>¥«¡¼¥Í¥ëµ¯Æ°»þ¤Ë¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£</para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+
+      <note>
+	<para>¾åµ­°Ê³°¤Îµ¯Æ°¥Õ¥é¥°¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	  &man.boot.8; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+	</para>
+      </note>
+    </sect2>
+
+<!--    <sect2 id="boot-kernel-userconfig">
+      <title>UserConfig: The Boot-time Kernel Configurator</title>
+
+      <para> </para>
+    </sect2> -->
+
+      <sect2 xml:id="boot-splash">
 	<info>
-	  <title>µ¯Æ°»þ¤Î¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó</title>
+	  <title>µ¯Æ°»þ¤Î¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤ÎÀßÄê</title>
 
 	  <authorgroup>
 	    <author>
@@ -605,9 +673,6 @@ boot:</screen>
 	  <xref linkend="x11"/> ¤Ç¤Ï¡¢
 	  ¥°¥é¥Õ¥£¥«¥ë¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤ä¥°¥é¥Õ¥£¥«¥ë¥í¥°¥¤¥ó¥Þ¥Í¡¼¥¸¥ã¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ª¤è¤ÓÀßÄêÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
-	<sect4 xml:id="boot-splash-function">
-	  <title>¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥óµ¡Ç½</title>
-
 	  <para>¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥óµ¡Ç½¤Ï¡¢
 	    256 ¿§¤Î¥Ó¥Ã¥È¥Þ¥Ã¥× (<filename>.bmp</filename>),
 	    ZSoft <acronym>PCX</acronym> (<filename>.pcx</filename>) ¤Þ¤¿¤Ï
@@ -657,10 +722,6 @@ boot:</screen>
 	    <package>sysutils/bsd-splash-changer</package> port
 	    ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¡¢
 	    µ¯Æ°»þ¤Ë¥¹¥×¥é¥Ã¥·¥å¥¤¥á¡¼¥¸¤Î¥³¥ì¥¯¥·¥ç¥ó¤«¤é¥é¥ó¥À¥à¤Ë°ìË礬ÁªÂò¤µ¤ì¤Þ¤¹¡£</para>
-	</sect4>
-
-	<sect4 xml:id="boot-splash-enable">
-	  <title>¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥óµ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë</title>
 
 	  <para>¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó <filename>.bmp</filename>,
 	    <filename>.pcx</filename> ¤Þ¤¿¤Ï <filename>.bin</filename>
@@ -743,89 +804,7 @@ bitmap_name="<replaceable>/boot/splash.b
 
 	  <para>¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢&man.splash.4;,
 	    &man.loader.conf.5; ¤ª¤è¤Ó &man.vga.4; ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
-	</sect4>
-      </sect3>
-    </sect2>
-  </sect1>
-
-  <sect1 xml:id="boot-kernel">
-    <title>¥«¡¼¥Í¥ëµ¯Æ°»þ¤Î±þÅú</title>
-
-    <indexterm>
-      <primary>¥«¡¼¥Í¥ë (kernel)</primary>
-      <secondary>µ¯Æ°»þ¤Î±þÅú</secondary>
-    </indexterm>
-
-    <para>¥«¡¼¥Í¥ë¤¬¥Ç¥Õ¥©¥ë¥È¤Î¥í¡¼¥À
-      (<xref linkend="boot-loader"/>) ¤â¤·¤¯¤Ï¥í¡¼¥À¤ò±ª²ó¤·¤Æ boot2
-      (<xref linkend="boot-boot1"/>) ¤Ë¤è¤Ã¤ÆÆÉ¤ß¹þ¤Þ¤ì¤ë¤È¡¢
-      µ¯Æ°¥Õ¥é¥°¤¬Ä´¤Ù¤é¤ì¡¢¤½¤ì¤Ë±þ¤¸¤ÆÆ°ºî¤¬Ä´À°¤µ¤ì¤Þ¤¹¡£</para>
-
-    <sect2 xml:id="boot-kernel-bootflags">
-      <title>¥«¡¼¥Í¥ëµ¯Æ°¥Õ¥é¥°</title>
-      <indexterm>
-	<primary>¥«¡¼¥Í¥ë (kernel)</primary>
-	<secondary>µ¯Æ°¥Õ¥é¥°</secondary>
-      </indexterm>
-
-      <para>Îɤ¯»È¤ï¤ì¤ëµ¯Æ°¥Õ¥é¥°¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£</para>
-
-      <variablelist xml:id="boot-kernel-bootflags-list">
-	<varlistentry>
-	  <term><option>-a</option></term>
-
-	  <listitem>
-	    <para>¥«¡¼¥Í¥ë½é´ü²½Ãæ¤Ë¡¢
-	      ¥ë¡¼¥È¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤È¤·¤Æ¥Þ¥¦¥ó¥È¤¹¤ë¥Ç¥Ð¥¤¥¹¤ò¿Ò¤Í¤Þ¤¹¡£</para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><option>-C</option></term>
-
-	  <listitem>
-	    <para>CDROM ¤«¤éµ¯Æ°¤·¤Þ¤¹¡£</para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><option>-c</option></term>
-
-	  <listitem>
-	    <para>µ¯Æ°»þ¤Ë¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¤ò¹Ô¤Ê¤¦
-	      UserConfig ¤ò¼Â¹Ô¤·¤Þ¤¹¡£</para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><option>-s</option></term>
-
-	  <listitem>
-	    <para>¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Çµ¯Æ°¤·¤Þ¤¹¡£</para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><option>-v</option></term>
-
-	  <listitem>
-	    <para>¥«¡¼¥Í¥ëµ¯Æ°»þ¤Ë¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£</para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-
-      <note>
-	<para>¾åµ­°Ê³°¤Îµ¯Æ°¥Õ¥é¥°¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-	  &man.boot.8; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-	</para>
-      </note>
     </sect2>
-
-<!--    <sect2 id="boot-kernel-userconfig">
-      <title>UserConfig: The Boot-time Kernel Configurator</title>
-
-      <para> </para>
-    </sect2> -->
   </sect1>
 
   <sect1 xml:id="device-hints">
@@ -941,17 +920,12 @@ bitmap_name="<replaceable>/boot/splash.b
       ¤â¤·¤¯¤Ï <command>loader</command> ¤Î
       <envar>init_path</envar> ÊÑ¿ô¤Ç»ØÄꤵ¤ì¤ë¾ì½ê¤Ë¤¢¤ê¤Þ¤¹¡£</para>
 
-    <sect2 xml:id="boot-autoreboot">
-      <title>¼«Æ°ºÆµ¯Æ° (automatic reboot)¤Îưºî</title>
-
-      <para>¼«Æ°ºÆµ¯Æ°¤Ç¤Ï¡¢
+      <para>µ¯Æ°¥·¡¼¥±¥ó¥¹¤Ç¤Ï¡¢
 	¥·¥¹¥Æ¥à¾å¤ÇÍøÍѤǤ­¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î°ì´·À­¤ò³Îǧ¤·¤Þ¤¹¡£
 	¤â¤·¤½¤ì¤ËÌäÂ꤬¤¢¤Ã¤Æ &man.fsck.8;
 	¤¬ UFS ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÉÔ°ìÃפò½¤Éü¤Ç¤­¤Ê¤±¤ì¤Ð¡¢
-	´ÉÍý¼Ô¤¬ÌäÂê¤òľÀܲò·è¤Ç¤­¤ë¤è¤¦¤Ë¡¢
-	&man.init.8; ¤Ï¥·¥¹¥Æ¥à¤ò¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É
-	(<xref linkend="boot-singleuser"/>) ¤Ø¤È°Ü¹Ô¤µ¤»¤Þ¤¹¡£</para>
-    </sect2>
+	´ÉÍý¼Ô¤¬ÌäÂê¤òľÀܲò·è¤Ç¤­¤ë¤è¤¦¤Ë¡¢&man.init.8;
+	¤Ï¥·¥¹¥Æ¥à¤ò¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ø¤È°Ü¹Ô¤µ¤»¤Þ¤¹¡£</para>
 
     <sect2 xml:id="boot-singleuser">
       <title>¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É</title>
@@ -959,8 +933,7 @@ bitmap_name="<replaceable>/boot/splash.b
       <indexterm><primary>¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É</primary></indexterm>
       <indexterm><primary>¥³¥ó¥½¡¼¥ë (console)</primary></indexterm>
 
-      <para>¤³¤Î¥â¡¼¥É¤Ë¤Ï¡¢¼«Æ°ºÆµ¯Æ°¤Î½èÍýÃæ (<xref
-	  linkend="boot-autoreboot"/>) ¤«¡¢
+      <para>¤³¤Î¥â¡¼¥É¤Ë¤Ï¡¢¼«Æ°ºÆµ¯Æ°¤Î½èÍýÃæ¤«¡¢
 	¥æ¡¼¥¶¤¬µ¯Æ°»þ¤Ë <option>-s</option> ¤ò»ØÄꤷ¤¿¾ì¹ç¡¢
 	¤¢¤ë¤¤¤Ï &man.loader.8; ¤Ç <envar>boot_single</envar>
 	ÊÑ¿ô¤òÀßÄꤹ¤ë¤³¤È¤Ë¤è¤Ã¤Æ°Ü¹Ô¤·¤Þ¤¹¡£</para>
@@ -1013,8 +986,6 @@ console none                            
 	¥·¥¹¥Æ¥à¤Ï¥Þ¥ë¥Á¥æ¡¼¥¶¥â¡¼¥É¤Ø°Ü¹Ô¤·¡¢
 	¥ê¥½¡¼¥¹¤ÎÀßÄê¤ò»Ï¤á¤Þ¤¹¡£</para>
 
-      <sect3 xml:id="boot-rc">
-	<title>¥ê¥½¡¼¥¹ÀßÄê</title>
 	<indexterm><primary>rc ¥Õ¥¡¥¤¥ë·²</primary></indexterm>
 
 	<para>¥ê¥½¡¼¥¹ÀßÄꥷ¥¹¥Æ¥à¤Ï¥Ç¥Õ¥©¥ë¥ÈÀßÄê¤ò
@@ -1031,7 +1002,6 @@ console none                            
 	<para>¥ê¥½¡¼¥¹ÀßÄꥷ¥¹¥Æ¥à¤Ë¤Ä¤¤¤Æ¤â¤Ã¤ÈÃΤꤿ¤¤¾ì¹ç¤Ë¤Ï¡¢
 	  &man.rc.8; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢
 	  ¥¹¥¯¥ê¥×¥È¤½¤Î¤â¤Î¤ò¼Â¹Ô¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£</para>
-      </sect3>
     </sect2>
   </sect1>

_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.