Author: buildbot
Date: Sun Nov 18 09:16:22 2018
New Revision: 1037014
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/instructions.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Nov 18 09:16:22 2018
@@ -1 +1 @@
-1846612
+1846818
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Nov 18 09:16:22 2018
@@ -1 +1 @@
-1846612
+1846818
Modified:
websites/staging/ooo-site/trunk/content/download/common/instructions.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/common/instructions.html
(original)
+++ websites/staging/ooo-site/trunk/content/download/common/instructions.html
Sun Nov 18 09:16:22 2018
@@ -53,11 +53,11 @@ migrate your old profile settings to the
<li><a href="#winreq">Review the System Requirements</a></li>
<li><a href="#windownload"> Download Apache OpenOffice 4.x.x</a></li>
<li><a href="#winunpack"> Unpack and install the downloaded Apache
OpenOffice 4.x files</li>
-
+
<li><a href="#fileassoc">(selecting) file association
information</a></li>
<li><a href="#winrun">Run Apache OpenOffice to ensure that the
installation was successful
- </ul>
-
+ </ul>
+
</ul>
</li>
<!-- end windows -->
@@ -76,8 +76,8 @@ migrate your old profile settings to the
<li><a href="#linux-general">Linux General Installation Notes: RPM or
DEB</a></li>
<li><a href="#linux-rpm">Linux RPM-based</a></li>
<li><a href="#linux-deb">Linux DEB-based</a></li>
- <li><a href="#other_linux">Additional Linux Information</a></li>
- </ul>
+ <li><a href="#other_linux">Additional Linux Information</a></li>
+ </ul>
</li>
<!--end Linux -->
@@ -301,7 +301,10 @@ from any web page.</p>
<h2 id="apple">Installation Instructions for Apple Macintosh</h2>
<h3 id="gatekeeper">OS X and Gatekeeper</h3>
-<p>Apache OpenOffice 4.x versions will be flagged by the new Gatekeeper
facility in OS X Mountain Lion. This is a new feature to help guard against
malware on Mac systems. There is a procedure laid out at the following link to
allow applications not installed from the Mac App store to run. See the article
at Mac support at <a
href="https://support.apple.com/de-de/HT202491";>https://support.apple.com/de-de/HT202491</a>.</p>
+<p>Apache OpenOffice 4.x versions will be flagged by the new Gatekeeper
facility in OS X Mountain Lion. This is a feature
+to help guard against malware on Mac systems. There is a procedure laid out at
the following link to allow applications not installed
+from the Mac App store to run.
+See the article at Mac support at <a
href="https://support.apple.com/en-us/HT202491";>https://support.apple.com/en-us/HT202491</a>.</p>
<h3 id="mac-general">Macintosh Installation Resources</h3>
<p><a
href="https://www.openoffice.org/porting/mac/faq/installing/ooo.html";>Installing
Apache OpenOffice on MacOS X</a></p>
@@ -324,10 +327,10 @@ exists, on your system.</p>
If this is symlinked to libreoffice, remove the symlink. (see your favorite
reference for how to do this)<br /><br />
This will NOT remove LibreOffice, this will only disallow LibreOffice to
redirect the normal OpenOffice binary --
typically <code>/usr/bin/soffice</code> -- to libreoffice instead.<br /></li>
- <li>Due to directory structure changes in Apache OpenOffice 4.x versions,
your older Openoffice 3.x should be deleted entirely by a new install or
update process. This is normal. If you experience problems
+ <li>Due to directory structure changes in Apache OpenOffice 4.x versions,
your older Openoffice 3.x should be deleted entirely by a new install or update
process. This is normal. If you experience problems
using the "update" process, please remove the old OpenOffice 3.x packages
manually.
</li>
- <li>If you have been testing one of the older developer snapshots, not the
released version, revision 150370,
+ <li>If you have been testing one of the older developer snapshots, not the
released version, revision 150370,
completely remove this old version before attempting a new install or
update.</li>
<li>See <a href="java.html">java requirements.</a></li>
</ol>
@@ -346,7 +349,7 @@ exists, on your system.</p>
where "linux package name" is the beginning part of the archive you just
downloaded.<br />
This will create an <b>installation directory</b>.<br />
The name of the installation directory will likely be the language
abbreviation for the install set, e.g., en-US.</li>
- <li>Add the install directory as a "local repository" for your GUI package
manager if possible. This
+ <li>Add the install directory as a "local repository" for your GUI package
manager if possible. This
will enable you to do a GUI install rather than command line.</li>
<li>Desktop integration.<br>
Desktop integration for deb-based systems requires installation of one
package.<br>
@@ -356,11 +359,11 @@ exists, on your system.</p>
</ol>
<h3 id="linux-rpm">Linux RPM-based Installation</h3>
-<ol>
+<ol>
<li><code>su</code> to root, if necessary, and navigate to Apache OpenOffice
<b>installation directory</b>.<br />
<em>You will likely need to be root to run the rpm command to install the
software.</em></li>
<li><code>cd</code> into the RPMS subdirectory of the installation
directory.<br />
- You should see a lot of rpms here and one sub-directory called
"desktop-integration".</li>
+ You should see a lot of rpms here and one sub-directory called
"desktop-integration".</li>
<li>Install this new version by typing <code>rpm -Uvih *rpm</code>.<br />
By default, this will install Apache OpenOffice in your <code>/opt</code>
directory.<br /><br />
Alternatively, you can use a GUI package installer, reference the
installation directory, and install all rpms at the top
@@ -378,7 +381,7 @@ exists, on your system.</p>
<li>One you download the Apache OpenOffice tar.gz package, you should be
able to decompress typing.<br />
<code>tar Apache-OpenOfficeX.X.X.tar.gz</code> package or using programs
such as Ark, or File-Roller.</li>
<li><code>cd</code> into the DEBS subdirectory of the installation
directory.<br />
- You should see a lot of debs here and one sub-directory called
"desktop-integration".</li>
+ You should see a lot of debs here and one sub-directory called
"desktop-integration".</li>
<li>Install this new version by typing <code>sudo dpkg -i *.deb</code> or
become root using <code>su</code> command.<br />
By default, this will install/update Apache OpenOffice in your
<code>/opt</code> directory.<br /><br />
Alternatively, you can use a GUI package installer, reference the
installation directory, and install all debs at the top
@@ -406,7 +409,7 @@ Please check carefully before using a th
<h5>Useful sites for Linux installation</h5>
<p>The following links are additional resources for installing Apache
OpenOffice on Linux by other parties. We hope you
- find them useful.
+ find them useful.
<ul>
<li><a
href="https://sourceforge.net/projects/apacheoo-deb/files/debian/";>Unofficial
debian repository</a></li>
<li><a
href="http://www.if-not-true-then-false.com/2010/install-openoffice-org-on-fedora-centos-red-hat-rhel/";>Installing
Apache OpenOffice on Fedora</a></li>
