Author: buildbot
Date: Sun Jan 18 17:50:34 2015
New Revision: 936664
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/xx/java/index.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Jan 18 17:50:34 2015
@@ -1 +1 @@
-1652808
+1652816
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Jan 18 17:50:34 2015
@@ -1 +1 @@
-1652808
+1652816
Modified: websites/staging/ooo-site/trunk/content/xx/java/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/java/index.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/java/index.html Sun Jan 18
17:50:34 2015
@@ -64,16 +64,15 @@ you should be able to add it through thi
time to get missing functionality to work.
</p>
-<!-- NOTE: The below paragraph depends on the content/cachedimages folder
- being at the logical root of http://openoffice.org/
+<!-- NOTE: The <img> in the paragraph below depends on a relative link to the
+ content/cachedimages folder. This must be corrected whenever this page
+ is cloned to content/java from content/xx/java.
-->
<p style="background: #FBD34E; padding: 0px 15px 0px 15px;">
-<img src="/cachedimages/exclamation-icon.png" style="margin: 5px 5px -2px
0px;" height="32" width="32" />
+<img src="../../cachedimages/exclamation-icon.png" style="margin: 5px 5px -2px
0px;" height="32" width="32" />
<b>Important note for all Windows users:</b>
</br>
-The Windows version of OpenOffice is 32-bit and therefore it requires a 32-bit
JRE. Even when you have a Windows version
-with 64-bit installed. Furthermore you have to install a 32-bit JRE -
additionally or instead - when you already have a
-64-bit JRE installed.
+The Windows version of OpenOffice is 32-bit. It installs and operates on both
32-bit and 64-bit versions of Microsoft Windows. However, a 32-bit Java
Runtime Environment is required for any use of a JRE by 32-bit applications
such as Apache OpenOffice. The 32-bit JRE must be in addition to any 64-bit
JRE that is also installed.
</p>
<h3>Where Can I Get Java?</h3>
