From owner-p4-projects@FreeBSD.ORG Thu Aug 4 20:21:49 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55C68106566B; Thu, 4 Aug 2011 20:21:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 185F01065670 for ; Thu, 4 Aug 2011 20:21:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 056F48FC13 for ; Thu, 4 Aug 2011 20:21:49 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p74KLmuL038377 for ; Thu, 4 Aug 2011 20:21:48 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p74KLmim038374 for perforce@freebsd.org; Thu, 4 Aug 2011 20:21:48 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 4 Aug 2011 20:21:48 GMT Message-Id: <201108042021.p74KLmim038374@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2011 20:21:49 -0000 http://p4web.freebsd.org/@@197198?ac=10 Change 197198 by rene@rene_acer on 2011/08/04 20:20:47 handbook/desktop: 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. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#23 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#23 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -187,11 +187,6 @@ &prompt.root; pkg_add -r firefox36 - If you want to run Firefox 3.5, - use instead: - - &prompt.root; pkg_add -r firefox35 - You can also use the Ports Collection if you prefer to compile from source code: @@ -200,8 +195,7 @@ For Firefox 3.6, in the previous command replace firefox with - firefox36. For Firefox - 3.5 use firefox35 instead. + firefox36. @@ -212,76 +206,6 @@ already installed Firefox. - According to the version of Firefox - you run various steps are required: - - - - For Firefox 3.5 - - 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 &os; - Foundation web site. - - To add &java; support to - Firefox, you first have to install - the java/javavmwrapper port. Then, - download the Diablo &jre; package - from , - and install it with &man.pkg.add.1;. - - - The above site does not provide binary packages for - &os; 8.X. It is however possible - to use the packages for &os; 7.X - on an 8.X system. Simply install the - misc/compat7x port before - installing the package. - Alternatively, Diablo &jre; - (as well as Diablo &jdk;) may be - installed using the Ports Collection (the relevant ports are - java/diablo-jre16 and - java/diablo-jdk16). - 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 - make install command - is invoked. - - - Start your browser, enter - about:plugins in the location bar and press - Enter. A page listing the installed plugins - will be displayed; the &java; - plugin should be listed there now. If it is not, each user - will have to run the following command: - - &prompt.user; ln -s /usr/local/diablo-jre1.6.0/plugin/i386/ns7/libjavaplugin_oji.so \ - $HOME/.mozilla/plugins/ - - or, if you installed the Diablo - &jdk; package: - - &prompt.user; ln -s /usr/local/diablo-jdk1.6.0/jre/plugin/i386/ns7/libjavaplugin_oji.so \ - $HOME/.mozilla/plugins/ - - Then relaunch your browser. - - - The commands above assume you are running the - &arch.i386; architecture, &arch.amd64; packages are also - available. - - - - - For Firefox 3.6 and 5.0<anchor id="moz-java-plugin-5"> - Install OpenJDK 6 through the Ports Collection by typing: @@ -297,18 +221,18 @@ Make sure you have kept the default configuration options for both ports. - Each user will have to run the following command: - - &prompt.user; ln -s /usr/local/lib/IcedTeaPlugin.so \ - $HOME/.mozilla/plugins/ - Start your browser, enter about:plugins in the location bar and press Enter. A page listing the installed plugins will be displayed; the &java; plugin should be listed there now. - - + + If the browser is unable to find the plugin, each user + will have to run the following command and relaunch the + browser: + + &prompt.user; ln -s /usr/local/lib/IcedTeaPlugin.so \ + $HOME/.mozilla/plugins/ @@ -476,7 +400,7 @@ appear with all the currently available plugins. To add the &java; plugin, - follow the instructions for + follow the instructions for Firefox.