svn commit: r41124 - head/ja_JP.eucJP/books/handbook/desktop

Ryusuke SUZUKI ryusuke at FreeBSD.org
Thu Mar 7 16:43:58 UTC 2013


Author: ryusuke
Date: Thu Mar  7 16:43:58 2013
New Revision: 41124
URL: http://svnweb.freebsd.org/changeset/doc/41124

Log:
  - Merge the following from the English version:
  
  	r40472 -> r41113	head/ja_JP.eucJP/books/handbook/desktop/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/desktop/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Thu Mar  7 15:15:21 2013	(r41123)
+++ head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Thu Mar  7 16:43:58 2013	(r41124)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40472
+     Original revision: r41113
      $FreeBSD$
 -->
 
@@ -23,77 +23,181 @@
   <sect1 id="desktop-synopsis">
     <title>¤³¤Î¾Ï¤Ç¤Ï</title>
 
-    <para>FreeBSD ¤Ç¤Ï¡¢Web ¥Ö¥é¥¦¥¶¤ä¥ï¡¼¥É¥×¥í¥»¥Ã¥µ¤È¤¤¤Ã¤¿
-      ¤¿¤¯¤µ¤ó¤Î¼ïÎà¤Î¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÍøÍѤǤ­¤Þ¤¹¡£
-      ¤½¤Î¿¤¯¤Ï packages ¤ä Ports Collection ¤òÍѤ¤¤ÆÆ³Æþ¤Ç¤­¤Þ¤¹¡£
-      ¿·¤·¤¤¥æ¡¼¥¶¤Î¿¤¯¤Ï¡¢
-      ¥Ç¥¹¥¯¥È¥Ã¥×¤Ë¤³¤Î¼ï¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¤¢¤ë¤³¤È¤ò´üÂÔ¤·¤Æ¤¤¤ë¤Ç¤·¤ç¤¦¡£
-      ¤³¤Î¾Ï¤Ç¤Ï¡¢¿Íµ¤¤Î¹â¤¤¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò packages
-      ¤ä Ports Collection ¤«¤é´Êñ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
-
-    <para>ports ¤«¤é¥×¥í¥°¥é¥à¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¡¢
-      ¤½¤Î¥×¥í¥°¥é¥à¤Ï¥½¡¼¥¹¤«¤é¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-      ¥³¥ó¥Ñ¥¤¥ë¤¹¤ëÂоݤä¥Þ¥·¥ó¤ÎÀ­Ç½¤Ë¤â¤è¤ê¤Þ¤¹¤¬¡¢
-      ¤³¤Îºî¶È¤Ë¤Ï¤È¤Æ¤â»þ´Ö¤¬¤«¤«¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-      ¥½¡¼¥¹¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ë»þ´Ö¤¬¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢
-      Ports Collection ¤Ë¼ýÏ¿¤µ¤ì¤Æ¤¤¤ë¤Û¤È¤ó¤É¤Î¥×¥í¥°¥é¥à¤ò¡¢
-      ¤¢¤é¤«¤¸¤á¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿ packages ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
-
-    <para>FreeBSD ¤Ë¤ª¤±¤ë Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤Ë¤è¤Ã¤Æ¡¢Linux
-      ÍѤ˳«È¯¤µ¤ì¤¿Â¿¤¯¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò
-      ¤¢¤Ê¤¿¤Î¥Ç¥¹¥¯¥È¥Ã¥×¤Ç¤âÍøÍѤǤ­¤Þ¤¹¡£
-      ¤É¤ó¤Ê Linux ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ç¤â¡¢
-      »öÁ°¤Ë <xref linkend="linuxemu"/> ¤òÆÉ¤ó¤Ç¤ª¤¯¤³¤È¤ò¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£
-      Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÍѤ¤¤¿ port
-      ¤Î¿¤¯¤Ï <quote>linux-</quote> ¤«¤é¤Ï¤¸¤Þ¤ë̾Á°¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-      &man.whereis.1;
-      ¤Ê¤É¤ò»È¤Ã¤ÆÆÃÄê¤Î port ¤òõ¤¹¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¤³¤È¤ò»×¤¤½Ð¤·¤Æ¤¯¤À¤µ¤¤¡£
-      ¤³¤Î¾Ï¤Ç¤Ï¡¢Linux ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤Ë
-      Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÍ­¸ú¤Ë¤·¤Æ¤¢¤ë¤³¤È¤òÁ°Äó¤È¤·¤Þ¤¹¡£</para>
+    <para>&os; ¤ÏÀ­Ç½¤ä°ÂÄêÀ­¤Ë¤è¤ê¥µ¡¼¥Ð¤È¤·¤Æ¿Íµ¤¤¬¤¢¤ë°ìÊý¤Ç¡¢
+      Æü¡¹¤Î¥Ç¥¹¥¯¥È¥Ã¥×¤È¤·¤Æ¤ÎÍøÍѤˤâŬ¤·¤Æ¤¤¤Þ¤¹¡£
+      &os.numports; ¤òͤ¨¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¡¢<link
+	linkend="packages-using">packages</link> ¤ä <link
+	linkend="ports-using">ports</link> ¤«¤éÍøÍѤǤ­¤ë¤Î¤Ç¡¢
+      ¤µ¤Þ¤¶¤Þ¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òư¤«¤»¤ë¤è¤¦¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¥Ç¥¹¥¯¥È¥Ã¥×¤òºî¤ê¾å¤²¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+      ¤³¤Î¾Ï¤Ç¤Ï¡¢packages ¤ä Ports Collection
+      ¤òÍѤ¤¤Æ¡¢¿Íµ¤¤Î¹â¤¤¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò³Ú¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤òÀâÌÀ¤·¤Þ¤¹¡£</para>
+
+    <para>&os; ¤Ï¡¢<link linkend="linuxemu">&linux ¥Ð¥¤¥Ê¥ê¸ß´¹</link>
+      µ¡Ç½¤ò»ý¤Ä¤Î¤Ç¡¢&linux; ÍѤ˳«È¯¤µ¤ì¤¿Â¿¤¯¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò
+      &os; ¤Î¥Ç¥¹¥¯¥È¥Ã¥×¤Ç¤âÍøÍѤǤ­¤Þ¤¹¡£
+      &linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÍѤ¤¤¿ port
+      ¤Î¿¤¯¤Ï <quote>linux-</quote> ¤«¤é¤Ï¤¸¤Þ¤ë̾Á°¤ò»ý¤Á¤Þ¤¹¡£
+      ¤³¤Î¾Ï¤Ç¤Ï¡¢&linux; ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤Ë
+      &linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤¬Í­¸ú¤Ç¤¢¤ë¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
-    <para>¤³¤Î¾Ï¤Ç¤Ï¡¢°Ê²¼¤ÎʬÌî¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
+    <para>¤³¤Î¾Ï¤Ç¤Ï¡¢
+      °Ê²¼¤Î¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
 
-    <itemizedlist>
-      <listitem>
-	<para>Web ¥Ö¥é¥¦¥¶ (<application>Firefox</application>,
-	  <application>Opera</application>,
-	  <application>Konqueror</application>,
-	  <application>Chromium</application> ¤Ê¤É)</para>
-      </listitem>
+    <informaltable frame="none" pgwide="1">
+      <tgroup cols="3">
+	<thead>
+	  <row>
+	    <entry>ʬÌî</entry>
+	    <entry>¥¢¥×¥ê¥±¡¼¥·¥ç¥ó̾</entry>
+	    <entry>Package ̾</entry>
+	    <entry>Ports ̾</entry>
+	  </row>
+	</thead>
 
-      <listitem>
-	<para>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó (<application>KOffice</application>,
-	  <application>AbiWord</application>,
-	  <application>GIMP</application>,
-	  <application>Apache OpenOffice</application>,
-	  <application>LibreOffice</application> ¤Ê¤É)</para>
-      </listitem>
+	<tbody>
+	  <row>
+	    <entry>¥Ö¥é¥¦¥¶</entry>
+	    <entry><application>Firefox</application></entry>
+	    <entry><literal>firefox</literal></entry>
+	    <entry><filename
+		role="package">www/firefox</filename></entry>
+	  </row>
 
