You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ro...@apache.org on 2011/11/20 22:58:29 UTC
svn commit: r1204274 - in /incubator/ooo/site/trunk:
content/openofficeorg/trademarks.mdtext templates/sidenav.mdtext
Author: robweir
Date: Sun Nov 20 21:58:29 2011
New Revision: 1204274
URL: http://svn.apache.org/viewvc?rev=1204274&view=rev
Log:
Added trademarks.mdtext and added it to nav sidebar
Added:
incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext (with props)
Modified:
incubator/ooo/site/trunk/templates/sidenav.mdtext
Added: incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext?rev=1204274&view=auto
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext (added)
+++ incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext Sun Nov 20 21:58:29 2011
@@ -0,0 +1,65 @@
+Title: Apache OpenOffice Trademarks
+Notice: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+
+
+The Apache Software Foundation hold 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
+permission from ASF.
+
+However, the Apache OpenOffice project is happy to work with 3rd
+parties who desire to use these trademarks in ways that are beneficial
+to the project, which do not imply endorsement by ASF, and which are
+fully in conformance with Apache policies.
+
+To request such permission, follow these steps:
+
+1) First familiarize yourself with the Apache Trademark Policy [1].
+Many of the common cases are already addressed there. And some uses
+of ASF marks ("nominative use") are automatically allowed.
+
+2) Email a proposal to ooo-private@incubator.apache.org. In the
+proposal, please include:
+
+a) Name and contact information of the company, organization or person
+requesting the permission
+
+b) A list of what ASF controlled marks you wish to use
+
+c) A description of how these marks would be used. Give supporting
+detail, along with context If you are requesting use of the logo, for
+example, provide a prototype of how the logo would appear in the
+context of the overall design.
+
+d) Any other information you think would be useful, e.g., any impeding deadlines
+
+2) On receipt of the proposal, the Apache OpenOffice PMC will review
+and decide whether or not to recommend approval.
+
+3) If the PMC recommends approval, then they will forward their
+recommendation, along with your proposal and any follow up
+communications, to the Apache V.P. of Brand Management for final
+approval.
+
+4) We will then notify you of the outcome.
+
+
+[1]: http://www.apache.org/foundation/marks/
+
Propchange: incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/ooo/site/trunk/templates/sidenav.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/templates/sidenav.mdtext?rev=1204274&r1=1204273&r2=1204274&view=diff
==============================================================================
--- incubator/ooo/site/trunk/templates/sidenav.mdtext (original)
+++ incubator/ooo/site/trunk/templates/sidenav.mdtext Sun Nov 20 21:58:29 2011
@@ -3,6 +3,7 @@
- [About](/openofficeorg/index.html)
- [Incubator page](http://incubator.apache.org/projects/openofficeorg.html)
- [License](/openofficeorg/license.html)
+ - [Trademarks](/openofficeorg/trademarks.html)
# Community