From ba9275e72bd705611064ec77b70b0595676f6b3a Mon Sep 17 00:00:00 2001
From: Nick Burch <nick@apache.org>
Date: Thu, 12 May 2011 19:13:01 +0000
Subject: [PATCH] Project branding update - add trademark notice to page
 footers

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1102428 13f79535-47bb-0310-9956-ffa450edef68
---
 src/documentation/content/xdocs/casestudies.xml               | 3 +++
 src/documentation/content/xdocs/download.xml                  | 3 +++
 src/documentation/content/xdocs/encryption.xml                | 3 +++
 src/documentation/content/xdocs/guidelines.xml                | 3 +++
 src/documentation/content/xdocs/historyandfuture.xml          | 3 +++
 src/documentation/content/xdocs/howtobuild.xml                | 3 +++
 src/documentation/content/xdocs/index.xml                     | 3 +++
 src/documentation/content/xdocs/legal.xml                     | 3 +++
 src/documentation/content/xdocs/mailinglists.xml              | 3 +++
 src/documentation/content/xdocs/mirrors.xml                   | 3 +++
 src/documentation/content/xdocs/news.xml                      | 3 +++
 src/documentation/content/xdocs/news/logocontest.xml          | 3 +++
 src/documentation/content/xdocs/overview.xml                  | 3 +++
 src/documentation/content/xdocs/subversion.xml                | 3 +++
 src/documentation/content/xdocs/text-extraction.xml           | 3 +++
 src/documentation/content/xdocs/trans/de/index.xml            | 3 +++
 src/documentation/content/xdocs/trans/es/casestudies.xml      | 3 +++
 src/documentation/content/xdocs/trans/es/historyandfuture.xml | 3 +++
 src/documentation/content/xdocs/trans/es/index.xml            | 3 +++
 src/documentation/content/xdocs/trans/es/news.xml             | 3 +++
 src/documentation/content/xdocs/trans/es/overview.xml         | 3 +++
 src/documentation/content/xdocs/trans/guidelines.xml          | 3 +++
 src/documentation/content/xdocs/trans/index.xml               | 3 +++
 src/documentation/skinconf.xml                                | 2 +-
 src/documentation/skins/common/xslt/html/site2xhtml.xsl       | 4 +++-
 src/documentation/skins/poi-site/xslt/html/site2xhtml.xsl     | 4 +++-
 26 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/src/documentation/content/xdocs/casestudies.xml b/src/documentation/content/xdocs/casestudies.xml
index 044b0e690b..32530f28d1 100644
--- a/src/documentation/content/xdocs/casestudies.xml
+++ b/src/documentation/content/xdocs/casestudies.xml
@@ -219,6 +219,9 @@ format,
     <footer>
         <legal>
             Copyright (c) @year@ The Apache Software Foundation All rights reserved.
+            <br />
+            Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+            POI project logo are trademarks of The Apache Software Foundation.
         </legal>
     </footer>
 </document>
