svn commit: r1502896 - /openoffice/ooo-site/trunk/content/download/common/java.html

[ks...@apache.org]

Author: kschenk
Date: Sat Jul 13 21:40:42 2013
New Revision: 1502896

URL: http://svn.apache.org/r1502896
Log:
A few updates to the java info page.

Modified:
    openoffice/ooo-site/trunk/content/download/common/java.html

Modified: openoffice/ooo-site/trunk/content/download/common/java.html
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/common/java.html?rev=1502896&r1=1502895&r2=1502896&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/common/java.html (original)
+++ openoffice/ooo-site/trunk/content/download/common/java.html Sat Jul 13 21:40:42 2013
@@ -12,9 +12,9 @@
 <p>Java is required for complete OpenOffice (OpenOffice.org) functionality. Java is mainly required for the HSQLDB database
 engine (used by our database product Base) and to make use of accessibility and assistive technologies. Furthermore some
 wizards rely on Java technology. See additional topics pertaining to the use of Java in OpenOffice.org and Apache
-OpenOffice in the <a href="">Installation FAQ</a></p>
+OpenOffice in the <a href="http://wiki.services.openoffice.org/wiki/Documentation/FAQ/Installation">Installation FAQ</a></p>
 
-<p>So what does this imply for me? Base (the database component) relies completely on Java technologies to run, but other
+<p>So what does this mean exactly? Base (the database component) relies completely on Java technologies to run, but other
 programs (like Writer, Calc and Impress) only need Java for special functionality. If you do not need to use Base and do not
 want to use any of the Wizards, then you do not need to have Java installed  and configured for running Apache OpenOffice
 (and older versions of OpenOffice.org). You can completely prevent OpenOffice from prompting you about the use of Java by
@@ -23,22 +23,24 @@ telling OpenOffice not to use a Java run
 that you have a Java Runtime Environment on your system to take full advantage of OpenOffice's features without any
 issues.</p>
 
-<p>Legacy versions of OpenOffice.org (3.3 and below) included a JRE packaged with the download. The latest Apache OpenOffice
-3.4.1 does not.</p>
+<p>Legacy versions of OpenOffice.org to version 3.3 included a JRE packaged with the download. Versions 3.4 of Openoffice.org or Apache OpenOffice
+do not.</p>
 
-<p>If you already have a JRE installed on your system in one of the standard areas for Java installation, OpenOffice should
+<p>If you already have a JRE (Java Runtime Environment) installed on your system in one of the standard areas for Java installation, OpenOffice should
 detect this installation and let you choose it for use in OpenOffice via the <strong>Tools-> OpenOffice.org -> Java</strong>.
 If you have a JRE installed that is not detected, you should be able to add it through this same menu.</p>
 
-<p>If you choose not to configure OpenOffice  with Java (or just forgot about it) you can easily install Java afterwards to
-get the missing functionality to work.</p> 
+<p>You can install a JRE or configure OpenOffice to use Java at any time to get missing functionality to work.</p> 
 
-<p>The current version, Apache OpenOffice 3.4, has worked reliably in a variety of environments using both
-<a href="http://java.com">Oracle Java</a> and <a href="http://openjdk.java.net/">openJDK</a>. Feel free to download a JRE
-from either of these sites if you feel you need this functionality.</p>
+<p>The current versions of  Apache OpenOffice work reliably with a  variety of JREs including
+<a href="http://java.com">Oracle Java, versions 6 and 7</a> and <a href="http://openjdk.java.net/">openJDK, versions 6 and 7</a>. Feel free to download a JRE
+from either of these sites if you feel you need this functionality. </p>
 
+<!-- 
+take this out for now
 <p><strong>The current version, Apache OpenOffice 3.4, has reported problems with using the 32-bit JRE on 64-bit Windows 7
 systems. However, this problem can not be reproduced in all cases. Java 1.7 is the latest Java from Oracle. </strong></p>
+-->
 
 <p>Please report any problems you experience with using Java on OpenOffice through our bug reporting system,
 <a href="https://issues.apache.org/ooo/">Bugzilla</a>, or one of the other support venues listed in the