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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Thu Feb 13 11:39:16 UTC 2014


Author: ryusuke
Date: Thu Feb 13 11:39:16 2014
New Revision: 43894
URL: http://svnweb.freebsd.org/changeset/doc/43894

Log:
  - Merge the following from the English version:
  
  	r43594 -> r43685	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 Feb 13 07:54:26 2014	(r43893)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Thu Feb 13 11:39:16 2014	(r43894)
@@ -3,26 +3,59 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r43594
+     Original revision: r43685
      $FreeBSD$
 -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="updating-upgrading">
-  <info><title>&os; ¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤È¥¢¥Ã¥×¥°¥ì¡¼¥É</title>
+<chapter xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="updating-upgrading">
+
+  <info>
+    <title>&os; ¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤È¥¢¥Ã¥×¥°¥ì¡¼¥É</title>
+
     <authorgroup>
-      <author><personname><firstname>Jim</firstname><surname>Mock</surname></personname><contrib>ºÆ¹½À®¡¢ºÆÊÔÀ®¤ª¤è¤Ó²þÄû: </contrib></author>
+      <author>
+	<personname>
+	  <firstname>Jim</firstname>
+	  <surname>Mock</surname>
+	</personname>
+	<contrib>ºÆ¹½À®¡¢ºÆÊÔÀ®¤ª¤è¤Ó²þÄû: </contrib>
+      </author>
       <!-- Mar 2000 -->
     </authorgroup>
+
     <authorgroup>
-      <author><personname><firstname>Jordan</firstname><surname>Hubbard</surname></personname><contrib>¸¶ºî: </contrib></author>
-      <author><personname><firstname>Poul-Henning</firstname><surname>Kamp</surname></personname></author>
-      <author><personname><firstname>John</firstname><surname>Polstra</surname></personname></author>
-      <author><personname><firstname>Nik</firstname><surname>Clayton</surname></personname></author>
+      <author>
+	<personname>
+	  <firstname>Jordan</firstname>
+	  <surname>Hubbard</surname>
+	</personname>
+	<contrib>¸¶ºî: </contrib>
+      </author>
+
+      <author>
+	<personname>
+	  <firstname>Poul-Henning</firstname>
+	  <surname>Kamp</surname>
+	</personname>
+      </author>
+
+      <author>
+	<personname>
+	  <firstname>John</firstname>
+	  <surname>Polstra</surname>
+	</personname>
+      </author>
+
+      <author>
+	<personname>
+	  <firstname>Nik</firstname>
+	  <surname>Clayton</surname>
+	</personname>
+      </author>
     </authorgroup>
-    
   </info>
 
-  
-
   <sect1 xml:id="updating-upgrading-synopsis">
     <title>¤³¤Î¾Ï¤Ç¤Ï</title>
 
@@ -78,7 +111,8 @@
 
     <itemizedlist>
       <listitem>
-	<para>¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤ÎŬÀÚ¤ÊÀßÄê (<xref linkend="advanced-networking"/>)</para>
+	<para>¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤ÎŬÀÚ¤ÊÀßÄê
+	  (<xref linkend="advanced-networking"/>)</para>
       </listitem>
       <listitem><para>¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤Î¥½¥Õ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Î½¬ÆÀ
         (<xref linkend="ports"/>)</para></listitem>
@@ -94,17 +128,33 @@
   </sect1>
 
   <sect1 xml:id="updating-upgrading-freebsdupdate">
-    <info><title>&os; Update</title>
+    <info>
+      <title>&os; Update</title>
+
       <authorgroup>
-	<author><personname><firstname>Tom</firstname><surname>Rhodes</surname></personname><contrib>´ó¹Æ: </contrib></author>
+	<author>
+	  <personname>
+	    <firstname>Tom</firstname>
+	    <surname>Rhodes</surname>
+	  </personname>
+	  <contrib>´ó¹Æ: </contrib>
+	</author>
       </authorgroup>
+
       <authorgroup>
-	<author><personname><firstname>Colin</firstname><surname>Percival</surname></personname><contrib>¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿¥Î¡¼¥È¤ÎÄó¶¡: </contrib></author>
+	<author>
+	  <personname>
+	    <firstname>Colin</firstname>
+	    <surname>Percival</surname>
+	  </personname>
+	  <contrib>¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿¥Î¡¼¥È¤ÎÄó¶¡: </contrib>
+	</author>
       </authorgroup>
     </info>
-    
 
