svn commit: r44208 - head/ja_JP.eucJP/books/handbook/ports

Ryusuke SUZUKI ryusuke at FreeBSD.org
Tue Mar 11 10:41:33 UTC 2014


Author: ryusuke
Date: Tue Mar 11 10:41:33 2014
New Revision: 44208
URL: http://svnweb.freebsd.org/changeset/doc/44208

Log:
  - Merge the following from the English version:
  
  	r42809 -> r42829	head/ja_JP.eucJP/books/handbook/ports/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/ports/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/ports/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/ports/chapter.xml	Tue Mar 11 07:16:12 2014	(r44207)
+++ head/ja_JP.eucJP/books/handbook/ports/chapter.xml	Tue Mar 11 10:41:33 2014	(r44208)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r42809
+     Original revision: r42829
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="ports">
@@ -578,39 +578,34 @@ docbook                     =
       package ¤Î´ÉÍý</title>
 
     <para><application>pkgng</application> ¤Ï¡¢&os; ¤Ë¤ª¤±¤ëÅÁÅýŪ¤Ê 
-      package ´ÉÍý¥Ä¡¼¥ë¤ÎÃÖ¤­´¹¤¨¤Ç¤¢¤ê¡¢¥Ð¥¤¥Ê¥ê packages ¤ò¤è¤êÁ᤯¡¢
-      ¤è¤ê´Êñ¤Ë´ÉÍý¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¿ô¿¤¯¤Îµ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£
-      <application>pkgng</application> ¤ÎºÇ½é¤Î¥ê¥ê¡¼¥¹¤Ï
-      2012 ǯ 8 ·î¤Ë¹Ô¤ï¤ì¤Þ¤·¤¿¡£</para>
+      package ´ÉÍý¥Ä¡¼¥ë¤ÎÃÖ¤­´¹¤¨¤È¤Ê¤ë¼¡À¤Âå¤Î´ÉÍý¥Ä¡¼¥ë¤Ç¡¢
+      ¥Ð¥¤¥Ê¥ê packages ¤ò¤è¤êÁ᤯¡¢
+      ¤è¤ê´Êñ¤Ë´ÉÍý¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¿ô¿¤¯¤Îµ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£</para>
 
     <para><application>pkgng</application> ¤Ï <package>ports-mgmt/portmaster</package> ¤ä <package>ports-mgmt/portupgrade</package> ¤Ê¤É¤Î
       port ´ÉÍý¥Ä¡¼¥ë¤ÎÃÖ¤­´¹¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-      <package>ports-mgmt/portmaster</package> ¤ª¤è¤Ó
-      <package>ports-mgmt/portupgrade</package> ¤Ï¡¢
+      ¤³¤ì¤é¤Î¥Ä¡¼¥ë¤Ï¡¢
       ¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥½¥Õ¥È¥¦¥§¥¢¤ò¥Ð¥¤¥Ê¥ê packages ¤È
       Ports Collection ¤Îξ·Á¼°¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¤¬¡¢
-      <application>pkgng</application> ¤Ï¥Ð¥¤¥Ê¥ê packages
+      °ìÊý¤Ç <application>pkgng</application> ¤Ï¥Ð¥¤¥Ê¥ê packages
       ¤Î¤ß¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
 
     <sect2 xml:id="pkgng-initial-setup">
       <title><application>pkgng</application> ÆþÌç</title>
 
       <para>&os; 9.1 °Ê¹ß¤Ç¤Ï¡¢
-	<application>pkgng</application> ¤Î¤¿¤á¤Î "¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×"
-	¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-	¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï <application>pkgng</application>
-	¤ò¥À¥¦¥ó¥í¡¼¥É¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
+	<application>pkgng</application> ¤È¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¤·¡¢
+	¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Î¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para>¥·¥¹¥Æ¥à¤ò¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
 	°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>/usr/sbin/pkg</userinput></screen>
 
-      <para>¤³¤ì¤è¤êÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Î &os; ¤Ç¤Ï¡¢Ports Collection
+      <para>¤³¤ì¤è¤êÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Î &os; ¤Ç¤Ï¡¢¤«¤ï¤ê¤Ë Ports Collection
 	¤Þ¤¿¤Ï packages ¤òÍѤ¤¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
-      <para><application>pkgng</application> port
-	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <para>port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/ports-mgmt/pkg</userinput>
 &prompt.root; <userinput>make</userinput>
@@ -620,10 +615,9 @@ docbook                     =
 
       <screen>&prompt.root; <userinput>pkg_add -r pkg</userinput></screen>
 
