Author: buildbot
Date: Tue Nov  5 01:03:09 2013
New Revision: 885449

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 Tue Nov  5 01:03:09 2013
@@ -1 +1 @@
-1538704
+1538846

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Nov  5 01:03:09 2013
@@ -1 +1 @@
-1538704
+1538846

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 
Tue Nov  5 01:03:09 2013
@@ -24,14 +24,17 @@
     
 
 <h2>Instructions for Downloading and Installing<br />
-Apache OpenOffice 4.0.0</h2>
+Apache OpenOffice 4.0 Versions</h2>
+
+<p>Last updated: 2013-11-04</p>
+
 
 <p><em>As of release 3.4, a JRE (Jave Runtime Environment) is no longer 
packaged with OpenOffice.
 However, you may still need a JRE for full functionality. (See <a 
href="java.html">
 Java and Apache OpenOffice</a>). Please ensure that your system has at least 
Java 1.6 installed for full
 functionality.</em></p>
 
-<p><em>Apache OpenOffice 4.0 has significant changes to your OpenOffice 
directory setup which effect your older OpenOffice profile.</em>
+<p><em>Apache OpenOffice 4.0 versions have significant changes to your 
OpenOffice directory setup which effect your older OpenOffice profile.</em>
 The <a 
href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes";>Apache
 OpenOffice 4.0 Release Notes</a> provide an explanation of these changes. 
However,you should have the opportunity to
 migrate your old profile settings to the new profile area.</p>
 
@@ -50,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">Installation Steps -- RPM or DEB: 
Download, Unpack, Desktop Integration notes</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> 
@@ -62,10 +65,10 @@ migrate your old profile settings to the
 
 <hr />
 
-<h2 id="win">Windows XP/2003/Vista/ 7 / 8 Quick-Start Guide for Apache 
OpenOffice 4.0</h2>
+<h2 id="win">Windows XP/2003/Vista/ 7 / 8 Quick-Start Guide for Apache 
OpenOffice 4.0 Versions</h2>
 
 <p>Welcome to Apache OpenOffice Quick-Start Guide for Windows environments. 
Below you will find step-by-step instructions
-to download and install Apache OpenOffice version 4.0.0 on your system. You 
may want to print this instruction sheet for
+to download and install Apache OpenOffice 4.0 versions on your system. You may 
want to print this instruction sheet for
 reference before beginning to download and install Apache OpenOffice.</p>
 
 <p>If you are experienced with the Windows operating system, you can use the 
instructions provided in the next section.
@@ -91,10 +94,10 @@ to return to this page.</p>
   <li>Review the <a 
href="http://www.openoffice.org/dev_docs/source/sys_reqs_aoo40.html";>System 
Requirements</a> for
   Apache OpenOffice use.</li>
   <li>Download and install <a href="http://www.java.com/";>Java JRE</a> if you 
need the features that are Java dependent.</li>
-  <li><a href="http://www.openoffice.org/download/";>Download Apache OpenOffice 
4.0.0</a>.</li>
+  <li><a href="http://www.openoffice.org/download/";>Download Apache OpenOffice 
4.0.x</a>.</li>
   <li>Login as administrator (if required).</li>
-  <li>Unpack and install the downloaded Apache OpenOffice 4.0.0 files.</li>
-  <li>Run Apache OpenOffice 4.0.0 to ensure that the installation was 
successful.</li>
+  <li>Unpack and install the downloaded Apache OpenOffice 4.0.x files.</li>
+  <li>Run Apache OpenOffice 4.0.x to ensure that the installation was 
successful.</li>
 </ol>
 
 <h3 id="comprehensive">Comprehensive Installation Instructions</h3>
@@ -111,7 +114,7 @@ Log in as an administrator if your compu
 
 <h3>Review the System Requirements</h3>
 
-<p>Your computer needs these resources as a minimum to run Apache OpenOffice 
4.0.0:</p>
+<p>Your computer needs these resources as a minimum to run Apache OpenOffice 
4.0 versions:</p>
 
 <ul>
   <li>Windows XP, Windows 2003, Windows Vista, Windows 7, Windows 8</li>
@@ -121,7 +124,7 @@ Log in as an administrator if your compu
   <li>1024 x 768 or higher resolution with at least 256 colours</li>
 </ul>
 
-<h3 id="download">Download Apache OpenOffice 4.0.0</h3>
+<h3 id="download">Download Apache OpenOffice 4.0.x </h3>
 
 <p>To download Apache OpenOffice from our website, you do not need to login. 
Also, it does not cost anything other than what
 your costs are to connect to the internet and download a large file.</p>
@@ -158,7 +161,7 @@ enables you to pause/resume the download
 <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>
 
-<h3>Unpack and install the downloaded Apache OpenOffice 4.0.0 files</h3>
+<h3>Unpack and install the downloaded Apache OpenOffice 4.0.x files</h3>
 
 <ol>
   <li>Either using Windows Explorer or Mozilla/Netscape's Download Manager, 
