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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Tue May 20 09:13:36 UTC 2014


Author: ryusuke
Date: Tue May 20 09:13:36 2014
New Revision: 44881
URL: http://svnweb.freebsd.org/changeset/doc/44881

Log:
  - Merge the following from the English version:
  
  	r44366 -> r44673	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 19 16:00:48 2014	(r44880)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Tue May 20 09:13:36 2014	(r44881)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44366
+     Original revision: r44673
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -725,92 +725,39 @@ before running "/usr/sbin/freebsd-update
     </indexterm>
 
     <para>¥É¥­¥å¥á¥ó¥È¤Ï¡¢&os; ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Îɬ¿ÜÍ×ÁǤǤ¹¡£
-      &os; ¥É¥­¥å¥á¥ó¥È¥»¥Ã¥È¤ÎºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ï¡¢
-      <link xlink:href="http://www.freebsd.org/doc/">&os; ¥¦¥§¥Ö¥µ¥¤¥È</link>
+      &os; ¥É¥­¥å¥á¥ó¥È¤ÎºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ï¡¢&os; ¥¦¥§¥Ö¥µ¥¤¥È
+      (<link xlink:href="&url.base;/doc/">http://www.freebsd.org/doc/</link>)
       ¤«¤éÆþ¼ê¤Ç¤­¤Þ¤¹¤¬¡¢
-      ¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤¬ÃÙ¤¤¡¢¤â¤·¤¯¤Ï¤Þ¤Ã¤¿¤¯Àܳ¤Ç¤­¤Ê¤¤¥æ¡¼¥¶¤â¤¤¤Þ¤¹¡£
-      ¥í¡¼¥«¥ë¤Î¥É¥­¥å¥á¥ó¥È¤òºÇ¿·¤Î &os;
-      ¥É¥­¥å¥á¥ó¥È¥»¥Ã¥È¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëÊýË¡¤¬¤¤¤¯¤Ä¤âÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-
-    <sect2 xml:id="dsvn-doc">
-      <title><application>Subversion</application>
-	¤òÍѤ¤¤¿¥É¥­¥å¥á¥ó¥È¤Î¥¢¥Ã¥×¥Ç¡¼¥ÈÊýË¡</title>
-
-      <para>&os; ¤Î¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤Ï¡¢
-	<application>svn</application> ¤òÍѤ¤¤ÆÆþ¼ê¤Ç¤­¤Þ¤¹¡£
-	¤³¤ÎÀá¤Ç¤Ï°Ê²¼¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
+      &os; ¥¦¥§¥Ö¥µ¥¤¥È¡¢¥Ï¥ó¥É¥Ö¥Ã¥¯¡¢<acronym>FAQ</acronym>
+      ¤ª¤è¤Óʸ½ñ¤ÎºÇ¿·ÈǤò¥í¡¼¥«¥ë¤ËÍÑ°Õ¤·¤Æ¤ª¤¯¤ÈÊØÍø¤Ç¤¹¡£</para>
 
-      <itemizedlist>
-	<listitem>
-	  <para>¥É¥­¥å¥á¥ó¥È¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¡£
-	    ¤³¤Î¥Ä¡¼¥ë¤Ï¡¢&os;
-	    ¤Î¥É¥­¥å¥á¥ó¥È¤ò¥½¡¼¥¹¤«¤éºÆ¹½ÃÛ¤¹¤ë¤Î¤ËɬÍפǤ¹¡£</para>
-	</listitem>
-
-	<listitem>
-	  <para><application>svn</application> ¤òÍѤ¤¤Æ¡¢
-	    ¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò
-	    <filename>/usr/doc</filename>
-	    °Ê²¼¤Ë¥À¥¦¥ó¥í¡¼¥É¤¹¤ëÊýË¡¡£</para>
-	</listitem>
-
-	<listitem>
-	  <para>&os; ¥É¥­¥å¥á¥ó¥È¤ò¥½¡¼¥¹¤«¤éºÆ¹½ÃÛ¤·¡¢
-	    <filename>/usr/share/doc</filename>
-	    °Ê²¼¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¡£</para>
-	</listitem>
-
-	<listitem>
-	  <para>¥É¥­¥å¥á¥ó¥È¤Î¥Ó¥ë¥É¥·¥¹¥Æ¥à¤Ë¤ª¤¤¤Æ¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥Ó¥ë¥É¥ª¥×¥·¥ç¥ó¤ÎÀâÌÀ¡£
-	    ¤¿¤È¤¨¤Ð¡¢ËÝÌõ¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤Î¤ß¤ò¹½ÃÛ¤¹¤ë¥ª¥×¥·¥ç¥ó¤ä¡¢
-	    ¤¢¤ëÆÃÄê¤Î½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È¤ò»ØÄꤹ¤ë¤è¤¦¤Ê¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
-	</listitem>
-      </itemizedlist>
-    </sect2>
+    <para>¤³¤Î¾Ï¤Ç¤Ï¡¢¥½¡¼¥¹¤Þ¤¿¤Ï Ports Collection ¤ò»È¤Ã¤Æ¡¢
+      ¥í¡¼¥«¥ë¤Î &os; ¥É¥­¥å¥á¥ó¥È¤òºÇ¿·¤ËÊݤÄÊýË¡¤òÀâÌÀ¤·¤Þ¤¹¡£</para>
 
-    <sect2 xml:id="installing-documentation-toolchain">
-      <title><application>svn</application>
-	¤ª¤è¤Ó¥É¥­¥å¥á¥ó¥È¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë</title>
-
-      <para>&os; ¤Î¥É¥­¥å¥á¥ó¥È¤ò¥½¡¼¥¹¤«¤éºÆ¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢
-	¥Ä¡¼¥ë¤Î¥³¥ì¥¯¥·¥ç¥ó¤¬É¬ÍפǤ¹¡£
-	¤³¤ì¤é¤Î¥Ä¡¼¥ë¤Ï¿¤¯¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤ò»ÈÍѤ¹¤ë¤¿¤á¡¢
-	&os; ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	¤Þ¤¿¡¢¤¹¤Ù¤Æ¤Î &os; ¥æ¡¼¥¶¤Ë¤È¤Ã¤ÆÍ­ÍѤȤ¤¤¦¤ï¤±¤Ç¤Ï¤Ê¤¯¡¢&os;
-	¤Î¤¿¤á¤Ë¿·¤·¤¤¥É¥­¥å¥á¥ó¥È¤ò³èȯ¤Ë¼¹É®¤·¤Æ¤¤¤ëÊý¤ä¡¢
-	ÉÑÈˤ˥ɥ­¥å¥á¥ó¥È¤ò¥½¡¼¥¹¤«¤é¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëÊý¤Ë¸þ¤±¤¿¤â¤Î¤Ç¤¹¡£</para>
-
-      <para><application>svn</application> ¤ò´Þ¤áɬÍפʥġ¼¥ë¤Ï¡¢
-	<package>textproc/docproj</package> ¥á¥¿ port 
-	¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£¤³¤Î port ¤Ï¡¢
-	&os; ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤Ë¤è¤ê³«È¯¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+    <para>¥É¥­¥å¥á¥ó¥È¤òÊÔ½¸¤·¤¿¤ê¡¢
+      ¥É¥­¥å¥á¥ó¥È¤Î¸í¤ê¤òÊó¹ð¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+      ¿·¤·¤¤¹×¸¥¼Ô¤Î¤¿¤á¤Î &os; ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥ÈÆþÌç
+      (<link xlink:href="&url.books.fdp-primer.en;">http://www.freebsd.org/doc/en_US.ISO8859-1/books/fdp-primer/</link>) ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
-      <note>
-	<para>¥É¥­¥å¥á¥ó¥È¤Î &postscript; ¤ä PDF ÈǤ¬É¬Íפʤ±¤ì¤Ð¡¢¤«¤ï¤ê¤Ë
-	  <package>textproc/docproj-nojadetex</package>
-	  ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¹Í¤¨¤Æ¤è¤¤¤Ç¤·¤ç¤¦¡£
-	  ¤³¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤Î¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤Ï¡¢
-	  <application>teTeX</application>
-	  ¤È¸Æ¤Ð¤ì¤ëÁÈÈÇ¥¨¥ó¥¸¥ó¤ò½ü¤¤¤¿¤¹¤Ù¤Æ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
-	  <application>teTeX</application> ¤ÏÂ礭¤Ê¥Ä¡¼¥ë¤Î¥³¥ì¥¯¥·¥ç¥ó¤Ç¤¹¡£
-	  ¤½¤Î¤¿¤á¡¢¤â¤· PDF ½ÐÎϤòËÜÅö¤ËɬÍפȤ·¤Ê¤±¤ì¤Ð¡¢
-	  ¤³¤Î¥Ä¡¼¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤¤¤³¤È¤Ï¤È¤Æ¤â¸­ÌÀ¤Ç¤¹¡£</para>
-      </note>
-    </sect2>
-
-    <sect2 xml:id="updating-documentation-sources">
-      <title>¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë</title>
+    <sect2 xml:id="updating-installed-documentation">
+      <title>¥½¡¼¥¹¤«¤é &os; ¥É¥­¥å¥á¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë</title>
 
-      <para>°Ê²¼¤ÎÎã¤Ç¤Ï¡¢<application>svn</application> ¤ò»È¤Ã¤Æ
-	western US ¥ß¥é¡¼¤«¤é HTTPS ¥×¥í¥È¥³¥ë¤òÍѤ¤¤Æ¡¢
-	¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Þ¤¹¡£</para>
+      <para>¥½¡¼¥¹¤«¤é &os; ¥É¥­¥å¥á¥ó¥È¤ò¹½ÃÛ¤¹¤ë¤Î¤ËɬÍפʥġ¼¥ë¤Ï¡¢
+	&os; ¤Î¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Ë¤Ï´Þ¤Þ¤ì¤Æ¤Ï¤¤¤Þ¤»¤ó¡£
+	<application>svn</application> ¤Ê¤É¤ÎɬÍפʥġ¼¥ë¤Ï¡¢
+	&os; ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤¬³«È¯¤·¤Æ¤¤¤ë
+	<package>textproc/docproj</package> package ¤Þ¤¿¤Ï port 
+	¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
+
+      <para>¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢<application>svn</application>
+	¤ò»È¤Ã¤Æ¡¢¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¤¯¤À¤µ¤¤¡£
+	°Ê²¼¤ÎÎã¤Ç¡¢
+	<replaceable>https://svn0.us-west.FreeBSD.org</replaceable>
+	¤ò <xref linkend="svn-mirrors"/>
+	¤ÎÃ椫¤é¤â¤Ã¤È¤â¶á¤¤¥ß¥é¡¼¤Î¥¢¥É¥ì¥¹¤ËÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <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>
-	¤ÎÃ椫¤é¤â¤Ã¤È¤â¶á¤¤¥ß¥é¡¼¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
-
       <para>ºÇ½é¤Ë¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï¾¯¤·»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¡£
 	¥À¥¦¥ó¥í¡¼¥É¤¬½ª¤ï¤ë¤Þ¤Ç¤ªÂÔ¤Á¤¯¤À¤µ¤¤¡£</para>
 
@@ -819,22 +766,40 @@ before running "/usr/sbin/freebsd-update
 
       <screen>&prompt.root; <userinput>svn update /usr/doc</userinput></screen>
 
-      <para>¥½¡¼¥¹¤òÆþ¼ê¤·¤¿¤é¡¢
-	<filename>/usr/doc/Makefile</filename> ¤ò»È¤¤¡¢
-	°Ê²¼¤Î¤è¤¦¤Ë¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
+      <para>ºÇ¿·¤Î¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤Î¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ò
+	<filename>/usr/doc</filename> ¤ËÍѰդǤ­¤¿¤é¡¢
+	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë½àÈ÷¤Ï¤¹¤Ù¤ÆÀ°¤¤¤Þ¤·¤¿¡£</para>
+
+      <para>ÍøÍѲÄǽ¤Ê¤¹¤Ù¤Æ¤Î¸À¸ì¤Î¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Ë¤Ï¡¢
+	°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
-&prompt.root; <userinput>make update</userinput></screen>
-    </sect2>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+      <para>¤â¤·¡¢¤¢¤ëÆÃÄê¤Î¸À¸ì¤Î¤ß¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤¿¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
+	<filename>/usr/doc</filename>
+	¤Î²¼¤Ë¤¢¤ë³Æ¸À¸ì¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ç <command>make</command>
+	¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/doc/en_US.ISO8859-1</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+      <para>¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëÊ̤ÎÊýË¡¤Ï¡¢
+	<filename>/usr/doc</filename>
+	¤Þ¤¿¤Ï³Æ¸À¸ì¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ç°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-    <sect2 xml:id="updating-documentation-options">
-      <title>¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ÎÄ´À°²Äǽ¤Ê¥ª¥×¥·¥ç¥ó</title>
+      <screen>&prompt.root; <userinput>make update</userinput></screen>
+
+      <para><varname>FORMATS</varname> ¤òÀßÄꤷ¤Æ¡¢
+	°Ê²¼¤Î¤è¤¦¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë½ÐÎÏ·Á¼°¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
+&prompt.root; <userinput>make FORMATS='html html-split' install clean</userinput></screen>
 
-      <para>&os; ¤Î¥É¥­¥å¥á¥ó¥È¥»¥Ã¥È¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤È¥Ó¥ë¥É¥·¥¹¥Æ¥à¤Ï¡¢
-	¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤Î°ìÉô¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤ò´Êñ¤Ë¤¹¤ë¥ª¥×¥·¥ç¥ó¤ä¡¢
-	ÆÃÄê¤ÎËÝÌõ¤Î¥Ó¥ë¥É¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+      <para>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤Î°ìÉô¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤ò´Êñ¤Ë¤¹¤ë¥ª¥×¥·¥ç¥ó¤ä¡¢
+	ÆÃÄê¤ÎËÝÌõ¤Î¥Ó¥ë¥É¤ò¹Ô¤¦¤¿¤á¤Î¥ª¥×¥·¥ç¥ó¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
  	¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥·¥¹¥Æ¥àÁ´È̤Υª¥×¥·¥ç¥ó¤Ç¤¢¤ë
-	<filename>/etc/make.conf</filename> ¤ä¡¢&man.make.1;
+	<filename>/etc/make.conf</filename> ¤ä¡¢<command>make</command>
 	¤ËÍ¿¤¨¤ë¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ÇÀßÄê¤Ç¤­¤Þ¤¹¡£</para>
 
       <para>¥ª¥×¥·¥ç¥ó¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</para>
@@ -857,8 +822,8 @@ before running "/usr/sbin/freebsd-update
 	    <para>¥Ó¥ë¥É¤ò¹Ô¤¦¥Õ¥©¡¼¥Þ¥Ã¥È¡¢¤Þ¤¿¤Ï½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È¤Î°ìÍ÷¡£
 	      ¸½ºß¤Ï <literal>html</literal>,
 	      <literal>html-split</literal>, <literal>txt</literal>,
-	      <literal>ps</literal>, <literal>pdf</literal>,
-	      ¤½¤·¤Æ <literal>rtf</literal> ¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+	      <literal>ps</literal> ¤½¤·¤Æ <literal>pdf</literal>
+	      ¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
 
@@ -875,47 +840,11 @@ before running "/usr/sbin/freebsd-update
       <para>&os; ¤Î¥·¥¹¥Æ¥àÁ´È̤Υª¥×¥·¥ç¥ó¤Ë´ØÏ¢¤¹¤ë¤â¤Ã¤È¿¤¯¤Î
 	<command>make</command> ÊÑ¿ô¤Ë¤Ä¤¤¤Æ¤Ï¡¢
 	&man.make.conf.5; ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
-
-      <para>&os; ¥É¥­¥å¥á¥ó¥È¤Î¥Ó¥ë¥É¥·¥¹¥Æ¥à¤ÇÂбþ¤·¤Æ¤¤¤ë¤µ¤é¤Ê¤ë
-	<command>make</command> ¤ÎÊÑ¿ô¤Ë´Ø¤·¤Æ¤Ï¡¢
-	<link xlink:href="&url.doc.langbase.en;/books/fdp-primer">¿·¤·¤¤¹×¸¥¼Ô¤Î¤¿¤á¤Î &os; ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥ÈÆþÌç </link> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-    </sect2>
-
-    <sect2 xml:id="updating-installed-documentation">
-      <title>¥½¡¼¥¹¤«¤é &os; ¥É¥­¥å¥á¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë</title>
-
-      <para>¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ÎºÇ¿·¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ò
-	<filename>/usr/doc</filename> ¤Ë¥À¥¦¥ó¥í¡¼¥É¤·¤¿¤é¡¢
-	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë½àÈ÷¤¬¤¹¤Ù¤ÆÀ°¤¤¤Þ¤·¤¿¡£</para>
-
-      <para><varname>DOC_LANG</varname>
-	¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¸À¸ì¤ò´°Á´¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Ë¤Ï¡¢
-	°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
-&prompt.root; <userinput>make install clean</userinput></screen>
-
-      <para>¤â¤·¡¢¤¢¤ëÆÃÄê¤Î¸À¸ì¤Î¤ß¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤¿¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
-	<filename>/usr/doc</filename>
-	¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ç°Ê²¼¤Î¤è¤¦¤Ë &man.make.1; ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <screen>&prompt.root; <userinput>cd /usr/doc/en_US.ISO8859-1</userinput>
-&prompt.root; <userinput>make update install clean</userinput></screen>
-
-      <para><varname>FORMATS</varname> ¤òÀßÄꤷ¤Æ¡¢
-	°Ê²¼¤Î¤è¤¦¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë½ÐÎÏ·Á¼°¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£</para>
-
-      <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
-&prompt.root; <userinput>make FORMATS='html html-split' install clean</userinput></screen>
-
-      <para>¥É¥­¥å¥á¥ó¥È¤òÊÔ½¸¤·¤¿¤ê¡¢ÄûÀµ¤·¤¿¤â¤Î¤òÄó½Ð¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-	<link xlink:href="&url.books.fdp-primer;">¿·¤·¤¤¹×¸¥¼Ô¤Î¤¿¤á¤Î &os;
-	¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥ÈÆþÌç</link> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
     </sect2>
 
-    <sect2 xml:id="doc-ports">
+    <sect2 xml:id="doc-ports-install-package">
       <info>
-	<title>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports</title>
+	<title>ports ¤òÍѤ¤¤¿¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤Î¥¢¥Ã¥×¥Ç¡¼¥È</title>
 
 	<authorgroup>
 	  <author>
@@ -939,17 +868,6 @@ before running "/usr/sbin/freebsd-update
 
       <para>¤³¤ì¤Þ¤Ç¤Î¥»¥¯¥·¥ç¥ó¤Ç¤Ï¡¢¥½¡¼¥¹¥³¡¼¥É¤òÍѤ¤¤¿ &os;
 	¥É¥­¥å¥á¥ó¥È¤Î¥¢¥Ã¥×¥Ç¡¼¥ÈÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤­¤Þ¤·¤¿¡£
-	¤¹¤Ù¤Æ¤Î &os; ¥·¥¹¥Æ¥à¤Ç¡¢
-	¥½¡¼¥¹¤«¤é¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤³¤È¤ÏÆñ¤·¤¤¤«¤âÃΤì¤Þ¤»¤ó¤·¡¢
-	¤Ç¤­¤¿¤È¤·¤Æ¤â¸½¼ÂŪ¤Ç¤Ï¤Ê¤¤¤³¤È¤â¤¢¤ê¤Þ¤¹¡£
-	¥É¥­¥å¥á¥ó¥È¤ò¥½¡¼¥¹¤«¤é¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢
-	¤«¤Ê¤êÂ礭¤Ê¥Ä¡¼¥ë¤È¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤«¤é¹½À®¤µ¤ì¤ë
-	<emphasis>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥Ä¡¼¥ë¥Á¥§¥¤¥ó</emphasis>
-	¤¬É¬Íפʤ¿¤á¤Ç¤¹¡£
-	¤Þ¤¿¡¢<application>svn</application>
-	¥ê¥Ý¥¸¥È¥ê¤«¤é¥½¡¼¥¹¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¡¢
-	¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¤¿¥½¡¼¥¹¤«¤é¥É¥­¥å¥á¥ó¥È¤ò¼êÆ°¤Ç¹½ÃÛ¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¡¢
-	¤½¤ì¤Ê¤ê¤Ë½ÏÃΤ·¤Æ¤¤¤ëɬÍפ⤢¤ê¤Þ¤¹¡£
 	¤³¤ÎÀá¤Ç¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë
 	&os; ¤Î¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ç¤¢¤ë¡¢
 	Ports Collection ¤òÍѤ¤¤¿ÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¡¢
@@ -957,84 +875,81 @@ before running "/usr/sbin/freebsd-update
 
       <itemizedlist>
 	<listitem>
-	  <para>¹½ÃۺѤΥɥ­¥å¥á¥ó¥È¤Î¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¡£
+	  <para>¹½ÃۺѤΥɥ­¥å¥á¥ó¥È¤Î packages ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¡£
 	    ¥í¡¼¥«¥ë¤Ç¤Î¹½ÃÛºî¶È¤ä¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</para>
 	</listitem>
 
 	<listitem>
-	  <para>¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤·¡¢ports
-	    ¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤ò»È¤Ã¤Æ¹½ÃÛ¤¹¤ëÊýË¡¤Ç¤¹¡£
+	  <para>ports ¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤ò»È¤Ã¤¿¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤Î¹½ÃÛÊýË¡¡£
 	    ¥Á¥§¥Ã¥¯¥¢¥¦¥È¤ª¤è¤Ó¹½ÃÛºî¶È¤¬´Êñ¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
 	</listitem>
       </itemizedlist>
 
       <para>&os; ¤Î¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤³¤ì¤é¤ÎÊýË¡¤Ï¡¢
 	&a.doceng; ¤¬Ëè·î¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¤¤ë
-        <emphasis>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports</emphasis>
+        ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports ¤ª¤è¤Ó packages
 	¤Ë¤è¤ê¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-	¤³¤ì¤é¤Î ports ¤Ï¡¢&os; Ports Collection ¤Î <link
-	  xlink:href="http://www.freshports.org/docs/">docs</link>
-	¥«¥Æ¥´¥ê¤Ë¤Þ¤È¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-
-      <sect3 xml:id="doc-ports-install-make">
-	<title>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports ¤Î¹½Ãۤȥ¤¥ó¥¹¥È¡¼¥ë</title>
-
-	<para>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports ¤Ç¤Ï¡¢
-	  ports ¤Î¹½Ãۥե졼¥à¥ï¡¼¥¯¤¬ÍѤ¤¤é¤ì¤ë¤Î¤Ç¡¢
-	  ¥É¥­¥å¥á¥ó¥È¤ò´Êñ¤Ë¹½ÃۤǤ­¤Þ¤¹¡£
-	  ¤³¤Î ports ¤Ï¡¢¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¼«Æ°Åª¤Ë¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¡¢
-	  ´Ä¶­ÊÑ¿ô¤ä¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤òŬÀÚ¤ËÀßÄꤷ¤Æ &man.make.1;
-	  ¤ò¼Â¹Ô¤·¤Þ¤¹¡£
-	  ¤Þ¤¿¡¢Â¾¤Î &os; port, package ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ÈƱÍͤ˴Êñ¤ÊÊýË¡¤Ç¡¢
-	  ¥É¥­¥å¥á¥ó¥È¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ä¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
-
-	<note>
-	  <para>Äɲäε¡Ç½¤È¤·¤Æ¡¢¤³¤Î ports ¤Ï
-	    <emphasis>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥Ä¡¼¥ë¥Á¥§¥¤¥ó</emphasis> ports
-	    ¤Ø¤Î°Í¸¤òÍý²ò¤·¤Æ¤¤¤ë¤Î¤Ç¡¢
-	    ¹½ÃÛ»þ¤Ë¤Ï¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤â¼«Æ°Åª¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
-	</note>
+	¤³¤ì¤é¤Î ports ¤Ï¡¢&os; Ports Collection ¤Î
+	docs ¥«¥Æ¥´¥ê (<link
+	  xlink:href="http://www.freshports.org/docs/">http://www.freshports.org/docs/</link>)
+	¤Ë¤Þ¤È¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
 	<para>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports ¤Î¹½À®¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£</para>
 
 	<itemizedlist>
 	  <listitem>
-	    <para><quote>¥Þ¥¹¥¿ port</quote>,
-	      <package>misc/freebsd-doc-en</package>¡£
-	      ¤¹¤Ù¤Æ¤Î±Ñ¸ìʸ½ñ¤Î ports ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
+	    <para><package>misc/freebsd-doc-en</package> package ¤Þ¤¿¤Ï port¤Ï¡¢
+	      ¤¹¤Ù¤Æ¤Î±Ñ¸ìʸ½ñ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
 	  </listitem>
 
 	  <listitem>
-	    <para><quote>¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥È¤Î port</quote>,
-	      <package>misc/freebsd-doc-all</package>¡£¤³¤ì¤Ï¡¢
+	    <para><package>misc/freebsd-doc-all</package> ¥á¥¿ package
+	      ¤â¤·¤¯¤Ï port ¤Ï¡¢
 	      ¤¹¤Ù¤Æ¤ÎÍøÍѲÄǽ¤Ê¸À¸ì¤Î¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥È¤ò¹½ÃÛ¤·¤Þ¤¹¡£</para>
 	  </listitem>
 
 	  <listitem>
-	    <para>³Æ¸À¸ì¤Î¤¿¤á¤Ë <quote>¥¹¥ì¡¼¥Ö port</quote>
+	    <para>³Æ¸À¸ì¤Î¤¿¤á¤Ë package ¤Þ¤¿¤Ï port
 	      ¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
 	      <package>misc/freebsd-doc-hu</package>
 	      ¤Ï¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó port ¤Ç¤¹¡£</para>
 	  </listitem>
 	</itemizedlist>
 
-	<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>
+	<para>¥Ð¥¤¥Ê¥ê package ¤ò»È¤¦¤È¡¢
+	  ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¸À¸ì¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î·Á¼°¤Î
+	  &os; ¥É¥­¥å¥á¥ó¥È¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£
+	  ¤¿¤È¤¨¤Ð¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢
+	  ¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¥É¥­¥å¥á¥ó¥È¤ÎºÇ¿· package
+	  ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
+
+	<screen>&prompt.root; <userinput>pkg install hu-freebsd-doc</userinput></screen>
+
+	<note>
+	  <para>¥É¥­¥å¥á¥ó¥È¤Î package ¤Ï¡¢Âбþ¤¹¤ë port ̾¤È¤Ï°Û¤Ê¤ê¡¢
+	    <literal><replaceable>lang</replaceable>-freebsd-doc</literal>
+	    ¤Î·Á¼°¤Ç̾Á°¤¬¤Ä¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£
+	    ¤³¤³¤Ç¡¢<replaceable>lang</replaceable> ¤Ï¸À¸ì¥³¡¼¥É¤Îû½Ì·Á¤Ç¤¹¡£
+	    ¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¾ì¹ç¤Ï <literal>hu</literal>¡¢´ÊÂλú¤Î¾ì¹ç¤Ë¤Ï
+	    <literal>zh_cn</literal> ¤Ç¤¹¡£</para>
+	</note>
+
+	<para>¥É¥­¥å¥á¥ó¥È¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤ò»ØÄꤹ¤ë¾ì¹ç¤Ë¤Ï¡¢package ¤Ç¤Ï¤Ê¤¯
+	  port ¤«¤é¹½ÃÛ¤ò¤·¤Æ¤¯¤À¤µ¤¤¡£
+	  ¤¿¤È¤¨¤Ð¡¢±Ñ¸ì¤Î¥É¥­¥å¥á¥ó¥È¤ò¹½ÃÛ¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ²¼¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports/misc/freebsd-doc-en</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-	<sect4 xml:id="doc-ports-options">
-	  <title>¶¦Ä̤Υª¥×¥·¥ç¥ó</title>
+	<para>¤³¤Î port ¤Ë¤Ï¡¢
+	  ¹½ÃÛ¤ª¤è¤Ó¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Õ¥©¡¼¥Þ¥Ã¥È¤òÀßÄꤹ¤ë¥á¥Ë¥å¡¼¤¬¤¢¤ê¤Þ¤¹¡£
+	  ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢<uri
+	    xlink:href="http://www.FreeBSD.org">http://www.FreeBSD.org</uri>
+	  ¤ÈƱ¤¸·Á¼°¤Ç¤¢¤ëʬ³äÈǤΠ<acronym>HTML</acronym> ·Á¼°¡¢
+	  <acronym>PDF</acronym> ¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
-	  <para>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports
-	    ¤Ë¤Ï¤¿¤¯¤µ¤ó¤Î¥ª¥×¥·¥ç¥ó¤¬ÍÑ°Õ¤µ¤ì¤Æ¤ª¤ê¡¢
-	    °Ê²¼¤Î¤è¤¦¤Ë
-	    ports ¤Î¿¶¤ëÉñ¤¤¤ò¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄ꤫¤éÊѹ¹¤Ç¤­¤Þ¤¹¡£</para>
+	  <para>°Ê²¼¤Î¤è¤¦¤Ë¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports ¤ò¹½ÃÛ¤¹¤ëºÝ¤Î
+	    <command>make</command> ¥ª¥×¥·¥ç¥ó¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
 	  <variablelist>
 	    <varlistentry>
@@ -1045,8 +960,8 @@ before running "/usr/sbin/freebsd-update
 		  ³Æ¥É¥­¥å¥á¥ó¥È¤ËÂФ·¡¢Ã±°ìÈǤΠHTML ¥Õ¥¡¥¤¥ë¤¬¹½ÃÛ¤µ¤ì¤Þ¤¹¡£
 		  À°·Á¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤Ï¡¢
 		  <filename>article.html</filename> ¤ä
-		  <filename>book.html</filename> ¤È¤¤¤Ã¤¿Ì¾Á°¤Ç¡¢
-		  ɬÍפ˱þ¤¸¤Æ²èÁü¤È¤È¤â¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
+		  <filename>book.html</filename>
+		  ¤È¤¤¤Ã¤¿Ì¾Á°¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -1054,8 +969,7 @@ before running "/usr/sbin/freebsd-update
 	      <term><varname>WITH_PDF</varname></term>
 
 	      <listitem>
-		<para>&adobe; Portable Document Format (PDF) ¤ò¹½ÃÛ¤·¤Þ¤¹¡£
-		  À°·Á¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤Ï¡¢
+		<para>À°·Á¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤Ï¡¢
 		  <filename>article.pdf</filename> ¤ä
 		  <filename>book.pdf</filename>
 		  ¤È¤¤¤Ã¤¿Ì¾Á°¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
@@ -1070,78 +984,23 @@ before running "/usr/sbin/freebsd-update
 		  ¥Ç¥Õ¥©¥ë¥È¤Î¥¤¥ó¥¹¥È¡¼¥ëÀè¤Ï
 		  <filename>/usr/local/share/doc/freebsd</filename>
 		  ¤Ç¤¹¡£</para>
-
-		<note>
-		  <para>¥Ç¥Õ¥©¥ë¥È¤Î¥¿¡¼¥²¥Ã¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢
-		    <application>svn</application>
-		    ¤òÍѤ¤¤ëÊýË¡¤È¤Ï°Û¤Ê¤ê¤Þ¤¹¡£
-		    ports ¤ÏÄ̾ï <filename>/usr/local</filename>
-		    ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤ë¤¿¤á¤Ç¤¹¡£
-		    <varname>PREFIX</varname> ÊÑ¿ô¤ò»È¤¦¤³¤È¤Ç¡¢
-		    ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê°Ê³°¤Ë¤â¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
-		</note>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
 
 	  <para>°Ê²¼¤Ï¡¢¾åµ­¤ÎÊÑ¿ô¤òÍѤ¤¤Æ¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¥É¥­¥å¥á¥ó¥È¤ò
-	    PDF ·Á¼°¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤Ç¤¹¡£</para>
+	    <acronym>PDF</acronym> ·Á¼°¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤Ç¤¹¡£</para>
 
 	  <screen>&prompt.root; cd /usr/ports/misc/freebsd-doc-hu
 &prompt.root; make -DWITH_PDF DOCBASE=share/doc/freebsd/hu install clean</screen>
-	</sect4>
-      </sect3>
-
-      <sect3 xml:id="doc-ports-install-package">
-	<title>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó package ¤ÎÍøÍÑ</title>
-
-	<para>Á°Àá¤ÇÀâÌÀ¤·¤¿¡¢
-	  ¥½¡¼¥¹¤«¤é¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó port ¤ò¹½ÃÛ¤¹¤ëÊýË¡¤Ç¤Ï¡¢
-	  ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤ò¥í¡¼¥«¥ë¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¡¢
-	  ¤Þ¤¿¡¢ports ¤Î¹½ÃۤΤ¿¤á¤Ë¥Ç¥£¥¹¥¯ÍÆÎ̤òɬÍפȤ·¤Þ¤¹¡£
-	  ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥ê¥½¡¼¥¹¤¬¤Ê¤¤¾ì¹ç¤ä¡¢
-	  ¥½¡¼¥¹¤«¤é¹½ÃÛ¤¹¤ë¾ì¹ç¤Ë¤Ï¿¤¯¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤òɬÍפȤ¹¤ë¤¿¤á¡¢
-	  ¹½ÃۺѤߤΥɥ­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports
-	  ¤Î¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-
-	<para>&a.doceng; ¤Ï¡¢Ëè·î &os; ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó package
-	  ¤Î¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
-	  ¤³¤ì¤é¤Î¥Ð¥¤¥Ê¥ê package ¤Ï¡¢¥·¥¹¥Æ¥à¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤ë
-	  &man.pkg.add.1;, &man.pkg.delete.1; ¤Ê¤É¤Î
-	  package ´ÉÍý¥Ä¡¼¥ë¤òÍѤ¤¤Æ°·¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
-
-	<note>
-	  <para>¥Ð¥¤¥Ê¥ê package ¤ò»È¤¦¤È¡¢
-	    ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¸À¸ì¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤ë
-	    <emphasis>¤¹¤Ù¤Æ</emphasis> ¤Î·Á¼°¤Î
-	    &os; ¥É¥­¥å¥á¥ó¥È¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
-	</note>
-
-	<para>¤¿¤È¤¨¤Ð¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢
-	  ¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¥É¥­¥å¥á¥ó¥È¤ÎºÇ¿· package ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
-
-	<screen>&prompt.root; <userinput>pkg install hu-freebsd-doc</userinput></screen>
 
-	<note>
-	  <para>¥É¥­¥å¥á¥ó¥È¤Î package ¤Ï¡¢Âбþ¤¹¤ë port ̾¤È¤Ï°Û¤Ê¤ê¡¢
-	    <literal><replaceable>lang</replaceable>-freebsd-doc</literal>
-	    ¤Î·Á¼°¤Ç̾Á°¤¬¤Ä¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£
-	    ¤³¤³¤Ç¡¢<replaceable>lang</replaceable> ¤Ï¸À¸ì¥³¡¼¥É¤Îû½Ì·Á¤Ç¤¹¡£
-	    ¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¾ì¹ç¤Ï <literal>hu</literal>¡¢´ÊÂλú¤Î¾ì¹ç¤Ë¤Ï
-	    <literal>zh_cn</literal> ¤Ç¤¹¡£</para>
-	</note>
-      </sect3>
-
-      <sect3 xml:id="doc-ports-update">
-	<title>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports ¤Î¥¢¥Ã¥×¥Ç¡¼¥È</title>
-
-	<para>¾¤Î port ¤ÈƱÍͤˡ¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó port
+	<para><xref linkend="ports"/> ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤ò»È¤Ã¤Æ¡¢
+	  ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó package ¤Þ¤¿¤Ï port
 	  ¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤­¤Þ¤¹¡£
 	  ¤¿¤È¤¨¤Ð¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢<package>ports-mgmt/portupgrade</package>
 	  ¤«¤é¡¢package ¤À¤±¤ò»È¤Ã¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¥É¥­¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£</para>
 
 	<screen>&prompt.root; <userinput>portmaster -PP hu-freebsd-doc</userinput></screen>
-      </sect3>
     </sect2>
   </sect1>
 
@@ -1687,7 +1546,7 @@ before running "/usr/sbin/freebsd-update
 	    ¿·¤·¤¤¥°¥ë¡¼¥×¤ä¿·¤·¤¤¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È¡¢
 	    ¤â¤·¤¯¤Ï¥¹¥¿¡¼¥È¥¢¥Ã¥×¥¹¥¯¥ê¥×¥È¤¬¥·¥¹¥Æ¥à¤ËÄɲ䵤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
-	  <screen>&prompt.root; <userinput>mergemaster</userinput></screen>
+	  <screen>&prompt.root; <userinput>mergemaster -iF</userinput></screen>
 	</step>
 
 	<step>


More information about the svn-doc-all mailing list