svn commit: r44913 - head/ja_JP.eucJP/books/handbook/cutting-edge

Ryusuke SUZUKI ryusuke at FreeBSD.org
Fri May 23 11:43:07 UTC 2014


Author: ryusuke
Date: Fri May 23 11:43:07 2014
New Revision: 44913
URL: http://svnweb.freebsd.org/changeset/doc/44913

Log:
  - Merge the following from the English version:
  
  	r44732 -> r44733	head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Thu May 22 23:21:27 2014	(r44912)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Fri May 23 11:43:07 2014	(r44913)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44732
+     Original revision: r44733
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -1142,7 +1142,7 @@ before running "/usr/sbin/freebsd-update
 	      <secondary>¥³¥ó¥Ñ¥¤¥ë</secondary>
 	    </indexterm> ¤¹¤ëÁ°¤Ë
 	    <filename>/usr/src/Makefile</filename> ¤òÃí°Õ¿¼¤¯Æɤߡ¢
-	    <link linkend="makeworld">"world" ¤ÎºÆ¹½ÃÛ</link>
+	    <xref linkend="makeworld"/>
 	    ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤Ë½¾¤Ã¤Æ¤¯¤À¤µ¤¤¡£
 	    &a.current; ¤È <filename>/usr/src/UPDATING</filename> ¤òÆɤá¤Ð¡¢
 	    ¼¡¤Î¥ê¥ê¡¼¥¹¤Ø¸þ¤±¤Æ°Ü¤Ã¤Æ¤æ¤¯¤ËÅö¤¿¤Ã¤Æ¡¢
@@ -1257,7 +1257,7 @@ before running "/usr/sbin/freebsd-update
 	      <secondary>¹½ÃÛ¡¢¥³¥ó¥Ñ¥¤¥ë</secondary>
 	    </indexterm> ¤¹¤ëÁ°¤Ë¡¢
 	    <filename>/usr/src/Makefile</filename> ¤òÃí°Õ¿¼¤¯Æɤߡ¢
-	    <link linkend="makeworld">"world" ¤ÎºÆ¹½ÃÛ</link>
+	    <xref linkend="makeworld"/>
 	    ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤Ë½¾¤Ã¤Æ¤¯¤À¤µ¤¤¡£
 	    &a.stable; ¤È <filename>/usr/src/UPDATING</filename> ¤òÆɤó¤Ç¡¢
 	    ¼¡¤Î¥ê¥ê¡¼¥¹¤Ø¸þ¤±¤Æ°Ü¤Ã¤Æ¤æ¤¯¤ËÅö¤¿¤Ã¤Æ¡¢
@@ -1341,7 +1341,7 @@ before running "/usr/sbin/freebsd-update
   </sect1>
 
   <sect1 xml:id="makeworld">
-    <title><quote>world</quote> ¤ÎºÆ¹½ÃÛ</title>
+    <title>world ¤ÎºÆ¹½ÃÛ</title>
 
     <indexterm>
       <primary><quote>world</quote> ¤ÎºÆ¹½ÃÛ</primary>
@@ -1387,13 +1387,12 @@ before running "/usr/sbin/freebsd-update
       </step>
     
       <step>
-	<para>buildworld Á°¤ÎɬÍפʥ¹¥Æ¥Ã¥×¤È¤·¤Æ¡¢
-	  Ʊ´ü¤·¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤Î¥½¡¼¥¹¤Î
-	  <filename>/usr/src/UPDATING</filename> ¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£
+	<para><filename>/usr/src/UPDATING</filename> ¤òÆɤߡ¢
+	  Ʊ´ü¤·¤Æ¤¤¤ë¥½¡¼¥¹¤Î¥Ð¡¼¥¸¥ç¥ó¤ÇɬÍפȤʤ륹¥Æ¥Ã¥×¤¬¤Ê¤¤¤«¤É¤¦¤«¤òÄ´¤Ù¤Æ²¼¤µ¤¤¡£
 	  ¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤ÏÀøºßŪ¤ÊÌäÂê¤äÆÃÄê¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë½ç¤Ê¤É¤Î½ÅÍפʾðÊ󤬴ޤޤì¤Æ¤¤¤Þ¤¹¡£
