svn commit: r1458986 - /manifoldcf/site/trunk/src/documentation/skinconf.xml

[kw...@apache.org]

Author: kwright
Date: Wed Mar 20 18:12:44 2013
New Revision: 1458986

URL: http://svn.apache.org/r1458986
Log:
Add more complete trademarks in footer.

Modified:
    manifoldcf/site/trunk/src/documentation/skinconf.xml

Modified: manifoldcf/site/trunk/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/manifoldcf/site/trunk/src/documentation/skinconf.xml?rev=1458986&r1=1458985&r2=1458986&view=diff
==============================================================================
--- manifoldcf/site/trunk/src/documentation/skinconf.xml (original)
+++ manifoldcf/site/trunk/src/documentation/skinconf.xml Wed Mar 20 18:12:44 2013
@@ -93,7 +93,17 @@ which will be used to configure the chos
   <year>2009-2013</year>
   <vendor>The Apache Software Foundation.</vendor>
   <copyright-link>http://www.apache.org/licenses/</copyright-link>
-
+  <!-- Optional text trademark statement below the copyright statement -->
+  <trademark-statement>
+    Apache ManifoldCF, ManifoldCF, Apache Forrest, Forrest, Apache Solr, Solr, Apache, the Apache feather logo, the Apache Forrest
+    logo, and the Apache ManifoldCF logo are trademarks of The Apache Software Foundation.
+    Documentum and EMC are a trademarks of EMC Corporation.
+    SharePoint, Windows, and Microsoft are trademarks of Microsoft, Inc.
+    FileNet P8 and IBM are trademarks of IBM, Inc.
+    LiveLink and OpenText are trademarks of OpenText, Inc.
+    QBase, MetaCarta, and GTS are trademarks of QBase, Inc.
+    Meridio and Autonomy are trademarks of HP, Inc.
+  </trademark-statement>
   <!-- Some skins use this to form a 'breadcrumb trail' of links.
     Use location="alt" to move the trail to an alternate location
     (if the skin supports it).