-    <indexterm><primary>Updating and Upgrading</primary></indexterm>
+    <indexterm>
+      <primary>Updating and Upgrading</primary>
+    </indexterm>
     <indexterm>
       <primary>freebsd-update</primary>
       <see>updating-upgrading</see>
@@ -130,8 +180,8 @@
 	¿·¤·¤¤¥ê¥ê¡¼¥¹¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëÁ°¤Ë¡¢
 	¥¢¥Ã¥×¥Ç¡¼¥È¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¥ê¥ê¡¼¥¹¤Î¥¢¥Ê¥¦¥ó¥¹¤ËÌܤòÄ̤·¡¢
 	½ÅÍפʾðÊ󤬤ʤ¤¤«¤É¤¦¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
-	¥ê¥ê¡¼¥¹¤Î¥¢¥Ê¥¦¥ó¥¹¤Ï
-	<uri xlink:href="http://www.FreeBSD.org/ja/releases/">http://www.FreeBSD.org/ja/releases/</uri>
+	¥ê¥ê¡¼¥¹¤Î¥¢¥Ê¥¦¥ó¥¹¤Ï <uri
+	  xlink:href="http://www.FreeBSD.org/ja/releases/">http://www.FreeBSD.org/ja/releases/</uri>
 	¤Ç³Îǧ¤Ç¤­¤Þ¤¹¡£</para>
     </note>
 
@@ -258,7 +308,8 @@ MergeChanges /etc/ /var/named/etc/</prog
 	¥Ñ¥Ã¥Á¤¬Â¸ºß¤¹¤ë¤È¡¢
 	¼«Æ°Åª¤Ë¥í¡¼¥«¥ë¥Ç¥£¥¹¥¯¤Ë¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¤Þ¤¹¤¬¡¢Å¬ÍѤϤµ¤ì¤Þ¤»¤ó¡£
 	¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¤¿¥Ñ¥Ã¥Á¤ò³Îǧ¤·¡¢¼êÆ°¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפΤ¢¤ë¤³¤È¤¬¡¢
-	<systemitem class="username">root</systemitem> °¸¤Æ¤Ë¥á¡¼¥ë¤ÇÄÌÃΤµ¤ì¤Þ¤¹¡£</para>
+	<systemitem class="username">root</systemitem>
+	°¸¤Æ¤Ë¥á¡¼¥ë¤ÇÄÌÃΤµ¤ì¤Þ¤¹¡£</para>
 
       <para>¤¦¤Þ¤¯¹Ô¤«¤Ê¤«¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢<command>freebsd-update</command>
 	¤ò°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤¹¤ë¤È¡¢ºÇ¸å¤ÎÊѹ¹¤Þ¤Ç¥í¡¼¥ë¥Ð¥Ã¥¯¤Ç¤­¤Þ¤¹¡£</para>
@@ -275,8 +326,8 @@ MergeChanges /etc/ /var/named/etc/</prog
 	¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
 	<command>freebsd-update</command> ¤¬Â¾¤ÎÉôʬ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¸å¡¢
 	¥«¡¼¥Í¥ë¤òºÆ¹½ÃÛ¤·¡¢¤â¤¦°ìÅÙ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	¤·¤«¤·¤Ê¤¬¤é¡¢<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤¬ <filename>/boot/GENERIC</filename>
-	¤Ë¸ºß¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢
+	¤·¤«¤·¤Ê¤¬¤é¡¢<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤¬
+	<filename>/boot/GENERIC</filename> ¤Ë¸ºß¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢
 	¸½ºß¤Î¥·¥¹¥Æ¥à¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¥«¡¼¥Í¥ë¤Ç¤Ê¤¯¤È¤â¡¢
 	<command>freebsd-update</command>
 	¤Ë¤è¤ê¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤Þ¤¹¡£</para>
@@ -666,17 +717,33 @@ before running "/usr/sbin/freebsd-update
   </sect1>
 
   <sect1 xml:id="updating-upgrading-portsnap">
-    <info><title>Portsnap: Ports Collection ¥¢¥Ã¥×¥Ç¡¼¥È¥Ä¡¼¥ë</title>
+    <info>
+      <title>Portsnap: Ports Collection ¥¢¥Ã¥×¥Ç¡¼¥È¥Ä¡¼¥ë</title>
+
       <authorgroup>