-	  Â礭¤Ê¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤Ï¡¢nstallworld
-	  ¤ÎÁ°¤ËÆÃÄê¤Î¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÊѹ¹¤·¤¿¤ê¡¢ºï½ü¤¹¤ë¤È¤¤¤Ã¤¿¡¢
-	  ÆÃÊ̤ʥ¹¥Æ¥Ã¥×¤¬ÄɲäÇɬÍפȤʤ뤳¤È¤¬¤¢¤ê¤Þ¤¹¡£
+	  Â礭¤Ê¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤Ï¡¢world
+	  ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤ËÆÃÄê¤Î¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÊѹ¹¤·¤¿¤ê¡¢
+	  ºï½ü¤¹¤ë¤È¤¤¤Ã¤¿¡¢ÆÃÊ̤ʥ¹¥Æ¥Ã¥×¤¬ÄɲäÇɬÍפȤʤ뤳¤È¤¬¤¢¤ê¤Þ¤¹¡£
 	  ¥Õ¥¡¥¤¥ë¤ÎºÇ¸å¤Ë¤Ï¡¢
 	  ¸½ºß¿ä¾©¤µ¤ì¤Æ¤¤¤ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¼ê½ç¤¬¾Ü¤·¤¯Àµ³Î¤ËÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	  ¤â¤·¡¢<filename>UPDATING</filename> ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤¬¡¢
@@ -1492,14 +1491,27 @@ before running "/usr/sbin/freebsd-update
 	<step>
 	  <para>¥³¥ó¥Ñ¥¤¥é¤È¥«¡¼¥Í¥ë¤Î¥ß¥¹¥Þ¥Ã¥Á¤òËɤ°¤¿¤á¡¢
 	    <filename class="directory">/usr/obj</filename>
-	    ¤Ë¤¢¤ë¿·¤·¤¤¥³¥ó¥Ñ¥¤¥é¤òÍѤ¤¤Æ¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤·¤Þ¤¹¡£</para>
+	    ¤Ë¤¢¤ë¿·¤·¤¤¥³¥ó¥Ñ¥¤¥é¤òÍѤ¤¤Æ¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤·¤Þ¤¹¡£
+	    ºÆ¹½Ãۤϡ¢¤¢¤ë¼ï¤Î¥á¥â¥ê¹½Â¤ÂΤ¬Êѹ¹¤µ¤ì¤¿¤è¤¦¤Ê¾ì¹ç¤Ë¤Ïɬ¿Ü¤Ç¡¢
+	    <command>ps</command> ¤ä <command>top</command>
+	    ¤Î¤è¤¦¤Ê¥×¥í¥°¥é¥à¤Ï¡¢
+	    ¥«¡¼¥Í¥ë¤È¥½¡¼¥¹¥³¡¼¥É¤Î¥Ð¡¼¥¸¥ç¥ó¤¬°ìÃפ·¤Ê¤¤¤ÈÀµ¾ï¤ËÆ°ºî¤·¤Ê¤¤¤Ç¤·¤ç¤¦¡£</para>
 
 	  <screen>&prompt.root; <userinput>make buildkernel</userinput></screen>
 	</step>
 
 	<step>
 	  <para>¿·¤·¤¯¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤¿¥«¡¼¥Í¥ë¤Çµ¯Æ°¤Ç¤­¤ë¤è¤¦¤Ë¡¢
-	    ¿·¤·¤¤¥«¡¼¥Í¥ë¤È¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤ò¥Ç¥£¥¹¥¯¾å¤ËÇÛÃÖ¤·¤Þ¤¹¡£</para>
+	    ¿·¤·¤¤¥«¡¼¥Í¥ë¤È¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤ò¥Ç¥£¥¹¥¯¾å¤ËÇÛÃÖ¤·¤Þ¤¹¡£
+	    <varname>kern.securelevel</varname> ¤ò 1 ¤è¤êÂ礭¤¯¤·¤Æ¤¤¤Æ¡¢
+	    <emphasis>¤«¤Ä</emphasis> ¥«¡¼¥Í¥ë¤Î¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤Ë
+	    <literal>noschg</literal> ¤Î¤è¤¦¤Ê¥Õ¥é¥°¤òÀßÄꤷ¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
+	    ¤Þ¤º¡¢¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ë°Ü¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£
+	    ¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï¡¢
+	    ¥Þ¥ë¥Á¥æ¡¼¥¶¥â¡¼¥É¤Ç¤³¤ì¤é¤Î¥³¥Þ¥ó¥É¤òÌäÂê¤Ê¤¯Æ°¤«¤»¤ë¤Ï¤º¤Ç¤¹¡£
+	    <varname>kern.securelevel</varname> ¤Ë¤Ä¤¤¤Æ¾Ü¤·¤¯¤Ï
+	    &man.init.8; ¤ò¡¢¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ë¤µ¤Þ¤¶¤Þ¤Ê¥Õ¥é¥°¤Ë¤Ä¤¤¤Æ¾Ü¤·¤¯¤Ï
+	    &man.chflags.1; ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
 	  <screen>&prompt.root; <userinput>make installkernel</userinput></screen>
 	</step>