-      <para>&os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤¬¤¹¤Ç¤Ë¹Ô¤ï¤ì¤Æ¤¤¤ë¤è¤¦¤Ê¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
-	<application>pkg_install</application> package
-	¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Õ¥©¡¼¥Þ¥Ã¥È¤ØÊÑ´¹¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	ÊÑ´¹¤ò¹Ô¤¦¤Ë¤Ï°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <para><application>pkgng</application> ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢
+	°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¡¢
+	package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¤³¤ì¤Þ¤Ç¤ÎÅÁÅýŪ¤Ê¥Õ¥©¡¼¥Þ¥Ã¥È¤«¤é¿·¤·¤¤¥Õ¥©¡¼¥Þ¥Ã¥È¤Ø¤ÈÊÑ´¹¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>pkg2ng</userinput></screen>
 
@@ -634,7 +628,7 @@ docbook                     =
       <important>
 	<para>¤³¤Î¥¹¥Æ¥Ã¥×¤ÏÈó²ÄµÕ¤Ç¤¹¡£
 	  °ìÅÙ package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò <application>pkgng</application>
-	  ¥Õ¥©¡¼¥Þ¥Ã¥È¤Ø¤ÈÊÑ´¹¤·¤¿¤é¡¢<application>pkg_install</application>
+	  ¥Õ¥©¡¼¥Þ¥Ã¥È¤Ø¤ÈÊÑ´¹¤·¤¿¤é¡¢ÅÁÅýŪ¤Ê <application>pkg_*</application>
 	  ¥Ä¡¼¥ë¤ò»È¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
       </important>
 
@@ -644,22 +638,17 @@ docbook                     =
 	  Ä̾¤³¤ì¤é¤Î¥¨¥é¡¼¤Ï̵»ë¤·¤Æ¹½¤¤¤Þ¤»¤ó¤¬¡¢
 	  <command>pkg2ng</command> ½ªÎ»¸å¤Ëɽ¼¨¤µ¤ì¤ë¡¢
 	  ÊÑ´¹¤Ë¼ºÇÔ¤·¤¿¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥½¥Õ¥È¥¦¥§¥¢¤Î°ìÍ÷¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-	  ¤³¤ì¤é¤Î¥½¥Õ¥È¥¦¥§¥¢¤ò¼êÆ°¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
+	  ¤³¤ì¤é¤Î¥½¥Õ¥È¥¦¥§¥¢¤ò¼êÆ°¤ÇºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
       </note>
 
       <para>&os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬
 	10.<replaceable>X</replaceable> ¤è¤êÁ°¤Ç¤¢¤ì¤Ð¡¢
 	°Ê²¼¤Î¹Ô¤ò <filename>/etc/make.conf</filename> ¤ËÄɲ䷤ơ¢
-	&os; Ports Collection ¤¬¥½¥Õ¥È¥¦¥§¥¢¤ÎÅÐÏ¿¤Ë¡¢
-	<application>pkg_install</application>
-	¤Ç¤Ï¤Ê¤¯ <application>pkgng</application>
+	&os; Ports Collection ¤¬¥½¥Õ¥È¥¦¥§¥¢¤ÎÅÐÏ¿¤Ë¡¢ÅÁÅýŪ¤Ê
+	package ¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤Ç¤Ï¤Ê¤¯¡¢<application>pkgng</application>
 	¤òÍѤ¤¤ë¤è¤¦¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <programlisting>WITH_PKGNG=	yes</programlisting>
-    </sect2>
-
-    <sect2 xml:id="pkgng-pkg-conf">
-      <title><application>pkgng</application> ´Ä¶­¤ÎÀßÄê</title>
 
       <para><application>pkgng</application> package ´ÉÍý¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
 	¤Û¤È¤ó¤É¤Î¥³¥Þ¥ó¥É¤ËÂФ·¤Æ package ¥ê¥Ý¥¸¥È¥ê¤ò»È¤¤¤Þ¤¹¡£
@@ -670,118 +659,107 @@ docbook                     =
 
       <para>¤½¤Î¾¤Î <application>pkgng</application>
 	¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤Ï¡¢pkg.conf(5) ¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-    </sect2>
-
-    <sect2 xml:id="pkgng-basic-usage">
-      <title>´ðËÜŪ¤Ê <application>pkgng</application> ¤ÎÁàºî</title>
 
       <para><application>pkgng</application> ¤ÎÍøÍѾðÊó¤Ï¡¢
