From owner-svn-doc-all@FreeBSD.ORG Tue Dec 9 18:58:53 2014 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 445F64C1; Tue, 9 Dec 2014 18:58:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2677B36F; Tue, 9 Dec 2014 18:58:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB9Iwrei031595; Tue, 9 Dec 2014 18:58:53 GMT (envelope-from xmj@FreeBSD.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB9Iwq1j031593; Tue, 9 Dec 2014 18:58:52 GMT (envelope-from xmj@FreeBSD.org) Message-Id: <201412091858.sB9Iwq1j031593@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org using -f From: Johannes Jost Meixner Date: Tue, 9 Dec 2014 18:58:52 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46078 - in head/en_US.ISO8859-1/books/handbook: desktop linuxemu X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2014 18:58:53 -0000 Author: xmj (ports committer) Date: Tue Dec 9 18:58:52 2014 New Revision: 46078 URL: https://svnweb.freebsd.org/changeset/doc/46078 Log: Rework desktop and linuxemu bits for c6. Now that ports defaults to CentOS 6.6, redo the relevant handbook bits, replacing Fedora 10 with CentOS 6.6. While there, improve the wording a little. Differential Revision: https://reviews.freebsd.org/D1117 Approved by: wblock, bcr Approved by: swills (mentor) Modified: head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml Tue Dec 9 14:02:20 2014 (r46077) +++ head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml Tue Dec 9 18:58:52 2014 (r46078) @@ -220,27 +220,16 @@ - Install the www/nspluginwrapper + Install www/nspluginwrapper from the port. Due to licensing restrictions, a package is not available. This port requires - emulators/linux_base-f10 which is a - large port. + emulators/linux_base-c6. - Install the - www/linux-f10-flashplugin11 port. Due - to licensing restrictions, a package is not - available. - - - - &prompt.root; ln -s /usr/local/lib/browser_plugins/linux-f10-flashplugin/libflashplayer.so \ - /usr/local/lib/browser_plugins/ - - Create the - /usr/local/lib/browser_plugins - directory if it is not already present. + Install www/linux-c6-flashplugin11 + from the port. Due to licensing restrictions, a package + is not available. @@ -318,13 +307,12 @@ opera. To install &adobe; &flash; plugin support, first compile - the www/linux-f10-flashplugin11 port, - as a package is not available due to licensing restrictions. - Then install either the - www/opera-linuxplugins port or package. + the www/linux-c6-flashplugin11 port. + Licensing restrictions prevent making a package available. + Then install www/opera-linuxplugins. This example compiles both applications from ports: - &prompt.root; cd /usr/ports/www/linux-f10-flashplugin11 + &prompt.root; cd /usr/ports/www/linux-c6-flashplugin11 &prompt.root; make install clean &prompt.root; cd /usr/ports/www/opera-linuxplugins &prompt.root; make install clean Modified: head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml Tue Dec 9 14:02:20 2014 (r46077) +++ head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml Tue Dec 9 18:58:52 2014 (r46078) @@ -120,17 +120,16 @@ 1 2 0xc0100000 16bdb8 kernel 7 1 0xc24db000 d000 linux.ko - The emulators/linux-base-f10 package or + The emulators/linux_base-c6 package or port is the easiest way to install a base set of &linux; libraries and binaries on a &os; system. To install the port: - &prompt.root; cd /usr/ports/emulators/linux_base-f10 + &prompt.root; cd /usr/ports/emulators/linux_base-c6 &prompt.root; make install distclean - In order for &linux; compatibility to be enabled at boot - time, add the following line to - /etc/rc.conf: + For &linux; compatibility to be enabled at boot time, + add this line to /etc/rc.conf: linux_enable="YES" @@ -337,7 +336,7 @@ multi on Running the &mathematica; Installer Before installing &mathematica;, make sure that the - textproc/linux-f10-aspell + textproc/linux-c6-aspell package or port is installed and that the &man.linprocfs.5; file system is mounted.