@@ -1539,7 +1551,13 @@ before running "/usr/sbin/freebsd-update
 	</step>
 
 	<step>
-	  <para>¼¡¤Ë¡¢¿·¤·¤¤ world
+	  <para>¥·¥¹¥Æ¥à¤ÎºÆ¹½ÃۤǤϡ¢
+	    <filename>/etc</filename>,
+	    <filename>/var</filename> ¤ä
+	    <filename>/usr</filename>
+	    ¤È¤¤¤Ã¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ë¿·µ¬¤ËƳÆþ¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ä¡¢
+	    Êѹ¹¤µ¤ì¤¿ÀßÄê¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ë¹¹¿·¤Ï¹Ô¤Ê¤ï¤ì¤Þ¤»¤ó¡£
+	    ¼¡¤Ë¡¢¿·¤·¤¤ world
 	    ¤ËÂФ¹¤ë <filename class="directory">/etc</filename>
 	    ¤ÎºÇ½é¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤ò¹Ô¤¤¤Þ¤¹¡£
 	    °Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï
@@ -1548,14 +1566,17 @@ before running "/usr/sbin/freebsd-update
 	    ¤¿¤È¤¨¤Ð¡¢
 	    ¤³¤Î¥¹¥Æ¥Ã¥×¤Ç¤Ï¡¢ºÇ¸å¤Î¥¢¥Ã¥×¥Ç¡¼¥È¸å¤Ë &os; ¤ËÄɲ䵤줿¡¢
 	    ¿·¤·¤¤¥°¥ë¡¼¥×¤ä¿·¤·¤¤¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È¡¢
-	    ¤â¤·¤¯¤Ï¥¹¥¿¡¼¥È¥¢¥Ã¥×¥¹¥¯¥ê¥×¥È¤¬¥·¥¹¥Æ¥à¤ËÄɲ䵤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</para>
+	    ¤â¤·¤¯¤Ï¥¹¥¿¡¼¥È¥¢¥Ã¥×¥¹¥¯¥ê¥×¥È¤¬¥·¥¹¥Æ¥à¤ËÄɲ䵤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
+	    ¼¡¤Î¥³¥Þ¥ó¥É¤Ë´Ø¤¹¤ë¾ÜºÙ¤Ê¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	    <xref linkend="mergemaster"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	  <screen>&prompt.root; <userinput>mergemaster -iF</userinput></screen>
 	</step>
 
 	<step>
 	  <para><filename class="directory">/usr/obj</filename>
-	    ¤Ë¤¢¤ë¿·¤·¤¤ world ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
+	    ¤Ë¤¢¤ë¿·¤·¤¤ world
+	¡¡  ¤ª¤è¤Ó¥·¥¹¥Æ¥à¤Î¥Ð¥¤¥Ê¥ê¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
 
 	  <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make installworld</userinput></screen>
@@ -1614,21 +1635,20 @@ before running "/usr/sbin/freebsd-update
         <primary><filename>make.conf</filename></primary>
       </indexterm>
 
-      <para>¤³¤ÎÀá¤Ç¤Ï world
-	¤Î¹½ÃÛ¤Î¥×¥í¥»¥¹¤Ç»È¤ï¤ì¤ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
+      <para>world
+	¤Î¹½ÃÛ¥×¥í¥»¥¹¤Ç¤Ï¡¢¤¤¤¯¤Ä¤«¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬»È¤ï¤ì¤Þ¤¹¡£</para>
 
