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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Sat Apr 6 02:37:29 UTC 2013


Author: ryusuke
Date: Sat Apr  6 02:37:29 2013
New Revision: 41383
URL: http://svnweb.freebsd.org/changeset/doc/41383

Log:
  - Merge the following from the English version:
  
  	r40809 -> r41349	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 Apr  6 01:50:46 2013	(r41382)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Sat Apr  6 02:37:29 2013	(r41383)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40809
+     Original revision: r41349
      $FreeBSD$
 -->
 
@@ -52,11 +52,9 @@
       ¥»¥­¥å¥ê¥Æ¥£¤ä¾¤Î½ÅÍפʽ¤Àµ¤Î¤¿¤á¡¢»þ¤Ë¤Ï¥¢¥Ã¥×¥Ç¡¼¥È¤ò¹Ô¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
       »ÈÍѤ·¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤Ë´Ø¤ï¤é¤º¡¢&os; ¤Ï¡¢
       ¼ê¸µ¤Î¥·¥¹¥Æ¥à¤òºÇ¿·¤Î³«È¯¥Ä¥ê¡¼¤ÈƱ´ü¤¹¤ë¤¿¤á¤ËɬÍפʥġ¼¥ë¤ò¤¹¤Ù¤ÆÍÑ°Õ¤·¤Æ¤¤¤Þ¤¹¡£
-      ¤½¤·¤Æ¡¢¤³¤ì¤é¤Î¥Ä¡¼¥ë¤Ï¡¢&os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤¿¤á¤Ë¤â»È¤¨¤Þ¤¹¡£
-      ¤â¤·¤â¤¢¤Ê¤¿¤¬¡¢³«È¯ÅÓÃæ¤Î¥·¥¹¥Æ¥à¤òÄɤ¤¤«¤±¤è¤¦¤«¡¢
-      ¤½¤ì¤È¤â¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¤Î¤É¤ì¤«¤ò»È¤¤Â³¤±¤è¤¦¤«¤È̤äƤ¤¤ë¤Î¤Ê¤é¡¢
-      ¤­¤Ã¤È¤³¤Î¾Ï¤¬»²¹Í¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£
-      ¼ê¸µ¤Î¥·¥¹¥Æ¥à¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë´ðËÜŪ¤Ê¥Ä¡¼¥ë¤Ë¤Ä¤¤¤Æ¤â²òÀ⤷¤Æ¤¤¤Þ¤¹¡£</para>
+      ¤½¤·¤Æ¡¢¤³¤ì¤é¤Î¥Ä¡¼¥ë¤Ï¡¢&os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤¿¤á¤Ë»È¤¨¤Þ¤¹¡£
+      ¤³¤Î¾Ï¤Ç¤Ï¡¢³«È¯¥Ö¥é¥ó¥Á¤òÄɤ¤¤«¤±¤ëÊýË¡¡¢¤ª¤è¤Ó¡¢&os;
+      ¥·¥¹¥Æ¥à¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë´ðËÜŪ¤Ê¥Ä¡¼¥ë¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Æ¤¤¤Þ¤¹¡£</para>
 
     <para>¤³¤Î¾Ï¤òÆɤó¤Çʬ¤«¤ë¤Î¤Ï:</para>
 
@@ -70,7 +68,7 @@
 	<para><application>freebsd-update</application>,
 	  <application>Subversion</application> ¤â¤·¤¯¤Ï
 	  <application>CTM</application>
-	  ¤ò»È¤Ã¤¿¥·¥¹¥Æ¥à¹¹¿·ÊýË¡</para>
+	  ¤ò»È¤Ã¤¿ &os; ¥·¥¹¥Æ¥à¤Î¹¹¿·ÊýË¡</para>
       </listitem>
 
       <listitem>
@@ -81,7 +79,7 @@
 	<para><application>Subversion</application>
 	  ¤Þ¤¿¤Ï¥É¥­¥å¥á¥ó¥ÈÍѤΠports<!-- and
 	  <application>Docsnap</application>--> ¤ò»È¤Ã¤Æ¡¢
-	  ¥É¥­¥å¥á¥ó¥È¤òºÇ¿·¤Î¤â¤Î¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëÊýË¡¡£</para>
+	  ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥É¥­¥å¥á¥ó¥È¤òºÇ¿·¤Î¤â¤Î¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëÊýË¡¡£</para>
       </listitem>
 
       <listitem>
@@ -89,8 +87,7 @@
       </listitem>
 
       <listitem>
-	<para><command>make buildworld</command> (Åù)
-      ¤ò»È¤Ã¤Æ¥Ù¡¼¥¹¥·¥¹¥Æ¥àÁ´ÂΤòºÆ¹½ÃÛ¤·¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡</para>
+	<para>¥Ù¡¼¥¹¥·¥¹¥Æ¥àÁ´ÂΤòºÆ¹½ÃÛ¤·¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡</para>
       </listitem>
 
     </itemizedlist>
@@ -98,8 +95,9 @@
     <para>¤³¤Î¾Ï¤òÆɤàÁ°¤Ë¡¢°Ê²¼¤Î½àÈ÷¤ò¤·¤Þ¤·¤ç¤¦¡£</para>
 
     <itemizedlist>
-      <listitem><para>¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤ÎŬÀÚ¤ÊÀßÄê (<xref
-      linkend="advanced-networking"/>)</para>
+      <listitem>
+	<para>¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤ÎŬÀÚ¤ÊÀßÄê (<xref
+	  linkend="advanced-networking"/>)</para>
       </listitem>
       <listitem><para>¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤Î¥½¥Õ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Î½¬ÆÀ
         (<xref linkend="ports"/>)</para></listitem>
@@ -108,8 +106,8 @@
     <note>
       <para>¤³¤Î¾Ï¤òÄ̤¸¤Æ¡¢
 	&os; ¤Î¥½¡¼¥¹¥³¡¼¥É¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤¿¤ê¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Î¤Ë
-	<command>svn</command> ¥³¥Þ¥ó¥É¤¬ÍѤ¤¤é¤ì¤Þ¤¹¡£
-	¤³¤Î¥³¥Þ¥ó¥É¤ò»È¤¦¤Ë¤Ï¡¢<filename
+	<command>svn</command> ¤¬ÍѤ¤¤é¤ì¤Þ¤¹¡£
+	¤³¤Î¥³¥Þ¥ó¥É¤ò»È¤¦¤¿¤á¤Ë¤Ï¡¢<filename
 	  role="package">devel/subversion</filename> port ¤Þ¤¿¤Ï package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
     </note>
@@ -132,7 +130,7 @@
 	</author>
       </authorgroup>
     </sect1info>
-    <title>FreeBSD Update</title>
+    <title>&os; Update</title>
 
     <indexterm><primary>Updating and Upgrading</primary></indexterm>
     <indexterm>
@@ -157,9 +155,10 @@
     <note>
       <para>¥Ð¥¤¥Ê¥ê¥¢¥Ã¥×¥Ç¡¼¥È¤Ï¡¢
 	¥»¥­¥å¥ê¥Æ¥£¥Á¡¼¥à¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤È¥ê¥ê¡¼¥¹¤ÇÍøÍѤǤ­¤Þ¤¹¡£
-	¿·¤·¤¤¥ê¥ê¡¼¥¹¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëÁ°¤Ë¡¢¸½ºß¤Î¥ê¥ê¡¼¥¹¤Î¥¢¥Ê¥¦¥ó¥¹¤ËÌܤòÄ̤·¡¢
-	¥¢¥Ã¥×¥Ç¡¼¥È¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¥ê¥ê¡¼¥¹¤ËÂФ·¤Æ½ÅÍפʾðÊ󤬤ʤ¤¤«¤É¤¦¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
-	¤³¤ì¤é¤Î¥¢¥Ê¥¦¥ó¥¹¤Ï
+	¿·¤·¤¤¥ê¥ê¡¼¥¹¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëÁ°¤Ë¡¢
+	¥¢¥Ã¥×¥Ç¡¼¥È¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¥ê¥ê¡¼¥¹¤Î¥¢¥Ê¥¦¥ó¥¹¤ËÌܤòÄ̤·¡¢
+	½ÅÍפʾðÊ󤬤ʤ¤¤«¤É¤¦¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	¥ê¥ê¡¼¥¹¤Î¥¢¥Ê¥¦¥ó¥¹¤Ï
 	<ulink url="http://www.FreeBSD.org/ja/releases/"></ulink>
 	¤Ç³Îǧ¤Ç¤­¤Þ¤¹¡£</para>
     </note>
@@ -171,11 +170,11 @@
     <sect2 id="freebsdupdate-config-file">
       <title>ÀßÄê¥Õ¥¡¥¤¥ë</title>
 
-      <para>ÀßÄê¥Õ¥¡¥¤¥ë <filename>/etc/freebsd-update.conf</filename>
-	¤ò¥Ç¥Õ¥©¥ë¥È¤«¤é¤­¤áºÙ¤«¤¯Ä´À°¤·¤Æ¡¢
+      <para><filename>/etc/freebsd-update.conf</filename>
+	¤ÎÀßÄê¤ò¥Ç¥Õ¥©¥ë¥È¤«¤é¤­¤áºÙ¤«¤¯Ä´À°¤·¤Æ¡¢
 	¥¢¥Ã¥×¥Ç¡¼¥È¥×¥í¥»¥¹¤òÀ©¸æ¤¹¤ë¥æ¡¼¥¶¤â¤¤¤Þ¤¹¡£
 	¤³¤Îºî¶È¤ÏÎɤ¯Ê¸½ñ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢
-	°Ê²¼¤Î¤¤¤¯¤Ä¤«¤Î¹àÌܤˤĤ¤¤Æ¤ÏÀâÌÀ¤¬É¬ÍפǤ·¤ç¤¦¡£</para>
+	°Ê²¼¤Î¹àÌܤˤĤ¤¤Æ¤ÏÀâÌÀ¤¬É¬ÍפǤ·¤ç¤¦¡£</para>
 
       <programlisting># Components of the base system which should be kept updated.
 Components src world kernel</programlisting>
@@ -190,7 +189,7 @@ Components src world kernel</programlist
 	¥½¡¼¥¹¥³¡¼¥É¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤òµö²Ä¤·¤Þ¤¹¡£</para>
 
       <para>¤³¤ÎÉôʬ¤Ë¤Ä¤¤¤Æ¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤­¡¢
-	¥¢¥Ã¥×¥Ç¡¼¥È¤·¤¿¤¤¹àÌܤò¥æ¡¼¥¶¤¬¥ê¥¹¥È¤Ë²Ã¤¨¤ë·Á¤Ë¤¹¤ë¤Î¤¬¥Ù¥¹¥È¤Ç¤·¤ç¤¦¡£
+	¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¹àÌܤò¥æ¡¼¥¶¤¬¥ê¥¹¥È¤Ë²Ã¤¨¤ë·Á¤Ë¤¹¤ë¤Î¤¬¥Ù¥¹¥È¤Ç¤·¤ç¤¦¡£
 	¥½¡¼¥¹¥³¡¼¥É¤È¥Ð¥¤¥Ê¥ê¤¬Æ±´ü¤·¤Æ¤¤¤Ê¤¤¤È¡¢
 	Èá»´¤Ê·ë²Ì¤ò¤â¤¿¤é¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
@@ -198,9 +197,10 @@ Components src world kernel</programlist
 # statement will be ignored.
 IgnorePaths</programlisting>
 
