Author: buildbot
Date: Sat Apr 1 09:41:14 2017
New Revision: 1009518
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/java.html
websites/staging/ooo-site/trunk/content/nl/index.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Apr 1 09:41:14 2017
@@ -1 +1 @@
-1789783
+1789785
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Apr 1 09:41:14 2017
@@ -1 +1 @@
-1789783
+1789785
Modified: websites/staging/ooo-site/trunk/content/download/common/java.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/common/java.html (original)
+++ websites/staging/ooo-site/trunk/content/download/common/java.html Sat Apr
1 09:41:14 2017
@@ -3,13 +3,13 @@
<head>
<link href="/css/ooo.css" rel="stylesheet" type="text/css">
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>Information about Java & Apache OpenOffice, OpenOffice.org</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Information about Java & Apache OpenOffice</title>
<style type="text/css">
/* <![CDATA[ */
/*-------------------- Exceptions on standard css -----------------------*/
- @import "../styles.css";
- @import "../exceptions.css";
+ @import "/css/styles.css";
+ @import "/css/exceptions.css";
/* ]]> */
</style>
@@ -30,15 +30,15 @@
-<h1>Java & Apache OpenOffice, OpenOffice.org</h1>
+<h1>Java & Apache OpenOffice</h1>
<h3>Why Do I Need Java to Use Apache OpenOffice?</h3>
-<p>Java is required for complete OpenOffice (OpenOffice.org) functionality.
Java is mainly required for the HSQLDB
+<p>Java is required for complete OpenOffice 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
+Furthermore some wizards rely on Java technology. See additional topics
pertaining to the use of Java in OpenOffice
and Apache OpenOffice in the
-<a
href="http://wiki.services.openoffice.org/wiki/Documentation/FAQ/Installation";>Installation
FAQ</a>.
+<a
href="https://wiki.openoffice.org/wiki/Documentation/FAQ/Installation";>Installation
FAQ</a>.
</p>
<p>So what does this mean exactly? Base (the database component) relies
completely on Java technologies to run, but other
@@ -46,7 +46,7 @@ programs (like Writer, Calc and Impress)
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 telling OpenOffice not to use a Java runtime environment (JRE).
From the OpenOffice main menu use:
-<strong>"Tools - OpenOffice.org - Java"</strong>, and uncheck "Use a Java
runtime environment". However, we do recommend
+<strong>"Tools - Options - Java"</strong>, and uncheck "Use a Java runtime
environment". However, we do recommend
that you have a JRE on your system to take full advantage of OpenOffice's
features without any issues.
</p>
@@ -59,15 +59,15 @@ that you have a JRE on your system to ta
<p>You will need to have a JRE version (32-bit or 64-bit) that is compatible
with the architecture of the Apache
OpenOffice version you downloaded. If you already have a JRE installed on your
system that satisfies this requirement 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,
+in OpenOffice via the <strong>"Tools - Options - Java"</strong>. If you have a
JRE installed that is not detected,
you should be able to add it through this same menu. And, you can install a
JRE or configure OpenOffice to use Java at any
time to get missing functionality to work.
</p>
<p></p>
-<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" />
+<p style="background: #FBD34E; padding: 0px 15px 15px 15px; border-radius:
10px; ">
+<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
@@ -76,9 +76,9 @@ with 64-bit installed. Furthermore you h
</p>
<h3>Where Can I Get Java?</h3>
-<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
+<p>The current versions of Apache OpenOffice work reliably with a variety of
JREs including
+<a href="https://java.com";>Oracle Java, versions 6, 7 and 8</a> and
+<a href="http://openjdk.java.net/";>openJDK, versions 6, 7 and 8</a>. Feel free
to download a JRE from either of these sites
if you feel you need this functionality.
</p>
@@ -90,12 +90,12 @@ systems. However, this problem can not b
-->
<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
-<a href="http://www.openoffice.org/support/";>Apache OpenOffice Support</a>
webpage, either the users list or forums.
+<a href="https://bz.apache.org/ooo/";>Bugzilla</a>, or one of the other support
venues listed in the
+<a href="https://www.openoffice.org/support/";>Apache OpenOffice Support</a>
webpage, either the users list or forums.
</p>
<p>For installing Java on Windows machines, one might appreciate:
-<a
href="http://java.com/en/download/help/windows_offline_download.xml";>Download
Instructions for Windows offline</a>.
+<a
href="https://java.com/en/download/help/windows_offline_download.xml";>Download
Instructions for Windows offline</a>.
</p>
Modified: websites/staging/ooo-site/trunk/content/nl/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/nl/index.html (original)
+++ websites/staging/ooo-site/trunk/content/nl/index.html Sat Apr 1 09:41:14
2017
@@ -133,7 +133,7 @@
title="Volg ons op Google+"><img
src="/images/logo-googleplus-16.png" alt="Google+" />
<a><u>Google+</u></a></span>
<span style="padding:0 5px;cursor: pointer; cursor: hand;"
onclick="javascript:follow('YouTube');"
- title="Subscribe to our YouTube channel"><img
src="/images/logo-youtube-16.png" alt="Subscribe to our YouTube channel" />
+ title="Abonneer u op ons kanaal van YouTube"><img
src="/images/logo-youtube-16.png" alt="Abonneer u op ons kanaal van YouTube" />
<a><u>YouTube</u></a></span>
</p>
</div>
