svn commit: r1162792 - in /openwebbeans/trunk/src/site: apt/index.apt apt/trademarks.apt resources/images/logos/openwebbeans_small.png site.xml

[st...@apache.org]

Author: struberg
Date: Mon Aug 29 13:17:25 2011
New Revision: 1162792

URL: http://svn.apache.org/viewvc?rev=1162792&view=rev
Log:
OWB-611 adding ASF trademark documentation to our site

Added:
    openwebbeans/trunk/src/site/apt/trademarks.apt
    openwebbeans/trunk/src/site/resources/images/logos/openwebbeans_small.png   (with props)
Modified:
    openwebbeans/trunk/src/site/apt/index.apt
    openwebbeans/trunk/src/site/site.xml

Modified: openwebbeans/trunk/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/src/site/apt/index.apt?rev=1162792&r1=1162791&r2=1162792&view=diff
==============================================================================
--- openwebbeans/trunk/src/site/apt/index.apt (original)
+++ openwebbeans/trunk/src/site/apt/index.apt Mon Aug 29 13:17:25 2011
@@ -31,6 +31,8 @@ Welcome to Apache OpenWebBeans
 
   * We are currently working towards an OpenWebBeans 1.1.1 release
 
+  * 29.08.2011 - Trademark Rules & Logo download page added
+
   * 04.08.2011 - Added backward compat support for Java5 for running OWB with older EE containers
 
   * 19.05.2001 - We got a new Logo, designed by Adonis Raduca and sponsored by Irian.at

Added: openwebbeans/trunk/src/site/apt/trademarks.apt
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/src/site/apt/trademarks.apt?rev=1162792&view=auto
==============================================================================
--- openwebbeans/trunk/src/site/apt/trademarks.apt (added)
+++ openwebbeans/trunk/src/site/apt/trademarks.apt Mon Aug 29 13:17:25 2011
@@ -0,0 +1,30 @@
+~~ 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.
+Apache OpenWebBeans Trademark Rules
+
+  Apache, ASF, OpenWebBeans, Apache OpenWebBeans and OWB are trademarks of the Apache Software Foundation.
+
+
+  For more information about ASF trademark rules, please visit the official
+  {{{http://www.apache.org/foundation/marks/}Apache Software Foundation Trademarks}} page.
+
+
+Apache OpenWebBeans Logos
+
+  The following logos are official project logos and might be used in presentations and articles
+  according to the {{{http://www.apache.org/foundation/marks/#guidelines}Apache Software Foundation Trademark Rules}}.
+
+  * {{{./images/logos/openwebbeans_vert.png}Vertical OpenWebBeans Logo}}
+
+  * {{{./images/logos/openwebbeans_hor.png}Horizontal OpenWebBeans Logo}}
+
+  * {{{./images/logos/openwebbeans_small.png}Small OpenWebBeans Logo}}

Added: openwebbeans/trunk/src/site/resources/images/logos/openwebbeans_small.png
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/src/site/resources/images/logos/openwebbeans_small.png?rev=1162792&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openwebbeans/trunk/src/site/resources/images/logos/openwebbeans_small.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: openwebbeans/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/src/site/site.xml?rev=1162792&r1=1162791&r2=1162792&view=diff
==============================================================================
--- openwebbeans/trunk/src/site/site.xml (original)
+++ openwebbeans/trunk/src/site/site.xml Mon Aug 29 13:17:25 2011
@@ -47,11 +47,12 @@
             <item name="JSR-299" href="jsr299.html" />
             <item name="JSR-330" href="jsr330.html" />
             <item name="Contributing" href="contributing.html" />
-            <item name="Documentation" href="documentation.html"/>
             <item name="IRC" href="irc.html" />
+            <item name="Documentation" href="documentation.html"/>
             <item name="FAQ" href="faq.html" />
             <item name="Extensions" href="extensions/index.html" />
             <item name="Download Apache OWB" href="http://www.apache.org/dyn/closer.cgi/openwebbeans/" />
+            <item name="Logos &amp; Trademarks" href="trademarks.html" />
         </menu>
 
         <menu ref="modules" />