-      <listitem>
-	<para>¥É¥­¥å¥á¥ó¥È¥Ó¥å¡¼¥¢ (<application>&acrobat.reader;</application>,
-	  <application>gv</application>,
-	  <application>Xpdf</application>,
-	  <application>GQview</application> ¤Ê¤É)</para>
-      </listitem>
+	  <row>
+	    <entry>¥Ö¥é¥¦¥¶</entry>
+	    <entry><application>Opera</application></entry>
+	    <entry><literal>opera</literal></entry>
+	    <entry><filename
+		role="package">www/opera</filename></entry>
+	  </row>
 
-      <listitem>
-	<para>ºâ̳´ÉÍý¥½¥Õ¥È¥¦¥§¥¢ (<application>GnuCash</application>,
-	  <application>Gnumeric</application>,
-	  <application>Abacus</application> ¤Ê¤É)</para>
-      </listitem>
-    </itemizedlist>
+	  <row>
+	    <entry>¥Ö¥é¥¦¥¶</entry>
+	    <entry><application>Konqueror</application></entry>
+	    <entry><literal>kde4-baseapps</literal></entry>
+	    <entry><filename
+		role="package">x11/kde4-baseapps</filename></entry>
+	  </row>
+
+	  <row>
+	    <entry>¥Ö¥é¥¦¥¶</entry>
+	    <entry><application>Chromium</application></entry>
+	    <entry><literal>chromium</literal></entry>
+	    <entry><filename
+		role="package">www/chromium</filename></entry>
+	  </row>
+
+	  <row>
+	    <entry>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry>
+	    <entry><application>Calligra</application></entry>
+	    <entry><literal>calligra</literal></entry>
+	    <entry><filename
+		role="package">editors/calligra</filename></entry>
+	  </row>
+
+	  <row>
+	    <entry>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry>
+	    <entry><application>AbiWord</application></entry>
+	    <entry><literal>abiword</literal></entry>
+	    <entry><filename
+		role="package">editors/abiword</filename></entry>
+	  </row>
+
+	  <row>
+	    <entry>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry>
+	    <entry><application>The GIMP</application></entry>
+	    <entry><literal>gimp</literal></entry>
+	    <entry><filename
+		role="package">graphics/gimp</filename></entry>
+	  </row>
+
+	  <row>
+	    <entry>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry>
+	    <entry><application>Apache
+		OpenOffice</application></entry>
+	    <entry><literal>openoffice</literal></entry>
+	    <entry><filename
+		role="package">editors/openoffice-3</filename></entry>
+	  </row>
+
+	  <row>
+	    <entry>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry>
+	    <entry><application>LibreOffice</application></entry>
+	    <entry><literal>libreoffice</literal></entry>
+	    <entry><filename
+		role="package">editors/libreoffice</filename></entry>
+	  </row>
+
+	  <row>
+	    <entry>¥É¥­¥å¥á¥ó¥È¥Ó¥å¡¼¥¢</entry>
+	    <entry><application>&acrobat.reader;</application></entry>
+	    <entry><literal>¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤Ë¤è¤ê package
+		¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£</literal></entry>
+	    <entry><filename
+		role="package">print/acroread9</filename></entry>
+	  </row>
+
+	  <row>
+	    <entry>¥É¥­¥å¥á¥ó¥È¥Ó¥å¡¼¥¢</entry>
+	    <entry><application>gv</application></entry>
+	    <entry><literal>gv</literal></entry>
+	    <entry><filename
+		role="package">print/gv</filename></entry>
+	  </row>
+
+	  <row>
+	    <entry>¥É¥­¥å¥á¥ó¥È¥Ó¥å¡¼¥¢</entry>
+	    <entry><application>Xpdf</application></entry>
+	    <entry><literal>xpdf</literal></entry>
+	    <entry><filename
+		role="package">graphics/xpdf</filename></entry>
+	  </row>
+
+	  <row>
+	    <entry>¥É¥­¥å¥á¥ó¥È¥Ó¥å¡¼¥¢</entry>
+	    <entry><application>GQview</application></entry>
+	    <entry><literal>gqview</literal></entry>
+	    <entry><filename
+		role="package">graphics/gqview</filename></entry>
+	  </row>
+
+	  <row>
+	    <entry>ºâ̳´ÉÍý¥½¥Õ¥È¥¦¥§¥¢</entry>
+	    <entry><application>GnuCash</application></entry>
+	    <entry><literal>gnucash</literal></entry>
+	    <entry><filename
+		role="package">finance/gnucash</filename></entry>
+	  </row>
+
+	  <row>
+	    <entry>ºâ̳´ÉÍý¥½¥Õ¥È¥¦¥§¥¢</entry>
+	    <entry><application>Gnumeric</application></entry>
+	    <entry><literal>gnumeric</literal></entry>
+	    <entry><filename
+		role="package">math/gnumeric</filename></entry>
+	  </row>
+
+	  <row>
+	    <entry>ºâ̳´ÉÍý¥½¥Õ¥È¥¦¥§¥¢</entry>
+	    <entry><application>KMyMoney</application></entry>
+	    <entry><literal>kmymoney-kde4</literal></entry>
+	    <entry><filename
+		role="package">finance/kmymoney-kde4</filename></entry>
+	  </row>
+	</tbody>
+      </tgroup>
+    </informaltable>
 
     <para>¤³¤Î¾Ï¤òÆÉ¤àÁ°¤Ë¡¢°Ê²¼¤Î¤³¤È¤òÍý²ò¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
     <itemizedlist>
       <listitem>
-	<para>¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥½¥Õ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡
-	  (<xref linkend="ports"/>)</para>
+	<para>package ¤Þ¤¿¤Ï ports
+	  ¤òÍѤ¤¤¿¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥½¥Õ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¡£</para>
       </listitem>
 
       <listitem>
-	<para>Linux ¥½¥Õ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡
-	  (<xref linkend="linuxemu"/>)</para>
+	<para>&linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ëÊýË¡¡£</para>
       </listitem>
     </itemizedlist>
 
@@ -119,26 +223,29 @@
       <secondary>web</secondary>
     </indexterm>
 
-    <para>FreeBSD ¤Ç¤Ï Web ¥Ö¥é¥¦¥¶¤Ï»öÁ°¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
+    <para>&os; ¤Ç¤Ï Web ¥Ö¥é¥¦¥¶¤Ï»öÁ°¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
       ¤½¤Î¤«¤ï¤ê¡¢Ports Collection ¤Î
       <ulink url="http://www.FreeBSD.org/ja/ports/www.html">www</ulink>
-      ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï¿ô¿¤¯¤Î Web ¥Ö¥é¥¦¥¶ ¤¬ÍѰդµ¤ì¤Æ¤ª¤ê¡¢
-      ¤¹¤°¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£¥½¡¼¥¹¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ë»þ´Ö¤¬¤Ê¤¤¾ì¹ç
-      (¥½¡¼¥¹¤«¤é¤Î¥³¥ó¥Ñ¥¤¥ë¤ÏÂçÊѤʻþ´Ö¤¬¤«¤«¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹)¡¢
-      ¿¤¯¤Î¥×¥í¥°¥é¥à¤ò packages ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
-
-    <para><application>KDE</application> ¤È
-      <application>GNOME</application> ¤Ç¤Ï¡¢¤Ï¤¸¤á¤«¤é HTML
-      ¥Ö¥é¥¦¥¶¤¬ÍѰդµ¤ì¤Æ¤¤¤Þ¤¹¡£
+      ¥«¥Æ¥´¥ê¤Ë¤Ï¿ô¿¤¯¤Î Web ¥Ö¥é¥¦¥¶ ¤¬ÍѰդµ¤ì¤Æ¤ª¤ê¡¢
+      ¿¤¯¤Î¥×¥í¥°¥é¥à¤ò packages ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤ê¡¢
+      Ports Collection ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤Þ¤¹¡£</para>
+
+    <para><application>KDE</application> ¤ä
+      <application>GNOME</application> ¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ë¤Ï¡¢
+      ¤½¤ì¤¾¤ì HTML ¥Ö¥é¥¦¥¶¤¬ÍѰդµ¤ì¤Æ¤¤¤Þ¤¹¡£
       ¤³¤ì¤é¤Î¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤òÀßÄꤹ¤ë¤¿¤á¤Î¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï
-      <xref linkend="x11-wm"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <link linkend="x11-wm"></link> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-    <para>·Ú²÷¤Ê Web ¥Ö¥é¥¦¥¶¤òõ¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢Ports Collection ¤«¤é
+    <para>·ÚÎ̤ʥ֥饦¥¶¤È¤·¤Æ¤Ï¡¢
       <filename role="package">www/dillo2</filename>,
       <filename role="package">www/links</filename>,
-      <filename role="package">www/w3m</filename> ¤ò»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <filename role="package">www/w3m</filename>
+      ¤È¤¤¤Ã¤¿¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
-    <para>¤³¤ÎÀá¤Ç¤Ï¼¡¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
+    <para>¤³¤ÎÀá¤Ç¤Ï°Ê²¼¤Î¿Íµ¤¤Î¤¢¤ë web ¥Ö¥é¥¦¥¶¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
+      ¤â¤·¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¥ê¥½¡¼¥¹¤òÂçÎ̤˾ÃÈñ¤·¤¿¤ê¡¢
+      ports ¤«¤é¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë»þ´Ö¤¬¤«¤«¤Ã¤¿¤ê¡¢
+      ¤â¤·¤¯¤ÏÂ礭¤Ê°Í¸¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤Î¤³¤È¤Ë¤Ä¤¤¤Æ¤â¿¨¤ì¤Þ¤¹¡£</para>
 
     <informaltable frame="none" pgwide="1">
       <tgroup cols="4">
@@ -147,7 +254,7 @@
 	    <entry>¥¢¥×¥ê¥±¡¼¥·¥ç¥ó̾</entry>
 	    <entry>ɬÍפʥ꥽¡¼¥¹</entry>
 	    <entry>port ¤«¤é¤Î¥¤¥ó¥¹¥È¡¼¥ë</entry>
-	    <entry>¼Â¹Ô¤ËɬÍפȤʤë¼ç¤Ê´Ä¶­</entry>
+	    <entry>È÷¹Í</entry>
 	  </row>
 	</thead>
 
@@ -156,32 +263,28 @@
 	    <entry><application>Firefox</application></entry>
 	    <entry>Ãæ</entry>
 	    <entry>½Å</entry>
-	    <entry><application>Gtk+</application></entry>
+	    <entry>&os; ¤ª¤è¤Ó &linux; ÈǤò¤¬ÍøÍѤǤ­¤Þ¤¹¡£</entry>
 	  </row>
 
 	  <row>
 	    <entry><application>Opera</application></entry>
 	    <entry>¾¯</entry>
 	    <entry>·Ú</entry>
-	    <entry>FreeBSD ÈÇ¤È Linux ÈǤòÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	      Linux ÈǤΥХ¤¥Ê¥ê¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢
-	      Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÍ­¸ú¤Ë¤·¡¢
-	      <application>linux-openmotif</application>
-	      ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</entry>
+	    <entry>&os; ¤È &linux; ÈǤòÍøÍѤǤ­¤Þ¤¹¡£</entry>
 	  </row>
 
 	  <row>
 	    <entry><application>Konqueror</application></entry>
 	    <entry>Ãæ</entry>
 	    <entry>½Å</entry>
-	    <entry><application>KDE</application> ¥é¥¤¥Ö¥é¥ê</entry>
+	    <entry><application>KDE</application> ¥é¥¤¥Ö¥é¥ê¤òɬÍפȤ·¤Þ¤¹¡£</entry>
 	  </row>
 
 	  <row>
 	    <entry><application>Chromium</application></entry>
 	    <entry>Ãæ</entry>
-	    <entry>Ãæ</entry>
-	    <entry><application>Gtk+</application></entry>
+	    <entry>½Å</entry>
+	    <entry><application>Gtk+</application> ¤òɬÍפȤ·¤Þ¤¹¡£</entry>
 	  </row>
 	</tbody>
       </tgroup>
@@ -195,60 +298,57 @@
       </indexterm>
 
       <para><application>Firefox</application> ¤Ï¡¢
-	Àè¿ÊŪ¤Ç̵ÎÁ¤«¤Ä¥ª¡¼¥×¥ó¥½¡¼¥¹¤Î°ÂÄꤷ¤¿¥Ö¥é¥¦¥¶¤Ç¤¹¡£
+	Àè¿ÊŪ¤Ç̵ÎÁ¤«¤Ä¥ª¡¼¥×¥ó¥½¡¼¥¹¤Î¥Ö¥é¥¦¥¶¤Ç¤¹¡£
 	&os; ¤Ë´°Á´¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
-	ɸ½à¤Ë¤è¤¯½àµò¤·¤¿ HTML ɽ¼¨¥¨¥ó¥¸¥ó¡¢¥¿¥Ö¥Ö¥é¥¦¥¸¥ó¥°¡¢¥Ý¥Ã¥×¥¢¥Ã¥×¥Ö¥í¥Ã¥¯¡¢
+	ɸ½à¤Ë½àµò¤·¤¿ HTML ɽ¼¨¥¨¥ó¥¸¥ó¡¢¥¿¥Ö¥Ö¥é¥¦¥¸¥ó¥°¡¢¥Ý¥Ã¥×¥¢¥Ã¥×¥Ö¥í¥Ã¥¯¡¢
 	³ÈÄ¥À­¡¢¹â¤¤°ÂÁ´À­¤Ê¤É¤¬ÆÃħ¤Ç¤¹¡£
 	<application>Firefox</application> ¤Ï <application>Mozilla</application>
 	¤Î¥³¡¼¥É¥Ù¡¼¥¹¤«¤éÇÉÀ¸¤·¤¿¥Ö¥é¥¦¥¶¤Ç¤¹¡£</para>
 
-      <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <para>ºÇ¿·¤Î <application>Firefox</application> ¤Î package
+	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen>
 
-      <para>¾å¤ÎÎã¤Ç¤Ï¡¢<application>Firefox</application>
-	¤ÎºÇ¿·ÈǤ¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£
-	<application>Firefox</application> ±äĹ¥µ¥Ý¡¼¥ÈÈÇ
+      <para><application>Firefox</application> ±äĹ¥µ¥Ý¡¼¥ÈÈÇ
 	(ESR: Extended Support Release)	¤òÍøÍѤ·¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢
 	¤«¤ï¤ê¤Ë°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r firefox-esr</userinput></screen>
 
-      <para>¥½¡¼¥¹¥³¡¼¥É¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ëÊý¤¬¹¥¤­¤Ê¤é¡¢Ports Collection
-	¤ò»È¤Ã¤Æ°Ê²¼¤Î¤è¤¦¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
+      <para>¥í¡¼¥«¥é¥¤¥ºÈǤϡ¢<filename
+	  role="package">www/firefox-i18n</filename> ¤ª¤è¤Ó <filename
+	  role="package">www/firefox-esr-i18n</filename>
+	¤«¤éÍøÍѤǤ­¤Þ¤¹¡£</para>
+
+      <para>¤«¤ï¤ê¤Ë¥½¡¼¥¹¥³¡¼¥É¤«¤é´õ˾¤Î <application>firefox</application>
+	¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï <filename
+	  role="package">www/firefox</filename> ¤ò¥Ó¥ë¥É¤·¤Þ¤¹¤¬¡¢
+	<literal>firefox</literal> ¤ÎÉôʬ¤Ï¡¢
+	¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë ESR ¤ä¥í¡¼¥«¥é¥¤¥º¤ËÃÖ¤­´¹¤¨¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/www/firefox</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para><application>Firefox</application> ESR ¤òÍøÍѤ¹¤ë¾ì¹ç¤Ï¡¢
-	¾å¤Î¥³¥Þ¥ó¥É¤Î <literal>firefox</literal> ¤ò
-	<literal>firefox-esr</literal> ¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
-    </sect2>
-
-    <sect2 id="moz-java-plugin">
+    <sect3 id="moz-java-plugin">
       <title>Firefox ¤È &java; ¥×¥é¥°¥¤¥ó</title>
 
       <note>
