Author: buildbot
Date: Tue Jun 25 14:27:26 2013
New Revision: 867394
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/distribution/oem/index.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 25 14:27:26 2013
@@ -1 +1 @@
-1496485
+1496486
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 25 14:27:26 2013
@@ -1 +1 @@
-1496485
+1496486
Modified: websites/staging/ooo-site/trunk/content/distribution/oem/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/distribution/oem/index.html
(original)
+++ websites/staging/ooo-site/trunk/content/distribution/oem/index.html Tue Jun
25 14:27:26 2013
@@ -46,13 +46,13 @@
<h2>OEM/Bundling of Apache OpenOffice</h2>
- <p>Apache OpenOffice is distributed under the Apache License 2.0, a
permissive open source license. Section 4 "Redistribution" of that license
describes the permissions and conditions related to redistribution of
+ <p>Apache OpenOffice is distributed under the <a
href="http://www.apache.org/licenses/LICENSE-2.0.html";>Apache License 2.0</a>,
a permissive open source license. Section 4 "Redistribution" of that license
describes the permissions and conditions related to redistribution of
OpenOffice.</p>
<p>In general we encourage redistribution of OpenOffice and offer the
following avenues for answering OEM questions:</p>
<ul>
- <li>For technical questions, related to customization of
OpenOffice, pre-installs, extensions, rebranding, etc., we recommend posting to
our public <a
href="http://openoffice.apache.org/mailing-lists.html#development-mailing-list-public"development
mailing list</a>.</li>
+ <li>For technical questions, related to customization of
OpenOffice, pre-installs, extensions, rebranding, etc., we recommend posting to
our public <a
href="http://openoffice.apache.org/mailing-lists.html#development-mailing-list-public";>development
mailing list</a>.</li>
<li>For questions related to Apache License and its
permissions, export controls, etc., you can consult the resources on the <a
href=="http://www.apache.org/legal/";>Apache Legal Affairs</a> home page.</li>
<li>For permissions to use the OpenOffice trademark or logo,
please refer to <a href="https://openoffice.apache.org/trademarks.html";>this
page</a></li>
</ul>
