OpenOffice.org is now Apache OpenOffice, so let's update a bit

the related parts of this chapter.

en_US.ISO8859-1/books/handbook/desktop/chapter.xml

@@ -61,7 +61,7 @@
 	  <application>KOffice</application>,
 	  <application>AbiWord</application>,
 	  <application>The GIMP</application>,
-	  <application>OpenOffice.org</application>,
+	  <application>Apache OpenOffice</application>,
 	  <application>LibreOffice</application>)</para>
       </listitem>
 
@@ -557,7 +557,7 @@
 	  </row>
 
 	  <row>
-	    <entry><application>OpenOffice.org</application></entry>
+	    <entry><application>Apache OpenOffice</application></entry>
 	    <entry>heavy</entry>
 	    <entry>huge</entry>
 	    <entry><application>&jdk;</application>, <application>Mozilla</application></entry>
@@ -687,16 +687,24 @@
     </sect2>
 
     <sect2>
-      <title>OpenOffice.org</title>
+      <title>Apache OpenOffice</title>
       <indexterm>
-	<primary><application>OpenOffice.org</application></primary>
+	<primary><application>Apache OpenOffice</application></primary>
       </indexterm>
       <indexterm>
 	<primary>office suite</primary>
-	<secondary><application>OpenOffice.org</application></secondary>
+	<secondary><application>Apache OpenOffice</application></secondary>
       </indexterm>
 
-      <para><application>OpenOffice.org</application> includes all of the
+      <para>On 1 June 2011, Oracle Corporation donated the
+	<application>OpenOffice.org</application> code base to the
+	Apache Software Foundation.
+	<application>OpenOffice.org</application> is now known as
+	<application>Apache OpenOffice</application> and developed
+	under the wing of the Apache Software Foundation's
+	Incubator.</para>
+
+      <para><application>Apache OpenOffice</application> 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.</para>
 
       <para>The word processor of
-	<application>OpenOffice.org</application> uses a native XML
+	<application>Apache OpenOffice</application> 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.
-	<application>OpenOffice.org</application> is already stable
+	<application>Apache OpenOffice</application> is already stable
 	and runs natively on &windows;, &solaris;, Linux, FreeBSD,
 	and &macos;&nbsp;X.  More
-	information about <application>OpenOffice.org</application>
+	information about <application>Apache OpenOffice</application>
 	can be found on the
-	<ulink url="http://www.openoffice.org/">OpenOffice.org web site</ulink>.
+	<ulink url="http://incubator.apache.org/openofficeorg/">Apache OpenOffice web site</ulink>.
 	For FreeBSD specific information, and to directly
 	download packages, use the <ulink
-	url="http://porting.openoffice.org/freebsd/">FreeBSD OpenOffice.org
+	url="http://porting.openoffice.org/freebsd/">FreeBSD Apache OpenOffice
 	Porting Team</ulink>'s web site.</para>
 
-      <para>To install <application>OpenOffice.org</application>,
+      <para>To install <application>Apache OpenOffice</application>,
 	do:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r openoffice.org</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg_add -r apache-openoffice</userinput></screen>
 
       <note>
 	<para>When running a -RELEASE version of &os;, this should work.
-	  Otherwise, you should look on the &os; <application>OpenOffice.org</application> Porting Team's
+	  Otherwise, you should look on the &os; <application>Apache OpenOffice</application> 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 @@
 
       <para>Once the package is installed, you just have to type the
 	following command to run
-        <application>OpenOffice.org</application>:</para>
+        <application>Apache OpenOffice</application>:</para>
 
-      <screen>&prompt.user; <userinput>openoffice.org</userinput></screen>
+      <screen>&prompt.user; <userinput>openoffice-<replaceable>X.Y.Z</replaceable></userinput></screen>
+
+      <para>where <replaceable>X.Y.Z</replaceable> is the version number
+	of the installed <application>Apache OpenOffice</application>,
+	e.g., <replaceable>3.4.0</replaceable>.</para>
 
       <note>
 	<para>During the first launch, you will be asked some
@@ -748,12 +760,12 @@
 	  will be created in your home directory.</para>
       </note>
 
-      <para>If the <application>OpenOffice.org</application> packages
+      <para>If the <application>Apache OpenOffice</application> 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.</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice.org-3</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice-3</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <note>
@@ -771,10 +783,14 @@
       </note>
 
       <para>Once this is done,
-	<application>OpenOffice.org</application> can be launched with
+	<application>Apache OpenOffice</application> can be launched with
 	the command:</para>
 
-      <screen>&prompt.user; <userinput>openoffice.org</userinput></screen>
+      <screen>&prompt.user; <userinput>openoffice-<replaceable>X.Y.Z</replaceable></userinput></screen>
+
+      <para>where <replaceable>X.Y.Z</replaceable> is the version number
+	of the installed <application>Apache OpenOffice</application>,
+	e.g., <replaceable>3.4.0</replaceable>.</para>
     </sect2>
 
     <sect2>