-	<para>¤³¤ÎÀá¤È¼¡¤Î 2 ¤Ä¤ÎÀá¤Ç¤Ï¡¢<application>Firefox</application>
+	<para>°Ê²¼¤ÎÀá¤Ç¤Ï¡¢<application>Firefox</application>
 	  ¤¬¤¢¤é¤«¤¸¤á¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤Þ¤¹¡£</para>
       </note>
 
-      <para>°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¡¢Ports Collection ¤«¤é
-	<application>OpenJDK 6</application> ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <screen>&prompt.root; <userinput>cd /usr/ports/java/openjdk6</userinput>
-&prompt.root; <userinput>make install clean</userinput></screen>
-
-      <para>¤½¤Î¸å¡¢
-	<filename role="package">java/icedtea-web</filename>
-	port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <para><filename role="package">java/icedtea-web</filename> ¤Ï¡¢
+	Java ¥¢¥×¥ì¥Ã¥È¤ËÂФ·¡¢¥Õ¥ê¡¼¥½¥Õ¥È¤Î web ¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤òÄ󶡤·¤Þ¤¹¡£
+	package ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£port ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤Ë¤Ï¡¢
+	°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/java/icedtea-web</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <para>¤É¤Á¤é¤Î ports ¤â¡¢¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥ª¥×¥·¥ç¥ó¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¤Þ¤Þ¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <para>¥Ö¥é¥¦¥¶¤òµ¯Æ°¤·¡¢¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤Ë
+      <para>¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢¥Ö¥é¥¦¥¶¤òµ¯Æ°¤·¡¢¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤Ë
 	<literal>about:plugins</literal> ¤ÈÆþÎϤ·¤Æ
 	<keycap>Enter</keycap> ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£
 	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥×¥é¥°¥¤¥ó°ìÍ÷¤Î¥Ú¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
@@ -260,9 +360,9 @@
 
       <screen>&prompt.user; <userinput>ln -s /usr/local/lib/IcedTeaPlugin.so \
   $HOME/.mozilla/plugins/</userinput></screen>
-    </sect2>
+    </sect3>
 
-    <sect2 id="moz-flash-plugin">
+    <sect3 id="moz-flash-plugin">
 
       <title>Firefox ¤È &adobe; &flash; ¥×¥é¥°¥¤¥ó</title>
 
@@ -271,70 +371,62 @@
       </indexterm>
 
       <para>&os; ÍѤΠ&adobe; &flash; ¥×¥é¥°¥¤¥ó¤ÏÄ󶡤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
-	¤·¤«¤·¤Ê¤¬¤é¡¢Linux ¥Ð¡¼¥¸¥ç¥ó¤Î¥×¥é¥°¥¤¥ó¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Î¥½¥Õ¥È¥¦¥§¥¢¥ì¥¤¥ä (wrapper) ¤¬Â¸ºß¤·¤Þ¤¹¡£
-	¤³¤Î wrapper ¤Ï¡¢&adobe; &acrobat; ¥×¥é¥°¥¤¥ó¤ä
-	&realplayer ¥×¥é¥°¥¤¥ó¤Ê¤É¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+	¤·¤«¤·¤Ê¤¬¤é¡¢&linux;
+	¥Ð¡¼¥¸¥ç¥ó¤Î¥×¥é¥°¥¤¥ó¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Î¥½¥Õ¥È¥¦¥§¥¢¥ì¥¤¥ä (wrapper) ¤¬Â¸ºß¤·¤Þ¤¹¡£
+	¤³¤Î wrapper ¤Ï¡¢
+	&realplayer ¥×¥é¥°¥¤¥ó¤È¤¤¤Ã¤¿Â¾¤Î¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
-      <para>»ÈÍѤ·¤Æ¤¤¤ë &os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤Ã¤ÆÉ¬Íפʺî¶È¤Ï°Û¤Ê¤ê¤Þ¤¹¡£</para>
+      <para>¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤ÆÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢
+	°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <procedure>
 	<step>
-	  <title>&os; 7.X</title>
-
 	  <para>
 	    <filename role="package">www/nspluginwrapper</filename>
-	    port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
-	    ¤³¤Î port ¤Ï¡¢<filename role="package">emulators/linux_base-fc4</filename>
-	    ¤È¤¤¤¦Â礭¤Ê port ¤òɬÍפȤ·¤Þ¤¹¡£</para>
-
-	  <para>¼¡¤Ë¡¢
-	    <filename role="package">www/linux-flashplugin9</filename>
-	    port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
-	    ¤³¤Î port ¤Ï¡¢&os; 7.X ¤Ë¤ª¤¤¤ÆÀµ¾ï¤Ëưºî¤¹¤ë
-	    &flash; 9.X ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
-	</step>
-
-	<step>
-	  <title>&os; 8.X °Ê¹ß</title>
-
-	  <para>
-	    <filename role="package">www/nspluginwrapper</filename>
-	    port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
+	    port ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
+	    ¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤Î¤¿¤á package ¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£
 	    ¤³¤Î port ¤Ï¡¢<filename
 	      role="package">emulators/linux_base-f10</filename>
 	    ¤È¤¤¤¦Â礭¤Ê port ¤òɬÍפȤ·¤Þ¤¹¡£</para>
+	</step>
 
-	  <para>¼¡¤Ë¡¢<filename
+	<step>
+	  <para><filename
 	      role="package">www/linux-f10-flashplugin11</filename>
-	    port ¤«¤é &flash; 11.X ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
-
-	  <para>¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¢
-	    °Ê²¼¤Î¤è¤¦¤Ë¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òºîÀ®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
+	    port ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
+	    ¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤Ë¤è¤ê¡¢package ¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£</para>
+	</step>
 
+	<step>
 	  <screen>&prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-f10-flashplugin/libflashplayer.so \
   /usr/local/lib/browser_plugins/</userinput></screen>
 
 	  <para><filename
 	      class="directory">/usr/local/lib/browser_plugins</filename>
-	    ¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢
-	    ¼êư¤ÇºîÀ®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
+	    ¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢ºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 	</step>
-      </procedure>
 
-      <para>»ÈÍѤ·¤Æ¤¤¤ë &os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤ËÂФ·¤ÆÅ¬ÀÚ¤Ê
-	&flash; port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¸å¤Ï¡¢
-	³Æ¥æ¡¼¥¶¤´¤È¤Ë <command>nspluginwrapper</command>
-	¤ò»È¤Ã¤Æ¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<step>
+	  <para>flash ¤òºÇ½é¤Ë»È¤¦Á°¤Ë¡¢
+	    ¥æ¡¼¥¶¤´¤È¤Ë°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
-      <screen>&prompt.user; <userinput>nspluginwrapper -v -a -i</userinput></screen>
+	  <screen>&prompt.user; <userinput>nspluginwrapper -v -a -i</userinput></screen>
 
-      <para>¤½¤Î¸å¡¢¥Ö¥é¥¦¥¶¤òµ¯Æ°¤·¡¢
-	¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤Ë <literal>about:plugins</literal> ¤ÈÆþÎϤ·¤Æ
-	<keycap>Enter</keycap> ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£
-	¸½ºßÍøÍѲÄǽ¤Ê¥×¥é¥°¥¤¥ó¤Î°ìÍ÷¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£</para>
-    </sect2>
+	  <para>flash ¤¬¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤¿¤é¡¢
+	    ³Æ¥æ¡¼¥¶¤Ï°Ê²¼¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
-    <sect2 id="moz-swfdec-flash-plugin">
+	  <screen>&prompt.user; <userinput>nspluginwrapper -v -a -u</userinput></screen>
+
+	  <para>¥Ö¥é¥¦¥¶¤òµ¯Æ°¤·¡¢¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤Ë
+	    <literal>about:plugins</literal> ¤ÈÆþÎϤ·¤Æ
+	    <keycap>Enter</keycap> ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£
+	    ¸½ºßÍøÍѲÄǽ¤Ê¥×¥é¥°¥¤¥ó¤Î°ìÍ÷¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£</para>
+	</step>
+
+      </procedure>
+    </sect3>
+
+    <sect3 id="moz-swfdec-flash-plugin">
 
       <title>Firefox ¤È Swfdec &flash; ¥×¥é¥°¥¤¥ó</title>
 
