Author: crossley
Date: Sun May 24 08:14:45 2009
New Revision: 778112
URL: http://svn.apache.org/viewvc?rev=778112&view=rev
Log:
Improve the trademark statement with feedback from Apache PRC people.
Modified:
forrest/trunk/main/fresh-site/src/documentation/skinconf.xml
forrest/trunk/main/webapp/resources/schema/entity/skinconf-common-plugins-07-1.xml
forrest/trunk/site-author/skinconf.xml
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.footer.panel.xml
Modified: forrest/trunk/main/fresh-site/src/documentation/skinconf.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/skinconf.xml?rev=778112&r1=778111&r2=778112&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/skinconf.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/skinconf.xml Sun May 24
08:14:45 2009
@@ -88,8 +88,8 @@
<copyright-link>http://www.example.org/</copyright-link>
<!-- Optional text trademark statement below the copyright statement -->
<trademark-statement>
- The names "Apache" and "Apache Forrest" and the Apache feather logo are
- trademarks of The Apache Software Foundation.
+ Apache, Apache Forrest, the Apache feather logo, and the Apache Forrest
+ logos are trademarks of The Apache Software Foundation.
</trademark-statement>
<!-- Some skins use this to form a 'breadcrumb trail' of links.
Use location="alt" to move the trail to an alternate location
Modified:
forrest/trunk/main/webapp/resources/schema/entity/skinconf-common-plugins-07-1.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/entity/skinconf-common-plugins-07-1.xml?rev=778112&r1=778111&r2=778112&view=diff
==============================================================================
---
forrest/trunk/main/webapp/resources/schema/entity/skinconf-common-plugins-07-1.xml
(original)
+++
forrest/trunk/main/webapp/resources/schema/entity/skinconf-common-plugins-07-1.xml
Sun May 24 08:14:45 2009
@@ -41,8 +41,8 @@
<vendor>The Apache Software Foundation.</vendor>
<copyright-link>http://www.apache.org/licenses/</copyright-link>
<trademark-statement>
- The names "Apache" and "Apache Forrest" and the Apache feather logo are
- trademarks of The Apache Software Foundation.
+ Apache, Apache Forrest, the Apache feather logo, and the Apache Forrest
+ logos are trademarks of The Apache Software Foundation.
</trademark-statement>
<trail>
<link1 name="Apache Forrest" href="http://forrest.apache.org/"/>
Modified: forrest/trunk/site-author/skinconf.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/site-author/skinconf.xml?rev=778112&r1=778111&r2=778112&view=diff
==============================================================================
--- forrest/trunk/site-author/skinconf.xml (original)
+++ forrest/trunk/site-author/skinconf.xml Sun May 24 08:14:45 2009
@@ -75,8 +75,8 @@
<copyright-link>http://www.apache.org/licenses/</copyright-link>
<!-- Optional text trademark statement below the copyright statement -->
<trademark-statement>
- The names "Apache" and "Apache Forrest" and the Apache feather logo are
- trademarks of The Apache Software Foundation.
+ Apache, Apache Forrest, the Apache feather logo, and the Apache Forrest
+ logos are trademarks of The Apache Software Foundation.
</trademark-statement>
<!-- Some skins use this to form a 'breadcrumb trail' of links.
If you don't want these, then set the attributes to blank.
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.footer.panel.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.footer.panel.xml?rev=778112&r1=778111&r2=778112&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.footer.panel.xml
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.footer.panel.xml
Sun May 24 08:14:45 2009
@@ -29,8 +29,10 @@
<year inception="true">2002</year>
<vendor>The Example Organisation. Licensed under Apache Licence
2.0</vendor>
<copyright-link>http://example.org</copyright-link>
- <msg>The names "Apache" and "Apache Forrest" and the Apache
feather logo are
- trademarks of The Apache Software Foundation.</msg>
+ <msg>
+ Apache, Apache Forrest, the Apache feather logo, and the Apache
+ Forrest logos are trademarks of The Apache Software Foundation.
+ </msg>
</copyright>
</forrest:property>
</forrest:contract>
