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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Sat Mar 22 22:22:12 2014
New Revision: 44331
URL: http://svnweb.freebsd.org/changeset/doc/44331

Log:
  - Merge the following from the English version:
  
  	r43809 -> r44275	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	Sat Mar 22 19:06:49 2014	(r44330)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Sat Mar 22 22:22:12 2014	(r44331)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r43809
+     Original revision: r44275
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -430,10 +430,10 @@ MergeChanges /etc/ /var/named/etc/ /boot
 		¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
 
 	      <screen>&prompt.root; <userinput>mount /cdrom</userinput>
-&prompt.root; <userinput>cd /cdrom/X.Y-RELEASE/kernels</userinput>
+&prompt.root; <userinput>cd /cdrom/<replaceable>X.Y-RELEASE</replaceable>/kernels</userinput>
 &prompt.root; <userinput>./install.sh GENERIC</userinput></screen>
 
-	      <para>¤³¤³¤Ç <filename>X.Y-RELEASE</filename>
+	      <para>¤³¤³¤Ç <filename class="directory">X.Y-RELEASE</filename>
 		¤ò¼ÂºÝ¤Î¥ê¥ê¡¼¥¹ÈÖ¹æ¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£
 		<filename>GENERIC</filename> ¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç <filename>/boot/GENERIC</filename>
 		¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
@@ -805,7 +805,7 @@ before running "/usr/sbin/freebsd-update
 	western US ¥ß¥é¡¼¤«¤é HTTPS ¥×¥í¥È¥³¥ë¤òÍѤ¤¤Æ¡¢
 	¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Þ¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>svn checkout https://svn0.us-west.FreeBSD.org/doc/head /usr/doc</userinput></screen>
+      <screen>&prompt.root; <userinput>svn checkout <replaceable>https://svn0.us-west.FreeBSD.org</replaceable>/doc/head /usr/doc</userinput></screen>
 
       <para>ÍøÍѲÄǽ¤Ê
 	<link linkend="svn-mirrors">Subversion ¥ß¥é¡¼¥µ¥¤¥È</link>
@@ -1124,7 +1124,7 @@ before running "/usr/sbin/freebsd-update
 
 	<note>
 	  <para>¥É¥­¥å¥á¥ó¥È¤Î package ¤Ï¡¢Âбþ¤¹¤ë port ̾¤È¤Ï°Û¤Ê¤ê¡¢
-	    <literal>lang-freebsd-doc</literal>
+	    <literal><replaceable>lang</replaceable>-freebsd-doc</literal>
 	    ¤Î·Á¼°¤Ç̾Á°¤¬¤Ä¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£
 	    ¤³¤³¤Ç¡¢<replaceable>lang</replaceable> ¤Ï¸À¸ì¥³¡¼¥É¤Îû½Ì·Á¤Ç¤¹¡£
 	    ¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¾ì¹ç¤Ï <literal>hu</literal>¡¢´ÊÂλú¤Î¾ì¹ç¤Ë¤Ï
@@ -1687,7 +1687,7 @@ before running "/usr/sbin/freebsd-update
 	    ¿·¤·¤¤¥°¥ë¡¼¥×¤ä¿·¤·¤¤¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È¡¢
 	    ¤â¤·¤¯¤Ï¥¹¥¿¡¼¥È¥¢¥Ã¥×¥¹¥¯¥ê¥×¥È¤¬¥·¥¹¥Æ¥à¤ËÄɲ䵤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
-	  <screen>&prompt.root; <userinput>mergemaster -p</userinput></screen>
+	  <screen>&prompt.root; <userinput>mergemaster</userinput></screen>
 	</step>
 
 	<step>
@@ -1829,7 +1829,7 @@ Script done, …</screen>
 
 	<para>¥³¥Þ¥ó¥É¥é¥¤¥ó¤Î°ìÈÌŪ¤Ê½ñ¼°¤Ï¡¢¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£</para>
 
-	<screen>&prompt.root; <userinput>make -x -DVARIABLE target</userinput></screen>
+	<screen>&prompt.root; <userinput>make -<replaceable>x</replaceable> -D<replaceable>VARIABLE</replaceable> <replaceable>target</replaceable></userinput></screen>
 
 	<para>¤³¤ÎÎã¤Ç¤Ï¡¢<option>-<replaceable>x</replaceable></option> ¤¬
 	  &man.make.1; ¤ËÅϤµ¤ì¤ë¥ª¥×¥·¥ç¥ó¤Ë¤Ê¤ê¤Þ¤¹¡£
@@ -1844,7 +1844,7 @@ Script done, …</screen>
           ƱÍͤǤ¹¡£¤³¤ì¤ÏÊÑ¿ô¤òÀßÄꤹ¤ë¤â¤¦°ì¤Ä¤ÎÊýË¡¤È¤·¤ÆÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	  ¤¿¤È¤¨¤Ð°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£</para>
 