-	<author><personname><firstname>Tom</firstname><surname>Rhodes</surname></personname><contrib>´ó¹Æ: </contrib></author>
+	<author>
+	  <personname>
+	    <firstname>Tom</firstname>
+	    <surname>Rhodes</surname>
+	  </personname>
+	  <contrib>´ó¹Æ: </contrib>
+	</author>
       </authorgroup>
+
       <authorgroup>
-	<author><personname><firstname>Colin</firstname><surname>Percival</surname></personname><contrib>¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿¥Î¡¼¥È¤ÎÄó¶¡: </contrib></author>
+	<author>
+	  <personname>
+	    <firstname>Colin</firstname>
+	    <surname>Percival</surname>
+	  </personname>
+	  <contrib>¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿¥Î¡¼¥È¤ÎÄó¶¡: </contrib>
+	</author>
       </authorgroup>
     </info>
-    
 
-    <indexterm><primary>¥¢¥Ã¥×¥Ç¡¼¥È¤È¥¢¥Ã¥×¥°¥ì¡¼¥É</primary></indexterm>
+    <indexterm>
+      <primary>¥¢¥Ã¥×¥Ç¡¼¥È¤È¥¢¥Ã¥×¥°¥ì¡¼¥É</primary>
+    </indexterm>
     <indexterm>
       <primary>Portsnap</primary>
       <see>¥¢¥Ã¥×¥Ç¡¼¥È¤È¥¢¥Ã¥×¥°¥ì¡¼¥É</see>
@@ -763,7 +830,8 @@ Fetching 133 new ports or files... done.
     </indexterm>
 
     <para>¥É¥­¥å¥á¥ó¥È¤Ï¡¢&os; ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Îɬ¿ÜÍ×ÁǤǤ¹¡£
-      &os; ¥É¥­¥å¥á¥ó¥È¥»¥Ã¥È¤ÎºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ï¡¢<link xlink:href="http://www.freebsd.org/doc/">&os; ¥¦¥§¥Ö¥µ¥¤¥È</link>
+      &os; ¥É¥­¥å¥á¥ó¥È¥»¥Ã¥È¤ÎºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ï¡¢
+      <link xlink:href="http://www.freebsd.org/doc/">&os; ¥¦¥§¥Ö¥µ¥¤¥È</link>
       ¤«¤éÆþ¼ê¤Ç¤­¤Þ¤¹¤¬¡¢
       ¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤¬ÃÙ¤¤¡¢¤â¤·¤¯¤Ï¤Þ¤Ã¤¿¤¯Àܳ¤Ç¤­¤Ê¤¤¥æ¡¼¥¶¤â¤¤¤Þ¤¹¡£
       ¥í¡¼¥«¥ë¤Î¥É¥­¥å¥á¥ó¥È¤òºÇ¿·¤Î &os;
@@ -844,7 +912,8 @@ Fetching 133 new ports or files... done.
 
       <screen>&prompt.root; <userinput>svn checkout https://svn0.us-west.FreeBSD.org/doc/head /usr/doc</userinput></screen>
 
-      <para>ÍøÍѲÄǽ¤Ê <link linkend="svn-mirrors">Subversion ¥ß¥é¡¼¥µ¥¤¥È</link>
+      <para>ÍøÍѲÄǽ¤Ê
+	<link linkend="svn-mirrors">Subversion ¥ß¥é¡¼¥µ¥¤¥È</link>
 	¤ÎÃ椫¤é¤â¤Ã¤È¤â¶á¤¤¥ß¥é¡¼¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <para>ºÇ½é¤Ë¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï¾¯¤·»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¡£
@@ -950,15 +1019,23 @@ Fetching 133 new ports or files... done.
     </sect2>
 
     <sect2 xml:id="doc-ports">
-      <info><title>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports</title>
+      <info>
+	<title>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports</title>
+
 	<authorgroup>
-	  <author><personname><firstname>Marc</firstname><surname>Fonvieille</surname></personname><contrib>¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿ºî¶È:</contrib></author>
+	  <author>
+	    <personname>
+	      <firstname>Marc</firstname>
+	      <surname>Fonvieille</surname>
+	    </personname>
+	    <contrib>¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿ºî¶È:</contrib>
+	  </author>
 	</authorgroup>
       </info>
 
-      
-
-      <indexterm><primary>Updating and Upgrading</primary></indexterm>
+      <indexterm>
+	<primary>Updating and Upgrading</primary>
+      </indexterm>
 
       <indexterm>
 	<primary>documentation package</primary>