-	man.pkg(8) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ä¡¢
+	pkg(8) ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ä¡¢
 	<command>pkg</command> ¤ò°ú¿ô¤Ê¤·¤Ë¼Â¹Ô¤¹¤ë¤Èɽ¼¨¤µ¤ì¤Þ¤¹¡£</para>
 
       <para>³Æ <application>pkgng</application> ¥³¥Þ¥ó¥É¤Î°ú¿ô¤Ï¡¢
 	¥³¥Þ¥ó¥É¤Ë¸ÇÍ­¤Ê¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	¤¿¤È¤¨¤Ð¡¢<command>pkg install</command> ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤òÆɤà¤Ë¤Ï¡¢
-	°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	°Ê²¼¤Î¥³¥Þ¥ó¥É¤Î¤É¤Á¤é¤«¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>pkg help install</userinput></screen>
 
       <screen>&prompt.root; <userinput>man pkg-install</userinput></screen>
 
-      <sect3 xml:id="pkgng-pkg-info">
-	<title><application>pkgng</application> ¤ò»È¤Ã¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿
-	  package ¤Î¾ðÊó¤òÆÀ¤ë¤Ë¤Ï</title>
-
-	<para><command>pkg info</command> ¤ò¼Â¹Ô¤¹¤ë¤È¡¢
-	  ¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë package ¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£
-	  &man.pkg.info.1; ƱÍÍ¡¢¤¹¤Ù¤Æ¤Î package ¤Î¥Ð¡¼¥¸¥ç¥ó¡¢
-	  ¤ª¤è¤ÓÀâÌÀ¤Î°ìÍ÷¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£</para>
-
-	<para>¤¢¤ëÆÃÄê¤Î package ¤Î¾ðÊó¤¬É¬ÍפǤ¢¤ì¤Ð¡¢
-	  °Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	<screen>&prompt.root; <userinput>pkg info packagename</userinput></screen>
+      <para>°Ê²¼¤ÎÀá¤Ç¤Ï¡¢<application>pkgng</application>
+	¤òÍѤ¤¤¿Ä̾ï¤Î¥Ð¥¤¥Ê¥ê package ¤Î´ÉÍý¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
+	³Æ¥³¥Þ¥ó¥É¤Ç¤Ï¡¢¥«¥¹¥¿¥Þ¥¤¥º¤Î¤¿¤á¤Ë¡¢
+	¿¤¯¤Î¥ª¥×¥·¥ç¥ó¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
+	¾ÜºÙ¤ä¡¢Â¾¤ÎÎã¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	¥³¥Þ¥ó¥É¤Î¥Ø¥ë¥×¤ä¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+    </sect2>
+ 
+    <sect2 xml:id="pkgng-pkg-info">
+	<title>¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë package ¤Î¾ðÊó¤òÆþ¼ê¤¹¤ë</title>
+
+	<para>¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Ê¤¤¤Ç <command>pkg info</command>
+	  ¤ò¼Â¹Ô¤¹¤ë¤È¡¢
+	  ¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î package ¤â¤·¤¯¤Ï¡¢
+	  ¤¢¤ëÆÃÄê¤Î package ¤Î¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£</para>
 
-	<para>¤¿¤È¤¨¤Ð¡¢¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë
+	<para>¤¿¤È¤¨¤Ð¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë
 	  <application>pkgng</application> ¤Î¾ðÊó¤òÄ´¤Ù¤ë¤Ë¤Ï¡¢
 	  °Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>pkg info pkg</userinput>
-pkg-1.0.2			New generation package manager</screen>
-      </sect3>
+pkg-1.1.4_1</screen>
+      </sect2>
 
-      <sect3 xml:id="pkgng-installing-deinstalling">
-	<title><application>pkgng</application>
-	  ¤òÍѤ¤¤¿ packages ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Èºï½ü</title>
-
-	<para>Ä̾¤Û¤È¤ó¤É¤Î &os; ¥æ¡¼¥¶¤Ï¡¢¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò
-	  <command>pkg install
-	    packagename</command>
-	  ¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤Ç¤·¤ç¤¦¡£</para>
+      <sect2 xml:id="pkgng-installing-deinstalling">
+	<title>package ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Èºï½ü</title>
 
-	<screen>&prompt.root; <userinput>pkg install packagename</userinput></screen>
+	<para>¥Ð¥¤¥Ê¥ê package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
+	  °Ê²¼¤Î¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
+	  ¤³¤³¤Ç <replaceable>packagename</replaceable> ¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë
+	  package ¤Î̾Á°¤Ç¤¹¡£</para>
 
