From ca243787da0d3c409b7768d0deacd0011f2ef689 Mon Sep 17 00:00:00 2001
From: Marc Fonvieille <blackend@FreeBSD.org>
Date: Fri, 18 Nov 2005 14:04:56 +0000
Subject: [PATCH] Additional update for openoffice.org-2.0

---
 .../books/handbook/desktop/chapter.sgml       | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
index 198712ff08..3f323a85a5 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
@@ -613,19 +613,24 @@
 	  location.</para>
       </note>
 
-      <para>Once the package is installed, you must run the setup
-        program and choose a <option>standard workstation installation</option>.
-        Run this command as the user who will use
+      <para>Once the package is installed, you just have to type the
+	following command to run
         <application>OpenOffice.org</application>:</para>
 
-      <screen>&prompt.user; <userinput>openoffice-setup</userinput></screen>
+      <screen>&prompt.user; <userinput>openoffice.org</userinput></screen>
+
+      <note>
+	<para>During the first launch, you will be asked some
+	  questions and a <filename>.openoffice.org2</filename> folder
+	  will be created in your home directory.</para>
+      </note>
 
       <para>If the <application>OpenOffice.org</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-1.1</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice.org-2.0</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <note>
@@ -642,12 +647,11 @@
 	  in the port directory.</para>
       </note>
 
-      <para>Once this is done, run the setup as the user who will use
-        <application>OpenOffice.org</application> and choose a
-        <option>standard workstation installation</option> by:</para>
+      <para>Once this is done,
+	<application>OpenOffice.org</application> can be launched with
+	the command:</para>
 
-      <screen>&prompt.user; <userinput>cd /usr/ports/editors/openoffice-1.1</userinput>
-&prompt.user; <userinput>make install-user</userinput></screen>
+      <screen>&prompt.user; <userinput>openoffice.org</userinput></screen>
     </sect2>
   </sect1>