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

Ryusuke SUZUKI <[email protected]>
Newsgroups gmane.os.freebsd.devel.cvs.doc
Message-ID <[email protected]>
Author: ryusuke
Date: Tue May 27 10:17:17 2014
New Revision: 44965
URL: http://svnweb.freebsd.org/changeset/doc/44965

Log:
  - Merge the following from the English version:
  
  	r44734 -> r44735	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	Mon May 26 19:01:20 2014	(r44964)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Tue May 27 10:17:17 2014	(r44965)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44734
+     Original revision: r44735
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -1628,7 +1628,9 @@ Script started, output file is /var/tmp/
 	    ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤Ë¤·¤¿¤¬¤Ã¤Æ¡¢
 	    ¤¹¤Ù¤Æ¤Î ports ¤òºÆ¹½ÃÛ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 	    ºÆ¹½ÃÛ¤¬½ª¤ï¤Ã¤¿¤é¡¢¿·¤·¤¤¥é¥¤¥Ö¥é¥ê¤È¶¥¹ç¤¹¤ë¤³¤È¤òÈò¤±¤ë¤¿¤á¡¢
-	    »È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥é¥¤¥Ö¥é¥ê¤òºï½ü¤·¤Þ¤¹¡£</para>
+	    »È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥é¥¤¥Ö¥é¥ê¤òºï½ü¤·¤Þ¤¹¡£
+	    ¤³¤Î²áÄø¤Ë´Ø¤¹¤ë¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢<xref linkend="make-delete-old"/>
+	    ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£</para>
 
 	  <screen>&prompt.root; <userinput>make delete-old-libs</userinput></screen>
 	</step>
@@ -1807,17 +1809,24 @@ Script started, output file is /var/tmp/
 	</primary>
       </indexterm>
 
-      <para>&man.mergemaster.8; ¤Ï Bourne ¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤Ç¡¢
-	<filename>/etc</filename> ¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤È¥½¡¼¥¹¥Ä¥ê¡¼¤Î
+      <para>&os; ¤Î &man.mergemaster.8; Bourne ¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤Ï¡¢
+	<filename>/etc</filename> ¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤È¡¢
 	<filename>/usr/src/etc</filename>
-	¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤Î°ã¤¤¤ò³Îǧ¤¹¤ë¤Î¤ò¼êÅÁ¤Ã¤Æ¤¯¤ì¤Þ¤¹¡£
+	¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤Î°ã¤¤¤ò³Îǧ¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
         ¤³¤ì¤ò»È¤¦¤Î¤¬¡¢
 	¥½¡¼¥¹¥Ä¥ê¡¼¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤Ë¥·¥¹¥Æ¥à¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò
 	¹¹¿·¤¹¤ë¤¿¤á¤Ë¿ä¾©¤µ¤ì¤ëÊýË¡¤Ç¤¹¡£</para>
 
-      <para>»Ï¤á¤ë¤Ë¤Ï¡¢¥×¥í¥ó¥×¥È¤«¤é
-	<command>mergemaster</command> ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤
-	<command>mergemaster</command> ¤Ï
+      <para><command>mergemaster</command> ¤ò»È¤¦Á°¤Ë¡¢
+	´û¸¤Î <filename>/etc</filename>
+	¤ò¤É¤³¤«°ÂÁ´¤Ê¾ì½ê¤Ë¥³¥Ô¡¼¤·¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡£
+	ºÆµ¢Åª¤Ê¥³¥Ô¡¼¤ò¹Ô¤Ê¤¦ <option>-R</option> ¤È¡¢
+	¥Õ¥¡¥¤¥ë¤Î¹¹¿·»þ´Ö¤ä½êÍ­¼Ô¤Ê¤É¤òÊݸ¤¹¤ë
+	<option>-p</option> ¤È¶¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	  <screen>&prompt.root; <userinput>cp -Rp /etc /etc.old</userinput></screen>
+
+      <para><command>mergemaster</command> ¤ò¼Â¹Ô¤¹¤ë¤È¡¢
 	<filename>/</filename> ¤òµ¯ÅÀ¤È¤·¤¿°ì»þŪ¤Ê¥ë¡¼¥È´Ä¶­¤ò¹½ÃÛ¤·¡¢
 	¤µ¤Þ¤¶¤Þ¤Ê¥·¥¹¥Æ¥àÀßÄê¥Õ¥¡¥¤¥ë¤ò
 	(ÌõÃí: ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï <filename>/var/tmp/temproot</filename> ¤Ë)
