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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Wed Feb  5 11:26:28 2014
New Revision: 43788
URL: http://svnweb.freebsd.org/changeset/doc/43788

Log:
  - Merge the following from the English version:
  
  	r43126 -> r43754	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	Wed Feb  5 10:46:25 2014	(r43787)
+++ head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Wed Feb  5 11:26:28 2014	(r43788)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r43126
+     Original revision: r43754
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="desktop">
@@ -304,13 +304,13 @@
       <para>ºÇ¿·¤Î <application>Firefox</application> ¤Î package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install firefox</userinput></screen>
 
       <para><application>Firefox</application> ±äĹ¥µ¥Ý¡¼¥ÈÈÇ
 	(ESR: Extended Support Release)	¤òÍøÍѤ·¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢
 	¤«¤ï¤ê¤Ë°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r firefox-esr</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install firefox-esr</userinput></screen>
 
       <para>¥í¡¼¥«¥é¥¤¥ºÈǤϡ¢<package>www/firefox-i18n</package>
 	¤ª¤è¤Ó <package>www/firefox-esr-i18n</package>
@@ -430,7 +430,7 @@
 
       <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r swfdec-plugin</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install swfdec-plugin</userinput></screen>
 
       <para>package ¤òÍøÍѤǤ­¤Ê¤¤¾ì¹ç¤Ï¡¢Ports Collection
 	¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -463,7 +463,7 @@
 	<literal>opera</literal> ¤ò <literal>linux-opera</literal>
 	¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r opera</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install opera</userinput></screen>
 
       <para>¤¢¤ë¤¤¤Ï Ports Collection ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
 	°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¡¢¥Í¥¤¥Æ¥£¥ÖÈǤ¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>      
@@ -559,7 +559,7 @@
       <para><application>Chromium</application> ¤Ï¡¢
 	°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ¹¤ë¤³¤È¤Ç package ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r chromium</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install chromium</userinput></screen>
 
       <para>¤Þ¤¿¤Ï¡¢Ports Collection ¤òÍѤ¤¤Æ
 	¥½¡¼¥¹¤«¤é <application>Chromium</application>
@@ -714,7 +714,7 @@
 	<package>editors/calligra</package> ¤ò¥¤¥ó¥¹¥È¡¼¥ë½ÐÍè¤Þ¤¹¡£
 	package ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r calligra</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install calligra</userinput></screen>
 
       <para>package ¤òÆþ¼ê¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢¤«¤ï¤ê¤Ë Ports Collection
 	¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -742,7 +742,7 @@
       <para><application>AbiWord</application> package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r abiword</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install abiword</userinput></screen>
 
       <para>package ¤òÆþ¼ê¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢
 	Ports Collection ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -771,7 +771,7 @@
 
       <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r gimp</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install gimp</userinput></screen>
 
       <para>¤â¤·¤¯¤Ï¡¢Ports Collection ¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -831,7 +831,7 @@
       <para><application>Apache OpenOffice</application> package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r apache-openoffice</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install apache-openoffice</userinput></screen>
 
       <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Æ
 	<application>Apache OpenOffice</application> ¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -910,7 +910,7 @@
       <para>±Ñ¸ìÈǤΠ<application>LibreOffice</application> package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r libreoffice</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install libreoffice</userinput></screen>
 
       <para>Ports Collection ¤Î edtors ¥«¥Æ¥´¥ê
 	(<link xlink:href="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</link>)
@@ -1063,7 +1063,7 @@
       <para>package ¤«¤é <application>gv</application>
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r gv</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install gv</userinput></screen>
 
       <para>package ¤òÍøÍѤǤ­¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢Ports Collection
 	¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1093,7 +1093,7 @@
       <para><application>Xpdf</application> ¤Î
 	package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r xpdf</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install xpdf</userinput></screen>
 
       <para>package ¤òÆþ¼ê¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢
 	Ports Collection ¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1126,7 +1126,7 @@
       <para><application>GQview</application>
 	package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r gqview</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install gqview</userinput></screen>
 
       <para>package ¤òÆþ¼ê¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢
 	Ports Collection ¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1211,7 +1211,7 @@
       <para><application>GnuCash</application> package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r gnucash</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install gnucash</userinput></screen>
 
       <para>package ¤¬¼ê¤ËÆþ¤é¤Ê¤±¤ì¤Ð¡¢Ports Collection
 	¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1246,7 +1246,7 @@
       <para><application>Gnumeric</application> package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r gnumeric</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install gnumeric</userinput></screen>
 
       <para>package ¤¬¼ê¤ËÆþ¤é¤Ê¤±¤ì¤Ð¡¢Ports Collection
 	¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1278,7 +1278,7 @@
       <para>package ¤«¤é <application>KMyMoney</application>
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r kmymoney-kde4</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install kmymoney-kde4</userinput></screen>
 
       <para>package ¤¬¼ê¤ËÆþ¤é¤Ê¤¤¾ì¹ç¤Ï¡¢
 	Ports Collection ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>