Author: buildbot
Date: Sat Sep 1 15:22:51 2012
New Revision: 830765
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:22:51 2012
@@ -1 +1 @@
-1379768
+1379770
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Sep 1 15:22:51 2012
@@ -1 +1 @@
-1379768
+1379770
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:22:51 2012
@@ -41,19 +41,14 @@ Java and Apache OpenOffice</a>). Please
functionality.</em></p>
<ul>
- <li><a href="#win">Windows</a>
- <ul>
- <li><a href="#fileassoc">File Associations</a></li>
- </ul>
- </li>
- <li><a href="#linux">Linux, General Information</a></li>
- <ul>
- <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">Packages for Linux Distributions</a></li>
- </ul>
- <li><a href="#apple">Apple Macintosh</a></li>
- <li><a href="#problems">Installation Problems</a></li>
+ <li><b><a href="#win">Windows</a></b></li>
+ <li><a href="#fileassoc">File Associations</a></li>
+ <li><b><a href="#linux">Linux, General Information</a></b></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">Packages for Linux Distributions</a></li>
+ <li><b><a href="#apple">Apple Macintosh</a></b></li>
+ <li><b><a href="#problems">Installation Problems</a></b></li>
</ul>
<hr />
@@ -297,17 +292,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/update 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/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 rpms at the top
level. This may also aid you in determing any dependency problems if they
exist.</li>
- <li>Install the desktop integration features for your setup. <br />
- <tt>cd</tt> to <tt>desktop-integration</tt> in the installation
directory,<br />
+ <li>Install the desktop integration features for your setup.<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.x to insure it's working.</li>
</ol>
@@ -333,17 +328,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/update 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/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
level. This may also aid you in determing any dependency problems if they
exist.</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.x to insure it's working.</li>
</ol>
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:22:51 2012
@@ -30,7 +30,7 @@ Apache OpenOffice 3.4.x and OpenOffice.o
<p>A more extensive, though older, <b>Installation Guide</b> is available in
<a
href="http://wiki.services.openoffice.org/w/images/7/7e/Installation_Guide_OOo3.pdf";>PDF</a>
and
<a
href="http://wiki.services.openoffice.org/w/images/6/63/Installation_Guide_OOo3.odt";>ODT</a>
formats from the
-<a
href="http://wiki.services.openoffice.org/wiki/Documentation";>OpenOffice.org
Documentation Project</a>.</p>
+<a href="http://wiki.services.openoffice.org/wiki/Documentation";>Apache
OpenOffice Documentation Project</a>.</p>
<p>You may also find the <a
href="http://wiki.services.openoffice.org/wiki/Documentation/FAQ/Installation";>
Installation FAQs</a> useful as well.</p>
@@ -41,17 +41,12 @@ Java and Apache OpenOffice</a>). Please
functionality.</em></p>
<ul>
- <li><a href="#win">Windows</a>
- <ul>
- <li><a href="#fileassoc">File Associations</a></li>
- </ul>
- </li>
- <li><a href="#linux">Linux, General Information</a></li>
- <ul>
- <li><a href="#other_linux">Packages for Linux Distributions</a></li>
- </ul>
- <li><a href="#apple">Apple Macintosh</a></li>
- <li><a href="#problems">Installation Problems</a></li>
+ <li><b><a href="#win">Windows</a></b></li>
+ <li><a href="#fileassoc">File Associations</a></li>
+ <li><b><a href="#linux">Linux, General Information</a></b></li>
+ <li><a href="#other_linux">Packages for Linux Distributions</a></li>
+ <li><b><a href="#apple">Apple Macintosh</a></b></li>
+ <li><b><a href="#problems">Installation Problems</a></b></li>
</ul>
<hr />
@@ -274,7 +269,7 @@ be included on the installation media of
<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 />
+ <li>Install the desktop integration features for your setup.<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>
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:22:51 2012
@@ -25,7 +25,7 @@
<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>
+<a style="color:#FF3300"><b>DRAFT</b> Last updated: 2012-09-01</a>
<h2 id="linux"> Linux Installations</h2>