@@ -1826,20 +1835,21 @@ Script started, output file is /var/tmp/
 	°Û¤Ê¤ë¥Õ¥¡¥¤¥ë¤Ï &man.diff.1; ·Á¼°¤Ç¼¨¤µ¤ì¡¢
 	<option>+</option> ¤Îµ­¹æ¤ÏÄɲäޤ¿¤ÏÊѹ¹¤µ¤ì¤¿¹Ô¤òɽ¤·¡¢
 	<option>-</option> ¤Ï´°Á´¤Ëºï½ü¤µ¤ì¤¿¤«¿·¤·¤¯ÃÖ¤­´¹¤¨¤é¤ì¤¿¹Ô¤òɽ¤·¤Þ¤¹¡£
-	&man.diff.1; ¤Î½ñ¼°¤È¥Õ¥¡¥¤¥ë¤Î°ã¤¤¤Îɽ¼¨ÊýË¡¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï¡¢
+	¥Õ¥¡¥¤¥ë¤Î°ã¤¤¤Îɽ¼¨ÊýË¡¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï¡¢
 	&man.diff.1; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <para>&man.mergemaster.8; ¤Ï°ã¤¤¤Î¤¢¤ë¥Õ¥¡¥¤¥ë¤ò¤½¤ì¤¾¤ì¼¨¤·¤Þ¤¹¡£
-	¿·¤·¤¤¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¤«¡¢
+      <para>¼¡¤Ë &man.mergemaster.8; ¤Ï°ã¤¤¤Î¤¢¤ë¥Õ¥¡¥¤¥ë¤ò¤½¤ì¤¾¤ì¼¨¤·¡¢
+	ÁªÂò²Äǽ¤Ê¥ª¥×¥·¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£
+	¤³¤³¤Ç¤Ï¡¢¿·¤·¤¤¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¤«¡¢
 	°ì»þ¥Õ¥¡¥¤¥ë¤ò¤½¤Î¤Þ¤Þ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤«¡¢
 	°ì»þ¥Õ¥¡¥¤¥ë¤È¸½ºß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤òÅý¹ç¤¹¤ë¤«¡¢
-	¤â¤·¤¯¤Ï &man.diff.1; ¤Î·ë²Ì¤ò¤â¤¦°ìÅÙ¸«¤ë¤«ÁªÂò¤Ç¤­¤Þ¤¹¡£</para>
+	¤â¤·¤¯¤Ï·ë²Ì¤ò¤â¤¦°ìÅÙ¸«¤ë¤«¤òÁªÂò¤Ç¤­¤Þ¤¹¡£</para>
 
-      <para>°ì»þ¥Õ¥¡¥¤¥ë¤Îºï½ü¤òÁª¤Ö¤È¡¢&man.mergemaster.8;
+      <para>°ì»þ¥Õ¥¡¥¤¥ë¤Îºï½ü¤òÁª¤Ö¤È¡¢<command>mergemaster</command>
 	¤Ë¸½ºß¤Î¥Õ¥¡¥¤¥ë¤òÊѹ¹¤·¤Ê¤¤¤Ç¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤òºï½ü¤»¤è¤ÈÅÁ¤¨¤Þ¤¹¡£
