From 361c4264ebf8adad788399105dadf2f587325d93 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Mon, 28 Mar 2011 11:17:45 +0000
Subject: [PATCH] Merge the following from the English version:
1.104 -> 1.105 doc/ja_JP.eucJP/books/handbook/desktop/chapter.sgml
---
ja_JP.eucJP/books/handbook/desktop/chapter.sgml | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/ja_JP.eucJP/books/handbook/desktop/chapter.sgml b/ja_JP.eucJP/books/handbook/desktop/chapter.sgml
index a6f1cbce3e..214eff2a85 100644
--- a/ja_JP.eucJP/books/handbook/desktop/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/desktop/chapter.sgml
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: 1.104
+ Original revision: 1.105
$FreeBSD$
-->
@@ -196,9 +196,14 @@
<screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen>
- <para>�����Ǥϡ�<application>Firefox</application> 3.6
+ <para>�����Ǥϡ�<application>Firefox</application> 4.0
�����ȡ��뤵��ޤ���
- <application>Firefox</application> 3.5 �����Ѥ��������ˤϡ�
+ <application>Firefox</application> 3.6 �����Ѥ��������ˤϡ�
+ �����˰ʲ��Τ褦�����Ϥ��Ƥ���������</para>
+
+ <screen>&prompt.root; <userinput>pkg_add -r firefox36</userinput></screen>
+
+ <para><application>Firefox</application> 3.5 �����Ѥ��������ˤϡ�
�����˰ʲ��Τ褦�����Ϥ��Ƥ���������</para>
<screen>&prompt.root; <userinput>pkg_add -r firefox35</userinput></screen>
@@ -209,8 +214,10 @@
<screen>&prompt.root; <userinput>cd /usr/ports/www/firefox</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
- <para><application>Firefox</application> 3.5 �����Ѥ�����ϡ�
+ <para><application>Firefox</application> 3.6 �����Ѥ�����ϡ�
��Υ��ޥ�ɤ� <literal>firefox</literal> ��
+ <literal>firefox36</literal> ���֤�������
+ <application>Firefox</application> 3.5 �����Ѥ�����ˤϡ�
<literal>firefox35</literal> ���֤������Ƥ���������</para>
</sect2>
@@ -291,7 +298,7 @@
</step>
<step>
- <title>Firefox 3.6</title>
+ <title>Firefox 3.6 ����� 4.0</title>
<para>�ʲ��Τ褦�����Ϥ��ơ�Ports Collection ����
<application>OpenJDK 6</application> �ȡ��뤷�Ƥ���������</para>