This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new dc4bf84 git-site-role commit from build_staging.sh
dc4bf84 is described below
commit dc4bf8479165c493b1ad5d43762b46abe7012bca
Author: jenkins <[email protected]>
AuthorDate: Mon Jan 4 17:43:13 2021 +0000
git-site-role commit from build_staging.sh
---
content/download/msg_prop_l10n_en.js | 8 ++++----
content/feed.xml | 4 ++--
content/product/windows.html | 10 +++++-----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/content/download/msg_prop_l10n_en.js
b/content/download/msg_prop_l10n_en.js
index 2664660..a7ce3d4 100644
--- a/content/download/msg_prop_l10n_en.js
+++ b/content/download/msg_prop_l10n_en.js
@@ -228,12 +228,12 @@ l10n.dl_full_link_text =
"Download full installation";
l10n.dl_full_link_title = "Click to download: ";
l10n.dl_langpack_link_text = "Download language pack";
l10n.dl_langpack_link_title = "Click to download: ";
-l10n.dl_win_info_text = "Windows : Title";
-l10n.dl_win_info_title = "Windows : Text";
+l10n.dl_win_info_text = "32-bit, 64-bit and Java -
What to choose?";
+l10n.dl_win_info_title = "At the moment there is a
32-bit (x86) version for Windows. However, this installs and runs also on
Windows 64-bit (x86-64).\nPlease note that you may need Java in 32-bit for
additional functionality which must then be selected only ones (see menu 'Tools
- Options - OpenOffice - Java').\n\nFor more information about OpenOffice and
Java please see the link on the right 'Java and Apache OpenOffice'.";
l10n.dl_linux_info_text = "RPM vs. DEB = What
to choose?";
l10n.dl_linux_info_title = "RPM is used in:\nCentOS,
Fedora, Mageia, Mandriva, MeeGo, openSUSE, Oracle Linux, PCLinuxOS, Red Hat
Enterprise Linux, Sailfish OS, Scientific Linux, SUSE Linux Enterprise
Server\n\nDEB is used in:\nDebian, Kanotix, Knoppix, Kubuntu, Linux Mint,
Lubuntu, Ubuntu, Xubuntu";
-l10n.dl_mac_info_text = "macOS : Title";
-l10n.dl_mac_info_title = "macOS : Text";
+// l10n.dl_mac_info_text = "macOS : Title";
+// l10n.dl_mac_info_title = "macOS : Text";
l10n.dl_full_link_porting_text = "Porting: Click to choose
from 3rd party vendors";
l10n.dl_full_link_porting_title = "Click to browse to
the porting webpage and download from 3rd party vendors";
diff --git a/content/feed.xml b/content/feed.xml
index 8ff5804..6df50ad 100644
--- a/content/feed.xml
+++ b/content/feed.xml
@@ -6,8 +6,8 @@
<atom:link href="http://localhost:8820/feed.xml"; rel="self"
type="application/rss+xml" />
<description>OpenOffice.org Feed</description>
<language>en-us</language>
- <pubDate>Sun, 3 Jan 2021 20:51:50 +0000</pubDate>
- <lastBuildDate>Sun, 3 Jan 2021 20:51:50 +0000</lastBuildDate>
+ <pubDate>Mon, 4 Jan 2021 17:41:36 +0000</pubDate>
+ <lastBuildDate>Mon, 4 Jan 2021 17:41:36 +0000</lastBuildDate>
</channel>
diff --git a/content/product/windows.html b/content/product/windows.html
index 467fac2..f252f3c 100644
--- a/content/product/windows.html
+++ b/content/product/windows.html
@@ -23,22 +23,22 @@
<div id="content"><h1 class="title">Apache OpenOffice for Windows</h1>
<h2><a href="#windows-version-support"
id="windows-version-support">Windows Version Support</a></h2>
-<p>The current Apache OpenOffice supports Microsoft Windows XP, Vista, Windows
7 and Windows 8.</p>
+<p>The current Apache OpenOffice supports Microsoft Windows XP, Vista, Windows
7, Windows 8 and Windows 10.</p>
<p>Specific platform version notes:</p>
<ul>
<li><strong>Windows 2000</strong>: OpenOffice may work on Windows 2000, but we
don’t test or recommend it.</li>
<li><strong>Windows XP</strong>: Tested, stable, no platform-specific problems
known.</li>
<li><strong>Windows Vista</strong>: Tested, stable, no platform-specific
problems known.</li>
<li><strong>Windows 7</strong>: Tested, stable.</li>
-<li><strong>Windows 8</strong>: We run as a “desktop application”,
not a Metro “App”. Requires x86 or 64-bit Windows. We do not
support Windows RT, the ARM-based version, intended for tablets.</li>
+<li><strong>Windows 8, 10</strong>: We run as a “desktop
application”, not a Metro “App”. Requires x86 or 64-bit
Windows. We do not support Windows RT, the ARM-based version, intended for
tablets.</li>
</ul>
-<p><strong>Please note</strong>: Apache OpenOffice is distributed as a 32-bit
application. It will run successfully in 32-bit mode on 64-bit versions of
Windows 7 and Windows 8. But in those cases a 32-bit JVM is required for some
functionality. Details are <a
href="http://www.openoffice.org/download/common/java.html";>here</a>.</p>
+<p><strong>Please note</strong>: Apache OpenOffice is distributed as a 32-bit
application. It will run successfully in 32-bit mode on 64-bit versions of
Windows 7, 8 and 10. But in those cases a 32-bit JVM is required for some
functionality. Details are <a
href="http://www.openoffice.org/download/common/java.html";>here</a>.</p>
<h2><a href="#hardware-requirements" id="hardware-requirements">Hardware
Requirements</a></h2>
<p>Hardware demands are quite modest and even older machines should be able to
run OpenOffice:</p>
<ul>
<li><strong>Memory</strong>: Minimum 256 Mbytes RAM (512 MB RAM
recommended).</li>
<li><strong>Storage</strong>: At least 650 Mbytes available disk space for a
default install via download. After installation and deletion of temporary
installation files, Apache OpenOffice will use approximately 440 Mbytes disk
space.</li>
-<li><strong>Graphics</strong>: 1024 x 768 or higher resolution with at least
256 colours.</li>
+<li><strong>Graphics</strong>: 1024 x 768 or higher resolution with at least
256 colors.</li>
</ul>
<h2><a href="#windows-specific-features"
id="windows-specific-features">Windows-specific Features</a></h2>
<p>Apache OpenOffice has the following special features on Windows:</p>
@@ -48,7 +48,7 @@
<h2><a href="#additional-resources" id="additional-resources">Additional
Resources</a></h2>
<ul>
<li>Click here to <a
href="http://www.openoffice.org/download/";>download</a></li>
-<li>Click here to get <a
href="http://www.openoffice.org/download/common/instructions.html#win";>Install
intructions for OpenOffice on Windows</a></li>
+<li>Click here to get <a
href="http://www.openoffice.org/download/common/instructions.html#win";>Install
instructions for OpenOffice on Windows</a></li>
<li>Click here to get help and support in the <a
href="http://forum.openoffice.org/";>Community Support Forums</a></li>
</ul>