-	¤³¤ÎÁªÂò¤Ï¡¢¸½ºß¤Î¥Õ¥¡¥¤¥ë¤òÊѹ¹¤¹¤ëÍýͳ¤¬Ê¬¤«¤é¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
-	¤ª´«¤á¤Ç¤­¤Þ¤»¤ó¡£
-	&man.mergemaster.8; ¤Î¥×¥í¥ó¥×¥È¤Ç <keycap>?</keycap> ¤È¥¿¥¤¥×¤¹¤ì¤Ð¡¢
+	¤³¤ÎÁªÂò¤Ï¡¢¤ª´«¤á¤Ç¤­¤Þ¤»¤ó¡£
+	<command>mergemaster</command>
+	¤Î¥×¥í¥ó¥×¥È¤Ç <keycap>?</keycap> ¤È¥¿¥¤¥×¤¹¤ì¤Ð¡¢
 	¤¤¤Ä¤Ç¤â¥Ø¥ë¥×¤¬¸«¤é¤ì¤Þ¤¹¡£
 	¥Õ¥¡¥¤¥ë¤Î¥¹¥­¥Ã¥×¤òÁª¤Ö¤È¡¢Â¾¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò½ª¤¨¤¿¤¢¤È¡¢
 	¤â¤¦°ìÅÙ¤½¤Î¥Õ¥¡¥¤¥ë¤¬Ä󼨤µ¤ì¤Þ¤¹¡£</para>
@@ -1860,90 +1870,19 @@ Script started, output file is /var/tmp/
 	¤³¤Î¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	¤¿¤¤¤Æ¤¤¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥æ¡¼¥¶¤¬ÀßÄê¤òÊѹ¹¤·¤¿¥Õ¥¡¥¤¥ë¤Ë»È¤ï¤ì¤Þ¤¹¡£</para>
 
-      <para>&man.diff.1; ¤Î·ë²Ì¤ò¤â¤¦°ìÅÙ¸«¤ë¡¢¤òÁªÂò¤¹¤ë¤È¡¢
-	¤Á¤ç¤¦¤ÉÀè¤Û¤É &man.mergemaster.8; ¤¬ÁªÂò»è¤òɽ¼¨¤¹¤ëÁ°¤ÈƱ¤¸¤è¤¦¤Ë¡¢
-	¥Õ¥¡¥¤¥ë¤ÎÁê°ÛÅÀ¤ò¸«¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+      <para>·ë²Ì¤ò¤â¤¦°ìÅÙ¸«¤ë¡¢¤òÁªÂò¤¹¤ë¤È¡¢
+	¥Õ¥¡¥¤¥ë¤ÎÁê°ÛÅÀ¤ò¤â¤¦°ìÅÙ¸«¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
-      <para>&man.mergemaster.8; ¤¬¥·¥¹¥Æ¥à¥Õ¥¡¥¤¥ë¤ÎÈæ³Ó¤ò½ª¤¨¤¿¤¢¤È¡¢
+      <para><command>mergemaster</command>
+	¤¬¥·¥¹¥Æ¥à¥Õ¥¡¥¤¥ë¤ÎÈæ³Ó¤ò½ª¤¨¤¿¤¢¤È¡¢
 	¾¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤â¥×¥í¥ó¥×¥È¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
-	&man.mergemaster.8;
-	¤¬¡¢¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤òºÆ¹½ÃÛ¤¹¤ë¤«¤É¤¦¤«¤ò¿Ò¤Í¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
+	¤¿¤È¤¨¤Ð¡¢
+	¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤òºÆ¹½ÃÛ¤¹¤ë¤«¤É¤¦¤«¤ò¿Ò¤Í¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
 	ºÇ¸å¤Ë»Ä¤Ã¤¿°ì»þ¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¤«¤É¤¦¤«¤ò¿Ò¤Í¤Æ½ªÎ»¤·¤Þ¤¹¡£</para>
 