-	<para><xref linkend="pkgng-pkg-conf"/> ¤ÇÀâÌÀ¤·¤¿Ä̤ꡢ
-	  <command>pkg install</command> ¤Ï¥ê¥Ý¥¸¥È¥ê¥Ç¡¼¥¿¤ò»ÈÍѤ·¤Þ¤¹¡£
-	  ¤³¤ì¤È¤ÏÈ¿ÂФˡ¢pkg-add(8) ¤Ï¥ê¥Ý¥¸¥È¥ê¥Ç¡¼¥¿¤òÍѤ¤¤Ê¤±¤ì¤Ð¡¢
-	  ÄêµÁ¤µ¤ì¤Æ¤¤¤ë <envar>PACKAGESITE</envar> ¤â»È¤¤¤Þ¤»¤ó¡£
-	  ¤½¤Î¤¿¤á¡¢°Í¸´Ø·¸¤ÏŬÀڤˤÏÄÉÀפµ¤ì¤º¡¢
-	  ­¤ê¤Ê¤¤°Í¸¤Ë¤Ä¤¤¤Æ¤â¥ê¥â¡¼¥È¥Û¥¹¥È¤«¤é¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¤Þ¤»¤ó¡£
-	  ¤³¤ÎÀá¤Ç¤Ï <command>pkg install</command> ¤Î»ÈÍÑÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
-	  <command>pkg add</command> ¤Î»ÈÍÑÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï pkg-add(8)
-	  ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+	<screen>&prompt.root; <userinput>pkg install packagename</userinput></screen>
 
-	<para>ÄɲäΥХ¤¥Ê¥ê package ¤Ï¡¢
-	  <command>pkg install</command> ¤Ë¤è¤ê¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£
-	  ¤¿¤È¤¨¤Ð¡¢
-	  <application>curl</application> ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<para>¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥ê¥Ý¥¸¥È¥ê¥Ç¡¼¥¿¤ò»ÈÍѤ·¤Æ¡¢
+	  ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤Ù¤­¥½¥Õ¥È¥¦¥§¥¢¤Î¥Ð¡¼¥¸¥ç¥ó¡¢¤ª¤è¤Ó¡¢
+	  ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤°Í¸¥½¥Õ¥È¥¦¥§¥¢¤¬¤¢¤ë¤«¤É¤¦¤«¤òÄ´¤Ù¤Þ¤¹¡£
+	  ¤¿¤È¤¨¤Ð¡¢<application>curl</application>
+	  ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>pkg install curl</userinput>
 Updating repository catalogue
-Repository catalogue is up-to-date, no need to fetch fresh copy
-The following packages will be installed:
+/usr/local/tmp/All/curl-7.31.0_1.txz          100% of 1181 kB 1380 kBps 00m01s
+
+/usr/local/tmp/All/ca_root_nss-3.15.1_1.txz   100% of  288 kB 1700 kBps 00m00s
+
+Updating repository catalogue
+The following 2 packages will be installed:
 
-	Installing ca_root_nss: 3.13.5
-	Installing curl: 7.24.0
+        Installing ca_root_nss: 3.15.1_1
+        Installing curl: 7.31.0_1
 
-The installation will require 4 MB more space
+The installation will require 3 MB more space
 
-1 MB to be downloaded
+0 B to be downloaded
 
 Proceed with installing packages [y/N]: <userinput>y</userinput>
-ca_root_nss-3.13.5.txz		100%	255KB 	255.1KB/s 255.1KB/s	00:00
-curl-7.24.0.txz			100%	1108KB	1.1MB/s	1.1MB/s		00:00
 Checking integrity... done
-Installing ca_root_nss-3.13.5... done
-Installing curl-7.24.0... done</screen>
+[1/2] Installing ca_root_nss-3.15.5_1... done
+[2/2] Installing curl-7.31.0_1... done
+Cleaning up cache files...Done</screen>
 
 	<para>¿·¤·¤¤ package ¤È°Í¸´Ø·¸¤«¤éÄɲ䵤줿 package ¤Ï¡¢
 	  ¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß package °ìÍ÷¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£</para>
 
 	<screen>&prompt.root; <userinput>pkg info</userinput>
-ca_root_nss-3.13.5	The root certificate bundle from the Mozilla Project
-curl-7.24.0	Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers
-pkg-1.0.2	New generation package manager</screen>
+ca_root_nss-3.15.5_1	The root certificate bundle from the Mozilla Project
+curl-7.31.0_1	Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers
+pkg-1.1.4_6	New generation package manager</screen>
 
 	<para>ɬÍפΤʤ¯¤Ê¤Ã¤¿ packages ¤Ï¡¢
 	  <command>pkg delete</command> ¤ò»È¤Ã¤Æºï½ü¤Ç¤­¤Þ¤¹¡£