-      <para>¥¢¥Ã¥×¥Ç¡¼¥È¤ÇÊѹ¹¤µ¤ì¤Æ¤Ï¤¤¤±¤Ê¤¤ÆÃÄê¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¢
-	<filename class="directory">/bin</filename> ¤ä
-	<filename class="directory">/sbin</filename> Åù¤Î¥Ñ¥¹¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£
+      <para><filename class="directory">/bin</filename> ¤ä
+	<filename class="directory">/sbin</filename>
+	Åù¤ÎÆÃÄê¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤ÇÊѹ¹¤·¤Ê¤¤¤è¤¦¤Ë¡¢
+	¤³¤ì¤é¤Î¥Ñ¥¹¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£
 	¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥í¡¼¥«¥ë¤ÎÊѹ¹ÅÀ¤ò <command>freebsd-update</command>
 	¤¬¾å½ñ¤­¤¹¤ë¤³¤È¤òËɤ°ÌÜŪ¤Ë¤âÍøÍѤǤ­¤Þ¤¹¡£</para>
 
@@ -209,7 +209,7 @@ IgnorePaths</programlisting>
 # modified by the user (unless changes are merged; see below).
 UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile</programlisting>
 
-      <para>»ØÄꤷ¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò¡¢
+      <para>¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢»ØÄꤷ¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò¡¢
 	¥í¡¼¥«¥ë¤ÇÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Î¤ß¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£
 	¥æ¡¼¥¶¤¬¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤òÊѹ¹¤·¤Æ¤¤¤ë¤È¡¢
 	¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Î¼«Æ°¥¢¥Ã¥×¥Ç¡¼¥È¤Ï̵¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
@@ -225,14 +225,14 @@ MergeChanges /etc/ /var/named/etc/</prog
       <para><command>freebsd-update</command>
 	¤¬¥Þ¡¼¥¸¤¹¤Ù¤­¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î°ìÍ÷¤Ç¤¹¡£
 	¥Õ¥¡¥¤¥ë¤Î¥Þ¡¼¥¸¤Î¥×¥í¥»¥¹¤Ï¡¢
-	&man.mergemaster.8; ¤ÈƱÍÍ &man.diff.1; ¥Ñ¥Ã¥Á¤ÎϢ³¤Ç¤¹¡£
-	¥Þ¡¼¥¸¤ò¾µÇ§¤¹¤ë¤«¡¢¥¨¥Ç¥£¥¿¤òµ¯Æ°¤¹¤ë¤«¡¢
+	&man.mergemaster.8; ¤ÈƱÍÍ &man.diff.1; ¥Ñ¥Ã¥Á¤ÎϢ³¤Ç¤¹¤¬¡¢
+	ÁªÂò»è¤Ï¾¯¤Ê¤¯¡¢¥Þ¡¼¥¸¤ò¾µÇ§¤¹¤ë¤«¡¢¥¨¥Ç¥£¥¿¤òµ¯Æ°¤¹¤ë¤«¡¢
 	<command>freebsd-update</command>
 	¤òÃæÃǤ¹¤ë¤«¤É¤¦¤«¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£
 	¤â¤·¡¢¿´ÇÛ¤ÊÅÀ¤¬¤¢¤ì¤Ð¡¢
 	<filename class="directory">/etc</filename>
 	¤ò¥Ð¥Ã¥¯¥¢¥Ã¥×¤·¤Æ¤«¤é¥Þ¡¼¥¸¤ò¾µÇ§¤·¤Æ¤¯¤À¤µ¤¤¡£
-	<command>mergemaster</command> ¥³¥Þ¥ó¥É¤Î¾ÜºÙ¤Ê¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	<command>mergemaster</command> ¤Î¾ÜºÙ¤Ê¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢
 	<xref linkend="mergemaster"/> ¤Ç³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <programlisting># Directory in which to store downloaded updates and temporary
@@ -249,7 +249,7 @@ MergeChanges /etc/ /var/named/etc/</prog
 # which actually are installed and upgrade those (StrictComponents no)?
 # StrictComponents no</programlisting>
 
-      <para><literal>yes</literal> ¤ËÀßÄꤹ¤ë¤È¡¢
+      <para>¤³¤Î¥ª¥×¥·¥ç¥ó¤ò <literal>yes</literal> ¤ËÀßÄꤹ¤ë¤È¡¢
 	<command>freebsd-update</command> ¤Ï
 	<literal>Components</literal> ¤Î¥ê¥¹¥È¤¬´°Á´¤ËÀµ¤·¤¤¤ÈȽÃǤ·¡¢
 	¤³¤Î¥ê¥¹¥È°Ê³°¤ÎÊѹ¹ÅÀ¤Ë¤Ä¤¤¤Æ¤Ï¼è¤ê°·¤¤¤Þ¤»¤ó¡£
@@ -261,30 +261,32 @@ MergeChanges /etc/ /var/named/etc/</prog
     <sect2 id="freebsdupdate-security-patches">
       <title>¥»¥­¥å¥ê¥Æ¥£¥Ñ¥Ã¥Á</title>
 
-      <para>¥»¥­¥å¥ê¥Æ¥£¥Ñ¥Ã¥Á¤Ï¥ê¥â¡¼¥È¥Þ¥·¥ó¤ËÊݸ¤µ¤ì¤Æ¤ª¤ê¡¢
-	°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
+      <para>°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢&os;
+	¤Î¥»¥­¥å¥ê¥Æ¥£¥Ñ¥Ã¥Á¤¬¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>freebsd-update fetch</userinput>
 &prompt.root; <userinput>freebsd-update install</userinput></screen>
 
-      <para>¥«¡¼¥Í¥ë¤Ë¥Ñ¥Ã¥Á¤¬Åö¤¿¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	¤¹¤Ù¤Æ¤¬¤¦¤Þ¤¯¼Â¹Ô¤Ç¤­¡¢¥·¥¹¥Æ¥à¤Ë¥Ñ¥Ã¥Á¤¬Åö¤¿¤ë¤è¤¦¤Ç¤¢¤ì¤Ð¡¢
-	ËèÈդΠ&man.cron.8; ¥¸¥ç¥Ö¤È¤·¤Æ <command>freebsd-update</command>
-	¤ò¼Â¹Ô¤·¤Æ¤â¤è¤¤¤Ç¤·¤ç¤¦¡£
-	¤³¤Î¥¿¥¹¥¯¤ò¼Â¹Ô¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢
-	°Ê²¼¤Î¥¨¥ó¥È¥ê¤ò <filename>/etc/crobntab</filename> ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
+      <para>¥¢¥Ã¥×¥Ç¡¼¥È¤Ë¤è¤Ã¤Æ¥«¡¼¥Í¥ë¤Ë¥Ñ¥Ã¥Á¤¬Åö¤¿¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢
+	¥Ñ¥Ã¥Á¤¬Åö¤¿¤Ã¤¿¥«¡¼¥Í¥ë¤Çµ¯Æ°¤¹¤ë¤è¤¦¤Ë¡¢
+	¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+	¤â¤·¤¯¤Ï¡¢¥·¥¹¥Æ¥à¤Ë¥Ñ¥Ã¥Á¤¬Åö¤Æ¤é¤ì¡¢
+	ËèÈդΠ&man.cron.8; ¥¸¥ç¥Ö¤È¤·¤Æ¡¢<command>freebsd-update</command>
+	¤ò¼Â¹Ô¤¹¤ë¤è¤¦¤Ë¡¢
+	°Ê²¼¤Î¥¨¥ó¥È¥ê¤ò <filename>/etc/crobntab</filename>
+	¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
       <programlisting>@daily                                  root    freebsd-update cron</programlisting>
 
-      <para>¤³¤Î¥¨¥ó¥È¥ê¤Ï¡¢ËèÆü°ìÅÙ
-	<command>freebsd-update</command> ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò¼Â¹Ô¤¹¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
-	¤³¤Î¤è¤¦¤Ë <option>cron</option> ¤Ëµ­½Ò¤¹¤ë¤È¡¢
+      <para>¤³¤Î¥¨¥ó¥È¥ê¤Ï¡¢ËèÆü°ìÅÙ <command>freebsd-update</command>
+	¤ò¼Â¹Ô¤¹¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
+	<option>cron</option> ¤È¶¦¤Ë¼Â¹Ô¤¹¤ë¤È¡¢
 	<command>freebsd-update</command>
 	¤Ï¥¢¥Ã¥×¥Ç¡¼¥È¤¬Â¸ºß¤¹¤ë¤È¤­¤À¤±³Îǧ¤·¤Þ¤¹¡£
 	¥Ñ¥Ã¥Á¤¬Â¸ºß¤¹¤ë¤È¡¢
 	¼«Æ°Åª¤Ë¥í¡¼¥«¥ë¥Ç¥£¥¹¥¯¤Ë¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¤Þ¤¹¤¬¡¢Å¬ÍѤϤµ¤ì¤Þ¤»¤ó¡£
-	¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¤¿¥Ñ¥Ã¥Á¤ò¼êÆ°¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¡¢
-	¤³¤Î¤³¤È¤Ï <username>root</username> °¸¤Æ¤Ë¥á¡¼¥ë¤ÇÄÌÃΤµ¤ì¤Þ¤¹¡£</para>
+	¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¤¿¥Ñ¥Ã¥Á¤ò³Îǧ¤·¡¢¼êÆ°¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפΤ¢¤ë¤³¤È¤¬¡¢
+	<username>root</username> °¸¤Æ¤Ë¥á¡¼¥ë¤ÇÄÌÃΤµ¤ì¤Þ¤¹¡£</para>
 
       <para>¤¦¤Þ¤¯¹Ô¤«¤Ê¤«¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢<command>freebsd-update</command>
 	¤ò°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤¹¤ë¤È¡¢ºÇ¸å¤ÎÊѹ¹¤Þ¤Ç¥í¡¼¥ë¥Ð¥Ã¥¯¤Ç¤­¤Þ¤¹¡£</para>
@@ -298,15 +300,15 @@ MergeChanges /etc/ /var/named/etc/</prog
       <para><command>freebsd-update</command>
 	¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬¼«Æ°Åª¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¥«¡¼¥Í¥ë¤Ï
 	<filename>GENERIC</filename> ¤Î¤ß¤Ç¤¹¡£
-	¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢<command>freebsd-update</command>
-	¤¬Â¾¤ÎÉôʬ¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤¿¸å¡¢
+	¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
+	<command>freebsd-update</command> ¤¬Â¾¤ÎÉôʬ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¸å¡¢
 	¥«¡¼¥Í¥ë¤òºÆ¹½ÃÛ¤·¡¢¤â¤¦°ìÅÙ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤¬ <filename
+	¤·¤«¤·¤Ê¤¬¤é¡¢<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤¬ <filename
 	  class="directory">/boot/GENERIC</filename>
 	¤Ë¸ºß¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢
-	<command>freebsd-update</command> ¤Ë¤è¤ê
-	(¸½ºß¤Î¥·¥¹¥Æ¥à¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¥«¡¼¥Í¥ë¤Ç¤Ê¤¯¤È¤â)
-	¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤Þ¤¹¡£</para>
+	¸½ºß¤Î¥·¥¹¥Æ¥à¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¥«¡¼¥Í¥ë¤Ç¤Ê¤¯¤È¤â¡¢
+	<command>freebsd-update</command>
+	¤Ë¤è¤ê¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤Þ¤¹¡£</para>
 
       <note>
 	<para><filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤ò¡¢¾ï¤Ë <filename
@@ -333,9 +335,10 @@ MergeChanges /etc/ /var/named/etc/</prog
 	  ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤òºÆ¹½ÃÛ¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
 	  ¤·¤«¤·¤Ê¤¬¤é <command>freebsd-update</command> ¤Ï¡¢
 	  <filename>/usr/src/sys/conf/newvers.sh</filename>
