Author: buildbot
Date: Sun Jul 14 21:59:20 2013
New Revision: 869501

Log:
Staging update by buildbot for ooo-site

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_4.0.0.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Jul 14 21:59:20 2013
@@ -1 +1 @@
-1503042
+1503071

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Jul 14 21:59:20 2013
@@ -1 +1 @@
-1503042
+1503071

Modified: 
websites/staging/ooo-site/trunk/content/download/common/instructions_4.0.0.html
==============================================================================
--- 
websites/staging/ooo-site/trunk/content/download/common/instructions_4.0.0.html 
(original)
+++ 
websites/staging/ooo-site/trunk/content/download/common/instructions_4.0.0.html 
Sun Jul 14 21:59:20 2013
@@ -38,13 +38,21 @@ The <a href="">Apache OpenOffice 4.0 Rel
 migrate your old profile settings to the new profile area.</p>
 
 <ul>
-  <li><b><a href="#win">Windows</a></b></li>
-  <li><a href="#fileassoc">File Associations</a></li>
-  <li><b><a href="#linux">Linux, General Information</a></b></li>
-  <li><a href="#linux-rpm">Linux RPM-based</a></li>
-  <li><a href="#linux-deb">Linux DEB-based</a></li>
-  <li><a href="#other_linux">Packages for Linux Distributions</a></li>
+  <li><b><a href="#win">Windows</a></b>
+  <ul>
+       <li><a href="#fileassoc">File Associations</a></li>
+  </ul>
+  </li>
   <li><b><a href="#apple">Apple Macintosh</a></b></li>
+  <li><b><a href="#linux">Linux</a></b>
+  <ul>
+       <li><a href="#linux-preinstall">Linux PreInstallation</a></li>
+       <li><a href="#linux-general">Linux General Installation Notes: RPM or 
DEB</a></li>
+       <li><a href="#linux-rpm">Linux RPM-based</a></li>
+       <li><a href="#linux-deb">Linux DEB-based</a></li>
+       <li><a href="#other_linux">Packages for Linux Distributions</a></li> 
+       </ul> 
+       </li>
   <li><b><a href="#problems">Installation Problems</a></b></li>
   <li><b><a href="#more">Additional Installation Resources</a></b></li>
 </ul>
@@ -143,7 +151,7 @@ enables you to pause/resume the download
 
 </ol>
 
-<p><b>NOTE: Much of the information that follows here can be found in a recent
+<p><b>NOTE: Much of the information that follows here can be found in the
 <a 
href="https://cwiki.apache.org/confluence/display/OOOUSERS/Win-en-x86-Setup";>
 Win 86 Setup Guide, secton 4. Installer Setup </a> from the developer 
wiki.</b></p>
 
@@ -249,6 +257,8 @@ from any web page.</p>
 
 <h2 id="linux"> Linux Installations</h2>
 
+<h3 id="linux-preinstall">Linux Pre-installation Notes</h3>
+
 <p>The following preinstallation steps are recommended for Linux 
distributions. These should be taken to assure that you
 have a clean install of Apache OpenOffice due to internal considerations 
and/or the installation of LibreOffice, if it
 exists, on your system.</p>
@@ -258,74 +268,59 @@ exists, on your system.</p>
   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 />
-  <b>Note:</b>
-  Depending on your particular distribution, you may need to deinstall 
LibreOffice entirely to get Apache OpenOffice working
-  correctly.</li>
-  <li>If you have an older 3.3.0 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>
+  typically <code>/usr/bin/soffice</code> -- to libreoffice instead.<br /></li>
+  <li>Due to directory structure changes in Apache OpenOffice 4.0, your older 
Openoffice 3.x will be deleted entirely
+   by the install scripts. This is normal.
+  </li>
+  <li>If you have been testing one of the older developer snapshots, not the 
RC, revision 1502185, completely remove this old
+  version.</li>
+  <li>See <a href="java.html">java requirements.</a></li>
 </ol>
 
 <hr />
 
-<h3 id="linux-rpm">Linux RPM-based Installation</h3>
-
-<h4>Prerequisites</h4>
-
-<p>If you want Java integration, you want to make sure you have the latest JRE 
installed. It should be at least JRE 1.6.
-You can find the JRE for Linux at the <a 
href="http://www.java.com/en/download/linux_manual.jsp";> Java JRE for Linux</a>
-download site. Alternatively, a JRE might be included on the installation 
media of your distro as part of a complete Java
-development environment.</p>
 
-<h4>Installation Steps</h4>
+<h3 id="linux-general">Installation Steps --RPM or DEB: Download to 
Installation Directory, Unpack</h3>
 
 <ol>
-  <li>Review the <a 
href="http://www.openoffice.org/dev_docs/source/sys_reqs_aoo40.html";>System 
Requirements</a></li>
+<li>Review the <a 
href="http://www.openoffice.org/dev_docs/source/sys_reqs_aoo40.html";>System 
Requirements</a></li>
   <li><a href="http://www.openoffice.org/download/";>Download your favorite 