-	  ¤¿¤È¤¨¤Ð¡¢<application>curl</application> ¤¬É¬Íפʤ¯¤Ê¤Ã¤¿¤é¡¢
-	  °Ê²¼¤Î¤è¤¦¤Ë¤·¤Æºï½ü¤Ç¤­¤Þ¤¹¡£</para>
+	  ¤¿¤È¤¨¤Ð¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æºï½ü¤Ç¤­¤Þ¤¹¡£</para>
 
 	<screen>&prompt.root; <userinput>pkg delete curl</userinput>
 The following packages will be deleted:
 
-	curl-7.24.0_1
+	curl-7.31.0_1
 
 The deletion will free 3 MB
 
 Proceed with deleting packages [y/N]: <userinput>y</userinput>
-Deleting curl-7.24.0_1... done</screen>
-      </sect3>
+[1/1] Deleting curl-7.31.0_1... done</screen>
+    </sect2>
 
-      <sect3 xml:id="pkgng-upgrading">
-	<title><application>pkgng</application> ¤Ë¤è¤ë package
-	  ¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É</title>
+    <sect2 xml:id="pkgng-upgrading">
+      <title>¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë package ¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É</title>
 
 	<para><command>pkg version</command>
 	  ¤òÍѤ¤¤Æ¸Å¤¯¤Ê¤Ã¤¿ packages ¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
@@ -790,54 +768,37 @@ Deleting curl-7.24.0_1... done</screen>
 	  ¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¡¢¥í¡¼¥«¥ë¤Î ports ¥Ä¥ê¡¼¤ò»È¤Ã¤Æ
 	  package ¤Î¥Ð¡¼¥¸¥ç¥ó¤òƱÄꤷ¤Þ¤¹¡£</para>
 
-	<para><application>pkgng</application> ¤òÍѤ¤¤Æ
-	  package ¤ò¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤­¤Þ¤¹¡£
-	  <application>curl</application>
-	  ¤Î¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤¬¥ê¥ê¡¼¥¹¤µ¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢¥í¡¼¥«¥ë package
-	  ¤ò°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤­¤Þ¤¹¡£</para>
-
-	<screen>&prompt.root; <userinput>pkg upgrade</userinput>
-Updating repository catalogue
-repo.txz		100%	297KB 296.5KB/s 296.5KB/s	00:00
-The following packages will be upgraded:
-
-	Upgrading curl: 7.24.0 -> 7.24.0_1
+	<para><application>pkg upgrade</application> ¤ò¼Â¹Ô¤¹¤ë¤È¡¢
+	  ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë packages
+	  ¤¬ºÇ¿·¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤µ¤ì¤Þ¤¹¡£
+	  ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤Î¥Ð¡¼¥¸¥ç¥ó¤È¡¢
+	  ¥ê¥Ý¥¸¥È¥ê¤Î¥«¥¿¥í¥°¤«¤éÍøÍѤǤ­¤ë¥Ð¡¼¥¸¥ç¥ó¤È¤òÈæ³Ó¤·¤Þ¤¹¡£
+	  Èæ³Ó¤¬½ª¤ï¤Ã¤¿¤é¡¢
+	  ¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î°ìÍ÷¤òɽ¼¨¤·¤Þ¤¹¡£
+	  ¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤¦¤Î¤Ç¤¢¤ì¤Ð¡¢
+	  <userinput>y</userinput> ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
+	  ¥­¥ã¥ó¥»¥ë¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢
+	  <userinput>n</userinput> ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+    </sect2>
 
-1 MB to be downloaded
+    <sect2 xml:id="pkgng-auditing">
+      <title>¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë package ¤Î¸¡¾Ú</title>
 
