Author: kschenk
Date: Tue May 15 22:46:08 2012
New Revision: 1338928
URL: http://svn.apache.org/viewvc?rev=1338928&view=rev
Log:
kls -- tool out UpUbuntu package reference. A few wording changes as well
Modified:
incubator/ooo/ooo-site/trunk/content/download/common/instructions.html
Modified: incubator/ooo/ooo-site/trunk/content/download/common/instructions.html
URL:
http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/download/common/instructions.html?rev=1338928&r1=1338927&r2=1338928&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/download/common/instructions.html
(original)
+++ incubator/ooo/ooo-site/trunk/content/download/common/instructions.html Tue
May 15 22:46:08 2012
@@ -29,11 +29,11 @@ Please ensure that your system has at le
<li><a href="#fileassoc">File Associations</a></li>
</ul>
</li>
- <li><a href="#linux">Linux</a>
+ <li><a href="#linux">Linux RPM-based</a></li>
+ <li>< a href="#linux-deb">Linux DEB-based</a></li>
<ul>
<li><a href="#other_linux">Packages for Linux Distributions</a></li>
</ul>
- </li>
<li><a href="#apple">Apple Macintosh</a></li>
<li> <a href="#problems">Installation Problems</a></li>
</ul>
@@ -348,8 +348,7 @@ site by clicking the Support tab availab
<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. Or, you can choose to have the JRE included with
-your Apache OpenOffice download. Alternatively, a JRE might be included on the
+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>
@@ -406,8 +405,7 @@ environment.</p>
<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. Or, you can choose to have the JRE included with
-your Apache OpenOffice download. Alternatively, a JRE might be included on the
+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>
@@ -461,17 +459,22 @@ environment.</p>
<h3>Packages for Linux Distributions (Not compiled by Apache OpenOffice
developers)
<a name="other_linux"></a></h3>
+
+<p> The Linux downloads provided on the Apache OpenOffice site (mirrors) are
generic for
+ either the RPM- or DEB-based package managers. If you have experience
in directly installing
+ these types of packages on your system, one of these types of installs
should work for you.
+ They are not specific to a particular Linux distribution.</p>
<p>Many Linux distributions now include a version of Apache OpenOffice in their
-own native package manager format (.rpm, .deb, etc.). These packages have
-been built and are supported by the distributions' own teams, not by
+own native package manager format (.rpm, .deb, etc.) either from their own
repositories
+or community repositories which they support. These packages have
+been built and are supported by the distributions' own teams or community
members, not by
Apache OpenOffice. Some distributions have strict policies around licensing,
which means they have chosen to disable parts of Apache OpenOffice which rely
on software which does not meet their criteria (e.g. the Fedora rpms have
disabled the parts of Apache OpenOffice which require Java).</p>
-<p>If you are using Ubuntu, you may want to check out <a
href="http://www.upubuntu.com/2012/05/how-to-install-apache-openoffice-34-via.html";>how
to install Apache OpenOffice via PPA on Ubuntu 12.04/11.10</a>
- from the UpUbuntu site.
+
<p><b>Note:</b> Please check carefully before using a third-party build that
it does actually include all the parts of Apache OpenOffice that you will
