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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Fri Oct 18 10:25:05 UTC 2013


Author: ryusuke
Date: Fri Oct 18 10:25:04 2013
New Revision: 42996
URL: http://svnweb.freebsd.org/changeset/doc/42996

Log:
  - Merge the following from the English version:
  
  	r42717 -> r42925	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	Fri Oct 18 02:29:58 2013	(r42995)
+++ head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Fri Oct 18 10:25:04 2013	(r42996)
@@ -3,11 +3,12 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r42717
+     Original revision: r42925
      $FreeBSD$
 -->
 
 <chapter id="desktop">
+  <!--
   <chapterinfo>
     <authorgroup>
       <author>
@@ -17,6 +18,7 @@
       </author>
     </authorgroup>
   </chapterinfo>
+-->
 
   <title>¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</title>
 
@@ -24,13 +26,20 @@
     <title>¤³¤Î¾Ï¤Ç¤Ï</title>
 
     <para>&os; ¤ÏÀ­Ç½¤ä°ÂÄêÀ­¤Ë¤è¤ê¥µ¡¼¥Ð¤È¤·¤Æ¿Íµ¤¤¬¤¢¤ë°ìÊý¤Ç¡¢
-      Æü¡¹¤Î¥Ç¥¹¥¯¥È¥Ã¥×¤È¤·¤Æ¤ÎÍøÍѤˤâŬ¤·¤Æ¤¤¤Þ¤¹¡£<link
-	linkend="packages-using">packages</link> ¤ä <link
-	linkend="ports-using">ports</link> ¤«¤é
-      &os.numports; ¤òĶ¤¨¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÍøÍѤǤ­¤ë¤Î¤Ç¡¢
+      Æü¡¹¤Î¥Ç¥¹¥¯¥È¥Ã¥×¤È¤·¤Æ¤ÎÍøÍѤˤâŬ¤·¤Æ¤¤¤Þ¤¹¡£
+      &os.numports; ¤òĶ¤¨¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò
+      packages ¤ä ports ¤«¤éÍøÍѤǤ­¤ë¤Î¤Ç¡¢
       ¤µ¤Þ¤¶¤Þ¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÆ°¤«¤»¤ë¤è¤¦¤Ë¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¥Ç¥¹¥¯¥È¥Ã¥×¤òºî¤ê¾å¤²¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
       ¤³¤Î¾Ï¤Ç¤Ï¡¢packages ¤ä Ports Collection
-      ¤òÍѤ¤¤Æ¡¢¿Íµ¤¤Î¹â¤¤¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò³Ú¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤òÀâÌÀ¤·¤Þ¤¹¡£</para>
+      ¤òÍѤ¤¤Æ¡¢¿Íµ¤¤Î¹â¤¤¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
+
+    <note>
+      <para>°ì¤«¤é¹½ÃÛ¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢
+	»öÁ°¤Ë¹½ÃÛ¤µ¤ì¤¿¥Ç¥¹¥¯¥È¥Ã¥×¥Ð¡¼¥¸¥ç¥ó¤Î FreeBSD
+	¤ò¤ªË¾¤ß¤Î¥æ¡¼¥¶¤Ï¡¢<ulink
+	  url="http://www.pcbsd.org/">pcbsd.org
+	¥¦¥§¥Ö¥µ¥¤¥È</ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+    </note>
 
     <para>&os; ¤Ï¡¢<link linkend="linuxemu">&linux; ¥Ð¥¤¥Ê¥ê¸ß´¹</link>
       µ¡Ç½¤ò»ý¤Ä¤Î¤Ç¡¢&linux; ÍѤ˳«È¯¤µ¤ì¤¿Â¿¤¯¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò
@@ -117,7 +126,7 @@
 		OpenOffice</application></entry>
 	    <entry><literal>openoffice</literal></entry>
 	    <entry><filename
-		role="package">editors/openoffice-3</filename></entry>
+		role="package">editors/openoffice-4</filename></entry>
 	  </row>
 
 	  <row>
@@ -193,18 +202,23 @@
     <itemizedlist>
       <listitem>
 	<para>package ¤Þ¤¿¤Ï ports
-	  ¤òÍѤ¤¤¿¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥½¥Õ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¡£</para>
+	  ¤òÍѤ¤¤¿¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥½¥Õ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡
+	  (<xref linkend="ports"/>)¡£</para>
+      </listitem>
+
+      <listitem>
+	<para>X ¤ª¤è¤Ó¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡
+	  (<xref linkend="x11"/>)¡£</para>
       </listitem>
 
       <listitem>
-	<para>&linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ëÊýË¡¡£</para>
+	<para>&linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ëÊýË¡
+	  (<xref linkend="linuxemu"/>)¡£</para>
       </listitem>
     </itemizedlist>
 
     <para>¥Þ¥ë¥Á¥á¥Ç¥£¥¢´Ä¶­¤òÀ°¤¨¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï
-      <xref linkend="multimedia"/> ¤ò¡¢
-      ÅŻҥ᡼¥ë¤òÀßÄꤷ¤Æ»È¤¤¤¿¤¤¾ì¹ç¤Ë¤Ï
-      <xref linkend="mail"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <xref linkend="multimedia"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
     <note>
       <title>ÌõÃí</title>
@@ -236,10 +250,10 @@
       ¤³¤ì¤é¤Î¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤òÀßÄꤹ¤ë¤¿¤á¤Î¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï
       <xref linkend="x11-wm"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-    <para>·ÚÎ̤ʥ֥饦¥¶¤È¤·¤Æ¤Ï¡¢
-      <filename role="package">www/dillo2</filename>,
-      <filename role="package">www/links</filename>,
-      <filename role="package">www/w3m</filename>
+    <para>·ÚÎ̤ʥ֥饦¥¶¤Ë¤Ï¡¢<filename
+	role="package">www/dillo2</filename>, <filename
+	role="package">www/links</filename>, ¤ª¤è¤Ó <filename
+	role="package">www/w3m</filename>
       ¤È¤¤¤Ã¤¿¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
     <para>¤³¤ÎÀá¤Ç¤Ï°Ê²¼¤Î¿Íµ¤¤Î¤¢¤ë web ¥Ö¥é¥¦¥¶¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
@@ -263,7 +277,8 @@
 	    <entry><application>Firefox</application></entry>
 	    <entry>Ãæ</entry>
 	    <entry>½Å</entry>