-Proceed with upgrading packages [y/N]: <userinput>y</userinput>
-curl-7.24.0_1.txz	100% 1108KB	1.1MB/s	1.1MB/s		00:00
-Checking integrity... done
-Upgrading curl from 7.24.0 to 7.24.0_1... done</screen>
-      </sect3>
-
-      <sect3 xml:id="pkgng-auditing">
-	<title><application>pkgng</application> ¤Ë¤è¤ë package
-	  ¤Î¸¡¾Ú</title>
-
-	<para>»þÀÞ¡¢Ports Collection
-	  ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤ËÀȼåÀ­¤¬¸«¤Ä¤«¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-	  <application>pkgng</application> ¤Ï¡¢<package>ports-mgmt/portaudit</package> package
-	  ƱÍͤθ¡¾Úµ¡Ç½¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
-	  ¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤ò¸¡¾Ú¤¹¤ë¤Ë¤Ï¡¢
+	<para>»þÀÞ¡¢
+	  ¥µ¡¼¥É¥¦¥§¥¢À½¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ËÀȼåÀ­¤¬¸«¤Ä¤«¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
+	  ÀȼåÀ­¤òÄ´¤Ù¤ë¤¿¤á¤Ë¡¢
+	  <application>pkgng</application> ¤Ï¡¢¸¡¾Úµ¡Ç½¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
+	  ¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤Ë´ûÃΤÎÀȼåÀ­¤¬¤Ê¤¤¤«¤É¤¦¤«¤òÄ´¤Ù¤ë¤Ë¤Ï¡¢
 	  °Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
  	<screen>&prompt.root; <userinput>pkg audit -F</userinput></screen>
-      </sect3>
     </sect2>
 
-    <sect2 xml:id="pkgng-advanced-usage">
-      <title>¹âÅÙ¤Ê <application>pkgng</application> ¤ÎÍøÍÑ</title>
+    <sect2 xml:id="pkgng-autoremove">
+      <title>¥ê¡¼¥Õ°Í¸ ports ¤Î¼«Æ°ºï½ü</title>
 
-      <sect3 xml:id="pkgng-autoremove">
-	<title> <application>pkgng</application> ¤Ë¤è¤ë¥ê¡¼¥Õ°Í¸ ports
-	¤Î¼«Æ°ºï½ü</title>
-
-	<para>package ¤òºï½ü¤¹¤ë¤È¡¢ÉÔɬÍפʰ͸ ports¡¢¤¿¤È¤¨¤Ð¾å¤ÎÎã¤Ç¤Ï
-	  <package>security/ca_root_nss</package>
+      <para>package ¤òºï½ü¤¹¤ë¤È¡¢ÉÔɬÍפʰ͸ ports
 	  ¤¬»Ä¤µ¤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-	  ¤³¤ì¤é¤Î packages ¤Ï¡¢
-	  ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¤Þ¤Þ¤Ç¤É¤³¤«¤é¤â°Í¸¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
 	  °Í¸¤Î¤¿¤á¤ËƳÆþ¤µ¤ì¡¢¸½ºß¤ÏÉÔɬÍפˤʤä¿ package ¤Ï¡¢
 	  °Ê²¼¤Î¤è¤¦¤Ë¤¹¤ë¤È¼«Æ°Åª¤Ë¸¡½Ð¤µ¤ì¡¢ºï½ü¤µ¤ì¤Þ¤¹¡£</para>
 
@@ -848,37 +809,32 @@ Packages to be autoremoved:
 The autoremoval will free 723 kB
 
 Proceed with autoremoval of packages [y/N]: <userinput>y</userinput>
-Deinstalling ca_root_nss-3.13.5... done</screen>
-      </sect3>
+Deinstalling ca_root_nss-3.15.1_1... done</screen>
+    </sect2>
 
-      <sect3 xml:id="pkgng-backup">
-	<title><application>pkgng</application> package
-	  ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×</title>
+    <sect2 xml:id="pkgng-backup">
+      <title>package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×</title>
 
 	<para>ÅÁÅýŪ¤Ê package ´ÉÍý¥·¥¹¥Æ¥à¤È¤Ï°Û¤Ê¤ê¡¢
 	  <application>pkgng</application> ¤Ë¤Ï package
 	  ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¥Ð¥Ã¥¯¥¢¥Ã¥×¤¹¤ë¥á¥«¥Ë¥º¥à¤¬¤¢¤ê¤Þ¤¹¡£
 	  package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÆâÍƤò¼êÆ°¤Ç¥Ð¥Ã¥¯¥¢¥Ã¥×¤¹¤ë¤Ë¤Ï¡¢
-	  °Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	  °Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£°Ê²¼¤Î
+	  <replaceable>pkgng.db</replaceable>
+	  ¤òŬÀڤʥե¡¥¤¥ë̾¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>pkg backup -d pkgng.db</userinput></screen>
 
-	<note>
-	  <para>¥Õ¥¡¥¤¥ë̾¤Î <replaceable>pkgng.db</replaceable>
-	    ¤òŬÀڤʥե¡¥¤¥ë̾¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
-	</note>
-
 	<para>¤µ¤é¤Ë¡¢<application>pkgng</application> ¤Ï
 	  package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤òËèÆü¼«Æ°Åª¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤¹¤ë
 	  &man.periodic.8; ¥¹¥¯¥ê¥×¥È¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