@@ -1000,7 +1077,8 @@ Fetching 133 new ports or files... done.
 	&a.doceng; ¤¬Ëè·î¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¤¤ë
         <emphasis>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports</emphasis>
 	¤Ë¤è¤ê¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-	¤³¤ì¤é¤Î ports ¤Ï¡¢&os; Ports Collection ¤Î <link xlink:href="http://www.freshports.org/docs/">docs</link>
+	¤³¤ì¤é¤Î ports ¤Ï¡¢&os; Ports Collection ¤Î <link
+	  xlink:href="http://www.freshports.org/docs/">docs</link>
 	¥«¥Æ¥´¥ê¤Ë¤Þ¤È¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <sect3 xml:id="doc-ports-install-make">
@@ -1026,23 +1104,28 @@ Fetching 133 new ports or files... done.
 
 	<itemizedlist>
 	  <listitem>
-	    <para><quote>¥Þ¥¹¥¿ port</quote>, <package>misc/freebsd-doc-en</package>¡£
+	    <para><quote>¥Þ¥¹¥¿ port</quote>,
+	      <package>misc/freebsd-doc-en</package>¡£
 	      ¤¹¤Ù¤Æ¤Î±Ñ¸ìʸ½ñ¤Î ports ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
 	  </listitem>
 
 	  <listitem>
-	    <para><quote>¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥È¤Î port</quote>, <package>misc/freebsd-doc-all</package>¡£
-	      ¤³¤ì¤Ï¡¢¤¹¤Ù¤Æ¤ÎÍøÍѲÄǽ¤Ê¸À¸ì¤Î¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥È¤ò¹½ÃÛ¤·¤Þ¤¹¡£</para>
+	    <para><quote>¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥È¤Î port</quote>,
+	      <package>misc/freebsd-doc-all</package>¡£¤³¤ì¤Ï¡¢
+	      ¤¹¤Ù¤Æ¤ÎÍøÍѲÄǽ¤Ê¸À¸ì¤Î¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥È¤ò¹½ÃÛ¤·¤Þ¤¹¡£</para>
 	  </listitem>
 
 	  <listitem>
 	    <para>³Æ¸À¸ì¤Î¤¿¤á¤Ë <quote>¥¹¥ì¡¼¥Ö port</quote>
-	      ¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢<package>misc/freebsd-doc-hu</package>
+	      ¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
+	      <package>misc/freebsd-doc-hu</package>
 	      ¤Ï¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó port ¤Ç¤¹¡£</para>
 	  </listitem>
 	</itemizedlist>
 
-	<para>¤¿¤È¤¨¤Ð¡¢<uri xlink:href="http://www.FreeBSD.org">http://www.FreeBSD.org</uri> ¤ÈƱ¤¸·Á¼°¤Ç¤¢¤ë¡¢
+	<para>¤¿¤È¤¨¤Ð¡¢<uri
+	    xlink:href="http://www.FreeBSD.org">http://www.FreeBSD.org</uri>
+	  ¤ÈƱ¤¸·Á¼°¤Ç¤¢¤ë¡¢
 	  ±Ñ¸ìÈǤÎʬ³ä¤µ¤ì¤¿ <acronym>HTML</acronym> ·Á¼°¤ò¹½ÃÛ¤·¡¢
 	  <filename>/usr/local/share/doc/freebsd</filename>
 	  ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤Î port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1089,7 +1172,8 @@ Fetching 133 new ports or files... done.
 
 	      <listitem>
 		<para>¥É¥­¥å¥á¥ó¥È¤Î¥¤¥ó¥¹¥È¡¼¥ëÀè¤òÀßÄꤷ¤Þ¤¹¡£
-		  ¥Ç¥Õ¥©¥ë¥È¤Î¥¤¥ó¥¹¥È¡¼¥ëÀè¤Ï <filename>/usr/local/share/doc/freebsd</filename>
+		  ¥Ç¥Õ¥©¥ë¥È¤Î¥¤¥ó¥¹¥È¡¼¥ëÀè¤Ï
+		  <filename>/usr/local/share/doc/freebsd</filename>
 		  ¤Ç¤¹¡£</para>
 
 		<note>
@@ -1292,8 +1376,9 @@ Fetching 133 new ports or files... done.
 
             <orderedlist>
 	      <listitem>
-		<para><link linkend="svn">svn</link><indexterm>
-		      <primary>Subversion</primary>
+		<para><link linkend="svn">svn</link>
+		  <indexterm>
+		    <primary>Subversion</primary>
 		  </indexterm>
 		  <indexterm>
 		    <primary>-CURRENT</primary>