-	  ¥Õ¥¡¥¤¥ë¤ò¾ï¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£
-	  ¤³¤ì¤Ï¡¢¸½ºß¤Î¥·¥¹¥Æ¥à¤Î¥Ñ¥Ã¥Á¥ì¥Ù¥ë (<command>uname -r</command> ¤¬
-	  <literal>-p</literal> ¤Çɽ¼¨¤¹¤ëÈÖ¹æ) ¤ò¼¨¤¹ºÝ¤Ë»²¾È¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤Ç¤¹¡£
+	  ¤ò¾ï¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£
+	  ¤³¤ì¤Ï¡¢¸½ºß¤Î¥·¥¹¥Æ¥à¤Î¥Ñ¥Ã¥Á¥ì¥Ù¥ë¤ò
+	  <command>uname -r</command> ¤¬ <literal>-p</literal>
+	  ¤Çɽ¼¨¤¹¤ë»þ¤Ë¤³¤Î¥Õ¥¡¥¤¥ë¤¬»²¾È¤µ¤ì¤Þ¤¹¡£
 	  ¤½¤Î¤¿¤á¡¢²¿¤âÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤â¡¢¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤òºÆ¹½ÃÛ¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢
 	  &man.uname.1; ¤¬¥·¥¹¥Æ¥à¤ÎÀµ³Î¤Ê¥Ñ¥Ã¥Á¥ì¥Ù¥ë¤òÊó¹ð¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
 	  ³Æ¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥¢¥Ã¥×¥Ç¡¼¥È¤ò¤¹¤Ð¤ä¤¯ÇÄ°®¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ë¤Î¤Ç¡¢
@@ -360,12 +363,12 @@ MergeChanges /etc/ /var/named/etc/</prog
 	¤³¤ì¤é¤Ë°Í¸¤¹¤ë¿¤¯¤Î¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë±Æ¶Á¤òÍ¿¤¨¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
 	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î ports ¤òºï½ü¤·¤ÆºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤«¡¢
 	¥á¥¸¥ã¡¼¥¢¥Ã¥×¥°¥ì¡¼¥É¸å¡¢
-	<filename role="package">ports-mgmt/portupgrade</filename>
-	¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»È¤Ã¤Æ¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+	<filename role="package">ports-mgmt/portmaster</filename>
+	¤È¤¤¤Ã¤¿¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»È¤Ã¤Æ¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥Ö¥ë¡¼¥È¥Õ¥©¡¼¥¹Åª¤ÊºÆ¹½Ãۤϡ¢
 	°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ë¤è¤ê¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>portupgrade -af</userinput></screen>
+      <screen>&prompt.root; <userinput>portmaster -f</userinput></screen>
 
       <para>¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¤¹¤Ù¤Æ¤Î ports ¤òŬÀڤ˺ƥ¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤·¤Þ¤¹¡£
 	<makevar>BATCH</makevar> ´Ä¶­ÊÑ¿ô¤ò
@@ -382,7 +385,7 @@ MergeChanges /etc/ /var/named/etc/</prog
 	  ¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¼ê½ç¤Ï &os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤Ã¤ÆÊѤï¤ê¤Þ¤¹¡£</para>
 
 	<sect4 id="freebsd-update-custom-kernel-8x">
-	  <title>&os; 8.X °ÊÁ°¤Î¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë¥«¥¹¥¿¥à¥«¡¼¥Í¥ë</title>
+	  <title>&os; 8.X ¤Ë¤ª¤±¤ë¥«¥¹¥¿¥à¥«¡¼¥Í¥ë</title>
 
 	  <para><filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤¬
 	    <filename class="directory">/boot/GENERIC</filename>
@@ -397,16 +400,16 @@ MergeChanges /etc/ /var/named/etc/</prog
 		<filename
 		  class="directory">/boot/kernel.old</filename>
 		¤Ï <filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤½¤Î¤â¤Î¤Ç¤¹¡£
-		¤¿¤Àñ¤Ë¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤ò
+		¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤ò
 		<filename class="directory">/boot/GENERIC</filename>
 		¤Ø¤ÈÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 	    </listitem>
 
 	    <listitem>
 	      <para>¥³¥ó¥Ô¥å¡¼¥¿¤Ø¤ÎʪÍýŪ¤Ê¥¢¥¯¥»¥¹¤¬²Äǽ¤Ç¤¢¤ì¤Ð¡¢
-		CD-ROM ¥á¥Ç¥£¥¢¤«¤é <filename>GENERIC</filename>
-		¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£
-		¥¤¥ó¥¹¥È¡¼¥ë¥Ç¥£¥¹¥¯¤òÁÞÆþ¤·¤Æ¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+		°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤³¤È¤Ç¡¢
+		¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤«¤é <filename>GENERIC</filename>
+		¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
 
 	      <screen>&prompt.root; <userinput>mount /cdrom</userinput>
 &prompt.root; <userinput>cd /cdrom/<replaceable>X.Y-RELEASE</replaceable>/kernels</userinput>
@@ -458,9 +461,9 @@ MergeChanges /etc/ /var/named/etc/</prog
 
 	    <listitem>
 	      <para>¥³¥ó¥Ô¥å¡¼¥¿¤Ø¤ÎʪÍýŪ¤Ê¥¢¥¯¥»¥¹¤¬²Äǽ¤Ç¤¢¤ì¤Ð¡¢
-		CD-ROM ¥á¥Ç¥£¥¢¤«¤é <filename>GENERIC</filename>
-		¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£
-		¥¤¥ó¥¹¥È¡¼¥ë¥Ç¥£¥¹¥¯¤òÁÞÆþ¤·¤Æ¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+		°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¡¢¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤«¤é
+		<filename>GENERIC</filename>
+		¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
 
 	      <screen>&prompt.root; <userinput>mount /cdrom</userinput>
 &prompt.root; <userinput>cd /cdrom/usr/freebsd-dist</userinput>
@@ -494,20 +497,19 @@ MergeChanges /etc/ /var/named/etc/</prog
 	<para><command>freebsd-update</command>
 	  ¤Ë¤è¤ë¥á¥¸¥ã¡¼¡¢¤Þ¤¿¤Ï¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥ó¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤Ï¡¢
 	  ¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¤ò¥¿¡¼¥²¥Ã¥È¤Ë¤·¤Æ¼Â¹Ô¤·¤Þ¤¹¡£
-	  ¤¿¤È¤¨¤Ð¡¢&os; 8.1
-	  ¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	  °Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï¡¢&os; 9.1 ¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£</para>
 
-	<screen>&prompt.root; <userinput>freebsd-update -r 8.1-RELEASE upgrade</userinput></screen>
+	<screen>&prompt.root; <userinput>freebsd-update -r 9.1-RELEASE upgrade</userinput></screen>
 
 	<para>¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢<command>freebsd-update</command>
 	  ¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤È¸½ºß¤Î¥·¥¹¥Æ¥à¤òɾ²Á¤·¡¢
-	  ¥·¥¹¥Æ¥à¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤¿¤á¤ËɬÍפʾðÊó¤ò¼ý½¸¤·¤Þ¤¹¡£
+	  ¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤¿¤á¤ËɬÍפʾðÊó¤ò¼ý½¸¤·¤Þ¤¹¡£
 	  ²èÌ̤ˤϡ¢¤É¤Î¥³¥ó¥Ý¡¼¥Í¥ó¥È¤¬Ç§¼±¤µ¤ì¡¢
-	  ¤É¤Î¥³¥ó¥Ý¡¼¥Í¥ó¥È¤¬Ç§¼±¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¤È¤¤¤Ã¤¿¥ê¥¹¥È¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
+	  ¤É¤Î¥³¥ó¥Ý¡¼¥Í¥ó¥È¤¬Ç§¼±¤µ¤ì¤Æ¤¤¤Ê¤¤¤È¤¤¤Ã¤¿¥ê¥¹¥È¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
 	  ¤¿¤È¤¨¤Ð°Ê²¼¤Î¤è¤¦¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£</para>
 
 	<screen>Looking up update.FreeBSD.org mirrors... 1 mirrors found.
-Fetching metadata signature for 8.0-RELEASE from update1.FreeBSD.org... done.
+Fetching metadata signature for 9.0-RELEASE from update1.FreeBSD.org... done.
 Fetching metadata index... done.
 Inspecting system... done.
 
@@ -531,7 +533,7 @@ Does this look reasonable (y/n)? y</scre
 	  ¾åµ­¤Î¥¹¥Æ¥Ã¥×¤Ç°Ê²¼¤Î¤è¤¦¤Ê·Ù¹ð¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£</para>
 
 	<screen>WARNING: This system is running a "<replaceable>MYKERNEL</replaceable>" kernel, which is not a
-kernel configuration distributed as part of FreeBSD 8.0-RELEASE.
+kernel configuration distributed as part of FreeBSD 9.0-RELEASE.
 This kernel will not be updated: you MUST update the kernel manually
 before running "/usr/sbin/freebsd-update install"</screen>
 
@@ -541,11 +543,12 @@ before running "/usr/sbin/freebsd-update
 
 	<para>¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥Á¤¬¥í¡¼¥«¥ë¥·¥¹¥Æ¥à¤Ø¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¤¿¤é¡¢
 	  ¼¡¤Ë¥Ñ¥Ã¥Á¤¬Å¬ÍѤµ¤ì¤Þ¤¹¡£
-	  ¤³¤Î¥×¥í¥»¥¹¤Ë¤«¤«¤ë»þ´Ö¤Ï¥³¥ó¥Ô¥å¡¼¥¿¤ÎÀ­Ç½¤È¥ï¡¼¥¯¥í¡¼¥É¤Ë°Í¸¤·¤Þ¤¹¡£
+	  ¤³¤Î¥×¥í¥»¥¹¤Ë¤Ï»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¡£
+	  ¤³¤Î»þ´Ö¤Ï¥³¥ó¥Ô¥å¡¼¥¿¤ÎÀ­Ç½¤È¥ï¡¼¥¯¥í¡¼¥É¤Ë°Í¸¤·¤Þ¤¹¡£
 	  ¤½¤Î¸å¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤¬¥Þ¡¼¥¸¤µ¤ì¤Þ¤¹¡£
-	  ¤³¤Î¥×¥í¥»¥¹¤Ç¤Ï¡¢¥Õ¥¡¥¤¥ë¤ò¥Þ¡¼¥¸¤¹¤ë¤«¡¢
+	  ¤³¤Î¥×¥í¥»¥¹¤Ç¤Ï¡¢¥æ¡¼¥¶¤Ï¥Õ¥¡¥¤¥ë¤ò¥Þ¡¼¥¸¤¹¤ë¤«¡¢
 	  ²èÌ̾å¤Ë¥¨¥Ç¥£¥¿¤òΩ¤Á¾å¤²¤Æ¼êÆ°¤Ç¥Þ¡¼¥¸¤¹¤ë¤«¤ò¿Ò¤Í¤é¤ì¤Þ¤¹¡£
-	  ¥×¥í¥»¥¹¤´¤È¤Ë¡¢¥Þ¡¼¥¸¤ËÀ®¸ù¤·¤¿¾ðÊ󤬥桼¥¶¤Ë¼¨¤µ¤ì¤Þ¤¹¡£
+	  ¥×¥í¥»¥¹¤¬¿Ê¤à¤´¤È¤Ë¡¢À®¸ù¤·¤¿¥Þ¡¼¥¸¤Î¤¹¤Ù¤Æ¤Î·ë²Ì¤Î¾ðÊ󤬥桼¥¶¤Ë¼¨¤µ¤ì¤Þ¤¹¡£
 	  ¥Þ¡¼¥¸¤Ë¼ºÇÔ¤·¤¿¤ê¡¢Ìµ»ë¤·¤¿¾ì¹ç¤Ë¤Ï¡¢¥×¥í¥»¥¹¤¬ÃæÃǤ·¤Þ¤¹¡£
 	  ¥æ¡¼¥¶¤Ë¤è¤Ã¤Æ¤Ï <filename class="directory">/etc</filename>
 	  ¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤ê¡¢