-	  &man.periodic.conf.5; ¤ÎÃæ¤Ç¡¢
+	  ¤³¤Îµ¡Ç½¤Ï¡¢&man.periodic.conf.5; ¤ÎÃæ¤Ç¡¢
 	  <literal>daily_backup_pkgng_enable</literal> ¤ò
-	  <literal>YES</literal> ¤ËÀßÄꤹ¤ë¤È¥Ð¥Ã¥¯¥¢¥Ã¥×¤µ¤ì¤Þ¤¹¡£</para>
+	  <literal>YES</literal> ¤ËÀßÄꤹ¤ë¤ÈÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
 
 	<tip>
-	  <para><application>pkg_install</application>
-	    ¤ÎÄê´üŪ¤Ê¥¹¥¯¥ê¥×¥È¤¬¡¢
-	    package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤òƱÍͤ˥Х寥¢¥Ã¥×¤¹¤ë¤³¤È¤òÈò¤±¤ë¤¿¤á¤Ë¤Ï¡¢
+	  <para>¥¹¥¯¥ê¥×¥È¤Ë¤è¤ëÄê´üŪ¤Ê
+	    package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò̵¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢
 	    &man.periodic.conf.5; ¤ÎÃæ¤Ç¡¢
 	    <literal>daily_backup_pkgdb_enable</literal> ¤ò
 	    <literal>NO</literal> ¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -887,12 +843,11 @@ Deinstalling ca_root_nss-3.13.5... done<
 	<para>²áµî¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤·¤¿ package
 	  ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÃæ¿È¤ò¥ê¥¹¥È¥¢¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-	<screen>&prompt.root; <userinput>pkg backup -r /path/to/pkgng.db</userinput></screen>
-      </sect3>
+	<screen>&prompt.root; <userinput>pkg backup -r <replaceable>/path/to/pkgng.db</replaceable></userinput></screen>
+    </sect2>
 
-      <sect3 xml:id="pkgng-clean">
-	<title>¸Å¤¯¤Ê¤Ã¤¿ <application>pkgng</application> package
-	  ¤Îºï½ü</title>
+    <sect2 xml:id="pkgng-clean">
+      <title>¸Å¤¯¤Ê¤Ã¤¿ package ¤Îºï½ü</title>
 
 	<para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢<application>pkgng</application>
 	  ¤Ï¥­¥ã¥Ã¥·¥å¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥Ð¥¤¥Ê¥ê packages ¤òÊݸ¤·¤Þ¤¹¡£
@@ -903,39 +858,26 @@ Deinstalling ca_root_nss-3.13.5... done<
 	  ¥¢¥Ã¥×¥°¥ì¡¼¥É¤µ¤ì¤¿ package
 	  ¤Î¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Ï¼«Æ°Åª¤Ë¤Ïºï½ü¤µ¤ì¤Þ¤»¤ó¡£</para>
 
-	<para>¥·¥¹¥Æ¥à¤«¤é¸Å¤¤¥Ð¥¤¥Ê¥ê package ¤òºï½ü¤¹¤ë¤Ë¤Ï¡¢
+	<para>¥·¥¹¥Æ¥à¤«¤é¤³¤ì¤é¤Î¸Å¤¤¥Ð¥¤¥Ê¥ê package ¤òºï½ü¤¹¤ë¤Ë¤Ï¡¢
 	  °Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>pkg clean</userinput></screen>
-      </sect3>
+    </sect2>
 