@@ -1313,12 +1398,15 @@ Fetching 133 new ports or files... done.
 	      </listitem>
 
               <listitem>
-                <para><application>CTM</application><indexterm>
+                <para>
+		  <application>CTM</application>
+		  <indexterm>
 		    <primary>-CURRENT</primary>
 		    <secondary>CTM ¤ò»È¤Ã¤¿Æ±´ü</secondary>
 		  </indexterm>¤òÍѤ¤¤ë¡£
 		  ÀܳÎÁ¤¬¹â³Û¤À¤Ã¤¿¤ê¡¢email ¤Ç¤Î¥¢¥¯¥»¥¹¤·¤«¤Ç¤­¤Ê¤¤¤è¤¦¤Ê¡¢
-                  ¤¢¤Þ¤êÎɼÁ¤Ç¤Ê¤¤ TCP/IP Àܳ¤Î¾ì¹ç¤Ë¤Ï¡¢<application>CTM</application>
+                  ¤¢¤Þ¤êÎɼÁ¤Ç¤Ê¤¤ TCP/IP Àܳ¤Î¾ì¹ç¤Ë¤Ï¡¢
+		  <application>CTM</application>
 		  ¤òÍøÍѤ¹¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£¤¿¤À¤·¡¢<application>
 		  Subversion</application>
 		  ¤Û¤É¤Ë¤Ï¿®Íê¤Ï¤Ç¤­¤Þ¤»¤ó¡£
@@ -1338,7 +1426,10 @@ Fetching 133 new ports or files... done.
               °ìÉô¤Î¤ß¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤è¤¦¤È¤¹¤ë¤È¡¢
               ¤Û¤Ü´Ö°ã¤¤¤Ê¤¯ÌäÂ꤬µ¯¤­¤Þ¤¹¡£</para>
 
-            <para>&os.current; ¤ò¥³¥ó¥Ñ¥¤¥ë<indexterm>
+            <para>
+	      &os.current;
+	      ¤ò¥³¥ó¥Ñ¥¤¥ë
+	      <indexterm>
 		<primary>-CURRENT</primary>
 		<secondary>¥³¥ó¥Ñ¥¤¥ë</secondary>
 	      </indexterm>¤¹¤ëÁ°¤Ë
@@ -1397,7 +1488,8 @@ Fetching 133 new ports or files... done.
 
 	  <footnote>
 	    <para>¸½»þÅÀ¤Ç¤Î¸Å¤¤¥ê¥ê¡¼¥¹¤Î FreeBSD
-	      ¤Î¥»¥­¥å¥ê¥Æ¥£¥Ý¥ê¥·¡¼¤ÎÁ´ÀâÌÀ¤òÃΤë¤Ë¤Ï¡¢<link xlink:href="&url.base;/security/">http://www.FreeBSD.org/ja/security/</link>
+	      ¤Î¥»¥­¥å¥ê¥Æ¥£¥Ý¥ê¥·¡¼¤ÎÁ´ÀâÌÀ¤òÃΤë¤Ë¤Ï¡¢<link
+		xlink:href="&url.base;/security/">http://www.FreeBSD.org/ja/security/</link>
 	      ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 	  </footnote>¡£</para>
 
@@ -1457,8 +1549,8 @@ Fetching 133 new ports or files... done.
           <listitem>
 	    <para>Ëè·î¸ø³«¤µ¤ì¤Æ¤¤¤ë &os.stable;
 	      ¤«¤é¥Ó¥ë¥É¤µ¤ì¤¿¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤Î¿·¤·¤¤¥·¥¹¥Æ¥à¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
-	      ¾ÜºÙ¤Ë¤Ä¤¤¤Æ¡¢
-	      <link xlink:href="&url.base;/snapshots/">¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È</link>
+	      ¾ÜºÙ¤Ë¤Ä¤¤¤Æ¡¢<link
+		xlink:href="&url.base;/snapshots/">¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È</link>
 	      ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
 	      ¤â¤·¤¯¤Ï¡¢<link linkend="mirrors">¥ß¥é¡¼¥µ¥¤¥È</link>¤«¤éºÇ¶á¤Î
 	      &os.stable; ¥ê¥ê¡¼¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¡¢²¼µ­¤ÎÀâÌÀ¤Ë½¾¤Ã¤ÆºÇ¿·¤Î
@@ -1471,7 +1563,8 @@ Fetching 133 new ports or files... done.
 
 	    <orderedlist>
 	      <listitem>