-      <para>&man.make.1; ¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤ÎÀâÌÀ¤Ï &man.make.conf.5; ¤ä¡¢
-	¶¦Ä̤ÎÎ㤬
+      <para><command>make</command> ¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤ÎÀâÌÀ¤Ï
+	&man.make.conf.5; ¤ä¡¢¶¦Ä̤ÎÎ㤬
 	<filename>/usr/share/examples/etc/make.conf</filename> ¤Ë¤¢¤ê¤Þ¤¹¡£
 	¤³¤ì¤é¤ÎÀßÄê¤ò <filename>/etc/make.conf</filename> ¤ËÄɲ乤ë¤È¡¢
-	&man.make.1; ¤Î¼Â¹Ô¤ä¥×¥í¥°¥é¥à¤Î¹½ÃÛÊýË¡¤òÀßÄê¤Ç¤­¤Þ¤¹¡£
+	<command>make</command> ¤Î¼Â¹Ô¤ä¥×¥í¥°¥é¥à¤Î¹½ÃÛÊýË¡¤òÀßÄê¤Ç¤­¤Þ¤¹¡£
 	¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢
-	&man.make.1; ¤¬»È¤ï¤ì¤ëºÝ¤Ë¤Ï¾ï¤ËÍ­¸ú¤È¤Ê¤ë¤¿¤á¡¢
+	<command>make</command> ¤¬»È¤ï¤ì¤ëºÝ¤Ë¤Ï¾ï¤ËÍ­¸ú¤È¤Ê¤ë¤¿¤á¡¢
 	Ports Collection ¤«¤é¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë»þ¡¢
 	¥æ¡¼¥¶¤¬½ñ¤¤¤¿ C ¥×¥í¥°¥é¥à¤ä &os;
-	¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò¹½ÃÛ¤¹¤ëºÝ¤Ë±Æ¶Á¤òµÚ¤Ü¤·¤Þ¤¹¡£</para>
-
-      <para>¤¢¤ëÀßÄê¤òÊѹ¹¤·¤¿¤³¤È¤Ë¤è¤ê¡¢±Æ¶Á¤¬¹­¤¤ÈϰϤˤª¤è¤Ó¡¢
+	¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò¹½ÃÛ¤¹¤ëºÝ¤Ë±Æ¶Á¤òµÚ¤Ü¤·¤Þ¤¹¡£
+	¤¢¤ëÀßÄê¤òÊѹ¹¤·¤¿¤³¤È¤Ë¤è¤ê¡¢±Æ¶Á¤¬¹­¤¤ÈϰϤˤª¤è¤Ó¡¢
 	¶Ã¤¯¤Ù¤­·ë²Ì¤ò¤â¤¿¤é¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
 	ξÊý¤Î¥Õ¥¡¥¤¥ë¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¥³¥á¥ó¥È¤òÆɤळ¤È¤È¡¢
 	¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤Ï¡¢¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤È°ÂÁ´À­¤Î´ÑÅÀ¤«¤éÁª¤Ð¤ì¤Æ¤¤¤ë¤³¤È¤ò³Ð¤¨¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1808,69 +1828,6 @@ Script done, …</screen>
 	¥È¥ê¥Ã¥¯¤ä¶áÆ»¤ò»È¤ï¤º¤ËÉáÄ̤˹½ÃÛ¤·¤¿¾ì¹ç¡¢&os.stable;
 	¤Î¹½ÃÛ¤Ë¤Ï 1, 2 »þ´Ö¤·¤«¤«¤«¤é¤Ê¤¤¤Ç¤·¤ç¤¦¡£
         &os.current; ¤Î¹½Ãۤϡ¢¤â¤¦¾¯¤·»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¡£</para>
