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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Sat Nov 16 13:36:40 UTC 2013 

Author: ryusuke
Date: Sat Nov 16 13:36:40 2013
New Revision: 43198
URL: http://svnweb.freebsd.org/changeset/doc/43198

Log:
  - Merge the following from the English version:
  
  	r42925 -> r43126	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 Nov 15 18:51:38 2013	(r43197)
+++ head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Sat Nov 16 13:36:40 2013	(r43198)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r42925
+     Original revision: r43126
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="desktop">
@@ -232,7 +232,8 @@
       ¤³¤ì¤é¤Î¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤òÀßÄꤹ¤ë¤¿¤á¤Î¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï
       <xref linkend="x11-wm"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-    <para>·ÚÎ̤ʥ֥饦¥¶¤Ë¤Ï¡¢<package>www/dillo2</package>, <package>www/links</package>, ¤ª¤è¤Ó <package>www/w3m</package>
+    <para>·ÚÎ̤ʥ֥饦¥¶¤Ë¤Ï¡¢<package>www/dillo2</package>,
+      <package>www/links</package>, ¤ª¤è¤Ó <package>www/w3m</package>
       ¤È¤¤¤Ã¤¿¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
     <para>¤³¤ÎÀá¤Ç¤Ï°Ê²¼¤Î¿Íµ¤¤Î¤¢¤ë web ¥Ö¥é¥¦¥¶¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
@@ -309,11 +310,13 @@
 
       <screen>&prompt.root; <userinput>pkg_add -r firefox-esr</userinput></screen>
 
-      <para>¥í¡¼¥«¥é¥¤¥ºÈǤϡ¢<package>www/firefox-i18n</package> ¤ª¤è¤Ó <package>www/firefox-esr-i18n</package>
+      <para>¥í¡¼¥«¥é¥¤¥ºÈǤϡ¢<package>www/firefox-i18n</package>
+	¤ª¤è¤Ó <package>www/firefox-esr-i18n</package>
 	¤«¤éÍøÍѤǤ­¤Þ¤¹¡£</para>
 
       <para>¤«¤ï¤ê¤Ë¥½¡¼¥¹¥³¡¼¥É¤«¤é´õ˾¤Î <application>firefox</application>
-	¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï <package>www/firefox</package> ¤ò¥Ó¥ë¥É¤·¤Þ¤¹¤¬¡¢
+	¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
+	¤³¤ÎÎã¤Ç¤Ï <package>www/firefox</package> ¤ò¥Ó¥ë¥É¤·¤Þ¤¹¤¬¡¢
 	<literal>firefox</literal> ¤ÎÉôʬ¤Ï¡¢
 	¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë ESR ¤ä¥í¡¼¥«¥é¥¤¥º¤ËÃÖ¤­´¹¤¨¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
 
@@ -470,7 +473,8 @@
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢<literal>opera</literal> ¤ò
 	<literal>linux-opera</literal> ¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <para>&adobe; &flash; ¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢¤Þ¤º <package>www/linux-f10-flashplugin11</package> port
+      <para>&adobe; &flash; ¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
+	¤Þ¤º <package>www/linux-f10-flashplugin11</package> port
 	¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£package ¤Ï¡¢¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤Ë¤è¤êÍøÍѤǤ­¤Þ¤»¤ó¡£
 	¤½¤Î¸å¡¢<package>www/opera-linuxplugins</package> port
 	¤â¤·¤¯¤Ï package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
@@ -698,7 +702,8 @@
 	¤Ï¥×¥ì¥¼¥ó¥Æ¡¼¥·¥ç¥ó¥½¥Õ¥È¥¦¥§¥¢¡¢¤½¤·¤Æ
 	<application>Karbon</application> ¤Ï¿Þ·ÁÉÁ²è¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£</para>
 
-      <para>&os; ¤Ç¤Ï package ¤Þ¤¿¤Ï port ¤«¤é <package>editors/calligra</package> ¤ò¥¤¥ó¥¹¥È¡¼¥ë½ÐÍè¤Þ¤¹¡£
+      <para>&os; ¤Ç¤Ï package ¤Þ¤¿¤Ï port ¤«¤é
+	<package>editors/calligra</package> ¤ò¥¤¥ó¥¹¥È¡¼¥ë½ÐÍè¤Þ¤¹¡£
 	package ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r calligra</userinput></screen>
@@ -764,7 +769,8 @@
       <screen>&prompt.root; <userinput>cd /usr/ports/graphics/gimp</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>Ports Collection ¤Î graphics ¥«¥Æ¥´¥ê (<link xlink:href="http://www.FreeBSD.org/ports/graphics.html">freebsd.org/ports/graphics.html</link>)
+      <para>Ports Collection ¤Î graphics ¥«¥Æ¥´¥ê (<link
+	xlink:href="http://www.FreeBSD.org/ports/graphics.html">freebsd.org/ports/graphics.html</link>)
 	¤Ë¤Ï¡¢<application>GIMP</application> ¤Ë´ØÏ¢¤·¤¿¥×¥é¥°¥¤¥ó¡¢
 	¥Ø¥ë¥×¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥æ¡¼¥¶¥Þ¥Ë¥å¥¢¥ë¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