navigate to the Apache OpenOffice file you
@@ -166,7 +169,7 @@ Win 86 Setup Guide, secton 4. Installer 
   <p>Windows Explorer users will want to find the file and double-click to 
launch the unpacking and installation program.
   Alternately, Mozilla/Netscape users will want to open the Download Manager, 
highlight the file, and click Launch File.
   In either case, the unpacking program will start.</p>
-  <p>The Welcome window is displayed to note that you have downloaded Apache 
OpenOffice 4.0.0. Click Next to continue.</p></li>
+  <p>The Welcome window is displayed to note that you have downloaded Apache 
OpenOffice 4.0.x. Click Next to continue.</p></li>
   <li>The Select Folder window is displayed. Accept the folder name displayed 
in the text box or enter the name of the
   folder in which to save the unpacked files, and click Unpack.
 
@@ -176,8 +179,8 @@ Win 86 Setup Guide, secton 4. Installer 
   -->
 
   </li>
-  <li>Once the files are unpacked, the Apache OpenOffice 4.0.0 Installation 
Wizard is displayed. Click Next to continue
-  installing Apache OpenOffice 4.0.0. Follow the prompts, and Apache 
OpenOffice will be installed on your system, ready for
+  <li>Once the files are unpacked, the Apache OpenOffice 4.0.x Installation 
Wizard is displayed. Click Next to continue
+  installing Apache OpenOffice 4.0.x. Follow the prompts, and Apache 
OpenOffice will be installed on your system, ready for
   use.</li>
   <li>Read the information in the Welcome window and then click Next.
   <p>The License Agreement window appears.</p>
@@ -263,7 +266,7 @@ from any web page.</p>
 <h2 id="apple">Installation Instructions for Apple Macintosh</h2>
 
 <h3 id="gatekeeper">OS X and Gatekeeper</h3>
-<p>Apache OpenOffice 4.0.0 will be flagged by the new Gatekeeper facility in 
OS X Mountain Lion. This is a new feature to help guard against malware on Mac 
systems. There is a procedure laid out at the following link to allow 
applications not installed from the Mac App store to run. See the article at 
Mac support at <a 
href="http://support.apple.com/kb/HT5290";>http://support.apple.com/kb/HT5290</a>.</p>
+<p>Apache OpenOffice 4.0 versions will be flagged by the new Gatekeeper 
facility in OS X Mountain Lion. This is a new feature to help guard against 
malware on Mac systems. There is a procedure laid out at the following link to 
allow applications not installed from the Mac App store to run. See the article 
at Mac support at <a 
href="http://support.apple.com/kb/HT5290";>http://support.apple.com/kb/HT5290</a>.</p>
 
 <h3 id="mac-general">Macintosh Installation Resources</h3>
 <p><a 
href="http://www.openoffice.org/porting/mac/faq/installing/ooo.html";>Installing 
Apache OpenOffice on MacOS X</a></p>
@@ -286,8 +289,7 @@ exists, on your system.</p>
   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>Due to directory structure changes in Apache OpenOffice 4.0, your older 
Openoffice 3.x should  be deleted entirely
-   by a new install or update process. This is normal. If you experience 
problems
+  <li>Due to directory structure changes in Apache OpenOffice 4.0 versions, 
your older Openoffice 3.x should  be deleted entirely    by a new install or 
update process. This is normal. If you experience problems
   using the "update" process, please remove the old OpenOffice 3.x packages 
manually.
   </li>
   <li>If you have been testing one of the older developer snapshots, not the 
released version, revision 150370, 
@@ -298,7 +300,7 @@ exists, on your system.</p>
 <hr />
 
 
-<h3 id="linux-general">Installation Steps -- RPM or DEB: Download, Unpack, 
Desktop Integration notes</h3>
+<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>
@@ -306,15 +308,16 @@ 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: <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 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 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><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>
+  <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>
 </ol>
 
 <h3 id="linux-rpm">Linux RPM-based Installation</h3>
@@ -331,7 +334,7 @@ exists, on your system.</p>
   <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>
-  <li>Finally, start up Apache OpenOffice 4.0.0.x to insure it's working.</li>
+  <li>Finally, start up Apache OpenOffice 4.0.x to insure it's working.</li>
 </ol>
 
 <h3 id="linux-deb">Linux DEB-based Installation</h3>
@@ -350,7 +353,7 @@ exists, on your system.</p>
   <li>Install the desktop integration features for your setup.<br />
   <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 dpkg.</li>
-  <li>Finally, start up Apache OpenOffice 4.0.0.x to insure it's working.</li>
+  <li>Finally, start up Apache OpenOffice 4.0.x to insure it's working.</li>
 </ol>
 
 <h3 id="other_linux">Packages for Linux Distributions (Not compiled by Apache 
OpenOffice developers)</h3>


Reply via email to