-	    <entry>&os; ¤ª¤è¤Ó &linux; ÈǤò¤¬ÍøÍѤǤ­¤Þ¤¹¡£</entry>
+	    <entry>&os;, &linux;
+	      ¤ª¤è¤ÓÃÏ°è²½¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤òÍøÍѤǤ­¤Þ¤¹¡£</entry>
 	  </row>
 
 	  <row>
@@ -298,8 +313,7 @@
       </indexterm>
 
       <para><application>Firefox</application> ¤Ï¡¢
-	Àè¿ÊŪ¤Ç̵ÎÁ¤«¤Ä¥ª¡¼¥×¥ó¥½¡¼¥¹¤Î¥Ö¥é¥¦¥¶¤Ç¤¹¡£
-	&os; ¤Ë´°Á´¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+	&os; ¤Ë´°Á´¤ËÂбþ¤·¤¿¥ª¡¼¥×¥ó¥½¡¼¥¹¤Î¥Ö¥é¥¦¥¶¤Ç¤¹¡£
 	ɸ½à¤Ë½àµò¤·¤¿ HTML ɽ¼¨¥¨¥ó¥¸¥ó¡¢¥¿¥Ö¥Ö¥é¥¦¥¸¥ó¥°¡¢¥Ý¥Ã¥×¥¢¥Ã¥×¥Ö¥í¥Ã¥¯¡¢
 	³ÈÄ¥À­¡¢¹â¤¤°ÂÁ´À­¤Ê¤É¤¬ÆÃħ¤Ç¤¹¡£
 	<application>Firefox</application> ¤Ï <application>Mozilla</application>
@@ -333,13 +347,12 @@
     <sect3 id="moz-java-plugin">
       <title>Firefox ¤È &java; ¥×¥é¥°¥¤¥ó</title>
 
-      <note>
-	<para>°Ê²¼¤ÎÀá¤Ç¤Ï¡¢<application>Firefox</application>
-	  ¤¬¤¢¤é¤«¤¸¤á¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤Þ¤¹¡£</para>
-      </note>
-
-      <para><filename role="package">java/icedtea-web</filename> ¤Ï¡¢
-	Java ¥¢¥×¥ì¥Ã¥È¤ËÂФ·¡¢¥Õ¥ê¡¼¥½¥Õ¥È¤Î web ¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤òÄ󶡤·¤Þ¤¹¡£
+      <para>
+	<application>Firefox</application> ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤Ï¡¢
+	&java; ¤Î¥µ¥Ý¡¼¥È¤Ï´Þ¤Þ¤ì¤Þ¤»¤ó¡£
+	<filename role="package">java/icedtea-web</filename> ¤Ï¡¢
+	Java ¥¢¥×¥ì¥Ã¥È¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Î¡¢
+	¥Õ¥ê¡¼¥½¥Õ¥È¤Î web ¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤Ç¤¹¡£
 	package ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£port ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤Ë¤Ï¡¢
 	°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -370,9 +383,9 @@
 	<primary>Flash</primary>
       </indexterm>
 
-      <para>&os; ÍѤΠ&adobe; &flash; ¥×¥é¥°¥¤¥ó¤ÏÄ󶡤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
-	¤·¤«¤·¤Ê¤¬¤é¡¢&linux;
-	¥Ð¡¼¥¸¥ç¥ó¤Î¥×¥é¥°¥¤¥ó¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Î¥½¥Õ¥È¥¦¥§¥¢¥ì¥¤¥ä (wrapper) ¤¬Â¸ºß¤·¤Þ¤¹¡£
+      <para>&os; ÍѤΠ&adobe; &flash; ¥×¥é¥°¥¤¥ó¤ÏÄ󶡤µ¤ì¤Æ¤¤¤Þ¤»¤ó¤¬¡¢
+	&linux;
+	ÈǤΥץ饰¥¤¥ó¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Î¥½¥Õ¥È¥¦¥§¥¢ wrapper ¤òÍøÍѤǤ­¤Þ¤¹¡£
 	¤³¤Î wrapper ¤Ï¡¢
 	&realplayer; ¥×¥é¥°¥¤¥ó¤È¤¤¤Ã¤¿Â¾¤Î¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
@@ -430,11 +443,11 @@
 
       <title>Firefox ¤È Swfdec &flash; ¥×¥é¥°¥¤¥ó</title>
 
-      <para>Swfdec ¤Ï &flash;
-	¥¢¥Ë¥á¡¼¥·¥ç¥ó¤Î¥Ç¥³¡¼¥É¤ä¥ì¥ó¥À¥ê¥ó¥°¤ò¹Ô¤¦¥é¥¤¥Ö¥é¥ê¤Ç¤¹¡£
-	Swfdec-Mozilla ¤Ï¡¢<application>Firefox</application> ¥Ö¥é¥¦¥¶¤Ë¤ª¤¤¤Æ
-	SWF ¥Õ¥¡¥¤¥ë¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Î¥×¥é¥°¥¤¥ó¤Ç¡¢Swfdec ¥é¥¤¥Ö¥é¥ê¤òÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£
-	¤³¤Î¥é¥¤¥Ö¥é¥ê¤Ï¡¢¸½ºß¤Ç¤âÀ¹¤ó¤Ë³«È¯¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+      <para><application>Swfdec</application> ¤Ï &flash;
+	¥¢¥Ë¥á¡¼¥·¥ç¥ó¤Î¥Ç¥³¡¼¥À¡¼¤ª¤è¤Ó¥ì¥ó¥À¥é¡¼¤Ç¤¹¡£
+	<application>Swfdec-Mozilla</application> ¤Ï¡¢
+	<application>Firefox</application> ¥Ö¥é¥¦¥¶¤Ë¤ª¤¤¤Æ
+	SWF ¥Õ¥¡¥¤¥ë¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Î¥×¥é¥°¥¤¥ó¤Ç¡¢Swfdec ¥é¥¤¥Ö¥é¥ê¤òÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -490,7 +503,8 @@
 	¤½¤Î¸å¡¢<filename
 	  role="package">www/opera-linuxplugins</filename> port
 	¤â¤·¤¯¤Ï package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-	°Ê²¼¤ÎÎã¤Ç¤Ï¡¢Î¾Êý¤ò ports ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£</para>
+	°Ê²¼¤ÎÎã¤Ç¤Ï¡¢Î¾Êý¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò
+	ports ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/www/linux-f10-flashplugin11</userinput>
 &prompt.root; <userinput>make install clean</userinput>
