svn commit: r1090334 - in /turbine/site: src/site/site.xml xdocs/index.xml

[tv...@apache.org]

Author: tv
Date: Fri Apr  8 16:31:22 2011
New Revision: 1090334

URL: http://svn.apache.org/viewvc?rev=1090334&view=rev
Log:
Implement ASF project branding requirements

Modified:
    turbine/site/src/site/site.xml
    turbine/site/xdocs/index.xml

Modified: turbine/site/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/site/src/site/site.xml?rev=1090334&r1=1090333&r2=1090334&view=diff
==============================================================================
--- turbine/site/src/site/site.xml (original)
+++ turbine/site/src/site/site.xml Fri Apr  8 16:31:22 2011
@@ -102,9 +102,11 @@
 
     <menu name="Apache">
         <item name="Apache Website"     href="http://www.apache.org/"/>
+        <item name="License"            href="http://www.apache.org/licenses/" />
         <item name="How the ASF works"  href="http://www.apache.org/foundation/how-it-works.html"/>
-        <item name="Sponsorship"        href="http://www.apache.org/foundation/sponsorship.html"/>
-        <item name="Thanks"             href="http://www.apache.org/foundation/thanks.html"/>
+        <item name="Sponsorship"        href="http://www.apache.org/foundation/sponsorship.html" />
+        <item name="Thanks"             href="http://www.apache.org/foundation/thanks.html" />
+        <item name="Security"           href="http://www.apache.org/security/" />
     </menu>
     </body>
 </project>

Modified: turbine/site/xdocs/index.xml
URL: http://svn.apache.org/viewvc/turbine/site/xdocs/index.xml?rev=1090334&r1=1090333&r2=1090334&view=diff
==============================================================================
--- turbine/site/xdocs/index.xml (original)
+++ turbine/site/xdocs/index.xml Fri Apr  8 16:31:22 2011
@@ -21,15 +21,15 @@
 <document>
 
   <properties>
-    <title>Turbine</title>
+    <title>Apache Turbine&#8482;</title>
   </properties>
 
 <body>
 
-<section name="Apache Turbine Web Application Framework">
+<section name="Apache Turbine&#8482; Web Application Framework">
 
   <p>
-    Turbine is a servlet based framework that allows experienced Java
+    Apache Turbine&#8482; is a servlet based framework that allows experienced Java
     developers to quickly build web applications. Turbine allows you
     to use personalize the web sites and to use user logins to restrict
     access to parts of your application.
@@ -143,5 +143,21 @@ quite a number of projects:
 </ul>
 </section>
 
+<section name="The Apache Software Foundation">
+<p>
+The <a href="http://www.apache.org">Apache Software Foundation</a> provides support for the 
+Apache community of open-source software projects. The Apache projects are defined by 
+collaborative consensus based processes, an open, pragmatic software license and a desire 
+to create high quality software that leads the way in its field.
+</p>
+<p> 
+Apache Turbine, Turbine, Apache, the Apache feather logo, and the Apache Turbine project logo
+are trademarks of The Apache Software Foundation.
+</p>
+<p>
+All other marks mentioned may be trademarks or registered trademarks of their respective 
+owners.
+</p>
+</section>
 </body>
 </document>