Linux version of Apache OpenOffice</a></li>
-  <li>Review helpful information and installation options in the
-  <a 
href="http://documentation.openoffice.org/setup_guide2/index.html#12";>Setup 
Guide.</a></li>
+  <!--  <li>Review helpful information and installation options in the
+  <a 
href="http://documentation.openoffice.org/setup_guide2/index.html#12";>Setup 
Guide.</a></li>-->
   <li>Unpack the downloaded image to prepare for installation.<br />
   The following command should work: <code>tar -xvzf "linux package 
name".tar.gz</code><br />
   where "linux package name" is the beginning part of the archive you just 
downloaded.<br /><br />
-  This will create an installation directory.<br />
+  This will create an <b>installation directory</b>.<br />
   The name of the installation directory will likely be the language 
abbreviation for the install set, e.g., en-US.</li>
-  <li><code>su</code> to root, if necessary, and navigate to Apache OpenOffice 
installation directory (the unpacked
-  archive).<br />
+  <li>Add the install directory as a "local repository" for your GUI package 
manager if possible. This 
+  will enable you to do a GUI install rather than command line.</li>
+  <li>Historically, OpenOffice has provided desktop integration packages for 
madriva, redhat, suee, and now
+  freedesktop. Many new desktop (window managers) like KDE4, Gnome3, and Unity 
now adhere to the freedsktop.org
+  standard for icon placement and mime-type definitions. You may want to 
switch to using the freedesktop desktop 
+  integration package if you experience issues with your former desktop 
integration.</li>
+</ol>
+
+<h3 id="linux-rpm">Linux RPM-based Installation</h3>
+<ol>  
+  <li><code>su</code> to root, if necessary, and navigate to Apache OpenOffice 
<b>installation directory</b>.<br />
   <em>You will likely need to be root to run the rpm command to install the 
software.</em></li>
   <li><code>cd</code> into the RPMS subdirectory of the installation 
directory.<br />
   You should see a lot of rpms here and one sub-directory called 
"desktop-integration".</li>  
   <li>Install this new version by typing <code>rpm -Uvih *rpm</code>.<br />
-  By default, this will install/update Apache OpenOffice in your 
<code>/opt</code> directory.<br /><br />
+  By default, this will install Apache OpenOffice in your <code>/opt</code> 
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.</li>
-  <li>Install the desktop integration features for your setup.<br />
+  <li>Install the desktop integration features for your setup.
   <code>cd</code> to <code>desktop-integration</code> in the installation 
directory,<br />
-  and, depending on your package manager/system, install the appropriate 
desktop interface using RPM.</li>
+  and, depending on your package manager/system, install the appropriate 
desktop interface using RPM.
+  </li>
   <li>Finally, start up Apache OpenOffice 4.0.0.x to insure it's working.</li>
 </ol>
 
 <h3 id="linux-deb">Linux DEB-based Installation</h3>
 
-<h4>Prerequisites</h4>
-
-<p>If you want Java integration, you want to make sure you have the latest JRE 
installed. It should be at least JRE 1.6.
-You can find the JRE for Linux at the <a 
href="http://www.java.com/en/download/linux_manual.jsp";> Java JRE for Linux</a>
-download site. Alternatively, a JRE might be included on the installation 
media of your distro as part of a complete Java
-development environment.</p>
-
-<h4>Installation Steps</h4>
 
 <ol>
-  <li>Review the <a 
href="http://www.openoffice.org/dev_docs/source/sys_reqs_aoo34.html";>System 
Requirements</a></li>
-  <li><a href="http://www.openoffice.org/download/";>Download your favorite 
Linux version of Apache OpenOffice</a></li>
-  <li>Review helpful information and installation options in the
-  <a 
href="http://documentation.openoffice.org/setup_guide2/index.html#12";>Setup 
Guide.</a></li>
-  <li>Unpack the downloaded image to prepare for installation.<br />
-  The following command should work: <code>tar -xvzf "linux package 
name".tar.gz</code><br />
-  where "linux package name" is the beginning part of the archive you just 
downloaded.<br /><br />
-  This will create an installation directory.<br />
-  The name of the installation directory will likely be the language 
abbreviation for the install set, e.g., en-US.</li>
   <li><code>su</code> to root, if necessary, and navigate to Apache OpenOffice 
installation directory (the unpacked
   archive).<br />
   <em>You will likely need to be root to run the deb command to install the 
software.</em></li>
@@ -371,7 +366,7 @@ can usually be successfully accomplished
 
 <p><a 
href="http://www.openoffice.org/porting/mac/faq/installing/ooo.html";>Installing 
Apache OpenOffice on MacOS X</a></p>
 
-See also: <a href="http://www.openoffice.org/porting/mac/";>the Mac porting 
project page</a>
+<p>See also: <a href="http://www.openoffice.org/porting/mac/";>the Mac porting 
project page</a></p>
 
 <hr />
 


Reply via email to