svn commit: r829715 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/common/instructions.html

[bu...@apache.org]

Author: buildbot
Date: Wed Aug 22 16:04:28 2012
New Revision: 829715

Log:
Staging update by buildbot for openofficeorg

Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    websites/staging/ooo-site/trunk/content/download/common/instructions.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Aug 22 16:04:28 2012
@@ -1 +1 @@
-1376104
+1376114

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Aug 22 16:04:28 2012
@@ -1 +1 @@
-1376104
+1376114

Modified: websites/staging/ooo-site/trunk/content/download/common/instructions.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/common/instructions.html (original)
+++ websites/staging/ooo-site/trunk/content/download/common/instructions.html Wed Aug 22 16:04:28 2012
@@ -25,8 +25,8 @@
     
 
 <h2>Instructions for Downloading and Installing <br />
-Apache OpenOffice.org 3.4 </h2>
-<p>Last updated: 2012-05-21</p>
+Apache OpenOffice.org 3.4.x </h2>
+<p>Last updated: 2012-08-22</p>
 
 <p>A more extensive, though older, <b>Installation Guide</b> is available in
 <a href="http://wiki.services.openoffice.org/w/images/7/7e/Installation_Guide_OOo3.pdf">PDF</a>
@@ -371,12 +371,14 @@ have a clean install of Apache OpenOffic
 exists, on your system.
 
 <ol>
-<li> Check to see if LibreOffice has re-routed the OpenOffice binary to itself instead.<br>
+<li> Check to see if LibreOffice has re-routed the OpenOffice binary.<br>
  Type <code>"whereis soffice"</code> from a console.</br>
  <br>If this is symlinked to libreoffice, remove the symlink. (see your favorite reference for how to do this)</br>
  <br>This will NOT remove LibreOffice, this will only disallow LibreOffice to redirect the normal OpenOffice binary --
- typically <code>/usr/bin/soffice</code> -- to libreoffice instead.</br></li>
- <li>Remove your old version of OpenOffice completely.<br>
+ typically <code>/usr/bin/soffice</code> -- to libreoffice instead.</br>
+ <p></p><b>Note:</b> Depending on your particular distribution, you may need to deinstall
+ LibreOffice entirely to get Apache OpenOffice working correctly.</p> </li>
+ <li>If you have an older 3.3 version (or lower) of OpenOffice.org installed, remove it completely.<br>
  The safest way to do this for most users is to use a GUI package manager to search for OpenOffice and remove
  all packages.</br></li>
 </ol>
@@ -424,7 +426,7 @@ environment.</p>
   </li>  
   <li>
     Install this new version by typing <tt>rpm -Uvih *rpm</tt>.<br/>
-    By default, this will install OpenOffice in your <tt>/opt</tt>
+    By default, this will upgrade/install OpenOffice in your <tt>/opt</tt>
     directory.<br/>
     <br>Alternatively, you can use a GUI package installer, reference the installation directory, and
     install all rpms at the top level. This may also aid you in determing any dependency problems if they exist.</br>
@@ -435,7 +437,7 @@ environment.</p>
      <tt>cd</tt> to <tt>desktop-integration</tt> in the installation directory,<br />
     and, depending on your package manager/system, install the appropriate desktop interface using RPM.
   </li>
-  <li>Finally, start up Apache OpenOffice 3.4 to insure it's working.</li>
+  <li>Finally, start up Apache OpenOffice 3.4.x to insure it's working.</li>
 </ol>
 
 <h3>Linux deb-based Installation<a name="linux-deb"></a></h3>
@@ -482,7 +484,7 @@ environment.</p>
   </li>  
   <li>
     Install this new version by typing <tt>sudo dpkg -i *.deb</tt>.<br/>
-    By default, this will install Apache OpenOffice in your <tt>/opt</tt>
+    By default, this will install/update Apache OpenOffice in your <tt>/opt</tt>
     directory.<br/>
     <br>Alternatively, you can use a GUI package installer, reference the installation directory, and
     install all debs at the top level. This may also aid you in determing any dependency problems if they exist.</br>