From owner-svn-doc-all@FreeBSD.ORG Sun Oct 28 19:36:16 2012 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 475EBF07; Sun, 28 Oct 2012 19:36:16 +0000 (UTC) (envelope-from blackend@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2B0748FC08; Sun, 28 Oct 2012 19:36:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9SJaGFj083825; Sun, 28 Oct 2012 19:36:16 GMT (envelope-from blackend@svn.freebsd.org) Received: (from blackend@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9SJaFuD083823; Sun, 28 Oct 2012 19:36:15 GMT (envelope-from blackend@svn.freebsd.org) Message-Id: <201210281936.q9SJaFuD083823@svn.freebsd.org> From: Marc Fonvieille Date: Sun, 28 Oct 2012 19:36:15 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r39828 - head/en_US.ISO8859-1/books/handbook/desktop 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.14 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: Sun, 28 Oct 2012 19:36:16 -0000 Author: blackend Date: Sun Oct 28 19:36:15 2012 New Revision: 39828 URL: http://svn.freebsd.org/changeset/doc/39828 Log: OpenOffice.org is now Apache OpenOffice, so let's update a bit the related parts of this chapter. Modified: head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml Sun Oct 28 16:49:03 2012 (r39827) +++ head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml Sun Oct 28 19:36:15 2012 (r39828) @@ -61,7 +61,7 @@ KOffice, AbiWord, The GIMP, - OpenOffice.org, + Apache OpenOffice, LibreOffice) @@ -557,7 +557,7 @@ - OpenOffice.org + Apache OpenOffice heavy huge &jdk;, Mozilla @@ -687,16 +687,24 @@ - OpenOffice.org + Apache OpenOffice - OpenOffice.org + Apache OpenOffice office suite - OpenOffice.org + Apache OpenOffice - OpenOffice.org includes all of the + On 1 June 2011, Oracle Corporation donated the + OpenOffice.org code base to the + Apache Software Foundation. + OpenOffice.org is now known as + Apache OpenOffice and developed + under the wing of the Apache Software Foundation's + Incubator. + + Apache OpenOffice includes all of the mandatory applications in a complete office productivity suite: a word processor, a spreadsheet, a presentation manager, and a drawing program. Its user interface is very similar @@ -707,29 +715,29 @@ dictionaries. The word processor of - OpenOffice.org uses a native XML + Apache OpenOffice uses a native XML file format for increased portability and flexibility. The spreadsheet program features a macro language and it can be interfaced with external databases. - OpenOffice.org is already stable + Apache OpenOffice is already stable and runs natively on &windows;, &solaris;, Linux, FreeBSD, and &macos; X. More - information about OpenOffice.org + information about Apache OpenOffice can be found on the - OpenOffice.org web site. + Apache OpenOffice web site. For FreeBSD specific information, and to directly download packages, use the FreeBSD OpenOffice.org + url="http://porting.openoffice.org/freebsd/">FreeBSD Apache OpenOffice Porting Team's web site. - To install OpenOffice.org, + To install Apache OpenOffice, do: - &prompt.root; pkg_add -r openoffice.org + &prompt.root; pkg_add -r apache-openoffice When running a -RELEASE version of &os;, this should work. - Otherwise, you should look on the &os; OpenOffice.org Porting Team's + Otherwise, you should look on the &os; Apache OpenOffice Porting Team's web site to download and install the appropriate package using &man.pkg.add.1;. Both the current release and development version are available for download at this @@ -738,9 +746,13 @@ Once the package is installed, you just have to type the following command to run - OpenOffice.org: + Apache OpenOffice: - &prompt.user; openoffice.org + &prompt.user; openoffice-X.Y.Z + + where X.Y.Z is the version number + of the installed Apache OpenOffice, + e.g., 3.4.0. During the first launch, you will be asked some @@ -748,12 +760,12 @@ will be created in your home directory. - If the OpenOffice.org packages + If the Apache OpenOffice packages are not available, you still have the option to compile the port. However, you must bear in mind that it requires a lot of disk space and a fairly long time to compile. - &prompt.root; cd /usr/ports/editors/openoffice.org-3 + &prompt.root; cd /usr/ports/editors/openoffice-3 &prompt.root; make install clean @@ -771,10 +783,14 @@ Once this is done, - OpenOffice.org can be launched with + Apache OpenOffice can be launched with the command: - &prompt.user; openoffice.org + &prompt.user; openoffice-X.Y.Z + + where X.Y.Z is the version number + of the installed Apache OpenOffice, + e.g., 3.4.0.