You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2013/02/15 22:15:51 UTC
svn commit: r850745 - in /websites/staging/openoffice/trunk/content: ./
trademarks.html
Author: buildbot
Date: Fri Feb 15 21:15:51 2013
New Revision: 850745
Log:
Staging update by buildbot for openoffice
Modified:
websites/staging/openoffice/trunk/content/ (props changed)
websites/staging/openoffice/trunk/content/trademarks.html
Propchange: websites/staging/openoffice/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Feb 15 21:15:51 2013
@@ -1 +1 @@
-1445809
+1446775
Modified: websites/staging/openoffice/trunk/content/trademarks.html
==============================================================================
--- websites/staging/openoffice/trunk/content/trademarks.html (original)
+++ websites/staging/openoffice/trunk/content/trademarks.html Fri Feb 15 21:15:51 2013
@@ -102,8 +102,8 @@
<h2 id="getting-permission-to-use-our-trademarks">Getting permission to use our trademarks</h2>
<p>The Apache Software Foundation holds trademarks on behalf of its
projects. For the Apache OpenOffice project these trademarks include
-the names Apache OpenOffice and OpenOffice.org, as well as the
-graphical logo. Use of these marks is prohibited without explicit
+the names Apache OpenOffice⢠and OpenOffice.org®, as well as the
+graphical logos. Use of these marks is prohibited without explicit
permission from the ASF.</p>
<p>However, the Apache OpenOffice project is happy to work with 3rd
parties who desire to use these trademarks in ways that are beneficial