@@ -556,51 +559,48 @@ before running "/usr/sbin/freebsd-update
 	  <para>¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥Á¤ÏÊ̤Υǥ£¥ì¥¯¥È¥ê¤Ç¥Þ¡¼¥¸¤µ¤ì¤Æ¤ª¤ê¡¢
 	    ¤Þ¤À¡¢¥·¥¹¥Æ¥à¤Ë¤ÏÈ¿±Ç¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
 	    ¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥Á¤¬Àµ¤·¤¯Å¬ÍѤµ¤ì¡¢
-	    ¤¹¤Ù¤Æ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬¥Þ¡¼¥¸¤µ¤ì¤Æ¥×¥í¥»¥¹¤¬¥¹¥à¡¼¥º¤Ë¿Ê¤ó¤Ç¤¤¤ë»þ¤Ë¤Ï¡¢
-	    ¥æ¡¼¥¶¤Ë¤è¤ëÊѹ¹ÅÀ¤Î¥³¥ß¥Ã¥È¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£</para>
-	</note>
-
-	<para>¤³¤Î¥×¥í¥»¥¹¤¬½ª¤ï¤Ã¤¿¤é¡¢
-	  °Ê²¼¤Î¥³¥Þ¥ó¥É¤òÍѤ¤¤Æ¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¥Ç¥£¥¹¥¯¤ËÈ¿±Ç¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    ¤¹¤Ù¤Æ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬¥Þ¡¼¥¸¤µ¤ì¤Æ¥×¥í¥»¥¹¤¬¥¹¥à¡¼¥º¤Ë¿Ê¤ó¤À¤é¡¢
+	    ¥æ¡¼¥¶¤Ï°Ê²¼¤Î¥³¥Þ¥ó¥É¤òÍѤ¤¤Æ¡¢
+	    Êѹ¹ÅÀ¤ò¥Ç¥£¥¹¥¯¤ËÈ¿±Ç¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
 
+	</note>
+
 	<para>¥Ñ¥Ã¥Á¤ÏºÇ½é¤Ë¥«¡¼¥Í¥ë¤È¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤ËÂФ·¤ÆÅö¤Æ¤é¤ì¤Þ¤¹¡£
 	  ¤³¤³¤Ç¥³¥ó¥Ô¥å¡¼¥¿¤òºÆµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 	  ¥·¥¹¥Æ¥à¤¬¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
-	  &man.nextboot.8; ¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¼¡²ó¤ÎºÆµ¯Æ°»þ¤Î¥«¡¼¥Í¥ë¤ò
-	  (¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤¿) <filename
-	  class="directory">/boot/GENERIC</filename> ¤ËÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	  &man.nextboot.8; ¤ò»È¤Ã¤Æ¼¡²ó¤ÎºÆµ¯Æ°»þ¤Î¥«¡¼¥Í¥ë¤ò¡¢
+	  ¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤¿ <filename
+	  class="directory">/boot/GENERIC</filename>
+	  ¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>nextboot -k GENERIC</userinput></screen>
 
 	<warning>
 	  <para><filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤ÇºÆµ¯Æ°¤¹¤ëÁ°¤Ë¡¢
-	    ¥·¥¹¥Æ¥à¤¬Å¬Àڤ˵¯Æ°¤¹¤ë¤¿¤á¤ËɬÍפÊ
-	    (¤â¤·¥³¥ó¥Ô¥å¡¼¥¿¤Ë¥ê¥â¡¼¥È¤Ç¥¢¥¯¥»¥¹¤·¤Æ¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¤¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢
-	    ¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤ËɬÍפÊ)
-	    ¤¹¤Ù¤Æ¤Î¥É¥é¥¤¥Ð¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
-	    Æäˡ¢¤³¤ì¤Þ¤Ç¤Ë¼Â¹Ô¤·¤Æ¤¤¤¿¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤¬
-	    (Ä̾ï¤Ï¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤È¤·¤ÆÄ󶡤µ¤ì¤Æ¤¤¤ë)
-	    ¥Ó¥ë¥ÉºÑ¤ß¤Îµ¡Ç½¤ò´Þ¤ó¤Ç¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
+	    ¥«¡¼¥Í¥ë¤Ë¥·¥¹¥Æ¥à¤¬Å¬Àڤ˵¯Æ°¤¹¤ë¤¿¤á¤ËɬÍפʤ¹¤Ù¤Æ¤Î¥É¥é¥¤¥Ð¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤³¤È¡¢
+	    ¤â¤·¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¤¤ë¥³¥ó¥Ô¥å¡¼¥¿¤¬¥ê¥â¡¼¥È¤Ç¥¢¥¯¥»¥¹¤·¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
+	    ¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤ËɬÍפʤ¹¤Ù¤Æ¤Î¥É¥é¥¤¥Ð¤â´Þ¤Þ¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	    Æäˡ¢¤³¤ì¤Þ¤Ç¼Â¹Ô¤·¤Æ¤¤¤ë¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤¬¡¢
+	    ¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤È¤·¤ÆÄ󶡤µ¤ì¤Æ¤¤¤ë¥Ó¥ë¥É¥¤¥ó¤Îµ¡Ç½¤ò´Þ¤ó¤Ç¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
 	    ¤³¤ì¤é¤Î¥â¥¸¥å¡¼¥ë¤ò°ì»þŪ¤Ë <filename>/boot/loader.conf</filename>
 	    ¤Îµ¡Ç½¤òÍѤ¤¤Æ¡¢
-	    <filename>GENERIC</filename> ¤Ø¤ÈÆɤ߹þ¤ó¤Ç¤¯¤À¤µ¤¤¡£
+	    <filename>GENERIC</filename> ¤ËÆɤ߹þ¤ó¤Ç¤¯¤À¤µ¤¤¡£
 	    ¥¢¥Ã¥×¥°¥ì¡¼¥É¥×¥í¥»¥¹¤¬½ª¤ï¤ë¤Þ¤Ç¤Ï¡¢
-	    ½ÅÍפǤϤʤ¤¥µ¡¼¥Ó¥¹¤ò̵¸ú¤Ë¤·¡¢
-	    ¥Ç¥£¥¹¥¯¤ä¥Í¥Ã¥È¥ï¡¼¥¯¤Î¥Þ¥¦¥ó¥È¤Ê¤É¤ÏÈò¤±¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    ½ÅÍפǤϤʤ¤¥µ¡¼¥Ó¥¹¤ò̵¸ú¤Ë¤¹¤ë¤È¤È¤â¤Ë¡¢
+	    ɬÍפΤʤ¤¥Ç¥£¥¹¥¯¤ä¥Í¥Ã¥È¥ï¡¼¥¯¤Î¥Þ¥¦¥ó¥È¤Ê¤É¤âÈò¤±¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 	</warning>
 
 	<para>¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤¿¥«¡¼¥Í¥ë¤Ç¥³¥ó¥Ô¥å¡¼¥¿¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>shutdown -r now</userinput></screen>
 
-	<para>¥·¥¹¥Æ¥à¤¬¥ª¥ó¥é¥¤¥ó¤ËÌá¤Ã¤¿¤é¡¢
-	  <command>freebsd-update</command> ¤òºÆ¤Ó¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+	<para>¥·¥¹¥Æ¥à¤¬¥ª¥ó¥é¥¤¥ó¤ËÌá¤Ã¤¿¤é¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ
+	  <command>freebsd-update</command> ¤òºÆ¤Ó¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£
 	  ¥¢¥Ã¥×¥Ç¡¼¥È¥×¥í¥»¥¹¤Î¾õÂÖ¤ÏÊݸ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢
 	  <command>freebsd-update</command> ¤ò¼Â¹Ô¤¹¤ë¤È¡¢ºÇ½é¤«¤é¤Ç¤Ï¤Ê¤¯¡¢
-	  ¸Å¤¤¶¦Í­¥é¥¤¥Ö¥é¥ê¤È¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¥×¥í¥»¥¹¤«¤é»Ï¤Þ¤ê¤Þ¤¹¡£
-	  ¤³¤Î¥¹¥Æ¡¼¥¸¤ò³¹Ô¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	  ¸Å¤¤¶¦Í­¥é¥¤¥Ö¥é¥ê¤È¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¥×¥í¥»¥¹¤«¤é»Ï¤Þ¤ê¤Þ¤¹¡£</para>
 
 	<screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
 
@@ -619,19 +619,15 @@ before running "/usr/sbin/freebsd-update
 	  ¤³¤Îºî¶È¤¬É¬ÍפʤΤϡ¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤¬¡¢
 	  ¥¢¥Ã¥×¥°¥ì¡¼¥É¤ÎºÝ¤Ëºï½ü¤µ¤ì¤¿¥é¥¤¥Ö¥é¥ê¤Ë°Í¸¤·¤Æ¤¤¤ë²ÄǽÀ­¤¬¤¢¤ë¤¿¤á¤Ç¤¹¡£
 	  <filename role="package">ports-mgmt/portupgrade</filename>
-	  ¥³¥Þ¥ó¥É¤Ï¡¢¤³¤Î¥×¥í¥»¥¹¤ò¼«Æ°²½¤·¤Þ¤¹¡£
-	  °Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¡¢¤³¤Î¥×¥í¥»¥¹¤ò³«»Ï¤·¤Þ¤¹¡£</para>
+	  ¤Ï¡¢¤³¤Î¥×¥í¥»¥¹¤ò¼«Æ°²½¤·¤Þ¤¹¡£</para>
 
-	<screen>&prompt.root; <userinput>portupgrade -f ruby</userinput>
-&prompt.root; <userinput>rm /var/db/pkg/pkgdb.db</userinput>
-&prompt.root; <userinput>portupgrade -f ruby18-bdb</userinput>
-&prompt.root; <userinput>rm /var/db/pkg/pkgdb.db /usr/ports/INDEX-*.db</userinput>
-&prompt.root; <userinput>portupgrade -af</userinput></screen>
+	<screen>&prompt.root; <userinput>portmaster -f</userinput></screen>
 
 	<para>¤³¤Îºî¶È¤Î½ªÎ»¸å¡¢ºÇ¸å¤Ë¤â¤¦°ìÅÙ
 	  <command>freebsd-update</command>
-	  ¤ò¼Â¹Ô¤¹¤ë¤È¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¥×¥í¥»¥¹¤¬´°Î»¤·¤Þ¤¹¡£
-	  °Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¤¹¤Ù¤Æ¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¥×¥í¥»¥¹¤Î¤ä¤ê»Ä¤·ºî¶È¤¬¹Ô¤ï¤ì¤Þ¤¹¡£</para>
+	  ¤ò¼Â¹Ô¤·¤Æ¡¢
+	  ¤¹¤Ù¤Æ¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¥×¥í¥»¥¹¤Î¤ä¤ê»Ä¤·ºî¶È¤ò¹Ô¤¤¡¢
+	  ¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¥×¥í¥»¥¹¤ò´°Î»¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
 
@@ -647,7 +643,7 @@ before running "/usr/sbin/freebsd-update
     <sect2 id="freebsdupdate-system-comparison">
       <title>¥·¥¹¥Æ¥à¤Î¾õÂÖ¤ÎÈæ³Ó</title>
 