@@ -504,8 +518,8 @@
 	¸½ºßÍøÍѲÄǽ¤Ê¥×¥é¥°¥¤¥ó¤Î°ìÍ÷¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£</para>
 
       <para><application>&java;</application> ¥×¥é¥°¥¤¥ó¤òÄɲ乤ë¤Ë¤Ï¡¢
-	<link linkend="moz-java-plugin">Firefox ¤Ç¤Î¼ê½ç</link>
-	¤Ë¤·¤¿¤¬¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<xref linkend="moz-java-plugin"/>
+ 	¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤Ë½¾¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
     </sect2>
 
     <sect2>
@@ -515,11 +529,10 @@
 	<primary><application>Konqueror</application></primary>
       </indexterm>
 
-      <para><application>Konqueror</application> ¤Ï <filename
-	  role="package">x11/kde4-baseapps</filename>
-	¤ò¹½À®¤¹¤ë¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£
-	<application>Konqueror</application> ¤Ï¥Ö¥é¥¦¥¶¤Ç¤¢¤ë¤ÈƱ»þ¤Ë¡¢
-	¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤ª¤è¤Ó¥Þ¥ë¥Á¥á¥Ç¥£¥¢¥Ó¥å¡¼¥¢¤ÎÌò³ä¤â²Ì¤¿¤·¤Þ¤¹¡£</para>
+      <para><application>Konqueror</application> ¤Ï¥Ö¥é¥¦¥¶¤Ç¤¢¤ë¤ÈƱ»þ¤Ë¡¢
+	¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤ª¤è¤Ó¥Þ¥ë¥Á¥á¥Ç¥£¥¢¥Ó¥å¡¼¥¢¤ÎÌò³ä¤â²Ì¤¿¤·¤Þ¤¹¡£
+	<filename role="package">x11/kde4-baseapps</filename> package ¤Þ¤¿¤Ï
+	port ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para><application>Konqueror</application> ¤Ï¡¢KHTML ¤È¤È¤â¤Ë¡¢WebKit
 	¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£WebKit ¤Ï Chromium
@@ -585,12 +598,9 @@
     <sect3 id="chromium-java-plugin">
       <title>Chromium ¤È &java; ¥×¥é¥°¥¤¥ó</title>
 
-      <note>
-	<para>°Ê²¼¤ÎÀá¤Ç¤Ï¡¢<application>Chromium</application>
-	  ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤Þ¤¹¡£</para>
-      </note>
-
-      <para>&java; ¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
+      <para><application>Chromium</application> ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤Ï¡¢
+	&java; ¤Ø¤Î¥µ¥Ý¡¼¥È¤Ï´Þ¤Þ¤ì¤Þ¤»¤ó¡£
+	&java; ¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
 	<xref linkend="moz-java-plugin"/>
 	¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤Ë½¾¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -613,8 +623,8 @@
 	<title>Chromium ¤È &adobe; &flash; ¥×¥é¥°¥¤¥ó</title>
 
 	<para><application>Chromium</application> ¤È &adobe; &flash;
-	  ¤ÎÀßÄê¤Ï¡¢<link
-	  linkend="moz-flash-plugin">Firefox ¤Î¼ê½ç</link> ¤ÈƱ¤¸¤Ç¤¹¡£
+	  ¤ÎÀßÄê¤Ï¡¢<xref
+	  linkend="moz-flash-plugin"/> ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤ÈƱ¤¸¤Ç¤¹¡£
 	  <application>Chromium</application>
 	  ¤Ï¡¢Â¾¤Î¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤òÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ë¤Î¤Ç¡¢
 	  ÄɲäÎÀßÄê¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£</para>
@@ -626,14 +636,15 @@
     <title>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</title>
 
     <para>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤¤¤¦¤³¤È¤Ë¤Ê¤ë¤È¡¢
-      ¿·¤·¤¤¥æ¡¼¥¶¤Ï¤·¤Ð¤·¤ÐÌ¥ÎÏŪ¤Ê¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤ä
-      ¿Æ¤·¤ß¤Î¤¢¤ë¥ï¡¼¥É¥×¥í¥»¥Ã¥µ¤òµá¤á¤ë¤Ç¤·¤ç¤¦¡£
-      ¥Ç¥Õ¥©¥ë¥È¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢
+      ¿·¤·¤¤¥æ¡¼¥¶¤Ï¤·¤Ð¤·¤Ð¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤ä¡¢
+      »È¤¤¤ä¤¹¤¤Ê¸½ñºîÀ®¥½¥Õ¥È¥¦¥§¥¢¤òµá¤á¤ë¤Ç¤·¤ç¤¦¡£
+      ¥Ç¥Õ¥©¥ë¥È¤ÎÀ¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢
       <application>KDE</application> ¤Î¤è¤¦¤Ê
       <link linkend="x11-wm">¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­</link>
       ¤Ï¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
-      ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ë¤«¤«¤ï¤é¤º¡¢&os; ¤Ç¤Ï¡¢
-      ¤¤¤¯¤Ä¤â¤Î¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¡¢Ê¸½ñºîÀ®¥½¥Õ¥È¥¦¥§¥¢¤òÍøÍѤǤ­¤Þ¤¹¡£</para>
+      ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Ë¤«¤«¤ï¤é¤º¡¢&os; ¤Ç¤Ï¡¢
+      ¤¤¤¯¤Ä¤â¤Î¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¡¢
+      ¥°¥é¥Õ¥£¥«¥ë¤Êʸ½ñºîÀ®¥½¥Õ¥È¥¦¥§¥¢¤òÍøÍѤǤ­¤Þ¤¹¡£</para>
 
     <para>¤³¤ÎÀá¤Ç¤Ï¡¢°Ê²¼¤Î¿Íµ¤¤Î¤¢¤ëÀ¸»ºÅª¤Ê¥½¥Õ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
       ¤â¤·¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¥ê¥½¡¼¥¹¤òÂçÎ̤˾ÃÈñ¤·¤¿¤ê¡¢
@@ -707,9 +718,9 @@
 	<secondary><application>Calligra</application></secondary>
       </indexterm>
 