-      <para>¼êư¤Ç¹¹¿·¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢Ã±¤Ë¥Õ¥¡¥¤¥ë¤ò
-	<filename>/usr/src/etc</filename>
-	¤«¤é <filename>/etc</filename> ¤Ë
-	¥³¥Ô¡¼¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£Àµ¾ï¤Ëưºî¤·¤Ê¤¤¤Ç¤·¤ç¤¦¡£
-	¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ë¤Ï¡¢
-	<quote>¥¤¥ó¥¹¥È¡¼¥ë¤È¤¤¤¦¼ê½ç¤òƧ¤Þ¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤â¤Î</quote>
-	¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-	<filename>/usr/src/etc</filename> ¤Ï
-	<filename>/etc</filename>
-	¤Ë¤½¤Î¤Þ¤ÞÃÖ¤­´¹¤¨¤é¤ì¤ë¤è¤¦¤Ê¥³¥Ô¡¼¤Ç¤Ï
-	<emphasis>¤Ê¤¤</emphasis>¤«¤é¤Ç¤¹¡£
-        ¤Þ¤¿¡¢<filename>/etc</filename> ¤Ë¤¢¤ë¤Ù¤­¥Õ¥¡¥¤¥ë¤Î¤¦¤Á¤Ç
-	<filename>/usr/src/etc</filename> ¤Ë¤Ê¤¤¤â¤Î¤â¤¢¤ê¤Þ¤¹¡£</para>
-
-      <para>¼êư¤Ç¹Ô¤¦ºÝ¤Î°ìÈÖ´Êñ¤ÊÊýË¡¤Ï¡¢
-	¥Õ¥¡¥¤¥ë¤ò¿·¤·¤¤¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤«¤é¡¢
-	°ÊÁ°¤Î¤â¤Î¤È°Û¤Ê¤Ã¤Æ¤¤¤ëÉôʬ¤òÄ´¤Ù¤Æ¹¹¿·ºî¶È¤ò¹Ô¤Ê¤¦¤³¤È¤Ç¤¹¡£</para>
-
-      <warning>
-	<title>´û¸¤Î <filename>/etc</filename> ¤ò¥Ð¥Ã¥¯¥¢¥Ã¥×¤¹¤ë</title>
-
-	<para>¤¿¤È¤¨¤Ð°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¡¢
-	  ´û¸¤Î <filename>/etc</filename>
-	  ¤ò¤É¤³¤«°ÂÁ´¤Ê¾ì½ê¤Ë¥³¥Ô¡¼¤·¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡£</para>
-
-	<screen>&prompt.root; <userinput>cp -Rp /etc /etc.old</userinput></screen>
-
-	<para>¤³¤³¤Ç¡¢<option>-R</option> ¤ÏºÆµ¢Åª¤Ê¥³¥Ô¡¼¤ò¹Ô¤Ê¤¤¡¢
-	  <option>-p</option> ¤Ï¥Õ¥¡¥¤¥ë¤Î¹¹¿·»þ´Ö¤ä½êÍ­¼Ô¤Ê¤É¤òÊݸ¤·¤Þ¤¹¡£</para>
-      </warning>
-
-      <para>¿·¤·¤¤ <filename>/etc</filename>
-	¤ä¤½¤Î¾¤Î¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Î¡¢
-	²¾¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òºî¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <screen>&prompt.root; <userinput>mkdir /var/tmp/root</userinput>
-&prompt.root; <userinput>cd /usr/src/etc</userinput>
-&prompt.root; <userinput>make DESTDIR=/var/tmp/root distrib-dirs distribution</userinput></screen>
-
-      <para>
-        ¾å¤ÎÎã¤Ï¡¢É¬Íפʥǥ£¥ì¥¯¥È¥ê¹½Â¤¤ò¤Ä¤¯¤ê¡¢¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
-	<filename>/var/tmp/root</filename> °Ê²¼¤Ëºî¤é¤ì¤ë¡¢
-	¤¿¤¯¤µ¤ó¤Î¶õ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ïºï½ü¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	°ìÈÖ´Êñ¤Ê¤ä¤êÊý¤Ï¡¢¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£</para>
-
-      <screen>&prompt.root; <userinput>cd /var/tmp/root</userinput>
-&prompt.root; <userinput>find -d . -type d | xargs rmdir 2&gt;/dev/null</userinput></screen>
-
-      <para>¤³¤ì¤Ï¶õ¥Ç¥£¥ì¥¯¥È¥ê¤ò¤¹¤Ù¤Æºï½ü¤·¤Þ¤¹¡£
-	¶õ¤Ç¤Ê¤¤¥Ç¥£¥ì¥¯¥È¥ê¤Ë´Ø¤¹¤ë·Ù¹ð¤òÈò¤±¤ë¤¿¤á¤Ë¡¢
-	ɸ½à¥¨¥é¡¼½ÐÎÏ¤Ï <filename>/dev/null</filename> ¤Ë
-	¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤Þ¤¹¡£</para>
-
-      <para>¤³¤ÎÃʳ¬¤Î <filename>/var/tmp/root</filename> ¤Ë¤Ï¡¢
-	ËÜÍè <filename>/</filename>
-	°Ê²¼¤Ë¤¢¤ë¤Ù¤­¥Õ¥¡¥¤¥ë¤¬¤¹¤Ù¤Æ´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£³Æ¥Õ¥¡¥¤¥ë¤ò½ç¤Ë¸«¤Æ¡¢
-	´û¸¤Î¥·¥¹¥Æ¥à¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤È°Û¤Ê¤ëÉôʬ¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <para><filename>/var/tmp/root</filename>
-	°Ê²¼¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ë¤Ï¡¢
-	<quote>.</quote> ¤«¤é»Ï¤Þ¤Ã¤Æ¤¤¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£
-	<command>ls -a</command> ¤ò»È¤Ã¤Æ³Î¤«¤á¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <para>¤â¤Ã¤È¤â´Êñ¤ÊÊýË¡¤Ï¡¢Æó¤Ä¤Î¥Õ¥¡¥¤¥ë¤òÈæ³Ó¤¹¤ë¥³¥Þ¥ó¥É
-	&man.diff.1; ¤ò»È¤¦¤³¤È¤Ç¤¹¡£</para>
-
-      <screen>&prompt.root; <userinput>diff /etc/shells /var/tmp/root/etc/shells</userinput></screen>
-
-      <para>¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢<filename>/etc/shells</filename> ¥Õ¥¡¥¤¥ë¤È
-	¿·¤·¤¤ <filename>/var/tmp/root/etc/shells</filename>
-	¥Õ¥¡¥¤¥ë¤Î°Û¤Ê¤ëÉôʬ¤òɽ¼¨¤·¤Þ¤¹¡£
-	ÆâÍÆ¤ò³Îǧ¤·¤Æ¡¢½ñ¤­´¹¤¨¤¿¤â¤Î¤ËÊѹ¹ÅÀ¤ò¥Þ¡¼¥¸¤¹¤ë¤«¡¢
-        ¤½¤ì¤È¤â´û¸¤Î¥Õ¥¡¥¤¥ë¤ò¿·¤·¤¤¤â¤Î¤Ç¾å½ñ¤­¤¹¤ë¤«¤òȽÃǤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
+<!--
+Probably not needed as changes should be minimal and mergemaster does
+a good job of merging.
       <tip>
 	<title>¿·¤·¤¤ root ¥Ç¥£¥ì¥¯¥È¥ê
 	  (<filename>/var/tmp/root</filename>) ¤Î̾Á°¤Ë