diff --git a/src/documentation/content/xdocs/download.xml b/src/documentation/content/xdocs/download.xml
index 193c5e44f2..715020027f 100644
--- a/src/documentation/content/xdocs/download.xml
+++ b/src/documentation/content/xdocs/download.xml
@@ -203,6 +203,9 @@ sub   4096g/7B45A98A 2007-06-18 [expires: 2012-06-16]
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/encryption.xml b/src/documentation/content/xdocs/encryption.xml
index 7354431fba..96472a20e4 100644
--- a/src/documentation/content/xdocs/encryption.xml
+++ b/src/documentation/content/xdocs/encryption.xml
@@ -75,6 +75,9 @@ try {
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/guidelines.xml b/src/documentation/content/xdocs/guidelines.xml
index eb0fe14d5c..2429f75e6d 100644
--- a/src/documentation/content/xdocs/guidelines.xml
+++ b/src/documentation/content/xdocs/guidelines.xml
@@ -272,6 +272,9 @@
 <footer>
    <legal>
       Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
    </legal>
 </footer>
 </document>
diff --git a/src/documentation/content/xdocs/historyandfuture.xml b/src/documentation/content/xdocs/historyandfuture.xml
index 42984d60f9..74faebf520 100644
--- a/src/documentation/content/xdocs/historyandfuture.xml
+++ b/src/documentation/content/xdocs/historyandfuture.xml
@@ -148,6 +148,9 @@ already started making waves.
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 
diff --git a/src/documentation/content/xdocs/howtobuild.xml b/src/documentation/content/xdocs/howtobuild.xml
index cbc4d3e8f2..bce7552de3 100644
--- a/src/documentation/content/xdocs/howtobuild.xml
+++ b/src/documentation/content/xdocs/howtobuild.xml
@@ -115,6 +115,9 @@
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/index.xml b/src/documentation/content/xdocs/index.xml
index 4ce68fa08f..c757193ba8 100644
--- a/src/documentation/content/xdocs/index.xml
+++ b/src/documentation/content/xdocs/index.xml
@@ -141,6 +141,9 @@
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/legal.xml b/src/documentation/content/xdocs/legal.xml
index f1fdb63311..0c106726f1 100644
--- a/src/documentation/content/xdocs/legal.xml
+++ b/src/documentation/content/xdocs/legal.xml
@@ -92,6 +92,9 @@ web site are trademarks of their respective owners.
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/mailinglists.xml b/src/documentation/content/xdocs/mailinglists.xml
index 833bcb500f..989dc192a5 100644
--- a/src/documentation/content/xdocs/mailinglists.xml
+++ b/src/documentation/content/xdocs/mailinglists.xml
@@ -91,6 +91,9 @@
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/mirrors.xml b/src/documentation/content/xdocs/mirrors.xml
index f273f5c123..13fe902c51 100644
--- a/src/documentation/content/xdocs/mirrors.xml
+++ b/src/documentation/content/xdocs/mirrors.xml
@@ -49,6 +49,9 @@
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/news.xml b/src/documentation/content/xdocs/news.xml
index daaf1a28ab..ffd7b5723f 100644
--- a/src/documentation/content/xdocs/news.xml
+++ b/src/documentation/content/xdocs/news.xml
@@ -225,6 +225,9 @@
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/news/logocontest.xml b/src/documentation/content/xdocs/news/logocontest.xml
index 3d796090c2..15503daaba 100644
--- a/src/documentation/content/xdocs/news/logocontest.xml
+++ b/src/documentation/content/xdocs/news/logocontest.xml
@@ -186,6 +186,9 @@
     <footer>
         <legal>
           Copyright (c) @year@ The Apache Software Foundation All rights reserved.
+          <br />
+          Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+          POI project logo are trademarks of The Apache Software Foundation.
         </legal>
     </footer>
 </document>
diff --git a/src/documentation/content/xdocs/overview.xml b/src/documentation/content/xdocs/overview.xml
index 3737d34972..d457d22488 100644
--- a/src/documentation/content/xdocs/overview.xml
+++ b/src/documentation/content/xdocs/overview.xml
@@ -314,6 +314,9 @@
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/subversion.xml b/src/documentation/content/xdocs/subversion.xml
index 4b8d298899..95adc768d0 100644
--- a/src/documentation/content/xdocs/subversion.xml
+++ b/src/documentation/content/xdocs/subversion.xml
@@ -85,6 +85,9 @@
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/text-extraction.xml b/src/documentation/content/xdocs/text-extraction.xml
index 0357f34fa9..dfbfe5d60a 100644
--- a/src/documentation/content/xdocs/text-extraction.xml
+++ b/src/documentation/content/xdocs/text-extraction.xml
@@ -165,6 +165,9 @@ for (POITextExtractor textExtractor : embeddedExtractors) {
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/trans/de/index.xml b/src/documentation/content/xdocs/trans/de/index.xml
index 32da9d2098..6345c406f6 100644
--- a/src/documentation/content/xdocs/trans/de/index.xml
+++ b/src/documentation/content/xdocs/trans/de/index.xml
@@ -203,6 +203,9 @@
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/trans/es/casestudies.xml b/src/documentation/content/xdocs/trans/es/casestudies.xml
index 58a22f38dd..11a6e2bf1b 100644
--- a/src/documentation/content/xdocs/trans/es/casestudies.xml
+++ b/src/documentation/content/xdocs/trans/es/casestudies.xml
@@ -182,6 +182,9 @@
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/trans/es/historyandfuture.xml b/src/documentation/content/xdocs/trans/es/historyandfuture.xml
index 74104584da..495da3f246 100644
--- a/src/documentation/content/xdocs/trans/es/historyandfuture.xml
+++ b/src/documentation/content/xdocs/trans/es/historyandfuture.xml
@@ -162,6 +162,9 @@
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 
diff --git a/src/documentation/content/xdocs/trans/es/index.xml b/src/documentation/content/xdocs/trans/es/index.xml
index 256ca4f4a1..67db1c339c 100644
--- a/src/documentation/content/xdocs/trans/es/index.xml
+++ b/src/documentation/content/xdocs/trans/es/index.xml
@@ -124,6 +124,9 @@
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/trans/es/news.xml b/src/documentation/content/xdocs/trans/es/news.xml
index 1bbfdf7907..6e333e8f35 100644
--- a/src/documentation/content/xdocs/trans/es/news.xml
+++ b/src/documentation/content/xdocs/trans/es/news.xml
@@ -224,6 +224,9 @@
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/trans/es/overview.xml b/src/documentation/content/xdocs/trans/es/overview.xml
index c1cf94678a..fe280a05ba 100644
--- a/src/documentation/content/xdocs/trans/es/overview.xml
+++ b/src/documentation/content/xdocs/trans/es/overview.xml
@@ -83,6 +83,9 @@
   <footer>
     <legal>
       Copyright (c) @year@ The POI Project All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/trans/guidelines.xml b/src/documentation/content/xdocs/trans/guidelines.xml
index 9a90ff377e..3f822733e9 100644
--- a/src/documentation/content/xdocs/trans/guidelines.xml
+++ b/src/documentation/content/xdocs/trans/guidelines.xml
@@ -140,6 +140,9 @@
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/content/xdocs/trans/index.xml b/src/documentation/content/xdocs/trans/index.xml
index 5f6aec70e0..7dc9a2f1b7 100644
--- a/src/documentation/content/xdocs/trans/index.xml
+++ b/src/documentation/content/xdocs/trans/index.xml
@@ -60,6 +60,9 @@
   <footer>
     <legal>
       Copyright (c) @year@ The Apache Software Foundation All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
     </legal>
   </footer>
 </document>
diff --git a/src/documentation/skinconf.xml b/src/documentation/skinconf.xml
index ad5b921bed..bcec8209c8 100644
--- a/src/documentation/skinconf.xml
+++ b/src/documentation/skinconf.xml
@@ -114,7 +114,7 @@ be used to configure the chosen Forrest skin.
   <host-logo></host-logo>
 
   <!-- The following are used to construct a copyright statement -->
-  <year>2002-2010</year>
+  <year>2002-2011</year>
   <vendor>The Apache Software Foundation</vendor>
 
   <!-- Some skins use this to form a 'breadcrumb trail' of links. If you don't
diff --git a/src/documentation/skins/common/xslt/html/site2xhtml.xsl b/src/documentation/skins/common/xslt/html/site2xhtml.xsl
index 90cd78b6f3..4d74954cba 100644
--- a/src/documentation/skins/common/xslt/html/site2xhtml.xsl
+++ b/src/documentation/skins/common/xslt/html/site2xhtml.xsl
@@ -98,7 +98,9 @@ footer, searchbar, css etc.  As input, it takes XML of the form:
 
         <xsl:comment>================= start Footer ==================</xsl:comment>
         Copyright &#169; <xsl:value-of select="$config/year"/>&#160;<xsl:value-of
-          select="$config/vendor"/> All rights reserved.
+          select="$config/vendor"/> All rights reserved.<br />
+          Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+          POI project logo are trademarks of The Apache Software Foundation.
         <script language="JavaScript" type="text/javascript"><![CDATA[<!--
           document.write(" - "+"Last Published: " + document.lastModified);
           //  -->]]></script>
diff --git a/src/documentation/skins/poi-site/xslt/html/site2xhtml.xsl b/src/documentation/skins/poi-site/xslt/html/site2xhtml.xsl
index 0de266e269..b3b633ed09 100644
--- a/src/documentation/skins/poi-site/xslt/html/site2xhtml.xsl
+++ b/src/documentation/skins/poi-site/xslt/html/site2xhtml.xsl
@@ -201,7 +201,9 @@ footer, searchbar, css etc.  As input, it takes XML of the form:
           <div align="center">
             <div class="copyright">
               Copyright &#169; <xsl:value-of select="$config/year"/>&#160;<xsl:value-of
-              select="$config/vendor"/>. All rights reserved.
+              select="$config/vendor"/>. All rights reserved.<br />
+              Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+              POI project logo are trademarks of The Apache Software Foundation.
             </div>
           </div>
         </td>
-- 
2.39.5