-		<para><link linkend="svn">svn</link><indexterm>
+		<para><link linkend="svn">svn</link>
+		  <indexterm>
 		    <primary>Subversion</primary>
 		  </indexterm> ¤ò»È¤Ã¤Æ¡¢
 		  ´õ˾¤¹¤ë³«È¯¥Ö¥é¥ó¥Á¡¢
@@ -1481,7 +1574,8 @@ Fetching 133 new ports or files... done.
 		  ¥Ö¥é¥ó¥Á̾¤Ë¤Ä¤¤¤Æ¤Ï¡¢¸½ºß¤Î³«È¯¤Î¥Ø¥Ã¥É¥Ö¥é¥ó¥Á¤Ï
 		  <literal>head</literal>¡¢¤ª¤è¤Ó <link xlink:href="&url.base;/releng/">¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¤Î¥Ú¡¼¥¸</link>
 		  ¤ÎÆÃÄê¤Î¥Ö¥é¥ó¥Á¤Ç¤Ï
-                  <literal>stable/9</literal><indexterm>
+                  <literal>stable/9</literal>
+		  <indexterm>
 		    <primary>-STABLE</primary>
 		    <secondary><application>Subversion</application>
 		      ¤ò»È¤Ã¤¿Æ±´ü</secondary>
@@ -1489,7 +1583,8 @@ Fetching 133 new ports or files... done.
 		  <literal>releng/9.2</literal> ¤È¤Ê¤ê¤Þ¤¹¡£
 		  <application>Subversion</application>
 		  ¤ò»È¤Ã¤Æ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ëºÝ¤Î
-		  URL ¤Î¥×¥ì¥Õ¥£¥Ã¥¯¥¹¤Ï¡¢<link linkend="svn-mirrors">Subversion ¥ß¥é¡¼¥µ¥¤¥È</link>
+		  URL ¤Î¥×¥ì¥Õ¥£¥Ã¥¯¥¹¤Ï¡¢<link
+		    linkend="svn-mirrors">Subversion ¥ß¥é¡¼¥µ¥¤¥È</link>
 		  ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 		  ¥ê¥Ý¥¸¥È¥ê¥µ¥¤¥º¤Î´ÑÅÀ¤«¤é¡¢
 		  ´õ˾¤¹¤ë¥µ¥Ö¥Ä¥ê¡¼¤Î¤ß¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Þ¤¹¡£</para>
@@ -1497,7 +1592,8 @@ Fetching 133 new ports or files... done.
 
 	      <listitem>
 		<para>¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Ø¤ÎÀܳ¤Ë¹â®¤Ê²óÀþ¤òÍøÍѤǤ­¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
-		  <application>CTM</application><indexterm>
+		  <application>CTM</application>
+		  <indexterm>
 		    <primary>-STABLE</primary>
 		    <secondary>CTM ¤ò»È¤Ã¤ÆƱ´ü¤¹¤ë</secondary>
 		  </indexterm>
@@ -1531,8 +1627,9 @@ Fetching 133 new ports or files... done.
 
     <para>¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÀܳ¤Þ¤¿¤ÏÅŻҥ᡼¥ë¤ò»ÈÍѤ·¤Æ¡¢&os;
       ¥×¥í¥¸¥§¥¯¥È¤Î¥½¡¼¥¹¤Î¤¢¤ë°ìÉôʬ¤Þ¤¿¤ÏÁ´ÂΤκǿ·¤òÄɤ¤¤«¤±¤ëÊýË¡¤Ï¿§¡¹¤¢¤ê¤Þ¤¹¡£
-      ´ðËÜŪ¤Ê¥µ¡¼¥Ó¥¹¤Ï <link linkend="svn">Subversion</link>
-      ¤È <link linkend="ctm">CTM</link> ¤Ç¤¹¡£</para>
+      ´ðËÜŪ¤Ê¥µ¡¼¥Ó¥¹¤Ï
+      <link linkend="svn">Subversion</link> ¤È
+      <link linkend="ctm">CTM</link> ¤Ç¤¹¡£</para>
 
     <warning>
       <para>¥½¡¼¥¹¥Ä¥ê¡¼¤Î°ìÉô¤òºÇ¿·¤Î¤â¤Î¤Ë¹¹¿·¤¹¤ë¤³¤È¤Ï²Äǽ¤Ç¤¹¡£
