Remove the instructions to install Firefox 3.5 now that it has been

removed from the Ports Collection.  Also remove the instructions to
install the JDK 1.6 plugin since these were specific to Firefox 3.5.

Reviewed by:	bcr, gjb
This commit is contained in:
Rene Ladan 2011-08-07 12:37:58 +00:00
parent f78f596d95
commit ba943c8e83
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=37531

View file

@ -187,11 +187,6 @@
<screen>&prompt.root; <userinput>pkg_add -r firefox36</userinput></screen>
<para>If you want to run <application>Firefox</application> 3.5,
use instead:</para>
<screen>&prompt.root; <userinput>pkg_add -r firefox35</userinput></screen>
<para>You can also use the Ports Collection if you
prefer to compile from source code:</para>
@ -200,8 +195,7 @@
<para>For <application>Firefox</application> 3.6, in the
previous command replace <literal>firefox</literal> with
<literal>firefox36</literal>. For <application>Firefox</application>
3.5 use <literal>firefox35</literal> instead.</para>
<literal>firefox36</literal>.</para>
</sect2>
<sect2 id="moz-java-plugin">
@ -212,76 +206,6 @@
already installed <application>Firefox</application>.</para>
</note>
<para>According to the version of <application>Firefox</application>
you run various steps are required:</para>
<procedure>
<step>
<title>For Firefox 3.5</title>
<para>The &os; Foundation has a license with Sun Microsystems to
distribute &os; binaries for the Java Runtime Environment
(&jre;) and Java Development Kit (&jdk;). Binary packages for
&os; are available on the <ulink
url="http://www.freebsdfoundation.org/downloads/java.shtml">&os;
Foundation</ulink> web site.</para>
<para>To add &java; support to
<application>Firefox</application>, you first have to install
the <filename
role="package">java/javavmwrapper</filename> port. Then,
download the <application>Diablo &jre;</application> package
from <ulink
url="http://www.freebsdfoundation.org/downloads/java.shtml"></ulink>,
and install it with &man.pkg.add.1;.</para>
<note>
<para>The above site does not provide binary packages for
&os;&nbsp;8.<replaceable>X</replaceable>. It is however possible
to use the packages for &os;&nbsp;7.<replaceable>X</replaceable>
on an 8.<replaceable>X</replaceable> system. Simply install the
<filename role="package">misc/compat7x</filename> port before
installing the package.</para>
<para>Alternatively, <application>Diablo &jre;</application>
(as well as <application>Diablo &jdk;</application>) may be
installed using the Ports Collection (the relevant ports are
<filename role="package">java/diablo-jre16</filename> and
<filename role="package">java/diablo-jdk16</filename>).
Installing from the Ports Collection requires the source files
(distfiles) to be downloaded manually due to licensing issues.
Specific download instructions are provided when the
<command>make <maketarget>install</maketarget></command> command
is invoked.</para>
</note>
<para>Start your browser, enter
<literal>about:plugins</literal> in the location bar and press
<keycap>Enter</keycap>. A page listing the installed plugins
will be displayed; the <application>&java;</application>
plugin should be listed there now. If it is not, each user
will have to run the following command:</para>
<screen>&prompt.user; <userinput>ln -s /usr/local/diablo-jre1.6.0/plugin/<replaceable>i386</replaceable>/ns7/libjavaplugin_oji.so \
$HOME/.mozilla/plugins/</userinput></screen>
<para>or, if you installed the <application>Diablo
&jdk;</application> package:</para>
<screen>&prompt.user; <userinput>ln -s /usr/local/diablo-jdk1.6.0/jre/plugin/<replaceable>i386</replaceable>/ns7/libjavaplugin_oji.so \
$HOME/.mozilla/plugins/</userinput></screen>
<para>Then relaunch your browser.</para>
<note>
<para>The commands above assume you are running the
&arch.i386; architecture, &arch.amd64; packages are also
available.</para>
</note>
</step>
<step>
<title>For Firefox 3.6 and 5.0<anchor id="moz-java-plugin-5"></title>
<para>Install <application>OpenJDK 6</application>
through the Ports Collection by typing:</para>
@ -309,8 +233,6 @@
<screen>&prompt.user; <userinput>ln -s /usr/local/lib/IcedTeaPlugin.so \
$HOME/.mozilla/plugins/</userinput></screen>
</step>
</procedure>
</sect2>
<sect2 id="moz-flash-plugin">
@ -478,7 +400,7 @@
appear with all the currently available plugins.</para>
<para>To add the <application>&java;</application> plugin,
follow the <link linkend="moz-java-plugin-5">instructions for
follow the <link linkend="moz-java-plugin">instructions for
Firefox</link>.</para>
</sect2>