@@ -807,8 +813,10 @@
 	&windows;, &linux;, &os; ¤ª¤è¤Ó &macos; X
 	¤Ë¤ª¤¤¤Æ°ÂÄꤷ¤Æ¥Í¥¤¥Æ¥£¥Ö¤ËÆ°ºî¤·¤Æ¤¤¤Þ¤¹¡£
 	<application>Apache OpenOffice</application>
-	¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï¡¢<link xlink:href="http://openoffice.org/">openoffice.org</link>
-	¤ò¤´Í÷¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢<link xlink:href="http://porting.openoffice.org/freebsd/">porting.openoffice.org/freebsd/</link>
+	¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï¡¢
+	<link xlink:href="http://openoffice.org/">openoffice.org</link>
+	¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
+	¤Þ¤¿¡¢<link xlink:href="http://porting.openoffice.org/freebsd/">porting.openoffice.org/freebsd/</link>
 	¤«¤é¡¢&os; ÆÃÍ­¤Î¾ðÊó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <para><application>Apache OpenOffice</application> package
@@ -860,7 +868,8 @@
 	<secondary><application>LibreOffice</application></secondary>
       </indexterm>
 
-      <para><application>LibreOffice</application> ¤Ï¡¢<link xlink:href="http://www.documentfoundation.org/">documentfoundation.org</link>
+      <para><application>LibreOffice</application> ¤Ï¡¢
+	<link xlink:href="http://www.documentfoundation.org/">documentfoundation.org</link>
 	¤¬³«È¯¤·¤Æ¤¤¤ë¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Î¥ª¥Õ¥£¥¹¥¹¥£¡¼¥È¤Ç¤¹¡£
 	¾¤Î¥á¥¸¥ã¡¼¤Ê¥ª¥Õ¥£¥¹¥¹¥£¡¼¥È¤È¸ß´¹À­¤¬¤¢¤ê¡¢
 	¤µ¤Þ¤¶¤Þ¤Ê¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ÇÍøÍѤǤ­¤Þ¤¹¡£
@@ -892,7 +901,8 @@
 
       <screen>&prompt.root; <userinput>pkg_add -r libreoffice</userinput></screen>
 
-      <para>Ports Collection ¤Î edtors ¥«¥Æ¥´¥ê (<link xlink:href="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</link>)
+      <para>Ports Collection ¤Î edtors ¥«¥Æ¥´¥ê
+	(<link xlink:href="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</link>)
 	¥«¥Æ¥´¥ê¤Ë¤Ï¡¢ÃÏ°è²½¤µ¤ì¤¿ <application>LibreOffice</application>
 	¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	ÃÏ°è²½¤µ¤ì¤¿ package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
@@ -906,8 +916,7 @@
 
       <para>½é²óµ¯Æ°»þ¤Ë¤Ï¡¢¤¤¤¯¤Ä¤«¤Î¼ÁÌ䤬¹Ô¤ï¤ì¡¢
 	¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë
-	<filename>.libreoffice</filename>
-	¥Õ¥©¥ë¥À¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£</para>
+	<filename>.libreoffice</filename> ¥Õ¥©¥ë¥À¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£</para>
 
       <para>´õ˾¤Î <application>LibreOffice</application> ¤Î packages
 	¤òÍøÍѤǤ­¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢port ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹¡£
@@ -922,7 +931,8 @@
 	<para>ÃÏ°è²½¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤ò¥Ó¥ë¥É¤·¤¿¤¤¤Î¤Ê¤é¡¢
 	  ´õ˾¤Î¸À¸ì¤Î port ¥Ç¥£¥ì¥¯¥È¥ê¤Ë <application>cd</application>
 	  ¥³¥Þ¥ó¥É¤Ç°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£
-	  Âбþ¤·¤Æ¤¤¤ë¸À¸ì¤Ï¡¢Ports Collection ¤Î editors ¥«¥Æ¥´¥ê (<link xlink:href="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</link>)
+	  Âбþ¤·¤Æ¤¤¤ë¸À¸ì¤Ï¡¢Ports Collection ¤Î editors ¥«¥Æ¥´¥ê
+	  (<link xlink:href="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</link>)
 	  ¤Ë¤¢¤ê¤Þ¤¹¡£</para>
       </note>
     </sect2>
@@ -999,7 +1009,8 @@
 	&os; ¤Ç¤â¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÍøÍѤǤ­¤Þ¤¹¡£
 	¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤«¤é package ¤ÏÍøÍѤǤ­¤Ê¤¤¤¿¤á¡¢
 	ports ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	ÃÏ°è²½¤µ¤ì¤¿¤â¤Î¤¬ Ports Collection ¤Î print ¥«¥Æ¥´¥ê (<link xlink:href="http://www.FreeBSD.org/ports/print.html">freebsd.org/ports/print.html</link>)
+	ÃÏ°è²½¤µ¤ì¤¿¤â¤Î¤¬ Ports Collection ¤Î print ¥«¥Æ¥´¥ê
+	(<link xlink:href="http://www.FreeBSD.org/ports/print.html">freebsd.org/ports/print.html</link>)
 	¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para>°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ports Collection ¤«¤é¡¢

More information about the svn-doc-head mailing list