@@ -344,18 +436,18 @@
 	SWF ¥Õ¥¡¥¤¥ë¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Î¥×¥é¥°¥¤¥ó¤Ç¡¢Swfdec ¥é¥¤¥Ö¥é¥ê¤òÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£
 	¤³¤Î¥é¥¤¥Ö¥é¥ê¤Ï¡¢¸½ºß¤Ç¤âÀ¹¤ó¤Ë³«È¯¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
-      <para>¤â¤·¡¢¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤Ê¤«¤Ã¤¿¤ê¡¢¥³¥ó¥Ñ¥¤¥ë¤·¤¿¤¯¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢
-	¥Í¥Ã¥È¥ï¡¼¥¯¤«¤é package ¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r swfdec-plugin</userinput></screen>
 
-      <para>package ¤òÆþ¼ê¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢Ports Collection
+      <para>package ¤òÍøÍѤǤ­¤Ê¤¤¾ì¹ç¤Ï¡¢Ports Collection
 	¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/www/swfdec-plugin</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <para>¤½¤Î¸å¡¢¥Ö¥é¥¦¥¶¤òºÆµ¯Æ°¤·¤Æ¥×¥é¥°¥¤¥ó¤òÍ­¸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      </sect3>
     </sect2>
 
     <sect2>
@@ -366,47 +458,48 @@
       </indexterm>
 
       <para><application>Opera</application> ¤Ï¡¢
-	µ¡Ç½ËþºÜ¤Ç¡¢É¸½àµ¬³Ê¤Ë½àµò¤·¤¿ Web ¥Ö¥é¥¦¥¶¤Ç¤¹¡£
-	¤Þ¤¿¡¢¥á¡¼¥ë¤ª¤è¤Ó¥Ë¥å¡¼¥¹¥ê¡¼¥À¤ä¡¢IRC ¥¯¥é¥¤¥¢¥ó¥È¡¢
+	µ¡Ç½ËþºÜ¤Ç¡¢É¸½àµ¬³Ê¤Ë½àµò¤·¤¿ Web ¥Ö¥é¥¦¥¶¤Ç¤¹¤¬¡¢
+	·ÚÎ̤ǹ⮤Ǥ¹¡£
+	¥á¡¼¥ë¤ª¤è¤Ó¥Ë¥å¡¼¥¹¥ê¡¼¥À¤ä¡¢IRC ¥¯¥é¥¤¥¢¥ó¥È¡¢
 	RSS/Atom ¥Õ¥£¡¼¥É¥ê¡¼¥À¡¢¤½¤Î¾¤¤¤í¤¤¤í¤Ê¤â¤Î¤¬ÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-	¤½¤ì¤Ë¤â¤«¤«¤ï¤é¤º¡¢<application>Opera</application>
-	¤ÏÈæ³ÓŪ·Ú¤¯¡¢Èó¾ï¤Ë®¤¯Æ°ºî¤·¤Þ¤¹¡£
-	FreeBSD <quote>¥Í¥¤¥Æ¥£¥Ö</quote>¥Ð¡¼¥¸¥ç¥ó¤È¡¢
-	Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤Ë¤è¤Ã¤ÆÆ°ºî¤¹¤ë¥Ð¡¼¥¸¥ç¥ó¤Î
+	&os; <quote>¥Í¥¤¥Æ¥£¥Ö</quote> ¥Ð¡¼¥¸¥ç¥ó¤È¡¢
+	&linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤Ë¤è¤Ã¤ÆÆ°ºî¤¹¤ë¥Ð¡¼¥¸¥ç¥ó¤Î
 	2 ¤Ä¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
-      <para>FreeBSD ÈǤΠ<application>Opera</application> ¤Ç Web
-	¤ò¸«¤ë¤Ë¤Ï¡¢¼¡¤Î package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
+      <para>°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï¡¢&os; ÈǤΠ<application>Opera</application>
+	package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
+	&linux; ÈǤò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
+	<literal>opera</literal> ¤ò <literal>linux-opera</literal>
+	¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r opera</userinput></screen>
 
-      <para>°ìÉô¤Î FTP ¥µ¥¤¥È¤Ç¤Ï¡¢¤¹¤Ù¤Æ¤Î packages ¤ÏÍѰդµ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
-	°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ¹¤ë¤³¤È¤Ç¡¢<application>Opera</application>
-	¤ò Ports Collection ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
+      <para>¤¢¤ë¤¤¤Ï Ports Collection ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
+	°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¡¢¥Í¥¤¥Æ¥£¥ÖÈǤò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>      
 
       <screen>&prompt.root; <userinput>cd /usr/ports/www/opera</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>Linux ÈǤΠ<application>Opera</application>
-	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢¾å¤ÎÎã¤Ç <literal>opera</literal> ¤ò
+      <para>&linux; ÈǤΠ<application>Opera</application>
+	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢<literal>opera</literal> ¤ò
 	<literal>linux-opera</literal> ¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <para>&os; ÍѤΠ&adobe; &flash; ¥×¥é¥°¥¤¥ó¤ÏÄ󶡤µ¤ì¤Æ¤¤¤Þ¤»¤ó¤¬¡¢
-	Linux ÈǤΥץ饰¥¤¥ó¤¬Â¸ºß¤·¤Þ¤¹¡£
-	¤³¤Î¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢¤Þ¤º <filename
+      <para>&adobe; &flash; ¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢¤Þ¤º <filename
 	  role="package">www/linux-f10-flashplugin11</filename> port
-	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
+	¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£package ¤Ï¡¢¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤Ë¤è¤êÍøÍѤǤ­¤Þ¤»¤ó¡£
 	¤½¤Î¸å¡¢<filename
 	  role="package">www/opera-linuxplugins</filename> port
-	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	¤â¤·¤¯¤Ï package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
+	°Ê²¼¤ÎÎã¤Ç¤Ï¡¢Î¾Êý¤ò ports ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/www/linux-f10-flashplugin11</userinput>
 &prompt.root; <userinput>make install clean</userinput>
 &prompt.root; <userinput>cd /usr/ports/www/opera-linuxplugins</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>¥×¥é¥°¥¤¥ó¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤ò¼¡¤Î¤è¤¦¤Ë¤·¤Æ³Îǧ¤Ç¤­¤Þ¤¹¡£
-	¥Ö¥é¥¦¥¶¤òµ¯Æ°¤·¡¢¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤Ë <literal>about:plugins</literal> ¤ÈÆþÎϤ·¤Æ
+      <para>¥¤¥ó¥¹¥È¡¼¥ë¤¬½ªÎ»¤·¤¿¤é¡¢
+	¥×¥é¥°¥¤¥ó¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¤«¤É¤¦¤«¤ò¥Ö¥é¥¦¥¶¤òµ¯Æ°¤·¤Æ³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤Ë <literal>about:plugins</literal> ¤ÈÆþÎϤ·¤Æ
 	<keycap>Enter</keycap> ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£
 	¸½ºßÍøÍѲÄǽ¤Ê¥×¥é¥°¥¤¥ó¤Î°ìÍ÷¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£</para>
 
@@ -422,30 +515,31 @@
 	<primary><application>Konqueror</application></primary>
       </indexterm>
 
-      <para><application>Konqueror</application> ¤Ï
-	<application>KDE</application> ¤ò¹½À®¤¹¤ë¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£
-	¤¿¤À¤·¡¢<application>KDE</application> ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤¯¤Æ¤â¡¢
-	<filename role="package">x11/kdebase3</filename>
-	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢Ã±ÂÎ¤ÇÆ°ºî¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+      <para><application>Konqueror</application> ¤Ï <filename
+	  role="package">x11/kde4-baseapps</filename>
+	¤ò¹½À®¤¹¤ë¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£
 	<application>Konqueror</application> ¤Ï¥Ö¥é¥¦¥¶¤Ç¤¢¤ë¤ÈƱ»þ¤Ë¡¢
 	¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤ª¤è¤Ó¥Þ¥ë¥Á¥á¥Ç¥£¥¢¥Ó¥å¡¼¥¢¤ÎÌò³ä¤â²Ì¤¿¤·¤Þ¤¹¡£</para>
 