@@ -1917,7 +2014,7 @@ Fetching 133 new ports or files... done.
 
       <para>¤½¤Î¸å¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£:</para>
 
-       <screen>&prompt.root; <userinput>adjkerntz -i</userinput>
+      <screen>&prompt.root; <userinput>adjkerntz -i</userinput>
 &prompt.root; <userinput>mergemaster -p</userinput>
 &prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make installworld</userinput>
@@ -2135,7 +2232,8 @@ Script done, …</screen>
 	  ¤Ë½ÐÎϤòÊݸ¤·¤Æ¤Ï<emphasis>¤¤¤±¤Þ¤»¤ó</emphasis>¡£
 	  ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢¼¡¤ÎºÆµ¯Æ°¤Çºï½ü¤µ¤ì¤Æ¤·¤Þ¤¦²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
 	  ½ÐÎϤÎÊݸ¤Ë¤Ï¡¢<filename>/var/tmp</filename> ¤ä
-          <systemitem class="username">root</systemitem> ¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤¬Å¬¤·¤Æ¤¤¤Þ¤¹¡£</para>
+          <systemitem class="username">root</systemitem>
+	  ¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤¬Å¬¤·¤Æ¤¤¤Þ¤¹¡£</para>
       </sect3>
 
       <sect3 xml:id="make-buildworld">
@@ -2146,7 +2244,9 @@ Script done, …</screen>
 
 	<screen>&prompt.root; <userinput>cd /usr/src</userinput></screen>
 
-	<indexterm><primary><command>make</command></primary></indexterm>
+	<indexterm>
+	  <primary><command>make</command></primary>
+	</indexterm>
 
 	<para>world ¤òºÆ¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢&man.make.1; ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
 	  ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢<filename>Makefile</filename> ¤«¤é¡¢
@@ -2222,11 +2322,13 @@ Script done, …</screen>
 	<para>ÂèÆó¤Ë¡¢NFS ¥Þ¥¦¥ó¥È¤òÍøÍѤ¹¤ë¤³¤È¤Ç¡¢
 	  ¥Í¥Ã¥È¥ï¡¼¥¯¾å¤ÎÊ£¿ô¤Î¥Þ¥·¥ó¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤³¤È¤¬²Äǽ¤ÊÅÀ¤¬¤¢¤²¤é¤ì¤Þ¤¹¡£
 	  ¤¿¤È¤¨¤Ð»°Âæ¤Î¥Þ¥·¥ó¡¢
-	  <systemitem>A</systemitem>, <systemitem>B</systemitem>, <systemitem>C</systemitem>
+	  <systemitem>A</systemitem>,
+	  <systemitem>B</systemitem>, <systemitem>C</systemitem>
 	  ¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢¤Þ¤º¥Þ¥·¥ó <systemitem>A</systemitem>
 	  ¤Ç <command>make buildworld</command> ¤È
           <command>make installworld</command> ¤ò¼Â¹Ô¤·¤Þ¤¹¡£
-	  ¤½¤ì¤«¤é¡¢¥Þ¥·¥ó <systemitem>B</systemitem> ¤È¥Þ¥·¥ó <systemitem>C</systemitem>
+	  ¤½¤ì¤«¤é¡¢¥Þ¥·¥ó <systemitem>B</systemitem>
+	  ¤È¥Þ¥·¥ó <systemitem>C</systemitem>
 	  ¤Ç¥Þ¥·¥ó <systemitem>A</systemitem> ¤Î
           <filename>/usr/src</filename> ¤È <filename>/usr/obj</filename> ¤ò
 	  NFS ¥Þ¥¦¥ó¥È¤·¡¢<command>make installworld</command>
@@ -2383,20 +2485,32 @@ Script done, …</screen>
 	¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤Ã¤ÆÉÔ¬¤Î»öÂÖ¤ËÈ÷¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
 
     <sect3 xml:id="mergemaster">
-      <info><title><command>mergemaster</command></title>
+      <info>
+	<title><command>mergemaster</command></title>
+
 	<authorgroup>
-	  <author><personname><firstname>Tom</firstname><surname>Rhodes</surname></personname><contrib>´ó¹Æ: </contrib></author>
+	  <author>
+	    <personname>
+	      <firstname>Tom</firstname>
+	      <surname>Rhodes</surname>
+	    </personname>
+	    <contrib>´ó¹Æ: </contrib>
+	  </author>
 	</authorgroup>
       </info>
       