@@ -2028,11 +1967,12 @@ Script started, output file is /var/tmp/
 
 	<screen>&prompt.root; <userinput>mkdir /var/tmp/root-`date "+%Y%m%d"`</userinput></screen>
       </tip>
+      -->
     </sect2>
 
     <sect2 xml:id="make-delete-old">
       <info>
-	<title>»È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Îºï½ü</title>
+	<title>»È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¡¢¥é¥¤¥Ö¥é¥ê¤Îºï½ü</title>
 
 	<authorgroup>
 	  <author>
@@ -2070,7 +2010,7 @@ Script started, output file is /var/tmp/
       <para>
 	<command>make installworld</command>
 	¤È¡¢¤½¤Î¸å¤Î <command>mergemaster</command> ¤¬Ìµ»ö¤Ë½ª¤ï¤Ã¤¿¤é¡¢
-	°Ê²¼¤ÎÊýË¡¤Ç»È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¤ä¥é¥¤¥Ö¥é¥ê¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	»È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¤ä¥é¥¤¥Ö¥é¥ê¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make check-old</userinput></screen>
@@ -2079,11 +2019,6 @@ Script started, output file is /var/tmp/
 
       <screen>&prompt.root; <userinput>make delete-old</userinput></screen>
 
-      <tip>
-	<para>¤½¤Î¾¤Î¥¿¡¼¥²¥Ã¥È¤Ë¤Ä¤¤¤Æ¤Ï
-	  <filename>/usr/src/Makefile</filename> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
-      </tip>
-
       <para>»È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ëºÝ¡¢
 	¥Õ¥¡¥¤¥ë¤´¤È¤Ë³Îǧ¤¬µá¤á¤é¤ì¤Þ¤¹¡£
 	³Îǧ¤ò¾Êά¤·¡¢¼«Æ°Åª¤Ë¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¤Ë¤Ï¡¢