-      <para><command>freebsd-update</command> ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤òÍѤ¤¤Æ¡¢
+      <para><command>freebsd-update</command> ¤òÍѤ¤¤Æ¡¢
 	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë &os; ¤Î¾õÂ֤ȡ¢
 	Àµ¤·¤¯Æ°ºî¤¹¤ë¤³¤È¤¬Ê¬¤«¤Ã¤Æ¤¤¤ë¾õÂ֤ȤòÈæ³Ó¤Ç¤­¤Þ¤¹¡£
 	¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥·¥¹¥Æ¥à¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡¢¥é¥¤¥Ö¥é¥ê¡¢
@@ -659,10 +655,10 @@ before running "/usr/sbin/freebsd-update
       <warning>
 	<para>¥³¥Þ¥ó¥É¥é¥¤¥ó̾¤Ï <acronym>IDS</acronym> ¤Ç¤¹¤¬¡¢
 	  <filename role="package">security/snort</filename>
-	  ¤Î¤è¤¦¤Ê¿¯Æþ¸¡ÃÎ¥·¥¹¥Æ¥à¤ÎÃÖ¤­´¹¤¨¤Ë¤Ê¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+	  ¤Î¤è¤¦¤Ê¿¯Æþ¸¡ÃÎ¥·¥¹¥Æ¥à¤ÎËÜÅö¤ÎÃÖ¤­´¹¤¨¤Ë¤Ê¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
 	  <command>freebsd-update</command> ¤Ï¥Ç¡¼¥¿¤ò¥Ç¥£¥¹¥¯¤ËÊݸ¤¹¤ë¤Î¤Ç¡¢
 	  ÉÔÀµ¤ÊÊѹ¹¤¬¹Ô¤ï¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
-	  <varname>kern.securelevel</varname> ¤ÎÀßÄê¤È¡¢
+	  <varname>kern.securelevel</varname> ¤È¡¢
 	  <command>freebsd-update</command> ¤Î¥Ç¡¼¥¿¤ò»ÈÍѤ·¤Ê¤¤¤È¤­¤Ë¡¢
 	  Æɤ߼è¤ê¤Î¤ß¤Îµö²Ä°À­¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ËÃÖ¤¯¤³¤È¤Ç¡¢
 	  ÉÔÀµ¤ÊÊѹ¹¤Î²ÄǽÀ­¤òÄ㤯¤Ç¤­¤Þ¤¹¤¬¡¢
@@ -674,10 +670,8 @@ before running "/usr/sbin/freebsd-update
 
       <para>¤³¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢¥·¥¹¥Æ¥à¤Ï¸¡ºº¤µ¤ì¡¢
 	¥ê¥ê¡¼¥¹¥Õ¥¡¥¤¥ë¤Î &man.sha256.1;
-	¥Ï¥Ã¥·¥åÃͤȸ½ºß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥åÃͤ¬¥Õ¥¡¥¤¥ë¤Î°ìÍ÷¤È¶¦¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
-	¤³¤ì¤¬ <filename>outfile.ids</filename> ¥Õ¥¡¥¤¥ë¤Ë½ÐÎϤ¹¤ëÍýͳ¤Ç¤¹¡£
-	ÌܤÇÈæ³Ó¤¹¤ë¤Ë¤Ï¤È¤Æ¤âÁ᤯¥¹¥¯¥í¡¼¥ë¤·¡¢
-	¥³¥ó¥½¡¼¥ë¥Ð¥Ã¥Õ¥¡¤ò¤¤¤Ã¤Ñ¤¤¤ËËþ¤¿¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¡£</para>
+	¥Ï¥Ã¥·¥åÃͤȸ½ºß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥åÃͤ¬¥Õ¥¡¥¤¥ë¤Î°ìÍ÷¤È¶¦¤Ë¡¢»ØÄꤷ¤¿
+	<filename>outfile.ids</filename> ¥Õ¥¡¥¤¥ë¤ËÁ÷¤é¤ì¤Þ¤¹¡£</para>
 
       <para>¤³¤ì¤é¤Î¹Ô¤Ï¶Ë¤á¤ÆŤ¤¤Î¤Ç¤¹¤¬¡¢½ÐÎÏ·Á¼°¤Ï´Êñ¤Ë¤¹¤°¤Ë²òÀϤǤ­¤Þ¤¹¡£
 	¤¿¤È¤¨¤Ð¡¢¤³¤ì¤é¤Î¥ê¥ê¡¼¥¹¤Ç°Û¤Ê¤Ã¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤òÃΤꤿ¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
@@ -694,9 +688,9 @@ before running "/usr/sbin/freebsd-update
 	¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢±¿ÍÑÃæ¤ËÊѹ¹¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤¹¡£
 	¤¿¤È¤¨¤Ð¡¢<filename>/etc/passwd</filename>
 	¤Ï¥æ¡¼¥¶¤¬¥·¥¹¥Æ¥à¤ËÄɲ䵤ì¤ë¤ÈÊѹ¹¤µ¤ì¤Þ¤¹¡£
-	¤Þ¤¿¡¢¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤Î¤è¤¦¤Ê¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤¹¡£
-	¤³¤ì¤é¤Ï <command>freebsd-update</command>
-	¤Ë¤è¤ê¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤Þ¤¹¡£
+	¤Þ¤¿¡¢¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤Î¤è¤¦¤Ê¥Õ¥¡¥¤¥ë¤Ï¡¢
+	<command>freebsd-update</command>
+	¤Ë¤è¤ê¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤ë¤¿¤á¡¢Êѹ¹¤µ¤ì¤Þ¤¹¡£
 	¤³¤Î¤è¤¦¤ÊÆÃÊ̤ʥե¡¥¤¥ë¤ä¥Ç¥£¥ì¥¯¥È¥ê¤ò½ü³°¤¹¤ë¤Ë¤Ï¡¢
 	¤½¤ì¤é¤ò <filename>/etc/freebsd-update.conf</filename> ¤Î
 	<literal>IDSIgnorePaths</literal> ¥ª¥×¥·¥ç¥ó¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
@@ -731,12 +725,12 @@ before running "/usr/sbin/freebsd-update
       <see>¥¢¥Ã¥×¥Ç¡¼¥È¤È¥¢¥Ã¥×¥°¥ì¡¼¥É</see>
     </indexterm>
 
-    <para>&os; ¤Î¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Ë¤Ï¡¢&man.portsnap.8; ¤È¸Æ¤Ð¤ì¤ë
-      Ports Collection ¤Î¥¢¥Ã¥×¥Ç¡¼¥È¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬¤¢¤ê¤Þ¤¹¡£
-      ¼Â¹Ô¤¹¤ë¤È¡¢¥ê¥â¡¼¥È¥µ¥¤¥È¤ËÀܳ¤·¡¢¥»¥­¥å¥ê¥Æ¥£¥­¡¼¤ò¸¡¾Ú¤·¡¢
-      Ports Collection ¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Þ¤¹¡£
+    <para>&os; ¤Î¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Ë¤Ï¡¢
+      Ports Collection ¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë &man.portsnap.8; ¤¬¤¢¤ê¤Þ¤¹¡£
+      ¤³¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¡¢&os; ¤Î¥µ¥¤¥È¤ËÀܳ¤·¡¢¥»¥­¥å¥ê¥Æ¥£¥­¡¼¤ò¸¡¾Ú¤·¡¢
+      Ports Collection ¤ÎºÇ¿·ÈǤò¥À¥¦¥ó¥í¡¼¥É¤·¤Þ¤¹¡£
       ¥»¥­¥å¥ê¥Æ¥£¥­¡¼¤Ï¡¢
-      ¥À¥¦¥ó¥í¡¼¥É¤·¤¿¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤¬¥À¥¦¥ó¥í¡¼¥ÉÃæ¤ËÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤Î¸¡¾Ú¤ËÍѤ¤¤é¤ì¤Þ¤¹¡£
+      ¥À¥¦¥ó¥í¡¼¥É¤·¤¿¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ËÍѤ¤¤é¤ì¤Þ¤¹¡£
       ºÇ¿·¤Î Ports Collection ¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï¡¢
       °Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -779,8 +773,8 @@ Fetching 133 new ports or files... done.
 <replaceable>...</replaceable></screen>
 
     <para>¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë Ports Collection
-      ¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë
-      <command>portsnap update</command> ¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
+      ¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Ë¤Ï¡¢
+      <command>portsnap update</command> ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 
     <screen>&prompt.root; <userinput>portsnap update</userinput></screen>
 
@@ -789,9 +783,9 @@ Fetching 133 new ports or files... done.
       ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤ê¡¢
       ¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤­¤Þ¤¹¡£</para>
 
-    <para><literal>fetch</literal> ¤È <literal>extract</literal> ¤Þ¤¿¤Ï
-      <literal>update</literal> ¤Î¥×¥í¥»¥¹¤òϢ³¤·¤Æ¹Ô¤¦¤Ë¤Ï¡¢
-      °Ê²¼¤ÎÎã¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+    <para><literal>fetch</literal> ¤ò»È¤¦¾ì¹ç¤Ë¤Ï¡¢
+      <literal>extract</literal> ¤ª¤è¤Ó <literal>update</literal>
+      ¤òϢ³¤·¤Æ¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
     <screen>&prompt.root; <userinput>portsnap fetch update</userinput></screen>
 
@@ -811,22 +805,20 @@ Fetching 133 new ports or files... done.
       <see>Updating and Upgrading</see>
     </indexterm>
 
-    <para>¥Ù¡¼¥¹¥·¥¹¥Æ¥à¡¢Ports Collection ¤Ë²Ã¤¨¡¢
-      ¥É¥­¥å¥á¥ó¥È¤â &os; ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¹½À®Í×ÁǤǤ¹¡£
+    <para>¥É¥­¥å¥á¥ó¥È¤Ï¡¢&os; ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Îɬ¿ÜÍ×ÁǤǤ¹¡£
       &os; ¥É¥­¥å¥á¥ó¥È¥»¥Ã¥È¤ÎºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ï¡¢<ulink
 	url="http://www.freebsd.org/doc/">&os; ¥¦¥§¥Ö¥µ¥¤¥È</ulink>
       ¤«¤éÆþ¼ê¤Ç¤­¤Þ¤¹¤¬¡¢
       ¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤¬ÃÙ¤¤¡¢¤â¤·¤¯¤Ï¤Þ¤Ã¤¿¤¯Àܳ¤Ç¤­¤Ê¤¤¥æ¡¼¥¶¤â¤¤¤Þ¤¹¡£
-      ¹¬±¿¤Ë¤â¡¢³Æ¥ê¥ê¡¼¥¹¤ÇÄ󶡤µ¤ì¤ë¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¡¢
-      ºÇ¿·¤Î &os;
-      ¥É¥­¥å¥á¥ó¥È¥»¥Ã¥È¤ò¥í¡¼¥«¥ë¤Ç°Ý»ý¤¹¤ëÊýË¡¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+      ¥í¡¼¥«¥ë¤Î¥É¥­¥å¥á¥ó¥È¤òºÇ¿·¤Î &os;
+      ¥É¥­¥å¥á¥ó¥È¥»¥Ã¥È¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëÊýË¡¤¬¤¤¤¯¤Ä¤âÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <sect2 id="dsvn-doc">
       <title><application>Subversion</application>
 	¤òÍѤ¤¤¿¥É¥­¥å¥á¥ó¥È¤Î¥¢¥Ã¥×¥Ç¡¼¥ÈÊýË¡</title>
 
       <para>&os; ¤Î¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤Ï¡¢
