Author: buildbot Date: Mon Jul 14 22:59:24 2014 New Revision: 916226 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 Mon Jul 14 22:59:24 2014 @@ -1 +1 @@ -1606375 +1610552 Modified: websites/staging/openoffice/trunk/content/trademarks.html ============================================================================== --- websites/staging/openoffice/trunk/content/trademarks.html (original) +++ websites/staging/openoffice/trunk/content/trademarks.html Mon Jul 14 22:59:24 2014 @@ -102,7 +102,7 @@ <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 logos. Use of these marks is prohibited without explicit +<a href="http://www.openoffice.org/marketing/art/galleries/logos/index.html">graphical logos</a>. 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