-        <indexterm><primary><command>mergemaster</command></primary></indexterm>
+      <indexterm>
+	<primary>
+	  <command>mergemaster</command>
+	</primary>
+      </indexterm>
 
       <para>&man.mergemaster.8; ¤Ï Bourne ¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤Ç¡¢
-	<filename>/etc</filename>
-	¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤È¥½¡¼¥¹¥Ä¥ê¡¼¤Î
+	<filename>/etc</filename> ¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤È¥½¡¼¥¹¥Ä¥ê¡¼¤Î
 	<filename>/usr/src/etc</filename>
 	¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤Î°ã¤¤¤ò³Îǧ¤¹¤ë¤Î¤ò¼êÅÁ¤Ã¤Æ¤¯¤ì¤Þ¤¹¡£
-        ¤³¤ì¤ò»È¤¦¤Î¤¬¡¢¥½¡¼¥¹¥Ä¥ê¡¼¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤Ë¥·¥¹¥Æ¥à¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò
+        ¤³¤ì¤ò»È¤¦¤Î¤¬¡¢
+	¥½¡¼¥¹¥Ä¥ê¡¼¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤Ë¥·¥¹¥Æ¥à¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò
 	¹¹¿·¤¹¤ë¤¿¤á¤Ë¿ä¾©¤µ¤ì¤ëÊýË¡¤Ç¤¹¡£</para>
 
       <para>»Ï¤á¤ë¤Ë¤Ï¡¢¥×¥í¥ó¥×¥È¤«¤é
@@ -2590,8 +2704,8 @@ Script done, …</screen>
 	    <screen>&prompt.root; <userinput>cd /var/tmp</userinput>
 &prompt.root; <userinput>diff -r root-20130214 root-20130221</userinput></screen>
 
-	    <para>¤³¤ì¤Ë¤è¤Ã¤ÆÊó¹ð¤µ¤ì¤ëÁê°ãÅÀ¤Ï¡¢ÂçÄñ¤Î¾ì¹ç¡¢<filename>/var/tmp/root-20130221/etc</filename>
-	      ¤È
+	    <para>¤³¤ì¤Ë¤è¤Ã¤ÆÊó¹ð¤µ¤ì¤ëÁê°ãÅÀ¤Ï¡¢ÂçÄñ¤Î¾ì¹ç¡¢
+	      <filename>/var/tmp/root-20130221/etc</filename> ¤È
 	      <filename>/etc</filename>
 	      ¤È¤ÎÁê°ãÅÀ¤ËÈæ¤Ù¤ÆÈó¾ï¤Ë¾¯¤Ê¤¤¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£
 	      Áê°ãÅÀ¤¬¾¯¤Ê¤¤¤¿¤á¡¢Êѹ¹ÅÀ¤ò´û¸¤Î
@@ -2624,12 +2738,19 @@ Script done, …</screen>
     </sect2>
 
     <sect2 xml:id="make-delete-old">
-      <info><title>»È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Îºï½ü</title>
+      <info>
+	<title>»È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Îºï½ü</title>
+
 	<authorgroup>
-	  <author><personname><firstname>Anton</firstname><surname>Shterenlikht</surname></personname><contrib>¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿¥Î¡¼¥È¤ÎÄó¶¡: </contrib></author>
+	  <author>
+	    <personname>
+	      <firstname>Anton</firstname>
+	      <surname>Shterenlikht</surname>
+	    </personname>
+	    <contrib>¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿¥Î¡¼¥È¤ÎÄó¶¡: </contrib>
+	  </author>
 	</authorgroup>
       </info>
-      
 
       <indexterm>
 	<primary>Deleting obsolete files and directories</primary>
@@ -3026,9 +3147,17 @@ Building everything..
   </sect1>
 
   <sect1 xml:id="small-lan">
-    <info><title>Ê£¿ô¤Î¥Þ¥·¥ó¤ÇÄɤ¤¤«¤±¤ë</title>
+    <info>
+      <title>Ê£¿ô¤Î¥Þ¥·¥ó¤ÇÄɤ¤¤«¤±¤ë</title>
+
       <authorgroup>
-	<author><personname><firstname>Mike</firstname><surname>Meyer</surname></personname><contrib>´ó¹Æ: </contrib></author>
+	<author>
+	  <personname>
+	    <firstname>Mike</firstname>
+	    <surname>Meyer</surname>
+	  </personname>
+	  <contrib>´ó¹Æ: </contrib>
+	</author>
       </authorgroup>
     </info>
     


More information about the svn-doc-all mailing list