@@ -2097,11 +2032,6 @@ Script started, output file is /var/tmp/
 
       <screen>&prompt.root; <userinput>yes|make delete-old</userinput></screen>
 
-    </sect2>
-
-    <sect2 xml:id="make-delete-old-libs">
-      <title>»È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥é¥¤¥Ö¥é¥ê¤Îºï½ü</title>
-
       <warning>
 	<title>Warning</title>
 
@@ -2116,7 +2046,6 @@ Script started, output file is /var/tmp/
       </warning>
 
       <para>¶¦Í­¥é¥¤¥Ö¥é¥ê¤ò¥Á¥§¥Ã¥¯¤¹¤ë¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤È¤·¤Æ¡¢
-	Ports Collection ¤Î
 	<package>sysutils/libchk</package> ¤ä
 	<package>sysutils/bsdadminscripts</package>
 	¤òÍøÍѤǤ­¤Þ¤¹¡£</para>
@@ -2144,15 +2073,14 @@ Script started, output file is /var/tmp/
 	°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¸Å¤¤¥é¥¤¥Ö¥é¥ê¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>make delete-old-libs</userinput></screen>
-      <para>¤³¤³¤Þ¤ÇÍè¤ì¤Ð¡¢&os; ¥·¥¹¥Æ¥à¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤ÏÀ®¸ù¤Ç¤¹¡£
-	¤ª¤á¤Ç¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£</para>
 
       <para>¤â¤·¤Á¤ç¤Ã¤È¤·¤¿ÌäÂ꤬¤¢¤Ã¤¿¾ì¹ç¤Ç¤â¡¢
         ¥·¥¹¥Æ¥à¤Î°ìÉô¤òºÆ¹½ÃÛ¤¹¤ë¤Î¤Ï´Êñ¤Ç¤¹¡£
 	¤¿¤È¤¨¤Ð¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¤ä <filename>/etc</filename>
 	¤Î¥Þ¡¼¥¸¤ÎÅÓÃæ¤Ç¸í¤Ã¤Æ
 	<filename>/etc/magic</filename> ¤òºï½ü¤·¤Æ¤·¤Þ¤¤¡¢
-	¤½¤Î·ë²Ì &man.file.1; ¤¬Æ°ºî¤·¤Ê¤¯¤Ê¤Ã¤Æ¤·¤Þ¤Ã¤¿¤è¤¦¤Ê¾ì¹ç¤Ë¤Ï¡¢
+	¤½¤Î·ë²Ì <command>file</command>
+	¤¬Æ°ºî¤·¤Ê¤¯¤Ê¤Ã¤Æ¤·¤Þ¤Ã¤¿¤è¤¦¤Ê¾ì¹ç¤Ë¤Ï¡¢
 	¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ½¤Éü¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src/usr.bin/file</userinput>

_______________________________________________
[email protected] mailing list
http://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.