Author: buildbot
Date: Sat Sep 1 15:15:35 2012
New Revision: 830764
Log:
Staging update by buildbot for openofficeorg
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
websites/staging/ooo-site/trunk/content/download/common/instructions_3.4.html
websites/staging/ooo-site/trunk/content/download/common/linux_instructions.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Sep 1 15:15:35 2012
@@ -1 +1 @@
-1379766
+1379768
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Sep 1 15:15:35 2012
@@ -1 +1 @@
-1379766
+1379768
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
Sat Sep 1 15:15:35 2012
@@ -40,7 +40,6 @@ However, you may still need a JRE for fu
Java and Apache OpenOffice</a>). Please ensure that your system has at least
Java 1.6 installed for full
functionality.</em></p>
-</p>
<ul>
<li><a href="#win">Windows</a>
<ul>
@@ -269,7 +268,7 @@ exists, on your system.</p>
typically <code>/usr/bin/soffice</code> -- to libreoffice instead.<br />
<b>Note:</b>
Depending on your particular distribution, you may need to deinstall
LibreOffice entirely to get Apache OpenOffice working
- correctly.</p></li>
+ correctly.</li>
<li>If you have an older 3.3.0 version (or lower) of OpenOffice.org
installed, remove it completely.<br />
The safest way to do this for most users is to use a GUI package manager to
search for OpenOffice and remove all
packages.<br /></li>
@@ -385,13 +384,12 @@ See also: <a href="http://www.openoffice
<h2 id="problems">Installation Problems</h2>
-<p>The best resources to help you with installation problems are:
+<p>The best resources to help you with installation problems are:</p>
<ul>
<li><a
href="http://incubator.apache.org/openofficeorg/mailing-lists.html";>the Users
mailing list</a></li>
<li><a href="http://user.services.openoffice.org/";>the Apache OpenOffice
User Support Forums</a></li>
</ul>
-</p>
</div>
Modified:
websites/staging/ooo-site/trunk/content/download/common/instructions_3.4.html
==============================================================================
---
websites/staging/ooo-site/trunk/content/download/common/instructions_3.4.html
(original)
+++
websites/staging/ooo-site/trunk/content/download/common/instructions_3.4.html
Sat Sep 1 15:15:35 2012
@@ -40,7 +40,6 @@ However, you may still need a JRE for fu
Java and Apache OpenOffice</a>). Please ensure that your system has at least
Java 1.6 installed for full
functionality.</em></p>
-</p>
<ul>
<li><a href="#win">Windows</a>
<ul>
@@ -265,18 +264,18 @@ be included on the installation media of
where "linux package name" is the beginning part of the archive you just
downloaded.<br /><br />
This will create an installation directory.<br />
The name of the installation directory will likely be the langueage
abbreviation for the install set, e.g., en-US.</li>
- <li><tt>su</tt> to root, if necessary, and navigate to Apache OpenOffice
installation directory (the unpacked
+ <li><code>su</code> to root, if necessary, and navigate to Apache OpenOffice
installation directory (the unpacked
archive).<br />
<em>You will likely need to be root to run the rpm command to install the
software.</em></li>
- <li><tt>cd</tt> into the RPMS subdirectory of the installation directory.<br
/>
+ <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>
- <li>Install this new version by typing <tt>rpm -Uvih *rpm</tt>.<br />
- By default, this will install OpenOffice in your <tt>/opt</tt> directory.<br
/>
+ <li>Install this new version by typing <code>rpm -Uvih *rpm</code>.<br />
+ By default, this will install OpenOffice in your <code>/opt</code>
directory.<br />
<b>NOTE:</b>
See additional installation options and other useful information in the
<a
href="http://documentation.openoffice.org/setup_guide2/index.html#12";>Setup
Guide</a>.</li>
<li>Install the desktop integration features for your setup. <br />
- <tt>cd</tt> to <tt>desktop-integration</tt> in the installation
directory,<br />
+ <code>cd</code> to <code>desktop-integration</code> in the installation
directory,<br />
and, depending on your package manager/system, install the appropriate
desktop interface using RPM.</li>
<li>Finally, start up Apache OpenOffice 3.4 to insure it's working.</li>
</ol>
@@ -300,18 +299,18 @@ be included on the installation media of
where "linux package name" is the beginning part of the archive you just
downloaded.<br /><br />
This will create an installation directory.<br />
The name of the installation directory will likely be the langueage
abbreviation for the install set, e.g., en-US.</li>
- <li><tt>su</tt> to root, if necessary, and navigate to Apache OpenOffice
installation directory (the unpacked
+ <li><code>su</code> to root, if necessary, and navigate to Apache OpenOffice
installation directory (the unpacked
archive).<br />
<em>You will likely need to be root to run the deb command.</em></li>
- <li><tt>cd</tt> into the DEBS subdirectory of the installation directory.<br
/>
+ <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>
- <li>Install this new version by typing <tt>sudo dpkg -i *.deb</tt>.<br />
- By default, this will install Apache OpenOffice in your <tt>/opt</tt>
directory.<br />
+ <li>Install this new version by typing <code>sudo dpkg -i *.deb</code>.<br />
+ By default, this will install Apache OpenOffice in your <code>/opt</code>
directory.<br />
<b>NOTE:</b>
See additional installation options and other useful information in the
<a
href="http://documentation.openoffice.org/setup_guide2/index.html#12";>Setup
Guide</a>.</li>
<li>Install the desktop integration features for your setup. <br />
- <tt>cd</tt> to <tt>desktop-integration</tt> in the installation
directory,<br />
+ <code>cd</code> to <code>desktop-integration</code> in the installation
directory,<br />
and, depending on your package manager/system, install the appropriate
desktop interface using dpkg.</li>
<li>Finally, start up Apache OpenOffice 3.4 to insure it's working.</li>
</ol>
@@ -347,13 +346,12 @@ See also: <a href="http://www.openoffice
<h2 id="problems">Installation Problems</h2>
-<p>The best resources to help you with installation problems are:
+<p>The best resources to help you with installation problems are:</p>
<ul>
<li><a
href="http://incubator.apache.org/openofficeorg/mailing-lists.html";>the Users
mailing list</a></li>
<li><a href="http://user.services.openoffice.org/";>the Apache OpenOffice
User Support Forums</a></li>
</ul>
-</p>
</div>
Modified:
websites/staging/ooo-site/trunk/content/download/common/linux_instructions.html
==============================================================================
---
websites/staging/ooo-site/trunk/content/download/common/linux_instructions.html
(original)
+++
websites/staging/ooo-site/trunk/content/download/common/linux_instructions.html
Sat Sep 1 15:15:35 2012
@@ -22,10 +22,11 @@
-<h2><font color="#FF3300">*DRAFT* Last updated: 2012-09-01</font><br />
-Instructions for Downloading and Installing <br />
+<h2>Instructions for Downloading and Installing<br />
Apache OpenOffice.org 3.4 on Linux</h2>
+<p style="color:#FF3300";><b>DRAFT</b> Last updated: 2012-09-01</p>
+
<h2 id="linux"> Linux Installations</h2>
<p>The following preinstallation steps are recommended for Linux
distributions. These should be taken to assure that you
@@ -64,17 +65,17 @@ development environment.</p>
where "linux package name" is the beginning part of the archive you just
downloaded.<br /><br />
This will create an installation directory.<br />
The name of the installation directory will likely be the language
abbreviation for the install set, e.g., en-US.</li>
- <li><tt>su</tt> to root, if necessary, and navigate to Apache OpenOffice
installation directory (the unpacked
+ <li><code>su</code> to root, if necessary, and navigate to Apache OpenOffice
installation directory (the unpacked
archive).<br />
<em>You will likely need to be root to run the rpm command to install the
software.</em></li>
- <li><tt>cd</tt> into the RPMS subdirectory of the installation directory.<br
/>
+ <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>
- <li>Install this new version by typing <tt>rpm -Uvih *rpm</tt>.<br />
- By default, this will install Apache OpenOffice in your <tt>/opt</tt>
directory.<br /><br />
+ <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
level. This may also aid you in determing any dependency problems if they
exist.<br /></li>
<li>Install the desktop integration features for your setup.<br />
- <tt>cd</tt> to <tt>desktop-integration</tt> in the installation
directory,<br />
+ <code>cd</code> to <code>desktop-integration</code> in the installation
directory,<br />
and, depending on your package manager/system, install the appropriate
desktop interface using RPM.</li>
<li>Finally, start up Apache OpenOffice 3.4 to insure it's working.</li>
</ol>
@@ -100,17 +101,17 @@ development environment.</p>
where "linux package name" is the beginning part of the archive you just
downloaded.<br /><br />
This will create an installation directory.<br />
The name of the installation directory will likely be the language
abbreviation for the install set, e.g., en-US.</li>
- <li><tt>su</tt> to root, if necessary, and navigate to Apache OpenOffice
installation directory (the unpacked
+ <li><code>su</code> to root, if necessary, and navigate to Apache OpenOffice
installation directory (the unpacked
archive).<br />
<em>You will likely need to be root to run the deb command to install the
software.</em></li>
- <li><tt>cd</tt> into the DEBS subdirectory of the installation directory.<br
/>
+ <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>
- <li>Install this new version by typing <tt>sudo dpkg -i *.deb</tt>.<br />
- By default, this will install Apache OpenOffice in your <tt>/opt</tt>
directory.<br /><br />
+ <li>Install this new version by typing <code>sudo dpkg -i *.deb</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 debs at the top
level. This may also aid you in determing any dependency problems if they
exist.<br /></li>
<li>Install the desktop integration features for your setup.<br />
- <tt>cd</tt> to <tt>desktop-integration</tt> in the installation
directory,<br />
+ <code>cd</code> to <code>desktop-integration</code> in the installation
directory,<br />
and, depending on your package manager/system, install the appropriate
desktop interface using dpkg.</li>
<li>Finally, start up Apache OpenOffice 3.4 to insure it's working.</li>
</ol>
@@ -136,7 +137,7 @@ build can be tricky, but can usually be
<h2 id="problems">Installation Problems</h2>
-<p>The best resources to help you with installation problems are:
+<p>The best resources to help you with installation problems are:</p>
<ul>
<li><a
href="http://incubator.apache.org/openofficeorg/mailing-lists.html";>the Users
mailing list</a></li>
