forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r1066732 - in /forrest/trunk: main/fresh-site/src/documentation/ main/template-sites/basic/src/documentation/ main/template-sites/benchmark/src/documentation/ main/template-sites/business/src/documentation/ main/webapp/resources/schema/enti...
Date Thu, 03 Feb 2011 03:57:54 GMT
Author: crossley
Date: Thu Feb  3 03:57:53 2011
New Revision: 1066732

URL: http://svn.apache.org/viewvc?rev=1066732&view=rev
Log:
Re-order the listed marks to follow the ASF example.

Modified:
    forrest/trunk/main/fresh-site/src/documentation/skinconf.xml
    forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml
    forrest/trunk/main/template-sites/benchmark/src/documentation/skinconf.xml
    forrest/trunk/main/template-sites/business/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.plugin.internal.dispatcher/themer/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=1066732&r1=1066731&r2=1066732&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/skinconf.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/skinconf.xml Thu Feb  3 03:57:53 2011
@@ -88,7 +88,7 @@ which will be used to configure the chos
   <copyright-link>http://www.example.org/</copyright-link>
 <!-- Optional text trademark statement below the copyright statement -->
   <trademark-statement>
-    Apache, Apache Forrest, Forrest, the Apache feather logo, and the Apache Forrest
+    Apache Forrest, Forrest, Apache, 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.

Modified: forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml?rev=1066732&r1=1066731&r2=1066732&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml (original)
+++ forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml Thu Feb  3 03:57:53
2011
@@ -89,7 +89,7 @@ which will be used to configure the chos
 <!-- Optional text trademark statement below the copyright statement -->
 <!--
   <trademark-statement>
-    Apache, Apache Forrest, Forrest, the Apache feather logo, and the Apache Forrest
+    Apache Forrest, Forrest, Apache, the Apache feather logo, and the Apache Forrest
     logos are trademarks of The Apache Software Foundation.
   </trademark-statement>
 -->

Modified: forrest/trunk/main/template-sites/benchmark/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/benchmark/src/documentation/skinconf.xml?rev=1066732&r1=1066731&r2=1066732&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/benchmark/src/documentation/skinconf.xml (original)
+++ forrest/trunk/main/template-sites/benchmark/src/documentation/skinconf.xml Thu Feb  3
03:57:53 2011
@@ -89,7 +89,7 @@ which will be used to configure the chos
 <!-- Optional text trademark statement below the copyright statement -->
 <!--
   <trademark-statement>
-    Apache, Apache Forrest, Forrest, the Apache feather logo, and the Apache Forrest
+    Apache Forrest, Forrest, Apache, the Apache feather logo, and the Apache Forrest
     logos are trademarks of The Apache Software Foundation.
   </trademark-statement>
 -->

Modified: forrest/trunk/main/template-sites/business/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/business/src/documentation/skinconf.xml?rev=1066732&r1=1066731&r2=1066732&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/business/src/documentation/skinconf.xml (original)
+++ forrest/trunk/main/template-sites/business/src/documentation/skinconf.xml Thu Feb  3 03:57:53
2011
@@ -89,7 +89,7 @@ which will be used to configure the chos
 <!-- Optional text trademark statement below the copyright statement -->
 <!--
   <trademark-statement>
-    Apache, Apache Forrest, Forrest, the Apache feather logo, and the Apache Forrest
+    Apache Forrest, Forrest, Apache, the Apache feather logo, and the Apache Forrest
     logos are trademarks of The Apache Software Foundation.
   </trademark-statement>
 -->

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=1066732&r1=1066731&r2=1066732&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 Thu
Feb  3 03:57:53 2011
@@ -41,7 +41,7 @@ in a 'forrest seed-sample" site.
 <vendor>The Apache Software Foundation.</vendor>
 <copyright-link>http://www.apache.org/licenses/</copyright-link>
 <trademark-statement>
-  Apache, Apache Forrest, Forrest, the Apache feather logo, and the Apache Forrest
+  Apache Forrest, Forrest, Apache, the Apache feather logo, and the Apache Forrest
   logos are trademarks of The Apache Software Foundation.
 </trademark-statement>
 <trail>

Modified: forrest/trunk/site-author/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/skinconf.xml?rev=1066732&r1=1066731&r2=1066732&view=diff
==============================================================================
--- forrest/trunk/site-author/skinconf.xml (original)
+++ forrest/trunk/site-author/skinconf.xml Thu Feb  3 03:57:53 2011
@@ -75,7 +75,7 @@ See main/fresh-site/src/documentation/sk
   <copyright-link>http://www.apache.org/licenses/</copyright-link>
 <!-- Optional text trademark statement below the copyright statement -->
   <trademark-statement>
-    Apache, Apache Forrest, Forrest, the Apache feather logo, and the Apache Forrest
+    Apache Forrest, Forrest, Apache, 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.

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.footer.panel.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.footer.panel.xml?rev=1066732&r1=1066731&r2=1066732&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.footer.panel.xml
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.footer.panel.xml
Thu Feb  3 03:57:53 2011
@@ -36,7 +36,7 @@ xmlns:jx="http://apache.org/cocoon/templ
       <forrest:contract name="siteinfo-trademark">
 	<forrest:property name="siteinfo-trademark">
 	  <trademark>
-            <msg>Apache, Apache Forrest, Forrest, the Apache feather logo, and the
Apache Forrest logos are trademarks of The Apache Software Foundation.</msg>
+            <msg>Apache Forrest, Forrest, Apache, the Apache feather logo, and the
Apache Forrest logos are trademarks of The Apache Software Foundation.</msg>
     	  </trademark>
         </forrest:property>
       </forrest:contract>



Mime
View raw message