-      <sect3 xml:id="pkgng-set">
-	<title><application>pkgng</application> package
-	  ¥á¥¿¥Ç¡¼¥¿¤ÎÊѹ¹</title>
-
-	<para>Îò»ËŪ¤Ë &os; Ports Collection
-	  ¤Ï¡¢¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ÎÊѹ¹¤ËÂбþ¤Ç¤­¤Þ¤¹¡£
-	  <application>pkg_install</application> ¤È¤Ï°Û¤Ê¤ê¡¢
-	  <application>pkgng</application> ¤Ë¤Ï¡¢
-	  package ¤Î¾ðÊó¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¥³¥Þ¥ó¥É¤¬ÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-	  ¤¿¤È¤¨¤Ð¡¢<package>lang/php5</package> ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬¡¢¤â¤È¤â¤È¤Ï
-	  <literal>5.3</literal> ¤Ç¡¢<literal>5.4</literal>
-	  ¤¬¥ê¥ê¡¼¥¹¤µ¤ì¤¿¤³¤È¤Ëȼ¤¤
-	  <package>lang/php53</package>
-	  ¤Ø¤È̾Á°¤¬Êѹ¹¤µ¤ì¤ë¾ì¹ç¡¢
-	  <application>pkg_install</application> ¤Ç¤Ï¡¢
-	  package ¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¡¢
-	  ¤É¤Î port ¤¬¥¤¥ó¥¹¥È¡¼¥ë¸µ¤Ç¤¢¤Ã¤¿¤«¤È¤¤¤¦¾ðÊó¤òÊѹ¹¤¹¤ë¤¿¤á¤Ë
-	  <package>ports-mgmt/portmaster</package>
-	  ¤Î¤è¤¦¤ÊÊ̤Υ½¥Õ¥È¥¦¥§¥¢¤òɬÍפȤ·¤Þ¤¹¡£</para>
+    <sect2 xml:id="pkgng-set">
+      <title>package ¥á¥¿¥Ç¡¼¥¿¤ÎÊѹ¹</title>
 
-	<para><package>ports-mgmt/portmaster</package> ¤ª¤è¤Ó
-	  <package>ports-mgmt/portupgrade</package>
-	  ports ¤È¤Ï°Û¤Ê¤ê¡¢°ú¿ô¤ËÍ¿¤¨¤ë¥Ð¡¼¥¸¥ç¥ó¤Î¿·¡¢µì¤Î½çÈ֤ϰۤʤê¤Þ¤¹¡£
-	  <application>pkgng</application> ¤Ç¤Î¹½Ê¸¤Ï¡¢<command>pkg set -o
-	    category/oldport:category/newport</command> ¤È¤Ê¤ê¤Þ¤¹¡£</para>
+	<para>&os; Ports Collection
+	  ¤Ç¤Ï¡¢¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥óÈֹ椬Êѹ¹¤Ë¤Ê¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
+	  ¤³¤ì¤ËÂбþ¤¹¤ë¤¿¤á¤Ë¡¢<application>pkgng</application> ¤Ë¤Ï¡¢
+	  package ¤Î¾ðÊó¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¥³¥Þ¥ó¥É¤¬ÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
+	  ¤¿¤È¤¨¤Ð¡¢<filename role="packages">lang/php5</filename> ¤¬¡¢
+	  ¥Ð¡¼¥¸¥ç¥ó <literal>5.4</literal> ¤òɽ¤¹¤è¤¦¤Ë¤Ê¤ê¡¢
+	  <filename role="packages">lang/php5</filename> ¤ò
+	  <filename role="package">lang/php53</filename>
+	  ¤È̾Á°¤òÊѹ¹¤¹¤ëɬÍפ¬¤¢¤ë¤è¤¦¤Ê¾ì¹ç¤Ë¡¢Í­ÍѤǤ¹¡£</para>
 
-	<para>¤¿¤È¤¨¤Ð¡¢¾åµ­¤ÎÎã¤Î package ¤Î¾ðÊó¤òÊѹ¹¤¹¤ë¤Ë¤Ï¡¢
+	<para>¾åµ­¤ÎÎã¤Î package ¤Î¾ðÊó¤òÊѹ¹¤¹¤ë¤Ë¤Ï¡¢
 	  °Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>pkg set -o lang/php5:lang/php53</userinput></screen>
@@ -952,7 +894,7 @@ Deinstalling ca_root_nss-3.13.5... done<
 	<screen>&prompt.root; <userinput>pkg set -o graphics/libglut:graphics/freeglut</userinput></screen>
 
 	<note>
-	  <para>package ¤Î¾ðÊó¤òÊѹ¹¤·¤¿¤é¡¢Â¿¤¯¤Î¾ì¹ç¡¢
+	  <para>package ¤Î¾ðÊó¤òÊѹ¹¤·¤¿¤é¡¢
 	    ¾ðÊó¤¬Êѹ¹¤µ¤ì¤¿ package ¤Ë°Í¸¤·¤Æ¤¤¤ë
 	    packages ¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬½ÅÍפȤʤê¤Þ¤¹¡£
 	    °Í¸ packages ¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
@@ -961,7 +903,6 @@ Deinstalling ca_root_nss-3.13.5... done<
 	  <screen>&prompt.root; <userinput>pkg install -Rf graphics/freeglut</userinput></screen>
 
 	</note>
-      </sect3>
     </sect2>
   </sect1>
 


More information about the svn-doc-all mailing list