-      <para>KDE ¥³¥ß¥å¥Ë¥Æ¥£¤Ï¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤È¤È¤â¤Ë¡¢
-	<application>KDE</application> ´Ä¶­°Ê³°¤Ç¤âÍøÍѲÄǽ¤Ê
-	¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
+      <para>KDE ¥Ç¥¹¥¯¥È¥Ã¥×¤Ë¤Ï¡¢
+	<application>KDE</application>
+	´Ä¶­°Ê³°¤Ç¤âÍøÍѲÄǽ¤Ê¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤¬¤¢¤ê¤Þ¤¹¡£
 	<application>Calligra</application> ¤Ë¤Ï¡¢Â¾¤Î¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤ÈƱÍͤˡ¢
 	ɸ½àŪ¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
 	<application>Words</application> ¤Ïʸ½ñºîÀ®¥½¥Õ¥È¥¦¥§¥¢¡¢
@@ -718,13 +729,8 @@
 	¤Ï¥×¥ì¥¼¥ó¥Æ¡¼¥·¥ç¥ó¥½¥Õ¥È¥¦¥§¥¢¡¢¤½¤·¤Æ
 	<application>Karbon</application> ¤Ï¿Þ·ÁÉÁ²è¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£</para>
 
-      <para>ºÇ¿·¤Î <application>KOffice</application>
-	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢»öÁ°¤Ë <application>KDE</application>
-	¤òºÇ¿·¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <para><filename
-	  role="package">editors/calligra</filename> ¤Ï¡¢package ¤Þ¤¿¤Ï port
-	¤«¤é¥¤¥ó¥¹¥È¡¼¥ë½ÐÍè¤Þ¤¹¡£      
+      <para>&os; ¤Ç¤Ï package ¤Þ¤¿¤Ï port ¤«¤é <filename
+	  role="package">editors/calligra</filename> ¤ò¥¤¥ó¥¹¥È¡¼¥ë½ÐÍè¤Þ¤¹¡£
 	package ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r calligra</userinput></screen>
@@ -745,12 +751,11 @@
 
       <para><application>AbiWord</application>
 	¤Ï¡¢<application>µsoft; Word</application>
-	¤Î¤è¤¦¤Ê¸«¤¿ÌܤäÁàºî´¶¤ò»ý¤Ä¥Õ¥ê¡¼¤Î¥ï¡¼¥É¥×¥í¥»¥Ã¥µ¤Ç¤¹¡£
-	½ñÎà¤ä¼ê»æ¡¢Êó¹ð½ñ¡¢¥á¥â¤Ê¤É¤ò½ñ¤¯¤Î¤ËŬ¤·¤Æ¤¤¤Þ¤¹¡£
-	®¤¯¡¢Â¿¤¯¤ÎÆÃħ¤¬¤¢¤ê¡¢¥æ¡¼¥¶¥Õ¥ì¥ó¥É¥ê¤Ç¤¹¡£</para>
+	¤Î¤è¤¦¤Ê¸«¤¿ÌܤäÁàºî´¶¤ò»ý¤Ä¥Õ¥ê¡¼¤Îʸ½ñºîÀ®¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£
+	®¤¯¡¢Â¿¤¯¤Îµ¡Ç½¤ò»ý¤Á¡¢¥æ¡¼¥¶¥Õ¥ì¥ó¥É¥ê¤Ç¤¹¡£</para>
 
       <para><application>AbiWord</application> ¤Ï¡¢
-	µsoft; <filename>.doc</filename>
+	µsoft; <filename>.rtf</filename>
 	¤Î¤è¤¦¤ÊÆȼ«»ÅÍͤò´Þ¤à¿¤¯¤Î·Á¼°¤Î¥Õ¥¡¥¤¥ë¤òÆɤ߽ñ¤­¤Ç¤­¤Þ¤¹¡£</para>
 
       <para><application>AbiWord</application> ¤ò package
@@ -791,9 +796,9 @@
       <screen>&prompt.root; <userinput>cd /usr/ports/graphics/gimp</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>Ports Collection ¤Î <ulink
-	  url="http://www.FreeBSD.org/ports/graphics.html">graphics</ulink>
-	¥«¥Æ¥´¥ê¤Ë¤Ï¡¢<application>GIMP</application> ¤Ë´ØÏ¢¤·¤¿¥×¥é¥°¥¤¥ó¡¢
+      <para>Ports Collection ¤Î graphics ¥«¥Æ¥´¥ê (<ulink
+	  url="http://www.FreeBSD.org/ports/graphics.html">freebsd.org/ports/graphics.html</ulink>)
+	¤Ë¤Ï¡¢<application>GIMP</application> ¤Ë´ØÏ¢¤·¤¿¥×¥é¥°¥¤¥ó¡¢
 	¥Ø¥ë¥×¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥æ¡¼¥¶¥Þ¥Ë¥å¥¢¥ë¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
     </sect2>
@@ -813,27 +818,22 @@
 	</secondary>
       </indexterm>
 
-      <para>2011 ǯ 7 ·î 1 Æü¡¢&oracle; ¤Ï
-	<application>OpenOffice.org</application> ¤Î¥³¡¼¥É¥Ù¡¼¥¹¤ò
-	Apache Software Foundation ¤Ø´ó£¤·¤Þ¤·¤¿¡£	
-	¸½ºß <application>OpenOffice.org</application> ¤Ï¡¢
-	<application>Apache OpenOffice</application> ¤È¤·¤ÆÃΤé¤ì¡¢
+      <para><application>Apache OpenOffice</application> ¤Ï¡¢
 	Apache Software Foundation
-	¤Î¥¤¥ó¥­¥å¥Ù¡¼¥¿¥×¥í¥¸¥§¥¯¥È¤È¤·¤Æ³«È¯¤¬¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-
-      <para><application>Apache OpenOffice</application>
+	¤Î¥¤¥ó¥­¥å¥Ù¡¼¥¿¥×¥í¥¸¥§¥¯¥È¤È¤·¤Æ³«È¯¤¬¹Ô¤ï¤ì¤Æ¤¤¤ë¥ª¡¼¥×¥ó¥½¡¼¥¹¤Î¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤Ç¤¹¡£
+	<application>Apache OpenOffice</application>
 	¤Ï¡¢´°Á´¤Ê¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤Ëɬ¿Ü¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó
-	(¥ï¡¼¥É¥×¥í¥»¥Ã¥µ¡¢É½·×»»¥½¥Õ¥È¥¦¥§¥¢¡¢
+	(ʸ½ñºîÀ®¥½¥Õ¥È¥¦¥§¥¢¡¢É½·×»»¥½¥Õ¥È¥¦¥§¥¢¡¢
 	¥×¥ì¥¼¥ó¥Æ¡¼¥·¥ç¥ó¥½¥Õ¥È¥¦¥§¥¢¡¢¤½¤·¤Æ¿Þ·ÁÉÁ²è¥½¥Õ¥È¥¦¥§¥¢)
 	¤ò¤Ò¤È¤È¤ª¤ê·¤¨¤Æ¤¤¤Þ¤¹¡£
 	¥æ¡¼¥¶¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï¾¤Î¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤È»÷¤Æ¤ª¤ê¡¢
 	¹­¤¯ÍѤ¤¤é¤ì¤Æ¤¤¤ë¤µ¤Þ¤¶¤Þ¤Ê·Á¼°¤Î¥Õ¥¡¥¤¥ë¤òÆɤ߽ñ¤­¤Ç¤­¤Þ¤¹¡£
-	¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥¹¥Ú¥ë¥Á¥§¥Ã¥«¡¢¼­½ñ¤Ï¹ñºÝ²½¤µ¤ì¤Æ¤ª¤ê¡¢
-	¿¤¯¤Î¸À¸ì¤ÇÍøÍѤǤ­¤Þ¤¹¡£</para>
+	¿¤¯¤Î¸À¸ì¤ÇÍøÍѤǤ­¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥¹¥Ú¥ë¥Á¥§¥Ã¥«¡¢
+	¼­½ñ¤Ï¹ñºÝ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para><application>Apache OpenOffice</application>
-	¤Î¥ï¡¼¥É¥×¥í¥»¥Ã¥µ¤Ï¡¢¥Í¥¤¥Æ¥£¥Ö¤Î¥Õ¥¡¥¤¥ë·Á¼°¤Ë XML ¤òºÎÍѤ¹¤ë¤³¤È¤Ç
-	¥Ý¡¼¥¿¥Ó¥ê¥Æ¥£¤ä½ÀÆðÀ­¤ò¹â¤á¤Æ¤¤¤Þ¤¹¡£
+	¤Îʸ½ñºîÀ®¥½¥Õ¥È¥¦¥§¥¢¤Ï¡¢¥Í¥¤¥Æ¥£¥Ö¤Î XML
+	¥Õ¥¡¥¤¥ë·Á¼°¤òºÎÍѤ¹¤ë¤³¤È¤Ç¥Ý¡¼¥¿¥Ó¥ê¥Æ¥£¤ä½ÀÆðÀ­¤ò¹â¤á¤Æ¤¤¤Þ¤¹¡£
 	ɽ·×»»¥½¥Õ¥È¥¦¥§¥¢¤Ë¤Ï¥Þ¥¯¥íµ¡Ç½¤¬¤¢¤ê¡¢
 	³°Éô¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÈÀܳ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
 	<application>Apache OpenOffice</application> ¤Ï¡¢
@@ -841,27 +841,16 @@
 	¤Ë¤ª¤¤¤Æ°ÂÄꤷ¤Æ¥Í¥¤¥Æ¥£¥Ö¤ËÆ°ºî¤·¤Æ¤¤¤Þ¤¹¡£
 	<application>Apache OpenOffice</application>
 	¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï¡¢<ulink
-	  url="http://incubator.apache.org/openofficeorg/">Apache
-	OpenOffice web ¥µ¥¤¥È</ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢<ulink
-	  url="http://porting.openoffice.org/freebsd/">&os; Apache
-	OpenOffice °Ü¿¢¥Á¡¼¥à</ulink>
-	¤Î web ¥µ¥¤¥È¤«¤é¡¢&os; ÆÃÍ­¤Î¾ðÊó¤ä
-	packages ¤òľÀܼèÆÀ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
+	  url="http://openoffice.org/">openoffice.org</ulink>
+	¤ò¤´Í÷¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢<ulink
+	  url="http://porting.openoffice.org/freebsd/">porting.openoffice.org/freebsd/</ulink>
+	¤«¤é¡¢&os; ÆÃÍ­¤Î¾ðÊó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <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 ¥µ¥¤¥È¤«¤éŬÀÚ¤Ê package ¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¡¢
-	  &man.pkg.add.1; ¤ò»ÈÍѤ·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-	  ¤³¤Î¥¦¥§¥Ö¥µ¥¤¥È¤«¤é¡¢¥ê¥ê¡¼¥¹ÈǤȳ«È¯ÈǤÎξÊý¤ò¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤¹¡£</para>
-      </note>
-
       <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Æ
 	<application>Apache OpenOffice</application> ¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -869,20 +858,18 @@
 
       <para>¤³¤³¤Ç <replaceable>X.Y.Z</replaceable> ¤Ï¡¢
 	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë
-	<application>Apache OpenOffice</application> ¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤Ç¤¹¡£</para>
-
-      <note>
-	<para>½é²óµ¯Æ°»þ¤Ë¡¢¤¤¤¯¤Ä¤«¤Î¼ÁÌ䤬¹Ô¤ï¤ì¡¢
-	  ¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë <filename>.openoffice.org</filename>
-	  ¥Õ¥©¥ë¥À¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£</para>
-      </note>
+	<application>Apache OpenOffice</application> ¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤Ç¤¹¡£
+	<application>Apache OpenOffice</application>
+	¤Î½é²óµ¯Æ°»þ¤Ë¡¢¤¤¤¯¤Ä¤«¤Î¼ÁÌ䤬¹Ô¤ï¤ì¡¢
+	¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë <filename>.openoffice.org</filename>
+	¥Õ¥©¥ë¥À¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£</para>
 
       <para>´õ˾¤Î <application>Apache OpenOffice</application> ¤Î packages
 	¤òÍøÍѤǤ­¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢port ¤òÍøÍѤ¹¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹¡£
 	¤·¤«¤·¤Ê¤¬¤é¡¢¥³¥ó¥Ñ¥¤¥ë¤Ë¤ÏÂ礭¤Ê¥Ç¥£¥¹¥¯¥¹¥Ú¡¼¥¹¤È¡¢
 	ËÜÅö¤Ë¤«¤Ê¤êŤ¤»þ´Ö¤òɬÍפȤ·¤Þ¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice-3</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice-4</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <note>
@@ -909,18 +896,18 @@
       </indexterm>
 
       <para><application>LibreOffice</application> ¤Ï¡¢<ulink
-	  url="http://www.documentfoundation.org/">The Document
-	Foundation</ulink>
+	  url="http://www.documentfoundation.org/">documentfoundation.org</ulink>
 	¤¬³«È¯¤·¤Æ¤¤¤ë¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Î¥ª¥Õ¥£¥¹¥¹¥£¡¼¥È¤Ç¤¹¡£
 	¾¤Î¥á¥¸¥ã¡¼¤Ê¥ª¥Õ¥£¥¹¥¹¥£¡¼¥È¤È¸ß´¹À­¤¬¤¢¤ê¡¢
 	¤µ¤Þ¤¶¤Þ¤Ê¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ÇÍøÍѤǤ­¤Þ¤¹¡£
+	<application>OpenOffice.org</application>
+	¤«¤é¤Î¿·¤·¤¤¥Õ¥©¡¼¥¯¤Ç¡¢
 	´°Á´¤Ê¥ª¥Õ¥£¥¹À¸»ºÀ­¥¹¥£¡¼¥È¤Ëɬ¿Ü¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó
-	(ʸ½ñºîÀ®¥½¥Õ¥È¥¦¥§¥¢¡¢É½·×»»¥½¥Õ¥È¥¦¥§¥¢¡¢¥×¥ì¥¼¥ó¥Æ¡¼¥·¥ç¥ó¥½¥Õ¥È¥¦¥§¥¢¡¢
-	¿Þ·ÁÉÁ²è¥½¥Õ¥È¥¦¥§¥¢¡¢¥Ç¡¼¥¿¥Ù¡¼¥¹´ÉÍý¥½¥Õ¥È¥¦¥§¥¢¡¢¿ô¼°¥¨¥Ç¥£¥¿)
-	¤ò¤¹¤Ù¤Æ·¤¨¤Æ¤¤¤ë <application>OpenOffice.org</application>
-	¤«¤é¤Î¿·¤·¤¤¥Õ¥©¡¼¥¯¤Ç¤¹¡£
-	¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥¹¥Ú¥ë¥Á¥§¥Ã¥«¡¢¼­½ñ¤Ï¹ñºÝ²½¤µ¤ì¤Æ¤ª¤ê¡¢
-	¿¤¯¤Î¸À¸ì¤ÇÍøÍѤǤ­¤Þ¤¹¡£</para>
+	(ʸ½ñºîÀ®¥½¥Õ¥È¥¦¥§¥¢¡¢É½·×»»¥½¥Õ¥È¥¦¥§¥¢¡¢
+	¥×¥ì¥¼¥ó¥Æ¡¼¥·¥ç¥ó¥½¥Õ¥È¥¦¥§¥¢¡¢¿Þ·ÁÉÁ²è¥½¥Õ¥È¥¦¥§¥¢¡¢
+	¥Ç¡¼¥¿¥Ù¡¼¥¹´ÉÍý¥½¥Õ¥È¥¦¥§¥¢¡¢¿ô¼°¥¨¥Ç¥£¥¿) ¤ò¤¹¤Ù¤Æ·¤¨¤Æ¤¤¤Þ¤¹¡£
+	¿¤¯¤Î¸À¸ì¤ÇÍøÍѤǤ­¡¢
+	¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥¹¥Ú¥ë¥Á¥§¥Ã¥«¡¢¼­½ñ¤Ï¹ñºÝ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para><application>LibreOffice</application>
 	¤Î¥ï¡¼¥É¥×¥í¥»¥Ã¥µ¤Ï¡¢
@@ -933,7 +920,8 @@
 	¤Ë¤ª¤¤¤Æ°ÂÄꤷ¤Æ¥Í¥¤¥Æ¥£¥Ö¤ËÆ°ºî¤·¤Æ¤¤¤Þ¤¹¡£
 	<application>LibreOffice</application>
 	¤Ë¤Ä¤¤¤Æ¤Î¾Ü¤·¤¤¾ðÊó¤Ï¡¢
-	<ulink url="http://www.libreoffice.org/">LibreOffice ¥¦¥§¥Ö¥µ¥¤¥È</ulink>
+	<ulink
+	  url="http://www.libreoffice.org/">libreoffice.org</ulink>
 	¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
       <para>±Ñ¸ìÈǤΠ<application>LibreOffice</application> package
@@ -941,8 +929,8 @@
 
       <screen>&prompt.root; <userinput>pkg_add -r libreoffice</userinput></screen>
 
-      <para>Ports Collection ¤Î <ulink
-	  url="http://www.FreeBSD.org/ports/editors.html">editors</ulink>
+      <para>Ports Collection ¤Î edtors ¥«¥Æ¥´¥ê (<ulink
+	  url="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</ulink>)
 	¥«¥Æ¥´¥ê¤Ë¤Ï¡¢ÃÏ°è²½¤µ¤ì¤¿ <application>LibreOffice</application>
 	¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	ÃÏ°è²½¤µ¤ì¤¿ package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
@@ -954,12 +942,10 @@
 
       <screen>&prompt.user; <userinput>libreoffice</userinput></screen>
 
-      <note>
-	<para>½é²óµ¯Æ°»þ¤Ë¤Ï¡¢¤¤¤¯¤Ä¤«¤Î¼ÁÌ䤬¹Ô¤ï¤ì¡¢
-	  ¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë
-	  <filename class="directory">.libreoffice</filename>
-	  ¥Õ¥©¥ë¥À¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£</para>
-      </note>
+      <para>½é²óµ¯Æ°»þ¤Ë¤Ï¡¢¤¤¤¯¤Ä¤«¤Î¼ÁÌ䤬¹Ô¤ï¤ì¡¢
+	¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë
+	<filename class="directory">.libreoffice</filename>
+	¥Õ¥©¥ë¥À¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£</para>
 
       <para>´õ˾¤Î <application>LibreOffice</application> ¤Î packages
 	¤òÍøÍѤǤ­¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢port ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹¡£
@@ -974,9 +960,9 @@
 	<para>ÃÏ°è²½¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤ò¥Ó¥ë¥É¤·¤¿¤¤¤Î¤Ê¤é¡¢
 	  ´õ˾¤Î¸À¸ì¤Î port ¥Ç¥£¥ì¥¯¥È¥ê¤Ë <application>cd</application>
 	  ¥³¥Þ¥ó¥É¤Ç°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£
-	  Âбþ¤·¤Æ¤¤¤ë¸À¸ì¤Ï¡¢Ports Collection ¤Î <ulink
-	    url="http://www.FreeBSD.org/ports/editors.html">editors</ulink>
-	  ¥«¥Æ¥´¥ê¤Ë¤¢¤ê¤Þ¤¹¡£</para>
+	  Âбþ¤·¤Æ¤¤¤ë¸À¸ì¤Ï¡¢Ports Collection ¤Î editors ¥«¥Æ¥´¥ê (<ulink
+	    url="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</ulink>)
+	  ¤Ë¤¢¤ê¤Þ¤¹¡£</para>
       </note>
     </sect2>
   </sect1>
@@ -1045,16 +1031,16 @@
 
       <para>º£¤ä¿¤¯¤Îʸ½ñ¤¬ Portable Document Format (PDF)
 	¥Õ¥¡¥¤¥ë·Á¼°¤ÇÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-	PDF ¥Õ¥¡¥¤¥ë¤òÆɤà¤Î¤Ë¤è¤¯ÍѤ¤¤é¤ì¤ë¥Ó¥å¡¼¥¢¤¬
+	¤è¤¯ÍѤ¤¤é¤ì¤ë PDF ¥Ó¥å¡¼¥¢¤¬
 	&adobe; ¤¬ &linux; ÍѤ˥ê¥ê¡¼¥¹¤·¤Æ¤¤¤ë
 	<application>&acrobat.reader;</application> ¤Ç¤¹¡£
 	&os; ¤Ï &linux; ¥Ð¥¤¥Ê¥ê¤ò¼Â¹Ô¤Ç¤­¤ë¤Î¤Ç¡¢
 	&os; ¤Ç¤â¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÍøÍѤǤ­¤Þ¤¹¡£
 	¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤«¤é package ¤ÏÍøÍѤǤ­¤Ê¤¤¤¿¤á¡¢
 	ports ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	ÃÏ°è²½¤µ¤ì¤¿¤â¤Î¤¬ Ports Collection ¤Î <ulink
-	  url="http://www.FreeBSD.org/ports/print.html">print</ulink>
-	¥«¥Æ¥´¥ê¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+	ÃÏ°è²½¤µ¤ì¤¿¤â¤Î¤¬ Ports Collection ¤Î print ¥«¥Æ¥´¥ê (<ulink
+	  url="http://www.FreeBSD.org/ports/print.html">freebsd.org/ports/print.html</ulink>)
+	¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para>°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ports Collection ¤«¤é¡¢
 	<application>&acrobat.reader; 9</application>
@@ -1082,17 +1068,14 @@
 	<secondary>¥Ó¥å¡¼¥¢</secondary>
       </indexterm>
 
-      <para><ulink
-	  url="http://www.gnu.org/software/gv/">gv</ulink>
-	¤Ï &postscript; ¤È PDF
-	¤Î¥Ó¥å¡¼¥¢¤Ç¤¹¡£¤³¤ì¤Ï¤â¤È¤â¤È
+      <para><application>gv</application>
+	¤Ï &postscript; ¤È PDF ¤Î¥Ó¥å¡¼¥¢¤Ç¤¹¡£¤³¤ì¤Ï
 	<application>ghostview</application> ¤ò¥Ù¡¼¥¹¤È¤·¤Æ¤¤¤Þ¤¹¤¬¡¢
 	<application>Xaw3d</application>
-	¥é¥¤¥Ö¥é¥ê¤Ë¤è¤Ã¤Æ¤è¤êÎɤ¤³°´Ñ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-	Æ°ºî¤¬Â®¤¯¤Æ¡¢¥æ¡¼¥¶¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤â¥·¥ó¥×¥ë¤Ç¤¹¡£
+	¥¦¥£¥¸¥Ã¥È¥Ä¡¼¥ë¥­¥Ã¥È¤Ë¤è¤Ã¤Æ¤è¤êÎɤ¤³°´Ñ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
 	<application>gv</application> ¤ÏÍÑ»æ¤Î¸þ¤­¤ä¥µ¥¤¥º¡¢
-	³ÈÂç½Ì¾®¡¢¥¢¥ó¥Á¥¨¥¤¥ê¥¢¥¹¤Ê¤É¤¿¤¯¤µ¤ó¤Îµ¡Ç½¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
-	¤Û¤È¤ó¤É¤¹¤Ù¤Æ¤ÎÁàºî¤Ï¥­¡¼¥Ü¡¼¥É¤È¥Þ¥¦¥¹¤ÎξÊý¤Ç¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+	³ÈÂç½Ì¾®¡¢¥¢¥ó¥Á¥¨¥¤¥ê¥¢¥¹¤Ê¤É¤¿¤¯¤µ¤ó¤ÎÀßÄê²Äǽ¤Êµ¡Ç½¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
+	¤Û¤È¤ó¤É¤¹¤Ù¤Æ¤ÎÁàºî¤ò¥­¡¼¥Ü¡¼¥É¤«¥Þ¥¦¥¹¤Î¤É¤Á¤é¤«¤À¤±¤Ç¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
       <para>package ¤«¤é <application>gv</application>
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
@@ -1116,13 +1099,12 @@
 	<secondary>¥Ó¥å¡¼¥¢</secondary>
       </indexterm>
 
-      <para>&os; ¸þ¤±¤Î·Ú¤¤ PDF ¥Ó¥å¡¼¥¢¤ò»È¤¤¤¿¤¤¤Î¤Ê¤é¡¢<ulink
-	  url="http://www.foolabs.com/xpdf/">xpdf</ulink>
+      <para>&os; ¸þ¤±¤Î·Ú¤¤ PDF ¥Ó¥å¡¼¥¢¤ò»È¤¤¤¿¤¤¤Î¤Ê¤é
+	<application>Xpdf</application>
 	¤ò»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
 	¤³¤ì¤Ï¾¯¤Ê¤¤¥ê¥½¡¼¥¹¤ÇÆ°ºî¤¹¤ë¥Ó¥å¡¼¥¢¤Ç¡¢·Ú¤¯¤Æ¸úΨŪ¤Ç¤¹¡£
 	ɸ½à¤Î X ¥Õ¥©¥ó¥È¤òÍøÍѤ·¡¢
-	<application>&motif;</application>,
-	¤½¤Î¾¤Î X ¥Ä¡¼¥ë¥­¥Ã¥È¤òɬÍפȤ·¤Þ¤»¤ó¡£</para>
+	¾¤Î X ¥Ä¡¼¥ë¥­¥Ã¥È¤òɬÍפȤ·¤Þ¤»¤ó¡£</para>
 
       <para><application>Xpdf</application> ¤Î
 	package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1147,12 +1129,11 @@
 	<primary><application>GQview</application></primary>
       </indexterm>
 
-      <para><ulink
-	  url="http://gqview.sourceforge.net/">GQview</ulink>
+      <para><application>GQview</application>
 	¤Ï²èÁü´ÉÍý¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£
 	¥¯¥ê¥Ã¥¯¤Ò¤È¤Ä¤Ç²èÁü¥Õ¥¡¥¤¥ë¤ò³«¤¤¤¿¤ê¡¢³°Éô¥¨¥Ç¥£¥¿¤òµ¯Æ°¤·¤¿¤ê¡¢
 	¥µ¥à¥Í¥¤¥ë²èÁü¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
-	¤Þ¤¿¡¢¥¹¥é¥¤¥É¥·¥ç¡¼¤ä´ðËÜŪ¤Ê¥Õ¥¡¥¤¥ëÁàºîµ¡Ç½¤âÈ÷¤¨¤Æ¤¤¤Þ¤¹¡£
+	¤Þ¤¿¡¢¥¹¥é¥¤¥É¥·¥ç¡¼¤ä´ðËÜŪ¤Ê¥Õ¥¡¥¤¥ëÁàºîµ¡Ç½¤âÈ÷¤¨¤Æ¤ª¤ê¡¢
 	²èÁü¤Î¥³¥ì¥¯¥·¥ç¥ó¤Î´ÉÍý¤ä¡¢½ÅÊ£¤·¤¿¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ë¤³¤È¤¬´Êñ¤Ë¤Ç¤­¤Þ¤¹¡£
 	<application>GQview</application> ¤ÏÁ´²èÌÌɽ¼¨¡¢
 	¤ª¤è¤Ó¹ñºÝ²½¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
@@ -1225,8 +1206,7 @@
 	<primary><application>GnuCash</application></primary>
       </indexterm>
 
-      <para><ulink
-	  url="http://www.gnucash.org/">GnuCash</ulink> ¤Ï¡¢
+      <para><application>GnuCash</application> ¤Ï¡¢
 	<application>GNOME</application> ¤Î°ìÉô¤Ç¡¢
 	»È¤¤¤ä¤¹¤¯¤«¤Ä¶¯ÎϤʥ¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤·¤Æ¥¨¥ó¥É¥æ¡¼¥¶¤ËÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	<application>GnuCash</application> ¤ò»È¤¨¤Ð¡¢
@@ -1265,12 +1245,10 @@
 	<secondary><application>Gnumeric</application></secondary>
       </indexterm>
 
-      <para><ulink
-	  url="http://projects.gnome.org/gnumeric/index.shtml">Gnumeric</ulink> ¤Ï¡¢
+      <para><application>Gnumeric</application> ¤Ï¡¢
 	<application>GNOME</application>
 	¥³¥ß¥å¥Ë¥Æ¥£¤Ë¤è¤Ã¤Æ³«È¯¤µ¤ì¤Æ¤¤¤ëɽ·×»»¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£
-	¥»¥ë¤Î½ñ¼°¤Ë½¾¤Ã¤Æ¥æ¡¼¥¶¤ÎÆþÎϤò¼«Æ°Åª¤Ë
-	<quote>¿ä¬</quote>¤¹¤ëÊØÍø¤Êµ¡Ç½¤ä¡¢
+	¥»¥ë¤Î½ñ¼°¤Ë½¾¤Ã¤Æ¥æ¡¼¥¶¤ÎÆþÎϤò¼«Æ°Åª¤Ë¿ä¬¤¹¤ëÊØÍø¤Êµ¡Ç½¤ä¡¢
 	¿¤¯¤Î¥·¡¼¥±¥ó¥¹¤ËÂФ¹¤ë¼«Æ°Êä´°µ¡Ç½¤¬¤¢¤ê¤Þ¤¹¡£
 	<application>Excel</application>,
 	<application>Lotus 1-2-3</application>,
@@ -1301,15 +1279,14 @@
 	<secondary><application>KMyMoney</application></secondary>
       </indexterm>
 
-      <para><ulink
-	  url="http://kmymoney2.sourceforge.net">KMyMoney</ulink>
+      <para><application>KMyMoney</application>
 	¤Ï¡¢<application>KDE</application>
 	¥³¥ß¥å¥Ë¥Æ¥£¤¬ºîÀ®¤·¤Æ¤¤¤ë¸Ä¿ÍÍѺâ̳´ÉÍý¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤¹¡£
-	¾¦ÍѤθĿÍÍѺâ̳´ÉÍý¥½¥Õ¥È¥¦¥§¥¢¤Ë¸«¤é¤ì¤ëµ¡Ç½¤ò¼è¤êÆþ¤ì¡¢
-	Ä󶡤¹¤ë¤³¤È¤òÌܻؤ·¤Æ¤¤¤Þ¤¹¡£
+	<application>KMyMoney</application> ¤Ï¡¢
+	¾¦ÍѤθĿÍÍѺâ̳´ÉÍý¥½¥Õ¥È¥¦¥§¥¢¤Ë¸«¤é¤ì¤ë½ÅÍפʵ¡Ç½¤òÄ󶡤¹¤ë¤³¤È¤òÌܻؤ·¤Æ¤¤¤Þ¤¹¡£
 	¤Þ¤¿¡¢»È¤¤¤ä¤¹¤¤Ê£¼°Êíµ­µ¡Ç½¤âÆÃħ¤Ç¤¹¡£
-	KMyMoney ¤Ïɸ½à¤Î Quicken Interchange
-	Format (QIF) ¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥Ý¡¼¥È²Äǽ¤Ç¡¢
+	<application>KMyMoney</application> ¤Ïɸ½à¤Î
+	<application>Quicken</application> QIF ¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥Ý¡¼¥È²Äǽ¤Ç¡¢
 	Åê»ñÍúÎò¤äÊ£¿ôÄ̲ߤμ谷¤¤¡¢ºâÀ¯¾õ¶·¤Î¥ì¥Ý¡¼¥È¤òÄ󶡤·¤Þ¤¹¡£</para>
 
       <para>package ¤«¤é <application>KMyMoney</application>


More information about the svn-doc-all mailing list