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

diff --git a/src/documentation/content/xdocs/casestudies.xml b/src/documentation/content/xdocs/casestudies.xml
index 044b0e690b471ffb137e8f58b6349f0be248bab0..32530f28d1194deafcd1be972a46c938a3ae50cc 100644 (file)
--- 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 193c5e44f22bc42776be31207519d768d936995f..715020027f7bbd8fe1b30c7793ede49d2f9c64be 100644 (file)
--- 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 7354431fba9a46587501e2ea5940c0ff341cea66..96472a20e4e7fb29734f3de492477dfad292db97 100644 (file)
--- 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 eb0fe14d5cfb5109d07f96729162e0eea4e7803d..2429f75e6d889e9b525708b30d20e32e78ad9fe7 100644 (file)
--- 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 42984d60f9024dee9dc576be1e5b8be3b5bf7c14..74faebf520d900ad529ff7fc545baeed56a0ad64 100644 (file)
--- 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 cbc4d3e8f245c347abb8191ca61652bddb012892..bce7552de327a64d7058eb2a282d1b3016da1021 100644 (file)
--- 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 4ce68fa08f3916b89ce5ca515480e498ada90052..c757193ba8055bd453ae7b5a0fe8065299cf17a4 100644 (file)
--- 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 f1fdb63311a3391f7679f2baf66d32a894a81ed6..0c106726f1876c43057956c8c4ad008ceb0321de 100644 (file)
--- 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 833bcb500fa6b755f42fb05236e10f4f21bd9fe3..989dc192a5e40c2454c4dbc6a6afca5ea62a07c8 100644 (file)
--- 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 f273f5c123247cb55b94149ee10a2816136884b0..13fe902c5174a0e64736d771322c1b5acae87581 100644 (file)
--- 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 daaf1a28ab3427c0176ff8178d6752d2552b3406..ffd7b5723f3dfa50e8203c3bbd6dbdbbef844d26 100644 (file)
--- 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 3d796090c2b4a9b8858e31e3dfdbf58fcb56d03c..15503daabac63919bda59548ad0b6d2ee7b8031c 100644 (file)
--- 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 3737d34972023846c8458f721931a764dd97b758..d457d224888b2fe4ca19b369622eaa92e6846a61 100644 (file)
--- 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 4b8d298899461cda88eac1b7bb74c31c652d27c8..95adc768d0878823fe1b4115b0b4a7bbd153ef09 100644 (file)
--- 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 0357f34fa985a85562d1883b43dd3cda12ce98ec..dfbfe5d60a5e665d194f7fdb70cbb92f8499ab23 100644 (file)
--- 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 32da9d20982109e2dc60d075f822017eeddc25e7..6345c406f6746e1874877d8b6ee6af282d909bf7 100644 (file)
--- 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 58a22f38dd9103d219eb15f01125dc41a126352b..11a6e2bf1bfb366be46696e149c621e721ec500f 100644 (file)
--- 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 74104584dad7e12f74008fab45f6862e0b9181cb..495da3f2469b29640988ca0ae8a9d072d85e6b03 100644 (file)
--- 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 256ca4f4a1c81939a0b27135c4f0e60af5038d73..67db1c339ca9cc34a4a5a40c78657604de4cbbd8 100644 (file)
--- 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 1bbfdf7907889a432d62fe883d0f06d681ce1d9d..6e333e8f35f8101f497d9d95ec4ddefcad1f0785 100644 (file)
--- 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 c1cf94678aaf75c03279ea04438b2520272fddf3..fe280a05ba33fd5351a8f87d6d6d46552246eb94 100644 (file)
--- 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 9a90ff377e88e2f5ab4de87df1b37268ee9686af..3f822733e94f024c310d0f07f458c772af5ea8bf 100644 (file)
--- 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 5f6aec70e0de6ff7dc3d896b252c547326ee89e0..7dc9a2f1b745cf0af4c1a16d55bfee554ba6e1e0 100644 (file)
--- 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 ad5b921bedc140ae2ae213717ddeb3feddb43abb..bcec8209c8dddf8dd5f6a7e5f2405c968effe1cc 100644 (file)
--- 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 90cd78b6f3d7c3a0da53e9a9eecf40841416bdf8..4d74954cba2a9793457edcdb02cddf46fee26441 100644 (file)
--- 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 0de266e2694a3bdce0be8f1856b47ce97dd74964..b3b633ed096bfeaf80df2cc1d290489c4fab250d 100644 (file)
--- 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>