Author: buildbot
Date: Mon Sep 23 23:37:25 2013
New Revision: 879630

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

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Sep 23 23:37:25 2013
@@ -1 +1 @@
-1525245
+1525734

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Sep 23 23:37:25 2013
@@ -1 +1 @@
-1525245
+1525734

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 
Mon Sep 23 23:37:25 2013
@@ -53,7 +53,7 @@ migrate your old profile settings to the
   <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-general">Installation Steps -- RPM or DEB: 
Download, Unpack, Desktop Integration notes</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> 
@@ -301,7 +301,7 @@ exists, on your system.</p>
 <hr />
 
 
-<h3 id="linux-general">Installation Steps --RPM or DEB: Download to 
Installation Directory, Unpack</h3>
+<h3 id="linux-general">Installation Steps -- RPM or DEB: Download, Unpack, 
Desktop Integration notes</h3>
 
 <ol>
 <li>Review the <a 
href="http://www.openoffice.org/dev_docs/source/sys_reqs_aoo40.html";>System 
Requirements</a></li>
@@ -309,16 +309,15 @@ exists, on your system.</p>
   <!--  <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 <b>installation directory</b>.<br />
+  The following command should work: <br><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 />
+  This will create an <b>installation directory</b> containily product level 
intallation packages and, <br>
+ a "desktop-integration" sub-directory for packages to integrate Apache 
OpenOffice into your Linux desktop.<br />
   The name of the installation directory will likely be the language 
abbreviation for the install set, e.g., en-US.</li>
   <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, suse, 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 
install the freedesktop desktop 
-  integration package if you experience issues with your former desktop 
integration.</li>
+  <li><b>Desktop integration notes:</b> If you are using a newer desktop 
window manager (KDE 4, Gnome 2 or 3, Unity), you should probably install the 
freedesktop-menus regardless of your distribution from the desktop-integration 
directory included with Apache OpenOffice. The <a 
href="http://www.freedesktop.org/wiki/";>freedesktop.org</a> specification is 
now used by several desktops (windows managers).
+<br> If this is not your situation, please see the "desktop-integration" 
directory for other choices.</li>
 </ol>
 
 <h3 id="linux-rpm">Linux RPM-based Installation</h3>


Reply via email to