Author: buildbot
Date: Sat Jun 15 14:00:13 2013
New Revision: 865748
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/best-practices.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jun 15 14:00:13 2013
@@ -1 +1 @@
-1493165
+1493357
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jun 15 14:00:13 2013
@@ -1 +1 @@
-1493165
+1493357
Modified:
websites/staging/ooo-site/trunk/content/distribution/best-practices.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/distribution/best-practices.html
(original)
+++ websites/staging/ooo-site/trunk/content/distribution/best-practices.html
Sat Jun 15 14:00:13 2013
@@ -33,7 +33,7 @@
to encourage and support the efforts of distributors by listing their
contact information on our website.</p>
<p>However, we also desire that users who purchase OpenOffice on physical
media have a similar high-quality experience, receiving the latest version of
the software,
- free of corruption and viruses, exactly as we approved it for release. So
in return for listing a distributor on our website, we require that they
publicly agree to adhear
+ free of corruption and viruses, exactly as we approved it for release. So
in return for listing a distributor on our website, we require that they
publicly agree to adhere
to the following Distribution Best Practices.</p>
<h2>Distributor Best Practices</h2>
@@ -48,7 +48,7 @@
<li>Do not suggest that the buyer is paying for support unless you
actually provide your own support, e.g., more than just pointing the user to
our community support forums.</li>
<li>Act in accordance with the <a
href="http://www.apache.org/foundation/marks/";>Apache Trademark Policy.</a> In
particular, use of the Apache OpenOffice logo is
permitted on your website only when the www.openoffice.org website
is the target of a hyperlink. Use beyond that, such as on a CD label, requires
explicit permission, which
- can be sought <a
href="https://openoffice.apache.org/trademarks.html";>per these
instructions.</a></li>
+ can be sought <a
href="http://openoffice.apache.org/trademarks.html";>per these
instructions.</a></li>
<li>Do not suggest that you are affiliated with or endorsed by the
Apache OpenOffice project.</li>
</ol>