-      <para><application>Konqueror</application>
-	¤Ë¤Ï¥×¥é¥°¥¤¥ó°ì¼°¤¬ÍѰդµ¤ì¤Æ¤ª¤ê¡¢
-	<filename role="package">misc/konq-plugins</filename>
-	¤òÍøÍѤ·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
-
       <para><application>Konqueror</application> KHTML ¤È¤È¤â¤Ë¡¢WebKit
-	¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£WebKit ¤Ï Chromium ¤Ê¤ÉºÇ¶á¤Î¥Ö¥é¥¦¥¶¤Î¿¤¯¤ÇºÎÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£
+	¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£WebKit ¤Ï Chromium
+	¤Ê¤ÉºÇ¶á¤Î¥Ö¥é¥¦¥¶¤Î¿¤¯¤ÇºÎÍѤµ¤ì¤Æ¤¤¤ë¥ì¥ó¥À¥ê¥ó¥°¥¨¥ó¥¸¥ó¤Ç¤¹¡£
 	&os; ¤Î <application>Konqueror</application> ¤Ç WebKit
-	¤ò»È¤¦¤Ë¤Ï°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	¤ò»È¤¦¤Ë¤Ï <filename
+	  role="package">www/kwebkitpart</filename> package ¤Þ¤¿¤Ï¡¢
+	port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
+	°Ê²¼¤ÎÎã¤Ç¤Ï¡¢port ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/www/kwebkitpart</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>¤½¤Î¸å¡¢<application>Konqueror</application> ¤Ë¤ª¤¤¤Æ¡¢
+      <para><application>Konqueror</application> ¤Ç¡¢WebKit ¤òÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢
 	<quote>Settings</quote>, <quote>Configure Konqueror</quote>
-	¤òÁªÂò¤·¡¢<quote>Change KHTML to WebKit</quote> ¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£
+	<quote>General</quote> ¤ÎÀßÄê¥Ú¡¼¥¸¤Ë¤ª¤¤¤Æ¡¢
+	¥É¥í¥Ã¥×¥À¥¦¥ó¥á¥Ë¥å¡¼¤«¤é
+	<quote>Default web browser engine</quote> ¤ò¥¯¥ê¥Ã¥¯¤·¡¢
+	<quote>WebKit</quote> ¤ò<quote>KHTML</quote> ¤ËÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <para><application>Konqueror</application> ¤Ï
 	<application>&flash;</application> ¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
@@ -483,35 +577,25 @@
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <note>
-	<para><application>Chromium</application> ¤Ï¡¢
-	  <filename>/usr/local/bin/chrome</filename> ¤È¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£
+	<para><application>Chromium</application> ¤Î¼Â¹Ô²Äǽ¥Õ¥¡¥¤¥ë¤Ï¡¢
+	  <filename>/usr/local/bin/chrome</filename> ¤Ç¤¹¡£
 	  <filename>/usr/local/bin/chromium</filename> ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
       </note>
-    </sect2>
 
-    <sect2 id="chromium-java-plugin">
+    <sect3 id="chromium-java-plugin">
       <title>Chromium ¤È &java; ¥×¥é¥°¥¤¥ó</title>
 
       <note>
-	<para>¤³¤ÎÀá¤Ç¤Ï¡¢<application>Chromium</application>
+	<para>°Ê²¼¤ÎÀá¤Ç¤Ï¡¢<application>Chromium</application>
 	  ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤Þ¤¹¡£</para>
       </note>
 
-      <para>°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¡¢Ports Collection ¤«¤é
-	<application>OpenJDK 6</application>
-	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <screen>&prompt.root; <userinput>cd /usr/ports/java/openjdk6
-&prompt.root; make install clean</userinput></screen>
-
-      <para>¤½¤Î¸å¡¢Ports Collection ¤«¤é <filename
-	role="package">java/icedtea-web</filename> ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <para>&java; ¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
+	<link linkend="moz-java-plugin"></link>
+	¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤Ë½¾¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/java/icedtea-web
-&prompt.root; make install clean</userinput></screen>
-
-      <para><application>Chromium</application> ¤òµ¯Æ°¤·¡¢
-	¥¢¥É¥ì¥¹¥Ð¡¼¤Ë¡¢
+      <para>&java; ¤Î¥µ¥Ý¡¼¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢
+	<application>Chromium</application> ¤òµ¯Æ°¤·¡¢¥¢¥É¥ì¥¹¥Ð¡¼¤Ë¡¢
 	<literal>about:plugins</literal> ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£
 	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥×¥é¥°¥¤¥ó¤Î°ìÍ÷¤Ë
 	IcedTea-Web ¤¬Äɲäµ¤ì¤Æ¤¤¤ë¤Ï¤º¤Ç¤¹¡£</para>
@@ -523,24 +607,18 @@
       <screen>&prompt.root; <userinput>mkdir -p /usr/local/share/chromium/plugins
 &prompt.root; ln -s /usr/local/lib/IcedTeaPlugin.so \
   /usr/local/share/chromium/plugins/</userinput></screen>
-    </sect2>
+      </sect3>
 
-    <sect2 id="chromium-flash-plugin">
-      <title>Chromium ¤È &adobe; &flash; ¥×¥é¥°¥¤¥ó</title>
+      <sect3 id="chromium-flash-plugin">
+	<title>Chromium ¤È &adobe; &flash; ¥×¥é¥°¥¤¥ó</title>
 
-      <note>
-	<para>¤³¤ÎÀá¤Ç¤Ï¡¢<application>Chromium</application>
-	  ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤Þ¤¹¡£</para>
-      </note>
-
-      <para><application>Chromium</application> ¤È &adobe; &flash;
-	¤ÎÀßÄê¤Ï¡¢<link
-	linkend="moz-flash-plugin">Firefox ¤Î¼ê½ç</link> ¤ÈƱ¤¸¤Ç¤¹¡£
-	&os; ¤Ë &adobe; &flash; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-	¾åµ­¤Î¾Ï¤ò»²¹Í¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-	<application>Chromium</application>
-	¤Ï¡¢Â¾¤Î¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤òÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ë¤Î¤Ç¡¢
-	ÄɲäÎÀßÄê¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£</para>
+	<para><application>Chromium</application> ¤È &adobe; &flash;
+	  ¤ÎÀßÄê¤Ï¡¢<link
+	  linkend="moz-flash-plugin">Firefox ¤Î¼ê½ç</link> ¤ÈƱ¤¸¤Ç¤¹¡£
+	  <application>Chromium</application>
+	  ¤Ï¡¢Â¾¤Î¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤òÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ë¤Î¤Ç¡¢
+	  ÄɲäÎÀßÄê¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£</para>
+      </sect3>
     </sect2>
   </sect1>
 
@@ -554,10 +632,13 @@
       <application>KDE</application> ¤Î¤è¤¦¤Ê
       <link linkend="x11-wm">¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­</link>
       ¤Ï¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
-      FreeBSD ¤Ï¡¢¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ë¤«¤«¤ï¤é¤º
-      ɬÍפʤâ¤Î¤Ï¤¹¤Ù¤ÆÄ󶡤·¤Æ¤¤¤Þ¤¹¡£</para>
+      ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ë¤«¤«¤ï¤é¤º¡¢&os; ¤Ç¤Ï¡¢
+      ¤¤¤¯¤Ä¤â¤Î¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¡¢Ê¸½ñºîÀ®¥½¥Õ¥È¥¦¥§¥¢¤òÍøÍѤǤ­¤Þ¤¹¡£</para>
 
