Return-Path: 
 <commits-return-4055-apmail-manifoldcf-commits-archive=manifoldcf.apache.org@manifoldcf.apache.org>
X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org
Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 83BFFF6CF
	for <apmail-manifoldcf-commits-archive@www.apache.org>;
 Wed, 20 Mar 2013 18:13:41 +0000 (UTC)
Received: (qmail 64371 invoked by uid 500); 20 Mar 2013 18:13:39 -0000
Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org
Received: (qmail 63851 invoked by uid 500); 20 Mar 2013 18:13:25 -0000
Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@manifoldcf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@manifoldcf.apache.org>
List-Post: <mailto:commits@manifoldcf.apache.org>
List-Id: <commits.manifoldcf.apache.org>
Reply-To: dev@manifoldcf.apache.org
Delivered-To: mailing list commits@manifoldcf.apache.org
Received: (qmail 63457 invoked by uid 99); 20 Mar 2013 18:13:10 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Mar 2013 18:13:10 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Mar 2013 18:13:05 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D1A972388847;
	Wed, 20 Mar 2013 18:12:44 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1458986 -
 /manifoldcf/site/trunk/src/documentation/skinconf.xml
Date: Wed, 20 Mar 2013 18:12:44 -0000
To: commits@manifoldcf.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130320181244.D1A972388847@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on 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).