-    </sect2>
-
-    <sect2 xml:id="new-kernel">
-      <title>¿·¤·¤¤¥«¡¼¥Í¥ë¤Î¹½Ãۤȥ¤¥ó¥¹¥È¡¼¥ë</title>
-      <indexterm>
-	<primary>¥«¡¼¥Í¥ë (kernel)</primary>
-	<secondary>¹½ÃÛ¡¢¥³¥ó¥Ñ¥¤¥ë</secondary>
-      </indexterm>
-
-      <para>¿·¤·¤¤¥·¥¹¥Æ¥à¤ÎÁ´µ¡Ç½¤ò´°Á´¤ËÍøÍѤǤ­¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢
-	¥«¡¼¥Í¥ë¤òºÆ¹½ÃÛ¤·¤Æ¤¯¤À¤µ¤¤¡£
-	ºÆ¹½Ãۤϡ¢¤¢¤ë¼ï¤Î¥á¥â¥ê¹½Â¤ÂΤ¬Êѹ¹¤µ¤ì¤¿»þ¤Ë¤ÏÆäËɬ¿Ü¤Ç¤¢¤ê¡¢
-	&man.ps.1; ¤ä &man.top.1; ¤Î¤è¤¦¤Ê¥×¥í¥°¥é¥à¤Ï¡¢
-	¥«¡¼¥Í¥ë¤È¥½¡¼¥¹¥³¡¼¥É¤Î¥Ð¡¼¥¸¥ç¥ó¤¬°ìÃפ·¤Ê¤¤¤ÈÀµ¾ï¤ËÆ°ºî¤·¤Ê¤¤¤Ç¤·¤ç¤¦¡£</para>
-
-      <para>ºÇ¤â´Êñ¤Ç°ÂÁ´¤Ë¥«¡¼¥Í¥ë¤ÎºÆ¹½ÃÛ¤ò¹Ô¤Ê¤¦ÊýË¡¤Ï¡¢
-	<filename>GENERIC</filename>
-	¤ò»È¤Ã¤¿¥«¡¼¥Í¥ë¤ò¹½ÃÛ¡¦¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤Ç¤¹¡£
-	<filename>GENERIC</filename>
-	¤Ë¤Ï¤¢¤Ê¤¿¤¬É¬ÍפȤ¹¤ë¥Ç¥Ð¥¤¥¹¤¬¤¹¤Ù¤Æ´Þ¤Þ¤ì¤Æ¤¤¤Ê¤¤¤«¤âÃΤì¤Þ¤»¤ó¤¬¡¢
-	¤¢¤Ê¤¿¤Î¥·¥¹¥Æ¥à¤ò¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ç
-	µ¯Æ°¤µ¤»¤ë¤Î¤ËɬÍפʤâ¤Î¤Ï¤¹¤Ù¤ÆÆþ¤Ã¤Æ¤¤¤Þ¤¹¡£
-	¤³¤ì¤Ï¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¥·¥¹¥Æ¥à¤¬¤­¤Á¤ó¤ÈÆ°ºî¤¹¤ë¤«¤É¤¦¤«Ä´¤Ù¤ëÎɤ¤ÊýË¡¤Î°ì¤Ä¤Ç¤¹¡£
-	<filename>GENERIC</filename> ¤Çµ¯Æ°¤·¤Æ¡¢
-	¥·¥¹¥Æ¥à¤¬Àµ¾ï¤ËÆ°ºî¤·¤Æ¤¤¤ë¤«¤É¤¦¤«¤ò³Î¤«¤á¤¿¤é¡¢
-	¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ò»È¤Ã¤Æ¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <para>&os; ¤Ç¤Ï¡¢¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤¹¤ëÁ°¤Ë <link linkend="make-buildworld">build world</link> ¤ò¹Ô¤¦¤³¤È¤¬½ÅÍפǤ¹¡£</para>
-
-      <note>
-	<para>´û¤Ë¤¢¤ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ò»È¤Ã¤Æ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢
-	  <literal>KERNCONF=<replaceable>MYKERNEL</replaceable></literal>
-	  ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make buildkernel KERNCONF=<replaceable>MYKERNEL</replaceable></userinput>
-&prompt.root; <userinput>make installkernel KERNCONF=<replaceable>MYKERNEL</replaceable></userinput></screen>
-
-      </note>
-
-      <para><literal>kern.securelevel</literal> ¤ò 1 ¤è¤êÂ礭¤¯¤·¤Æ¤¤¤Æ¡¢
-	<emphasis>¤«¤Ä</emphasis> ¥«¡¼¥Í¥ë¤Î¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤Ë
-	<literal>noschg</literal> ¤Î¤è¤¦¤Ê¥Õ¥é¥°¤òÀßÄꤷ¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-	<buildtarget>installkernel</buildtarget>
-	¤ò¹Ô¤¦¤Î¤Ë¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ë°Ü¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£
-	¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï¡¢
-	¥Þ¥ë¥Á¥æ¡¼¥¶¥â¡¼¥É¤Ç¤³¤ì¤é¤Î¥³¥Þ¥ó¥É¤òÌäÂê¤Ê¤¯Æ°¤«¤»¤ë¤Ï¤º¤Ç¤¹¡£
-	<literal>kern.securelevel</literal> ¤Ë¤Ä¤¤¤Æ¾Ü¤·¤¯¤Ï
-	&man.init.8; ¤ò¡¢¥Õ¥¡¥¤¥ë¤ÎÍÍ¡¹¤Ê¥Õ¥é¥°¤Ë¤Ä¤¤¤Æ¾Ü¤·¤¯¤Ï
-	&man.chflags.1; ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
-
-      <para>¿·¤·¤¤¥«¡¼¥Í¥ë¤¬Æ°ºî¤¹¤ë¤«¤É¤¦¤«¥Æ¥¹¥È¤¹¤ë¤¿¤á¤Ë¡¢
-	¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤ÇºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-    </sect2>
-
-    <sect2 xml:id="make-installworld">
-      <title>¿·¤·¤¤¥·¥¹¥Æ¥à¥Ð¥¤¥Ê¥ê¤Î¥¤¥ó¥¹¥È¡¼¥ë</title>
-
-      <para>¼¡¤Ë¡¢<buildtarget>installworld</buildtarget>
-	¤ò»È¤Ã¤Æ¿·¤·¤¤¥·¥¹¥Æ¥à¥Ð¥¤¥Ê¥ê¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£</para>
-
-      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make installworld</userinput></screen>
 
       <note>
 	<para><command>make buildworld</command>