-    <para>¤³¤ÎÀá¤Ç¤Ï¼¡¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
+    <para>¤³¤ÎÀá¤Ç¤Ï¡¢°Ê²¼¤Î¿Íµ¤¤Î¤¢¤ëÀ¸»ºÅª¤Ê¥½¥Õ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
+      ¤â¤·¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¥ê¥½¡¼¥¹¤òÂçÎ̤˾ÃÈñ¤·¤¿¤ê¡¢
+      ports ¤«¤é¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë»þ´Ö¤¬¤«¤«¤Ã¤¿¤ê¡¢
+      ¤â¤·¤¯¤ÏÂ礭¤Ê°Í¸¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤Î¤³¤È¤Ë¤Ä¤¤¤Æ¤â¿¨¤ì¤Þ¤¹¡£</para>
 
     <informaltable frame="none" pgwide="1">
       <tgroup cols="4">
@@ -572,7 +653,7 @@
 
 	<tbody>
 	  <row>
-	    <entry><application>KOffice</application></entry>
+	    <entry><application>Calligra</application></entry>
 	    <entry>¾¯</entry>
 	    <entry>½Å</entry>
 	    <entry><application>KDE</application></entry>
@@ -598,7 +679,7 @@
 	      OpenOffice</application></entry>
 	    <entry>¿</entry>
 	    <entry>ÇüÂç</entry>
-	    <entry><application>&jdk;</application>,
+	    <entry><application>&jdk;</application> ¤ª¤è¤Ó
 	      <application>Mozilla</application></entry>
 	  </row>
 
@@ -616,43 +697,42 @@
     </informaltable>
 
     <sect2>
-      <title>KOffice</title>
+      <title>Calligra</title>
 
       <indexterm>
-	<primary><application>KOffice</application></primary>
+	<primary><application>Calligra</application></primary>
       </indexterm>
       <indexterm>
 	<primary>¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È</primary>
-	<secondary><application>KOffice</application></secondary>
+	<secondary><application>Calligra</application></secondary>
       </indexterm>
 
       <para>KDE ¥³¥ß¥å¥Ë¥Æ¥£¤Ï¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤È¤È¤â¤Ë¡¢
 	<application>KDE</application> ´Ä¶­°Ê³°¤Ç¤âÍøÍѲÄǽ¤Ê
 	¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
-	¤³¤Î¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤Ë¤Ï¡¢Â¾¤Î¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤ÈƱÍͤˡ¢
-	4 ¤Ä¤Îɸ½àŪ¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-	<application>KWord</application> ¤Ï¥ï¡¼¥É¥×¥í¥»¥Ã¥µ¡¢
-	<application>KSpread</application> ¤Ïɽ·×»»¥½¥Õ¥È¥¦¥§¥¢¡¢
-	<application>KPresenter</application>
+	<application>Calligra</application> ¤Ë¤Ï¡¢Â¾¤Î¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤ÈƱÍͤˡ¢
+	ɸ½àŪ¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
+	<application>Words</application> ¤Ïʸ½ñºîÀ®¥½¥Õ¥È¥¦¥§¥¢¡¢
+	<application>Sheets</application> ¤Ïɽ·×»»¥½¥Õ¥È¥¦¥§¥¢¡¢
+	<application>Stage</application>
 	¤Ï¥×¥ì¥¼¥ó¥Æ¡¼¥·¥ç¥ó¥½¥Õ¥È¥¦¥§¥¢¡¢¤½¤·¤Æ
-	<application>Kontour</application> ¤Ï¿Þ·ÁÉÁ²è¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£</para>
+	<application>Karbon</application> ¤Ï¿Þ·ÁÉÁ²è¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£</para>
 
       <para>ºÇ¿·¤Î <application>KOffice</application>
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢»öÁ°¤Ë <application>KDE</application>
 	¤òºÇ¿·¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <para><application>KDE4</application> ¤Î
-	<application>KOffice</application> ¤ò package
-	¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
-
-      <screen>&prompt.root; <userinput>pkg_add -r koffice-kde4</userinput></screen>
-
-      <para>package ¤òÆþ¼ê¤Ç¤­¤Ê¤¤¾ì¹ç¤Ç¤â Ports Collection ¤òÍøÍѤǤ­¤Þ¤¹¡£
-	¤¿¤È¤¨¤Ð¡¢<application>KDE4</application> ¤Î
-	<application>KOffice</application>
-	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
+      <para><filename
+	  role="package">editors/calligra</filename> ¤Ï¡¢package ¤Þ¤¿¤Ï port
+	¤«¤é¥¤¥ó¥¹¥È¡¼¥ë½ÐÍè¤Þ¤¹¡£      
+	package ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
+
+      <screen>&prompt.root; <userinput>pkg_add -r calligra</userinput></screen>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/editors/koffice-kde4</userinput>
+      <para>package ¤òÆþ¼ê¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢¤«¤ï¤ê¤Ë Ports Collection
+	¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/ports/editors/calligra</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
     </sect2>
 
@@ -667,20 +747,18 @@
 	¤Ï¡¢<application>µsoft; Word</application>
 	¤Î¤è¤¦¤Ê¸«¤¿ÌܤäÁàºî´¶¤ò»ý¤Ä¥Õ¥ê¡¼¤Î¥ï¡¼¥É¥×¥í¥»¥Ã¥µ¤Ç¤¹¡£
 	½ñÎà¤ä¼ê»æ¡¢Êó¹ð½ñ¡¢¥á¥â¤Ê¤É¤ò½ñ¤¯¤Î¤ËŬ¤·¤Æ¤¤¤Þ¤¹¡£
-	Èó¾ï¤Ë®¤¯¡¢Â¿¤¯¤ÎÆÃħ¤¬¤¢¤ê¡¢Èó¾ï¤Ë¥æ¡¼¥¶¥Õ¥ì¥ó¥É¥ê¤Ç¤¹¡£</para>
+	®¤¯¡¢Â¿¤¯¤ÎÆÃħ¤¬¤¢¤ê¡¢¥æ¡¼¥¶¥Õ¥ì¥ó¥É¥ê¤Ç¤¹¡£</para>
 
       <para><application>AbiWord</application> ¤Ï¡¢
 	µsoft; <filename>.doc</filename>
 	¤Î¤è¤¦¤ÊÆÈ¼«»ÅÍͤò´Þ¤à¿¤¯¤Î·Á¼°¤Î¥Õ¥¡¥¤¥ë¤òÆÉ¤ß½ñ¤­¤Ç¤­¤Þ¤¹¡£</para>
 
-      <para>¼¡¤Î¤è¤¦¤Ë¤·¤Æ <application>AbiWord</application> ¤ò package
-	¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
+      <para><application>AbiWord</application> ¤ò package
+	¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r abiword</userinput></screen>
 
-      <para>package ¤òÆþ¼ê¤Ç¤­¤Ê¤¤¾ì¹ç¤Ç¤â Ports Collection ¤òÍøÍѤǤ­¤Þ¤¹¡£
-	¤ª¤½¤é¤¯ Ports Collection ¤ÎÊý¤¬¿·¤·¤¤¤Ç¤·¤ç¤¦¡£
-	¼¡¤Î¤è¤¦¤Ë¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
+      <para>package ¤òÆþ¼ê¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢Ports Collection ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/editors/abiword</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -695,7 +773,7 @@
 
       <para>²èÁü¤òÉÁ²è¤·¤¿¤ê¼Ì¿¿¤ò½¤Àµ¤¹¤ë¤³¤È¤Ë´Ø¤·¤Æ¡¢
 	<application>GIMP</application>
-	¤Ï¤È¤Æ¤âÀöÎý¤µ¤ì¤¿ÊÔ½¸¥×¥í¥°¥é¥à¤Ç¤¹¡£
+	¤ÏÀöÎý¤µ¤ì¤¿ÊÔ½¸¥×¥í¥°¥é¥à¤Ç¤¹¡£
 	ñ½ã¤Ë¤ª³¨¤«¤­¥½¥Õ¥È¥¦¥§¥¢¤È¤·¤Æ»È¤¦¤³¤È¤â¤Ç¤­¤Þ¤¹¤·¡¢
 	¹âÉʼÁ¤Ê¼Ì¿¿¤Î²Ã¹©¥Ä¡¼¥ë¤È¤·¤Æ¤â»È¤¨¤Þ¤¹¡£
 	¿¤¯¤Î¥×¥é¥°¥¤¥ó¤ËÂбþ¤·¤Æ¤ª¤ê¡¢