-	<application>Subversion</application> ¤òÍѤ¤¤ÆÆþ¼ê¤Ç¤­¤Þ¤¹¡£
+	<application>svn</application> ¤òÍѤ¤¤ÆÆþ¼ê¤Ç¤­¤Þ¤¹¡£
 	¤³¤ÎÀá¤Ç¤Ï°Ê²¼¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
 
       <itemizedlist>
@@ -837,7 +829,7 @@ Fetching 133 new ports or files... done.
 	</listitem>
 
 	<listitem>
-	  <para><application>Subversion</application> ¤òÍѤ¤¤Æ¡¢
+	  <para><application>svn</application> ¤òÍѤ¤¤Æ¡¢
 	    ¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò
 	    <filename class="directory">/usr/doc</filename>
 	    °Ê²¼¤Ë¥À¥¦¥ó¥í¡¼¥É¤¹¤ëÊýË¡¡£</para>
@@ -858,22 +850,21 @@ Fetching 133 new ports or files... done.
     </sect2>
 
     <sect2 id="installing-documentation-toolchain">
-      <title><application>Subversion</application>
+      <title><application>svn</application>
 	¤ª¤è¤Ó¥É¥­¥å¥á¥ó¥È¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë</title>
 
       <para>&os; ¤Î¥É¥­¥å¥á¥ó¥È¤ò¥½¡¼¥¹¤«¤éºÆ¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢
-	¤«¤Ê¤êÂ礭¤Ê¥Ä¡¼¥ë¤Î¥³¥ì¥¯¥·¥ç¥ó¤¬É¬ÍפǤ¹¡£
-	¤³¤ì¤é¤Î¥Ä¡¼¥ë¤Ï¿¤¯¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤òɬÍפȤ·¡¢¤Þ¤¿¡¢
-	¤¹¤Ù¤Æ¤Î &os; ¥æ¡¼¥¶¤Ë¤È¤Ã¤ÆÍ­ÍѤȤ¤¤¦¤ï¤±¤Ç¤Ï¤Ê¤¤¤Î¤Ç¡¢
+	¥Ä¡¼¥ë¤Î¥³¥ì¥¯¥·¥ç¥ó¤¬É¬ÍפǤ¹¡£
+	¤³¤ì¤é¤Î¥Ä¡¼¥ë¤Ï¿¤¯¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤ò»ÈÍѤ¹¤ë¤¿¤á¡¢
 	&os; ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	¤³¤ì¤é¤Î¥Ä¡¼¥ë¤Ï¡¢&os;
+	¤Þ¤¿¡¢¤¹¤Ù¤Æ¤Î &os; ¥æ¡¼¥¶¤Ë¤È¤Ã¤ÆÍ­ÍѤȤ¤¤¦¤ï¤±¤Ç¤Ï¤Ê¤¯¡¢&os;
 	¤Î¤¿¤á¤Ë¿·¤·¤¤¥É¥­¥å¥á¥ó¥È¤ò³èȯ¤Ë¼¹É®¤·¤Æ¤¤¤ëÊý¤ä¡¢
 	ÉÑÈˤ˥ɥ­¥å¥á¥ó¥È¤ò¥½¡¼¥¹¤«¤é¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëÊý¤Ë¸þ¤±¤¿¤â¤Î¤Ç¤¹¡£</para>
 
-      <para>ɬÍפʥġ¼¥ë¤Ï¡¢¤¹¤Ù¤Æ Ports Collection ¤ÇÆþ¼ê¤Ç¤­¤Þ¤¹¡£<filename
-	  role="package">textproc/docproj</filename> ¤Ï¡¢
-	&os; ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤Ë¤è¤ê³«È¯¤µ¤ì¤Æ¤¤¤ë¥Þ¥¹¥¿¡¼ port ¤Ç¡¢
-	¤³¤ì¤é¤Î¥Ä¡¼¥ë¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ä¥¢¥Ã¥×¥Ç¡¼¥È¤òÍưפˤ·¤Þ¤¹¡£</para>
+      <para><application>svn</application> ¤ò´Þ¤áɬÍפʥġ¼¥ë¤Ï¡¢
+	<filename role="package">textproc/docproj</filename> ¥á¥¿ port 
+	¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£¤³¤Î port ¤Ï¡¢
+	&os; ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤Ë¤è¤ê³«È¯¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <note>
 	<para>¥É¥­¥å¥á¥ó¥È¤Î &postscript; ¤ä PDF ÈǤ¬É¬Íפʤ±¤ì¤Ð¡¢¤«¤ï¤ê¤Ë
@@ -887,20 +878,14 @@ Fetching 133 new ports or files... done.
 	  ¤½¤Î¤¿¤á¡¢¤â¤· PDF ½ÐÎϤòËÜÅö¤ËɬÍפȤ·¤Ê¤±¤ì¤Ð¡¢
 	  ¤³¤Î¥Ä¡¼¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤¤¤³¤È¤Ï¤È¤Æ¤â¸­ÌÀ¤Ç¤¹¡£</para>
       </note>
-
-      <para><filename role="package">textproc/docproj</filename>
-	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¡¢<application>Subversion</application>
-	¤â¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
     </sect2>
 
     <sect2 id="updating-documentation-sources">
       <title>¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë</title>
 
-      <para>¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤Ï¡¢
-	<application>Subversion</application>
-	¥×¥í¥°¥é¥à¤ò»È¤Ã¤Æ¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤¹¡£
-	western US ¥ß¥é¡¼¤«¤é HTTPS
-	¥×¥í¥È¥³¥ë¤òÍѤ¤¤Æ¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <para>°Ê²¼¤ÎÎã¤Ç¤Ï¡¢<application>svn</application> ¤ò»È¤Ã¤Æ
+	western US ¥ß¥é¡¼¤«¤é HTTPS ¥×¥í¥È¥³¥ë¤òÍѤ¤¤Æ¡¢
+	¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>svn checkout <replaceable>https://svn0.us-west.FreeBSD.org</replaceable>/doc/head /usr/doc</userinput></screen>
 
@@ -916,9 +901,8 @@ Fetching 133 new ports or files... done.
 
       <screen>&prompt.root; <userinput>svn update <filename class="directory">/usr/doc</filename></userinput></screen>
 
-      <para>¥½¡¼¥¹¤òÆþ¼ê¤·¤¿¤é¡¢<filename
-	  class="directory">/usr/doc</filename> ¥Ç¥£¥ì¥¯¥È¥ê¤Î
-	<filename>Makefile</filename> ¤ò»È¤¤¡¢
+      <para>¥½¡¼¥¹¤òÆþ¼ê¤·¤¿¤é¡¢
+	<filename>/usr/doc/Makefile</filename> ¤ò»È¤¤¡¢
 	°Ê²¼¤Î¤è¤¦¤Ë¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
@@ -928,14 +912,14 @@ Fetching 133 new ports or files... done.
     <sect2 id="updating-documentation-options">
       <title>¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ÎÄ´À°²Äǽ¤Ê¥ª¥×¥·¥ç¥ó</title>
 
-      <para>&os; ¤Î¥É¥­¥å¥á¥ó¥È¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤È¥Ó¥ë¥É¥·¥¹¥Æ¥à¤Ï¡¢
+      <para>&os; ¤Î¥É¥­¥å¥á¥ó¥È¥»¥Ã¥È¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤È¥Ó¥ë¥É¥·¥¹¥Æ¥à¤Ï¡¢
 	¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤Î°ìÉô¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤ò´Êñ¤Ë¤¹¤ë¥ª¥×¥·¥ç¥ó¤ä¡¢
 	ÆÃÄê¤ÎËÝÌõ¤Î¥Ó¥ë¥É¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
  	¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥·¥¹¥Æ¥àÁ´È̤Υª¥×¥·¥ç¥ó¤Ç¤¢¤ë
-	<filename>/etc/make.conf</filename> ¥Õ¥¡¥¤¥ë¤ä¡¢&man.make.1;
-	¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ËÍ¿¤¨¤ë¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ÇÀßÄê¤Ç¤­¤Þ¤¹¡£</para>
+	<filename>/etc/make.conf</filename> ¤ä¡¢&man.make.1;
+	¤ËÍ¿¤¨¤ë¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ÇÀßÄê¤Ç¤­¤Þ¤¹¡£</para>
 
-      <para>°Ê²¼¤¬¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Î°ìÉô¤Ç¤¹¡£</para>
+      <para>¥ª¥×¥·¥ç¥ó¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
       <variablelist>
 	<varlistentry>
@@ -943,7 +927,7 @@ Fetching 133 new ports or files... done.
 
 	  <listitem>
 	    <para>¥Ó¥ë¥É¤ª¤è¤Ó¥¤¥ó¥¹¥È¡¼¥ë¤Î¸À¸ì¤ª¤è¤Ó¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î°ìÍ÷¡£
-	      ¤¿¤È¤¨¤Ð¡¢±Ñ¸ì¤Î¥É¥­¥å¥á¥ó¥È¤Î¤ß¤ò»ØÄꤹ¤ë¤Ë¤Ï
+	      ¤¿¤È¤¨¤Ð¡¢±Ñ¸ì¤Î¥É¥­¥å¥á¥ó¥È¤ò»ØÄꤹ¤ë¤Ë¤Ï
 	      <literal>en_US.ISO8859-1</literal> ¤òÀßÄꤷ¤Þ¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
@@ -971,11 +955,12 @@ Fetching 133 new ports or files... done.
 	</varlistentry>
       </variablelist>
 
-      <para>&os; ¤Î¥·¥¹¥Æ¥àÁ´È̤Υª¥×¥·¥ç¥ó¤Ë´ØÏ¢¤¹¤ë¤â¤Ã¤È¿¤¯¤Î make ÊÑ¿ô¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+      <para>&os; ¤Î¥·¥¹¥Æ¥àÁ´È̤Υª¥×¥·¥ç¥ó¤Ë´ØÏ¢¤¹¤ë¤â¤Ã¤È¿¤¯¤Î
+	<command>make</command> ÊÑ¿ô¤Ë¤Ä¤¤¤Æ¤Ï¡¢
 	&man.make.conf.5; ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
-      <para>&os; ¥É¥­¥å¥á¥ó¥È¤Î¥Ó¥ë¥É¥·¥¹¥Æ¥à¤ÇÂбþ¤·¤Æ¤¤¤ë¤µ¤é¤Ê¤ë make ¤ÎÊÑ¿ô¤Ë´Ø¤·¤Æ¤Ï¡¢
-
+      <para>&os; ¥É¥­¥å¥á¥ó¥È¤Î¥Ó¥ë¥É¥·¥¹¥Æ¥à¤ÇÂбþ¤·¤Æ¤¤¤ë¤µ¤é¤Ê¤ë
+	<command>make</command> ¤ÎÊÑ¿ô¤Ë´Ø¤·¤Æ¤Ï¡¢
 	<ulink url="&url.doc.langbase.en;/books/fdp-primer">¿·¤·¤¤¹×¸¥¼Ô¤Î¤¿¤á¤Î &os; ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥ÈÆþÌç </ulink> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
     </sect2>
 
@@ -983,11 +968,11 @@ Fetching 133 new ports or files... done.
       <title>¥½¡¼¥¹¤«¤é &os; ¥É¥­¥å¥á¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë</title>
 
       <para>¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ÎºÇ¿·¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ò