@@ -1893,24 +1850,9 @@ Script done, …</screen>
       </note>
     </sect2>
 
-    <sect2 xml:id="post-installworld-updates">
-      <title><command>make installworld</command> ¤Ç¹¹¿·¤µ¤ì¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î¹¹¿·</title>
-
-      <para>¥·¥¹¥Æ¥à¤ÎºÆ¹½Ãۤϡ¢¤¤¤¯¤Ä¤«¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¢
-	Æäˡ¢<filename>/etc</filename> ¤ä
-	<filename>/var</filename> ¤ä
-	<filename>/usr</filename> ¤Ë¤ª¤¤¤Æ¡¢
-        ¿·µ¬¤ËƳÆþ¤µ¤ì¤¿¤ê¡¢Êѹ¹¤µ¤ì¤¿ÀßÄê¥Õ¥¡¥¤¥ë¤Ë¤è¤ë
-        ¥Õ¥¡¥¤¥ë¤Î¹¹¿·¤Ï¹Ô¤Ê¤ï¤ì¤Þ¤»¤ó¡£</para>
-
-      <para>¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤¹¤ë¤â¤Ã¤È¤â´Êñ¤ÊÊýË¡¤Ï¡¢
-	&man.mergemaster.8; ¤ò»È¤¦¤³¤È¤Ç¤¹¡£
-	ɬ¤º <filename>/etc</filename>
-	¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤Ã¤ÆÉÔ¬¤Î»öÂÖ¤ËÈ÷¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-    <sect3 xml:id="mergemaster">
+    <sect2 xml:id="mergemaster">
       <info>
-	<title><command>mergemaster</command></title>
+	<title>ÀßÄê¥Õ¥¡¥¤¥ë¤ÎƱ´ü</title>
 
 	<authorgroup>
 	  <author>
@@ -1991,10 +1933,6 @@ Script done, …</screen>
 	&man.mergemaster.8;
 	¤¬¡¢¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤òºÆ¹½ÃÛ¤¹¤ë¤«¤É¤¦¤«¤ò¿Ò¤Í¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
 	ºÇ¸å¤Ë»Ä¤Ã¤¿°ì»þ¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¤«¤É¤¦¤«¤ò¿Ò¤Í¤Æ½ªÎ»¤·¤Þ¤¹¡£</para>
-      </sect3>
-
-      <sect3>
-	<title>¼êÆ°¤Ç¤Î¹¹¿·</title>
 
       <para>¼êÆ°¤Ç¹¹¿·¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢Ã±¤Ë¥Õ¥¡¥¤¥ë¤ò
 	<filename>/usr/src/etc</filename>
@@ -2154,7 +2092,6 @@ Script done, …</screen>
 
 	<screen>&prompt.root; <userinput>mkdir /var/tmp/root-`date "+%Y%m%d"`</userinput></screen>
       </tip>
-      </sect3>
     </sect2>
 
     <sect2 xml:id="make-delete-old">


More information about the svn-doc-all mailing list