svn commit: r1459199 - in /manifoldcf/trunk/site/src/documentation: skinconf.xml skins/common/xslt/fo/footerinfo.xsl skins/lucene/xslt/html/site-to-xhtml.xsl

[kw...@apache.org]

Author: kwright
Date: Thu Mar 21 09:18:28 2013
New Revision: 1459199

URL: http://svn.apache.org/r1459199
Log:
Add trademark attribution.

Modified:
    manifoldcf/trunk/site/src/documentation/skinconf.xml
    manifoldcf/trunk/site/src/documentation/skins/common/xslt/fo/footerinfo.xsl
    manifoldcf/trunk/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl

Modified: manifoldcf/trunk/site/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/skinconf.xml?rev=1459199&r1=1459198&r2=1459199&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/skinconf.xml (original)
+++ manifoldcf/trunk/site/src/documentation/skinconf.xml Thu Mar 21 09:18:28 2013
@@ -20,7 +20,7 @@ Skin configuration file. This file conta
 which will be used to configure the chosen Forrest skin.
 -->
 
-<!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.6-3//EN" "http://forrest.apache.org/dtd/skinconfig-v06-3.dtd">
+<!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.8-2//EN" "http://forrest.apache.org/dtd/skinconfig-v08-2.dtd">
 <skinconfig>
   <!-- To enable lucene search add provider="lucene" (default is google).
     Add box-location="alt" to move the search box to an alternate location
@@ -93,6 +93,18 @@ 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 Hewlett Packard, Inc.
+    Alfresco is a trademark of Alfresco Software, 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

Modified: manifoldcf/trunk/site/src/documentation/skins/common/xslt/fo/footerinfo.xsl
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/skins/common/xslt/fo/footerinfo.xsl?rev=1459199&r1=1459198&r2=1459199&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/skins/common/xslt/fo/footerinfo.xsl (original)
+++ manifoldcf/trunk/site/src/documentation/skins/common/xslt/fo/footerinfo.xsl Thu Mar 21 09:18:28 2013
@@ -41,6 +41,9 @@ with @role='pdf' is present, that is use
           select="//skinconfig/vendor"/>
 <xsl:text> All rights reserved.</xsl:text>
       </xsl:if>
+      <xsl:if test="not($pdfcredit) and not($config/disable-trademark-footer = 'true')">
+        <xsl:value-of select="//skinconfig/trademark-statement"/>
+      </xsl:if>
     </xsl:variable>
     <xsl:variable name="url" select="$pdfcredit/url"/>
     <fo:block-container font-style="italic" absolute-position="absolute"

Modified: manifoldcf/trunk/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl?rev=1459199&r1=1459198&r2=1459199&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl (original)
+++ manifoldcf/trunk/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl Thu Mar 21 09:18:28 2013
@@ -324,6 +324,11 @@ footer, searchbar, css etc.  As input, i
               </xsl:choose>
             </div>
           </xsl:if>
+          <xsl:if test="not($config/disable-trademark-footer = 'true')">
+            <div class="copyright">
+              <xsl:value-of select="$config/trademark-statement"/>
+            </div>
+          </xsl:if>
           <xsl:if test="$filename = 'index.html'">
             <div id="logos" >
               <xsl:if test="$config/disable-compliance-links/@align">