svn commit: r39835 - head/ja_JP.eucJP/books/handbook/desktop
Ryusuke SUZUKI
ryusuke at FreeBSD.org
Mon Oct 29 12:44:40 UTC 2012
Author: ryusuke
Date: Mon Oct 29 12:44:39 2012
New Revision: 39835
URL: http://svn.freebsd.org/changeset/doc/39835
Log:
- Merge the following from the English version:
r39265 -> r39828 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 Mon Oct 29 04:28:28 2012 (r39834)
+++ head/ja_JP.eucJP/books/handbook/desktop/chapter.xml Mon Oct 29 12:44:39 2012 (r39835)
@@ -3,7 +3,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r39265
+ Original revision: r39828
$FreeBSD$
-->
@@ -65,8 +65,8 @@
<para>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó (<application>KOffice</application>,
<application>AbiWord</application>,
<application>GIMP</application>,
- <application>OpenOffice.org</application>,
- <application>LibreOffice</application> ¤Ê¤É)</para>
+ <application>Apache OpenOffice</application>,
+ <application>LibreOffice</application> ¤Ê¤É)</para>
</listitem>
<listitem>
@@ -582,7 +582,7 @@
</row>
<row>
- <entry><application>OpenOffice.org</application></entry>
+ <entry><application>Apache OpenOffice</application></entry>
<entry>¿</entry>
<entry>ÇüÂç</entry>
<entry><application>&jdk;</application>, <application>Mozilla</application></entry>
@@ -714,16 +714,24 @@
</sect2>
<sect2>
- <title>OpenOffice.org</title>
+ <title>Apache OpenOffice</title>
<indexterm>
- <primary><application>OpenOffice.org</application></primary>
+ <primary><application>Apache OpenOffice</application></primary>
</indexterm>
<indexterm>
<primary>¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È</primary>
- <secondary><application>OpenOffice.org</application></secondary>
+ <secondary><application>Apache OpenOffice</application></secondary>
</indexterm>
- <para><application>OpenOffice.org</application>
+ <para>2011 ǯ 7 ·î 1 Æü¡¢Oracle Corporation ¤Ï
+ <application>OpenOffice.org</application> ¤Î¥³¡¼¥É¥Ù¡¼¥¹¤ò
+ Apache Software Foundation ¤Ø´ó£¤·¤Þ¤·¤¿¡£
+ ¸½ºß <application>OpenOffice.org</application> ¤Ï¡¢
+ <application>Apache OpenOffice</application> ¤È¤·¤ÆÃΤé¤ì¡¢
+ Apache Software Foundation
+ ¤Î¥¤¥ó¥¥å¥Ù¡¼¥¿¥×¥í¥¸¥§¥¯¥È¤È¤·¤Æ³«È¯¤¬¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+
+ <para><application>Apache OpenOffice</application>
¤Ï¡¢´°Á´¤Ê¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤Ëɬ¿Ü¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó
(¥ï¡¼¥É¥×¥í¥»¥Ã¥µ¡¢É½·×»»¥½¥Õ¥È¥¦¥§¥¢¡¢
¥×¥ì¥¼¥ó¥Æ¡¼¥·¥ç¥ó¥½¥Õ¥È¥¦¥§¥¢¡¢¤½¤·¤Æ¿Þ·ÁÉÁ²è¥½¥Õ¥È¥¦¥§¥¢)
@@ -733,40 +741,44 @@
¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥¹¥Ú¥ë¥Á¥§¥Ã¥«¡¢¼½ñ¤Ï¹ñºÝ²½¤µ¤ì¤Æ¤ª¤ê¡¢
¿¤¯¤Î¸À¸ì¤ÇÍøÍѤǤ¤Þ¤¹¡£</para>
- <para><application>OpenOffice.org</application>
+ <para><application>Apache OpenOffice</application>
¤Î¥ï¡¼¥É¥×¥í¥»¥Ã¥µ¤Ï¡¢¥Í¥¤¥Æ¥£¥Ö¤Î¥Õ¥¡¥¤¥ë·Á¼°¤Ë XML ¤òºÎÍѤ¹¤ë¤³¤È¤Ç
¥Ý¡¼¥¿¥Ó¥ê¥Æ¥£¤ä½ÀÆðÀ¤ò¹â¤á¤Æ¤¤¤Þ¤¹¡£
ɽ·×»»¥½¥Õ¥È¥¦¥§¥¢¤Ë¤Ï¥Þ¥¯¥íµ¡Ç½¤¬¤¢¤ê¡¢
³°Éô¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÈÀܳ¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£
- <application>OpenOffice.org</application> ¤Ï¡¢¤¹¤Ç¤Ë
+ <application>Apache OpenOffice</application> ¤Ï¡¢¤¹¤Ç¤Ë
&windows;, &solaris;, Linux, FreeBSD, &macos; X
¤Ë¤ª¤¤¤Æ°ÂÄꤷ¤Æ¥Í¥¤¥Æ¥£¥Ö¤ËÆ°ºî¤·¤Æ¤¤¤Þ¤¹¡£
- <application>OpenOffice.org</application>
+ <application>Apache OpenOffice</application>
¤Ë¤Ä¤¤¤Æ¤Î¾Ü¤·¤¤¾ðÊó¤Ï¡¢
- <ulink url="http://www.openoffice.org/">OpenOffice.org web ¥µ¥¤¥È</ulink>
+ <ulink url="http://incubator.apache.org/openofficeorg/">Apache OpenOffice web ¥µ¥¤¥È</ulink>
¤ò¤´Í÷¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢
- <ulink url="http://porting.openoffice.org/freebsd/">FreeBSD OpenOffice.org ¥×¥í¥¸¥§¥¯¥È¥Á¡¼¥à</ulink>
+ <ulink url="http://porting.openoffice.org/freebsd/">FreeBSD Apache OpenOffice ¥×¥í¥¸¥§¥¯¥È¥Á¡¼¥à</ulink>
¤Î Web ¥µ¥¤¥È¤«¤é¡¢FreeBSD ÆÃͤξðÊó¤ä
packages ¤òľÀܼèÆÀ¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£</para>
- <para><application>OpenOffice.org</application>
+ <para><application>Apache OpenOffice.org</application>
¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
- <screen>&prompt.root; <userinput>pkg_add -r openoffice.org</userinput></screen>
+ <screen>&prompt.root; <userinput>pkg_add -r apache-opeonoffice</userinput></screen>
<note>
<para>&os; ¤Î¥ê¥ê¡¼¥¹ÈǤò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¤³¤ÎÁàºî¤Ï¤¦¤Þ¤¯¤¤¤¯¤Ç¤·¤ç¤¦¡£
- ¤½¤ì°Ê³°¤ÎÈǤò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¢&os; <application>OpenOffice.org</application> Porting Team
- ¤Î web ¥µ¥¤¥È¤«¤éŬÀڤʥѥ屡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¡¢
+ ¤½¤ì°Ê³°¤ÎÈǤò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¢&os; <application>Apache OpenOffice</application>
+ °Ü¿¢¥Á¡¼¥à¤Î web ¥µ¥¤¥È¤«¤éŬÀڤʥѥ屡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¡¢
&man.pkg.add.1; ¤ò»ÈÍѤ·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
¤³¤³¤«¤é¤Ï¥ê¥ê¡¼¥¹ÈǤȳ«È¯ÈǤÎξÊý¤¬¥À¥¦¥ó¥í¡¼¥É¤Ç¤¤Þ¤¹¡£</para>
</note>
<para>package
¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ¹¤ë¤È¡¢
- <application>OpenOffice.org</application> ¤¬µ¯Æ°¤·¤Þ¤¹¡£</para>
+ <application>Apache OpenOffice</application> ¤¬µ¯Æ°¤·¤Þ¤¹¡£</para>
+
+ <screen>&prompt.user; <userinput>openoffice-<replaceable>X.Y.Z</replaceable></userinput></screen>
- <screen>&prompt.user; <userinput>openoffice.org</userinput></screen>
+ <para>¤³¤³¤Ç <replaceable>X.Y.Z</replaceable> ¤Ï¡¢
+ <replaceable>3.4.0</replaceable> ¤Î¤è¤¦¤Ê¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë
+ <application>Apache OpenOffice</application> ¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤Ç¤¹¡£</para>
<note>
<para>½é²óµ¯Æ°»þ¤Ë¡¢¤¤¤¯¤Ä¤«¤Î¼ÁÌ䤬ɽ¼¨¤µ¤ì¡¢
@@ -774,12 +786,12 @@
¥Õ¥©¥ë¥À¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£</para>
</note>
- <para><application>OpenOffice.org</application> ¤Î packages
+ <para><application>Apache OpenOffice</application> ¤Î packages
¤òÍøÍѤǤ¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢port ¤òÍøÍѤ¹¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹¤¬¡¢
¥³¥ó¥Ñ¥¤¥ë¤Ë¤ÏÂ礤ʥǥ£¥¹¥¯¥¹¥Ú¡¼¥¹¤È¡¢
ËÜÅö¤Ë¤«¤Ê¤êŤ¤»þ´Ö¤òɬÍפȤ¹¤ë¤³¤È¤ò¿´¤Ëα¤á¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice.org-3</userinput>
+ <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice-3</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
<note>
@@ -794,10 +806,13 @@
</note>
<para>¥¤¥ó¥¹¥È¡¼¥ë¤¬½ª¤ï¤Ã¤¿¤é¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç
- <application>OpenOffice.org</application> ¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+ <application>Apache OpenOffice</application> ¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
- <screen>&prompt.user; <userinput>openoffice.org</userinput></screen>
+ <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>
</sect2>
<sect2>
More information about the svn-doc-head
mailing list