@@ -704,33 +782,20 @@
 	¤Ï¤µ¤Þ¤¶¤Þ¤Ê·Á¼°¤Î¥Õ¥¡¥¤¥ë¤òÆÉ¤ß½ñ¤­¤Ç¤­¡¢
 	¥¹¥­¥ã¥Ê¤ä¥¿¥Ö¥ì¥Ã¥È¤È¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
-      <para>¼¡¤Î¥³¥Þ¥ó¥É¤Ë¤è¤ê package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
+      <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r gimp</userinput></screen>
 
-      <para>ÍøÍѤ·¤Æ¤¤¤ë FTP ¥µ¥¤¥È¤Ë¤³¤Î package ¤¬¤Ê¤¤¾ì¹ç¤Ç¤â¡¢
-	Ports Collection ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£
-	Ports Collection ¤Î <ulink
-	  url="http://www.FreeBSD.org/ja/ports/graphics.html">graphics</ulink>
-	¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï <application>Gimp ¥Þ¥Ë¥å¥¢¥ë</application>¤â¤¢¤ê¤Þ¤¹¡£
-	¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£</para>
+      <para>¤â¤·¤¯¤Ï¡¢Ports Collection ¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/graphics/gimp</userinput>
-&prompt.root; <userinput>make install clean</userinput>
-&prompt.root; <userinput>cd /usr/ports/graphics/gimp-manual-pdf</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <note>
-	<para>Ports Collection ¤Î <ulink
-	    url="http://www.FreeBSD.org/ja/ports/graphics.html">graphics</ulink>
-	  ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï <application>GIMP</application>
-	  ¤Î³«È¯ÈǤǤ¢¤ë
-	  <filename role="package">graphics/gimp-devel</filename>
-	  ¤¬¤¢¤ê¤Þ¤¹¡£
-	  <application>Gimp ¥Þ¥Ë¥å¥¢¥ë</application> ¤Î HTML ¥Ð¡¼¥¸¥ç¥ó¤Ï
-	  <filename role="package">graphics/gimp-manual-html</filename>
-	  ¤Ë¤¢¤ê¤Þ¤¹¡£</para>
-      </note>
+      <para>Ports Collection ¤Î <ulink
+	  url="http://www.FreeBSD.org/ports/graphics.html">graphics</ulink>
+	¥«¥Æ¥´¥ê¤Ë¤Ï¡¢<application>GIMP</application> ¤Ë´ØÏ¢¤·¤¿¥×¥é¥°¥¤¥ó¡¢
+	¥Ø¥ë¥×¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥æ¡¼¥¶¥Þ¥Ë¥å¥¢¥ë¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£</para>
+
     </sect2>
 
     <sect2>
@@ -748,7 +813,7 @@
 	</secondary>
       </indexterm>
 
-      <para>2011 ǯ 7 ·î 1 Æü¡¢Oracle Corporation ¤Ï
+      <para>2011 ǯ 7 ·î 1 Æü¡¢&oracle; ¤Ï
 	<application>OpenOffice.org</application> ¤Î¥³¡¼¥É¥Ù¡¼¥¹¤ò
 	Apache Software Foundation ¤Ø´ó£¤·¤Þ¤·¤¿¡£	
 	¸½ºß <application>OpenOffice.org</application> ¤Ï¡¢
@@ -771,74 +836,65 @@
 	¥Ý¡¼¥¿¥Ó¥ê¥Æ¥£¤ä½ÀÆðÀ­¤ò¹â¤á¤Æ¤¤¤Þ¤¹¡£
 	ɽ·×»»¥½¥Õ¥È¥¦¥§¥¢¤Ë¤Ï¥Þ¥¯¥íµ¡Ç½¤¬¤¢¤ê¡¢
 	³°Éô¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÈÀܳ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-	<application>Apache OpenOffice</application> ¤Ï¡¢¤¹¤Ç¤Ë
-	&windows;, &solaris;, Linux, FreeBSD, &macos; X
+	<application>Apache OpenOffice</application> ¤Ï¡¢
+	&windows;, &linux;, &os; ¤ª¤è¤Ó &macos; X
 	¤Ë¤ª¤¤¤Æ°ÂÄꤷ¤Æ¥Í¥¤¥Æ¥£¥Ö¤Ëưºî¤·¤Æ¤¤¤Þ¤¹¡£
 	<application>Apache OpenOffice</application>
-	¤Ë¤Ä¤¤¤Æ¤Î¾Ü¤·¤¤¾ðÊó¤Ï¡¢<ulink
+	¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï¡¢<ulink
 	  url="http://incubator.apache.org/openofficeorg/">Apache
 	OpenOffice web ¥µ¥¤¥È</ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢<ulink
-	  url="http://porting.openoffice.org/freebsd/">FreeBSD Apache
-	OpenOffice ¥×¥í¥¸¥§¥¯¥È¥Á¡¼¥à</ulink>
-	¤Î Web ¥µ¥¤¥È¤«¤é¡¢FreeBSD ÆÃÍ­¤Î¾ðÊó¤ä
+	  url="http://porting.openoffice.org/freebsd/">&os; Apache
+	OpenOffice °Ü¿¢¥Á¡¼¥à</ulink>
+	¤Î web ¥µ¥¤¥È¤«¤é¡¢&os; ÆÃÍ­¤Î¾ðÊó¤ä
 	packages ¤òľÀܼèÆÀ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
 
-      <para><application>Apache OpenOffice</application>
+      <para><application>Apache OpenOffice</application> package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r apache-openoffice</userinput></screen>
 
       <note>
 	<para>&os; ¤Î¥ê¥ê¡¼¥¹ÈǤò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¤³¤ÎÁàºî¤Ï¤¦¤Þ¤¯¤¤¤¯¤Ç¤·¤ç¤¦¡£
-	  ¤½¤ì°Ê³°¤ÎÈǤò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¢&os; <application>Apache OpenOffice</application>
-	  °Ü¿¢¥Á¡¼¥à¤Î web ¥µ¥¤¥È¤«¤éŬÀڤʥѥ屡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¡¢
+	  ¤½¤ì°Ê³°¤ÎÈǤò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
+	  &os; <application>Apache OpenOffice</application>
+	  °Ü¿¢¥Á¡¼¥à¤Î web ¥µ¥¤¥È¤«¤éŬÀÚ¤Ê package ¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¡¢
 	  &man.pkg.add.1; ¤ò»ÈÍѤ·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-	  ¤³¤³¤«¤é¤Ï¥ê¥ê¡¼¥¹ÈǤȳ«È¯ÈǤÎξÊý¤¬¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤¹¡£</para>
+	  ¤³¤Î¥¦¥§¥Ö¥µ¥¤¥È¤«¤é¡¢¥ê¥ê¡¼¥¹ÈǤȳ«È¯ÈǤÎξÊý¤ò¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤¹¡£</para>
       </note>
 
-      <para>package
-	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ¹¤ë¤È¡¢
-	<application>Apache OpenOffice</application> ¤¬µ¯Æ°¤·¤Þ¤¹¡£</para>
+      <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Æ
+	<application>Apache OpenOffice</application> ¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.user; <userinput>openoffice-<replaceable>X.Y.Z</replaceable></userinput></screen>
 
       <para>¤³¤³¤Ç <replaceable>X.Y.Z</replaceable> ¤Ï¡¢
-	<replaceable>3.4.0</replaceable> ¤Î¤è¤¦¤Ê¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë
+	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë
 	<application>Apache OpenOffice</application> ¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤Ç¤¹¡£</para>
 
       <note>
-	<para>½é²óµ¯Æ°»þ¤Ë¡¢¤¤¤¯¤Ä¤«¤Î¼ÁÌ䤬ɽ¼¨¤µ¤ì¡¢
-	  ¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë <filename>.openoffice.org</filename>
+	<para>½é²óµ¯Æ°»þ¤Ë¡¢¤¤¤¯¤Ä¤«¤Î¼ÁÌ䤬¹Ô¤ï¤ì¡¢
+	  ¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë <filename>.openoffice.org</filename>
 	  ¥Õ¥©¥ë¥À¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£</para>
       </note>

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


More information about the svn-doc-all mailing list