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
2011-05-12 19:13:01 +00:00 · 2011-05-12 19:13:01 +00:00 · 3c40f4aab7
parent 735dd86ac4
commit 3c40f4aab7
26 changed files with 76 additions and 3 deletions
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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>
--- 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>