-	<filename class="directory">/usr/doc</filename> ¤Ë¥À¥¦¥ó¥í¡¼¥É¤·½ª¤ï¤Ã¤¿¤é¡¢
+	<filename class="directory">/usr/doc</filename> ¤Ë¥À¥¦¥ó¥í¡¼¥É¤·¤¿¤é¡¢
 	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë½àÈ÷¤¬¤¹¤Ù¤ÆÀ°¤¤¤Þ¤·¤¿¡£</para>
 
-      <para>makefile ¤Î <makevar>DOC_LANG</makevar>
-	¥ª¥×¥·¥ç¥ó¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¸À¸ì¤ò´°Á´¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Ë¤Ï¡¢
+      <para><makevar>DOC_LANG</makevar>
+	¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¸À¸ì¤ò´°Á´¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Ë¤Ï¡¢
 	°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
@@ -1000,7 +985,7 @@ Fetching 133 new ports or files... done.
       <screen>&prompt.root; <userinput>cd /usr/doc/en_US.ISO8859-1</userinput>
 &prompt.root; <userinput>make update install clean</userinput></screen>
 
-      <para>make ¤Î <makevar>FORMATS</makevar> ÊÑ¿ô¤òÀßÄꤷ¤Æ¡¢
+      <para><makevar>FORMATS</makevar> ¤òÀßÄꤷ¤Æ¡¢
 	°Ê²¼¤Î¤è¤¦¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë½ÐÎÏ·Á¼°¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
@@ -1008,7 +993,7 @@ Fetching 133 new ports or files... done.
 
       <para>¥É¥­¥å¥á¥ó¥È¤òÊÔ½¸¤·¤¿¤ê¡¢ÄûÀµ¤·¤¿¤â¤Î¤òÄó½Ð¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
 	<ulink
-	  url="&url.books.fdp-primer;">¿·¤·¤¤¹×¸¥¼Ô¤Î¤¿¤á¤Î FreeBSD
+	  url="&url.books.fdp-primer;">¿·¤·¤¤¹×¸¥¼Ô¤Î¤¿¤á¤Î &os;
 	¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥ÈÆþÌç</ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
     </sect2>
 
@@ -1034,31 +1019,32 @@ Fetching 133 new ports or files... done.
 
       <para>¤³¤ì¤Þ¤Ç¤Î¥»¥¯¥·¥ç¥ó¤Ç¤Ï¡¢¥½¡¼¥¹¥³¡¼¥É¤òÍѤ¤¤¿ &os;
 	¥É¥­¥å¥á¥ó¥È¤Î¥¢¥Ã¥×¥Ç¡¼¥ÈÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤­¤Þ¤·¤¿¡£
-	¤·¤«¤·¤Ê¤¬¤é¡¢¤¹¤Ù¤Æ¤Î¥·¥¹¥Æ¥à¤Ë¤ª¤¤¤Æ¡¢
+	¤¹¤Ù¤Æ¤Î &os; ¥·¥¹¥Æ¥à¤Ç¡¢
 	¥½¡¼¥¹¤«¤é¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤³¤È¤ÏÆñ¤·¤¤¤«¤âÃΤì¤Þ¤»¤ó¤·¡¢
 	¤Ç¤­¤¿¤È¤·¤Æ¤â¸½¼ÂŪ¤Ç¤Ï¤Ê¤¤¤³¤È¤â¤¢¤ê¤Þ¤¹¡£
 	¥É¥­¥å¥á¥ó¥È¤ò¥½¡¼¥¹¤«¤é¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢
 	¤«¤Ê¤êÂ礭¤Ê¥Ä¡¼¥ë¤È¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤«¤é¹½À®¤µ¤ì¤ë
-	<emphasis>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥Ä¡¼¥ë¥Á¥§¥¤¥ó</emphasis> ¤¬É¬ÍפǤ¹¡£
-	¤Þ¤¿¡¢<application>Subversion</application>
+	<emphasis>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥Ä¡¼¥ë¥Á¥§¥¤¥ó</emphasis>
+	¤¬É¬Íפʤ¿¤á¤Ç¤¹¡£
+	¤Þ¤¿¡¢<application>svn</application>
 	¥ê¥Ý¥¸¥È¥ê¤«¤é¥½¡¼¥¹¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¡¢
 	¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¤¿¥½¡¼¥¹¤«¤é¥É¥­¥å¥á¥ó¥È¤ò¼êÆ°¤Ç¹½ÃÛ¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¡¢
 	¤½¤ì¤Ê¤ê¤Ë½ÏÃΤ·¤Æ¤¤¤ëɬÍפ⤢¤ê¤Þ¤¹¡£
 	¤³¤ÎÀá¤Ç¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë
 	&os; ¤Î¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ç¤¢¤ë¡¢
-	Ports Collection ¤òÍѤ¤¤¿°Ê²¼¤ÎÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
+	Ports Collection ¤òÍѤ¤¤¿ÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¡¢
+	°Ê²¼¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>¹½ÃۺѤΥɥ­¥å¥á¥ó¥È¤Î¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¡£
-	    ¥í¡¼¥«¥ë¤Ç¤Î¹½ÃÛºî¶È¤ÏɬÍפ¢¤ê¤Þ¤»¤ó
-	    (¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó)¡£</para>
+	    ¥í¡¼¥«¥ë¤Ç¤Î¹½ÃÛºî¶È¤ä¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</para>
 	</listitem>
 
 	<listitem>
 	  <para>¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤·¡¢ports
-	    ¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤ò»È¤Ã¤Æ¹½ÃÛ¤¹¤ëÊýË¡
-	    (¥Á¥§¥Ã¥¯¥¢¥¦¥È¤ª¤è¤Ó¹½ÃÛºî¶È¤¬´Êñ¤Ë¤Ê¤ê¤Þ¤¹)¡£</para>
+	    ¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤ò»È¤Ã¤Æ¹½ÃÛ¤¹¤ëÊýË¡¤Ç¤¹¡£
+	    ¥Á¥§¥Ã¥¯¥¢¥¦¥È¤ª¤è¤Ó¹½ÃÛºî¶È¤¬´Êñ¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
 	</listitem>
       </itemizedlist>
 
@@ -1068,7 +1054,7 @@ Fetching 133 new ports or files... done.
 	¤Ë¤è¤ê¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	¤³¤ì¤é¤Î ports ¤Ï¡¢&os; Ports Collection ¤Î <ulink
 	  url="http://www.freshports.org/docs/">docs</ulink>
-	²¾ÁÛ¥«¥Æ¥´¥ê¤Ë¤Þ¤È¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+	¥«¥Æ¥´¥ê¤Ë¤Þ¤È¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <sect3 id="doc-ports-install-make">
 	<title>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports ¤Î¹½Ãۤȥ¤¥ó¥¹¥È¡¼¥ë</title>
@@ -1095,9 +1081,7 @@ Fetching 133 new ports or files... done.
 	  <listitem>
 	    <para><quote>¥Þ¥¹¥¿ port</quote>, <filename
 		role="package">misc/freebsd-doc-en</filename>¡£
-	      ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó port ¤Î¥Õ¥¡¥¤¥ë¤Ï¤³¤³¤Ë¤¢¤ê¤Þ¤¹¡£
-	      ¤³¤Î port ¤Ï¡¢¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports ¤Î¥Ù¡¼¥¹¤Ç¤¹¡£
-	      ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢±Ñ¸ì¤Îʸ½ñ¤Î¤ß¤ò¹½ÃÛ¤·¤Þ¤¹¡£</para>
+	      ¤¹¤Ù¤Æ¤Î±Ñ¸ìʸ½ñ¤Î ports ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
 	  </listitem>
 
 	  <listitem>
@@ -1107,35 +1091,30 @@ Fetching 133 new ports or files... done.
 	  </listitem>
 
 	  <listitem>
-	    <para>ºÇ¸å¤Ë¡¢³Æ¸À¸ì¤Î¤¿¤á¤Ë <quote>¥¹¥ì¡¼¥Ö port</quote>
+	    <para>³Æ¸À¸ì¤Î¤¿¤á¤Ë <quote>¥¹¥ì¡¼¥Ö port</quote>
 	      ¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢<filename
 		role="package">misc/freebsd-doc-hu</filename>
-	      ¤Ï¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó port ¤Ç¤¹¡£
-	      ¤³¤Î port ¤Ï¡¢¤¹¤Ù¤Æ¥Þ¥¹¥¿ port ¤Ë°Í¸¤·¡¢
-	      ³Æ¸À¸ì¤ÎËÝÌõ¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
+	      ¤Ï¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó port ¤Ç¤¹¡£</para>
 	  </listitem>
 	</itemizedlist>
 
-	<para>¥½¡¼¥¹¤«¤é¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
-	  °Ê²¼¤Î¥³¥Þ¥ó¥É¤ò (<username>root</username> ¸¢¸Â¤Ç)
-	  ¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<para>¤¿¤È¤¨¤Ð¡¢<ulink
+	    url="http://www.FreeBSD.org"></ulink> ¤ÈƱ¤¸·Á¼°¤Ç¤¢¤ë¡¢
+	  ±Ñ¸ìÈǤÎʬ³ä¤µ¤ì¤¿ <acronym>HTML</acronym> ·Á¼°¤ò¹½ÃÛ¤·¡¢
+	  <filename
+	    class="directory">/usr/local/share/doc/freebsd</filename>
+	  ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤Î port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports/misc/freebsd-doc-en</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-	<para>±Ñ¸ìÈǤÎʬ³ä¤µ¤ì¤¿ <acronym>HTML</acronym> ·Á¼° (<ulink
-	    url="http://www.FreeBSD.org"></ulink> ¤ÈƱ¤¸·Á¼°)
-	  ¤Î¥É¥­¥å¥á¥ó¥È¤¬¹½ÃÛ¤µ¤ì¡¢<filename
-	    class="directory">/usr/local/share/doc/freebsd</filename>
-	  ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
-
 	<sect4 id="doc-ports-options">
 	  <title>¶¦Ä̤Υª¥×¥·¥ç¥ó</title>
 
 	  <para>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports
 	    ¤Ë¤Ï¤¿¤¯¤µ¤ó¤Î¥ª¥×¥·¥ç¥ó¤¬ÍÑ°Õ¤µ¤ì¤Æ¤ª¤ê¡¢
-	    ports ¤Î¿¶¤ëÉñ¤¤¤ò¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄ꤫¤éÊѹ¹¤Ç¤­¤Þ¤¹¡£
-	    °Ê²¼¤Ï¤½¤ÎÃ椫¤é¤¤¤¯¤Ä¤«¤ò¥ê¥¹¥È¥¢¥Ã¥×¤·¤¿¤â¤Î¤Ç¤¹¡£</para>
+	    °Ê²¼¤Î¤è¤¦¤Ë
+	    ports ¤Î¿¶¤ëÉñ¤¤¤ò¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄ꤫¤éÊѹ¹¤Ç¤­¤Þ¤¹¡£</para>
 
 	  <variablelist>
 	    <varlistentry>
@@ -1143,11 +1122,11 @@ Fetching 133 new ports or files... done.
 
 	      <listitem>
 		<para>HTML ·Á¼°¤ò¹½ÃÛ¤·¤Þ¤¹¡£
-		  ¤½¤ì¤¾¤ì¤Î¥É¥­¥å¥á¥ó¥È¤´¤È¤Ëñ°ìÈǤΠHTML ¥Õ¥¡¥¤¥ë¤¬¹½ÃÛ¤µ¤ì¤Þ¤¹¡£
+		  ³Æ¥É¥­¥å¥á¥ó¥È¤ËÂФ·¡¢Ã±°ìÈǤΠHTML ¥Õ¥¡¥¤¥ë¤¬¹½ÃÛ¤µ¤ì¤Þ¤¹¡£
 		  À°·Á¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤Ï¡¢
 		  <filename>article.html</filename> ¤ä
 		  <filename>book.html</filename> ¤È¤¤¤Ã¤¿Ì¾Á°¤Ç¡¢