-	<screen>&prompt.root; <userinput>make -DNO_PROFILE target</userinput></screen>
+	<screen>&prompt.root; <userinput>make -DNO_PROFILE <replaceable>target</replaceable></userinput></screen>
 
 	<para>
           ¤Ï¡¢¥×¥í¥Õ¥¡¥¤¥ëÈǤΥ饤¥Ö¥é¥ê¤ò¹½ÃÛ¤·¤Ê¤¤¤³¤È¤ò»ØÄꤹ¤ë
@@ -1869,7 +1869,7 @@ Script done, …</screen>
 	<para>ÂçÄñ¤Î¾ì¹ç¡¢&man.make.1; ¤Ë¥Ñ¥é¥á¡¼¥¿¤ò»ØÄꤹ¤ëɬÍפϤʤ¤¤Ç¤·¤ç¤¦¤«¤é¡¢
 	  ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ï¼¡¤Î¤è¤¦¤Ê¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
 
-	<screen>&prompt.root; <userinput>make target</userinput></screen>
+	<screen>&prompt.root; <userinput>make <replaceable>target</replaceable></userinput></screen>
 
 	<para>¤³¤³¤Ç¡¢<replaceable>target</replaceable>
 	  ¤Ï¡¢Â¿¤¯¤Î¥Ó¥ë¥É¥ª¥×¥·¥ç¥ó¤Î¤É¤ì¤«¤Ë¤Ê¤ê¤Þ¤¹¡£
@@ -1976,12 +1976,12 @@ Script done, …</screen>
 
       <note>
 	<para>´û¤Ë¤¢¤ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ò»È¤Ã¤Æ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢
-	  <literal>KERNCONF=MYKERNEL</literal>
+	  <literal>KERNCONF=<replaceable>MYKERNEL</replaceable></literal>
 	  ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make buildkernel KERNCONF=MYKERNEL</userinput>
-&prompt.root; <userinput>make installkernel KERNCONF=MYKERNEL</userinput></screen>
+&prompt.root; <userinput>make buildkernel KERNCONF=<replaceable>MYKERNEL</replaceable></userinput>
+&prompt.root; <userinput>make installkernel KERNCONF=<replaceable>MYKERNEL</replaceable></userinput></screen>
 
       </note>
 
@@ -2396,7 +2396,7 @@ Script done, …</screen>
 
       <screen>&prompt.root; <userinput>pkg which /usr/local/lib/libtiff.so</userinput>
   /usr/local/lib/libtiff.so was installed by package tiff-3.9.4
-  &prompt.root; <userinput>pkg which /usr/local/lib/libXext.so</userinput>
+&prompt.root; <userinput>pkg which /usr/local/lib/libXext.so</userinput>
   /usr/local/lib/libXext.so was installed by package libXext-1.1.1,1</screen>
 
       <para>¸«¤Ä¤«¤Ã¤¿ port ¤ò¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¤·¡¢
@@ -2566,7 +2566,7 @@ Building everything..
 		class="directory">/usr</filename>
 	      ¤òºÆ¥Þ¥¦¥ó¥È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-	    <para><filename>/usr/obj</filename>
+	    <para><filename class="directory">/usr/obj</filename>
 	      ¤Î¤¢¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¡¢<option>async</option>
 	      ¥ª¥×¥·¥ç¥ó¤ò¤Ä¤±¤Æ¥Þ¥¦¥ó¥È¤â¤·¤¯¤ÏºÆ¥Þ¥¦¥ó¥È¤·¤Æ¤¯¤À¤µ¤¤¡£
 	      ¤³¤ì¤Ë¤è¤Ã¤Æ¡¢¥Ç¥£¥¹¥¯¤Ø¤Î½ñ¤­¹þ¤ß¤¬ÈóƱ´ü¤Ë¤Ê¤ê¤Þ¤¹¡£
@@ -2703,7 +2703,8 @@ Building everything..
 	¥Ó¥ë¥É¥Þ¥·¥ó¤Ï¼«Ê¬¼«¿È¤Î¥«¡¼¥Í¥ë¤«¤é½ç¤ËÁ´Éô¤Î¥«¡¼¥Í¥ë̾¤ò
 	<varname>KERNCONF</varname> ¤Ë¥ê¥¹¥È¥¢¥Ã¥×¤·¤Æ¤¯¤À¤µ¤¤¡£
 	³Æ¥Þ¥·¥ó¤Î¥«¡¼¥Í¥ë¤â¥Ó¥ë¥É¤¹¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
-	¥Ó¥ë¥É¥Þ¥·¥ó¤Ï³Æ¥Þ¥·¥ó¤Î¥«¡¼¥Í¥ëÀßÄê¥Õ¥¡¥¤¥ë¤ò <filename>/usr/src/sys/arch/conf</filename>
+	¥Ó¥ë¥É¥Þ¥·¥ó¤Ï³Æ¥Þ¥·¥ó¤Î¥«¡¼¥Í¥ëÀßÄê¥Õ¥¡¥¤¥ë¤ò
+	<filename class="directory">/usr/src/sys/<replaceable>arch</replaceable>/conf</filename>
 	¤Ë»ý¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
     </sect2>