-		  ²èÁü¤È¤È¤â¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
+		  ɬÍפ˱þ¤¸¤Æ²èÁü¤È¤È¤â¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -1155,11 +1134,7 @@ Fetching 133 new ports or files... done.
 	      <term><makevar>WITH_PDF</makevar></term>
 
 	      <listitem>
-		<para>&adobe; Portable Document Format ¤ò¹½ÃÛ¤·¤Þ¤¹¡£
-		  &adobe; &acrobat.reader;,
-		  <application>Ghostscript</application>¡¢
-		  ¤Þ¤¿¤Ï¡¢Â¾¤Î PDF
-		  ¥ê¡¼¥À¤ÇÆɤि¤á¤Î¤â¤Î¤Ç¤¹¡£
+		<para>&adobe; Portable Document Format (PDF) ¤ò¹½ÃÛ¤·¤Þ¤¹¡£
 		  À°·Á¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤Ï¡¢
 		  <filename>article.pdf</filename> ¤ä
 		  <filename>book.pdf</filename>
@@ -1178,10 +1153,8 @@ Fetching 133 new ports or files... done.
 
 		<note>
 		  <para>¥Ç¥Õ¥©¥ë¥È¤Î¥¿¡¼¥²¥Ã¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢
-		    <application>Subversion</application>
+		    <application>svn</application>
 		    ¤òÍѤ¤¤ëÊýË¡¤È¤Ï°Û¤Ê¤ê¤Þ¤¹¡£
-		    ¤Ê¤¼¤Ê¤é¤Ð¡¢¤³¤ÎÀá¤ÇÀâÌÀ¤ò¤·¤Æ¤¤¤ëÊýË¡¤Ç¤Ï
-		    port ¤òÍѤ¤¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ª¤ê¡¢
 		    ports ¤ÏÄ̾ï <filename
 		      class="directory">/usr/local</filename>
 		    ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤ë¤¿¤á¤Ç¤¹¡£
@@ -1193,7 +1166,7 @@ Fetching 133 new ports or files... done.
 	  </variablelist>
 
 	  <para>°Ê²¼¤Ï¡¢¾åµ­¤ÎÊÑ¿ô¤òÍѤ¤¤Æ¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¥É¥­¥å¥á¥ó¥È¤ò
-	    PDF ·Á¼°¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤ò¼¨¤¹¡¢´Êñ¤ÊÎã¤Ç¤¹¡£</para>
+	    PDF ·Á¼°¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤Ç¤¹¡£</para>
 
 	  <screen>&prompt.root; cd /usr/ports/misc/freebsd-doc-hu
 &prompt.root; make -DWITH_PDF DOCBASE=share/doc/freebsd/hu install clean</screen>
@@ -1231,7 +1204,7 @@ Fetching 133 new ports or files... done.
 	<screen>&prompt.root; <userinput>pkg_add -r hu-freebsd-doc</userinput></screen>
 
 	<note>
-	  <para>¥É¥­¥å¥á¥ó¥È¤Î package ¤Ï¡¢¸À¸ì¤´¤È¤ËÂбþ¤¹¤ë port ¤Ë
+	  <para>¥É¥­¥å¥á¥ó¥È¤Î package ¤Ï¡¢Âбþ¤¹¤ë port ̾¤È¤Ï°Û¤Ê¤ê¡¢
 	    <literal><replaceable>lang</replaceable>-freebsd-doc</literal>
 	    ¤Î·Á¼°¤Ç̾Á°¤¬¤Ä¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£
 	    ¤³¤³¤Ç¡¢<replaceable>lang</replaceable> ¤Ï¸À¸ì¥³¡¼¥É¤Îû½Ì·Á¤Ç¤¹¡£
@@ -1243,15 +1216,13 @@ Fetching 133 new ports or files... done.
       <sect3 id="doc-ports-update">
 	<title>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports ¤Î¥¢¥Ã¥×¥Ç¡¼¥È</title>
 
-	<para>¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó port
-	  ¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Ë¤Ï¡¢
-	  ports ¤Î¥¢¥Ã¥×¥Ç¡¼¥È¥Ä¡¼¥ë¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤ì¤Ð½½Ê¬¤Ç¤¹¡£
+	<para>¾¤Î port ¤ÈƱÍͤˡ¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó port
+	  ¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤­¤Þ¤¹¡£
 	  ¤¿¤È¤¨¤Ð¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢<filename
 	    role="package">ports-mgmt/portupgrade</filename>
-	  ¥Ä¡¼¥ë¤Ç¡¢package
-	  ¤À¤±¤ò»È¤Ã¤Æ¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£</para>
+	  ¤«¤é¡¢package ¤À¤±¤ò»È¤Ã¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£</para>
 
-	<screen>&prompt.root; <userinput>portupgrade -PP hu-freebsd-doc</userinput></screen>
+	<screen>&prompt.root; <userinput>portmaster -PP hu-freebsd-doc</userinput></screen>
       </sect3>
     </sect2>
 
@@ -1288,16 +1259,17 @@ Fetching 133 new ports or files... done.
 
       <para>The only requirement for using this technique is
 	the <filename role="package">net/rsync</filename> port or
-	package.  To add it, use the following command:</para>
+	package.  To install the package, use the following
+	command:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
 
       <note>
-	<para><application>Docsnap</application> has been originally
+	<para><application>Docsnap</application> was originally
 	  developed for updating documentation installed
-	  to <filename class="directory">/usr/share/doc</filename>, but
-	  the following examples could be adapted for other directories
-	  as well.  For user directories, it does not require
+ 	  <filename class="directory">/usr/share/doc</filename>, but
+ 	  the following examples could be adapted for other
+	  directories.  Updating to user directories does not require
 	  <username>root</username> privileges.</para>
       </note>
 
@@ -1308,17 +1280,15 @@ Fetching 133 new ports or files... done.
 
       <note>
 	<para>There is only one <application>Docsnap</application>
-	  server at the moment;
-	  the <hostid>docsnap.sk.FreeBSD.org</hostid> shown
-	  above.</para>
+	  server at the moment; the
+	  <hostid>docsnap.sk.FreeBSD.org</hostid> shown above.</para>
       </note>
 
-      <para>Do not use the <option>--delete</option> flag here as there
-	are some items installed
-	into <filename class="directory">/usr/share/doc</filename>
-	during <command>make installworld</command>, which would
-	accidentally be removed.  To clean up, use this command
-	instead:</para>
+      <para>Do not use <option>--delete</option> as there are some
+	items installed into <filename
+	  class="directory">/usr/share/doc</filename> during
+	<command>make installworld</command> which would accidentally
+	be removed.  To clean up, use this command instead:</para>
 
       <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
 
@@ -1336,11 +1306,10 @@ Fetching 133 new ports or files... done.
     <indexterm><primary>-CURRENT</primary></indexterm>
     <indexterm><primary>-STABLE</primary></indexterm>
 
-    <para>FreeBSD ¤Ë¤ÏÆó¤Ä¤Î³«È¯¥Ö¥é¥ó¥Á¤¬¤¢¤ê¤Þ¤¹¡£
+    <para>&os; ¤Ë¤ÏÆó¤Ä¤Î³«È¯¥Ö¥é¥ó¥Á¤¬¤¢¤ê¤Þ¤¹¡£
       ¤½¤ì¤Ï &os.current; ¤È &os.stable; ¤Ç¤¹¡£
-      ¤³¤Î¾Ï¤Ç¤Ï¤½¤ì¤¾¤ì¤Ë¤Ä¤¤¤Æ´Êñ¤ËÀâÌÀ¤·¡¢
-      ¤É¤Î¤è¤¦¤Ë¤·¤Æ¤¢¤Ê¤¿¤Î¥·¥¹¥Æ¥à¤òÂбþ¤¹¤ë¥Ä¥ê¡¼¤ËÂФ·¤Æ¡¢
-      ¤É¤¦¤ä¤Ã¤Æ¾ï¤ËºÇ¿·¤Î¾õÂÖ¤ËÊݤĤ«¤Ë¤Ä¤¤¤Æ°·¤¤¤Þ¤¹¡£
+      ¤³¤Î¾Ï¤Ç¤Ï¤½¤ì¤¾¤ì¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¡¢
+      ¤É¤Î¤è¤¦¤Ë¤·¤Æ¥·¥¹¥Æ¥à¤ÎÂбþ¤¹¤ë¥Ä¥ê¡¼¤òºÇ¿·¤Î¾õÂÖ¤ËÊݤĤ«¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
       ¤Þ¤º¤Ï &os.current;¡¢¼¡¤Ë &os.stable; ¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
 
     <para><emphasis>Ìõ: &a.hanai;¡¢1996 ǯ 11 ·î 6 Æü</emphasis></para>
@@ -1348,9 +1317,7 @@ Fetching 133 new ports or files... done.
     <sect2 id="current">
       <title>ºÇ¿·¤Î &os; ¤òÄɤ¤¤«¤±¤ë</title>
 
-      <para>¤³¤ì¤òÆɤàÁ°¤Ë¡¢
-        ¿´¤Ë¤È¤á¤Æ¤ª¤¤¤ÆÍߤ·¤¤¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-	&os.current; ¤È¤Ï &os; ¤Î³«È¯¤Î <quote>ºÇÁ°Àþ</quote> ¤À¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
+      <para>&os.current; ¤È¤Ï &os; ¤Î³«È¯¤Î <quote>ºÇÁ°Àþ</quote> ¤Ç¤¹¡£
 	&os.current; ¤Î¥æ¡¼¥¶¤Ï¹â¤¤µ»½ÑÎϤò»ý¤Ä¤³¤È¤¬Í׵ᤵ¤ì¡¢
 	¼«Ê¬¤Î¥·¥¹¥Æ¥à¤¬Êú¤¨¤ëº¤Æñ¤ÊÌäÂê¤ò¼«ÎϤDzò·è¤Ç¤­¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
         ¤â¤· &os; ¤ò»È¤¤»Ï¤á¤¿¤Ð¤«¤ê¤Ê¤é¡¢
@@ -1363,21 +1330,20 @@ Fetching 133 new ports or files... done.
           Ãæ¤Ë¤Ï¸½ºß³«È¯ÅÓ¾å¤Î¥½¥Õ¥È¥¦¥§¥¢¡¢
           ¼Â¸³Åª¤ÊÊѹ¹¡¢¤¢¤ë¤¤¤Ï²áÅÏŪ¤Êµ¡Ç½¤Ê¤É¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
           ¤Þ¤¿¡¢¤³¤ÎÃæ¤ËÆþ¤Ã¤Æ¤¤¤ëµ¡Ç½¤¬¤¹¤Ù¤Æ¡¢
-          ¼¡¤Î¸ø¼°¥ê¥ê¡¼¥¹¤ËÆþ¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£
-          &os.current; ¤ò¥½¡¼¥¹¤«¤é¤Û¤ÜËèÆü¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¤¤ë¿Í¤Ï
-          ¤¿¤¯¤µ¤ó¤¤¤Þ¤¹¤¬¡¢
+	  ¼¡¤Î¸ø¼°¥ê¥ê¡¼¥¹¤ËÆþ¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£&os.current;
+	  ¤ò¥½¡¼¥¹¤«¤é¤Û¤ÜËèÆü¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¤¤ë¿Í¤Ï¤¿¤¯¤µ¤ó¤¤¤Þ¤¹¤¬¡¢

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-doc-head mailing list