update trademark text

2026-02-27 20:40:08 +08:00 · 2025-11-23 20:25:00 +01:00 · 2025-11-23 20:25:00 +01:00 · ed156e63c6
commit ed156e63c6
parent 5a7cd39393
23 changed files with 26 additions and 26 deletions
--- a/src/documentation/content/xdocs/apidocs/index.xml
+++ b/src/documentation/content/xdocs/apidocs/index.xml
@ -80,7 +80,7 @@
    <legal>
      Copyright (c) @year@ The Apache Software Foundation All rights reserved.
      <br />
-      Apache POI, POI, Apache, the Apache feather logo, and the Apache
+      Apache POI, POI, Apache, the Apache logo, and the Apache
      POI project logo are trademarks of The Apache Software Foundation.
    </legal>
  </footer>
--- a/src/documentation/content/xdocs/casestudies.xml
+++ b/src/documentation/content/xdocs/casestudies.xml
@ -444,7 +444,7 @@ format,
        <legal>
            Copyright (c) @year@ The Apache Software Foundation All rights reserved.
            <br />
-            Apache POI, POI, Apache, the Apache feather logo, and the Apache
+            Apache POI, POI, Apache, the Apache logo, and the Apache
            POI project logo are trademarks of The Apache Software Foundation.
        </legal>
    </footer>
--- a/src/documentation/content/xdocs/components/configuration.xml
+++ b/src/documentation/content/xdocs/components/configuration.xml
@ -225,7 +225,7 @@
    <legal>
      Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
      <br />
-      Apache POI, POI, Apache, the Apache feather logo, and the Apache
+      Apache POI, POI, Apache, the Apache logo, and the Apache
      POI project logo are trademarks of The Apache Software Foundation.
    </legal>
  </footer>
--- a/src/documentation/content/xdocs/components/index.xml
+++ b/src/documentation/content/xdocs/components/index.xml
@ -416,7 +416,7 @@
    <legal>
      Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
      <br />
-      Apache POI, POI, Apache, the Apache feather logo, and the Apache
+      Apache POI, POI, Apache, the Apache logo, and the Apache
      POI project logo are trademarks of The Apache Software Foundation.
    </legal>
  </footer>
--- a/src/documentation/content/xdocs/components/logging.xml
+++ b/src/documentation/content/xdocs/components/logging.xml
@ -283,7 +283,7 @@
        <legal>
            Copyright (c) @year@ The Apache Software Foundation All rights reserved.
            <br />
-            Apache POI, POI, Apache, the Apache feather logo, and the Apache
+            Apache POI, POI, Apache, the Apache logo, and the Apache
            POI project logo are trademarks of The Apache Software Foundation.
        </legal>
    </footer>
--- a/src/documentation/content/xdocs/components/poi-jvm-languages.xml
+++ b/src/documentation/content/xdocs/components/poi-jvm-languages.xml
@ -344,7 +344,7 @@ void exportHeader(Sheet s, CellStyle headerStyle, String info, String[] headers)
    <legal>
      Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
      <br />
-      Apache POI, POI, Apache, the Apache feather logo, and the Apache
+      Apache POI, POI, Apache, the Apache logo, and the Apache
      POI project logo are trademarks of The Apache Software Foundation.
    </legal>
  </footer>
--- a/src/documentation/content/xdocs/components/poi-ruby.xml
+++ b/src/documentation/content/xdocs/components/poi-ruby.xml
@ -144,7 +144,7 @@
    <legal>
      Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
      <br />
-      Apache POI, POI, Apache, the Apache feather logo, and the Apache
+      Apache POI, POI, Apache, the Apache logo, and the Apache
      POI project logo are trademarks of The Apache Software Foundation.
    </legal>
  </footer>
--- a/src/documentation/content/xdocs/devel/git.xml
+++ b/src/documentation/content/xdocs/devel/git.xml
@ -83,7 +83,7 @@
    <legal>
      Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
      <br />
-      Apache POI, POI, Apache, the Apache feather logo, and the Apache
+      Apache POI, POI, Apache, the Apache logo, and the Apache
      POI project logo are trademarks of The Apache Software Foundation.
    </legal>
  </footer>
--- a/src/documentation/content/xdocs/devel/guidelines.xml
+++ b/src/documentation/content/xdocs/devel/guidelines.xml
@ -342,7 +342,7 @@
   <legal>
      Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
      <br />
-      Apache POI, POI, Apache, the Apache feather logo, and the Apache
+      Apache POI, POI, Apache, the Apache logo, and the Apache
      POI project logo are trademarks of The Apache Software Foundation.
   </legal>
 </footer>
--- a/src/documentation/content/xdocs/devel/history/index.xml
+++ b/src/documentation/content/xdocs/devel/history/index.xml
@ -154,7 +154,7 @@
    <legal>
      Copyright (c) @year@ The Apache Software Foundation All rights reserved.
      <br />
-      Apache POI, POI, Apache, the Apache feather logo, and the Apache
+      Apache POI, POI, Apache, the Apache logo, and the Apache
      POI project logo are trademarks of The Apache Software Foundation.
    </legal>
  </footer>
--- a/src/documentation/content/xdocs/devel/index.xml
+++ b/src/documentation/content/xdocs/devel/index.xml
@ -159,7 +159,7 @@
    <legal>
      Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
      <br />
-      Apache POI, POI, Apache, the Apache feather logo, and the Apache
+      Apache POI, POI, Apache, the Apache logo, and the Apache
      POI project logo are trademarks of The Apache Software Foundation.
    </legal>
  </footer>
--- a/src/documentation/content/xdocs/devel/nightly.xml
+++ b/src/documentation/content/xdocs/devel/nightly.xml
@ -48,7 +48,7 @@
    <legal>
      Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
      <br />
-      Apache POI, POI, Apache, the Apache feather logo, and the Apache
+      Apache POI, POI, Apache, the Apache logo, and the Apache
      POI project logo are trademarks of The Apache Software Foundation.
    </legal>
  </footer>
--- a/src/documentation/content/xdocs/devel/references/logocontest.xml
+++ b/src/documentation/content/xdocs/devel/references/logocontest.xml
@ -38,7 +38,7 @@
                    <img alt="logo" src="images/logoMichaelMosmann.png"/>
                </p>
            </section>
-            <section><title>Loïc Lefèvre</title>
+            <section><title>Lo<EFBFBD>c Lef<65>vre</title>
                <p>
                    <img alt="logo" src="images/logoLoicLefevre.png"/>&nbsp;&nbsp;&nbsp;
                    <img alt="logo" src="images/logoLoicLefevre2.png"/>
@ -187,7 +187,7 @@
        <legal>
          Copyright (c) @year@ The Apache Software Foundation All rights reserved.
          <br />
-          Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+          Apache POI, POI, Apache, the Apache logo, and the Apache 
          POI project logo are trademarks of The Apache Software Foundation.
        </legal>
    </footer>
--- a/src/documentation/content/xdocs/download.xml
+++ b/src/documentation/content/xdocs/download.xml
@ -164,7 +164,7 @@ sub   4096g/7B45A98A 2007-06-18 [expires: 2012-06-16]</source>
    <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 POI, POI, Apache, the Apache logo, and the Apache POI project logo are trademarks of The
            Apache Software Foundation.
        </legal>
    </footer>
--- a/src/documentation/content/xdocs/encryption.xml
+++ b/src/documentation/content/xdocs/encryption.xml
@ -503,7 +503,7 @@
        <legal>
            Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
            <br />
-            Apache POI, POI, Apache, the Apache feather logo, and the Apache
+            Apache POI, POI, Apache, the Apache logo, and the Apache
            POI project logo are trademarks of The Apache Software Foundation.
        </legal>
    </footer>
--- a/src/documentation/content/xdocs/help/index.xml
+++ b/src/documentation/content/xdocs/help/index.xml
@ -135,7 +135,7 @@
    <legal>
      Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
      <br />
-      Apache POI, POI, Apache, the Apache feather logo, and the Apache
+      Apache POI, POI, Apache, the Apache logo, and the Apache
      POI project logo are trademarks of The Apache Software Foundation.
    </legal>
  </footer>
--- a/src/documentation/content/xdocs/index.xml
+++ b/src/documentation/content/xdocs/index.xml
@ -275,7 +275,7 @@
    <legal>
      Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
      <br />
-      Apache POI, POI, Apache, the Apache feather logo, and the Apache
+      Apache POI, POI, Apache, the Apache logo, and the Apache
      POI project logo are trademarks of The Apache Software Foundation.
    </legal>
  </footer>
--- a/src/documentation/content/xdocs/legal.xml
+++ b/src/documentation/content/xdocs/legal.xml
@ -42,7 +42,7 @@ All material on this website is Copyright &copy; 2002-2025, The Apache
 Software Foundation.
 </p>
 <p>
-Apache POI, POI, Apache, the Apache feather logo, and the Apache POI 
+Apache POI, POI, Apache, the Apache logo, and the Apache POI 
 project logo are trademarks of The Apache Software Foundation.
 </p>
 <p>
@ -93,7 +93,7 @@ web site are trademarks of their respective owners.
    <legal>
      Copyright (c) @year@ The Apache Software Foundation All rights reserved.
      <br />
-      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      Apache POI, POI, Apache, the Apache logo, and the Apache 
      POI project logo are trademarks of The Apache Software Foundation.
    </legal>
  </footer>
--- a/src/documentation/content/xdocs/related-projects.xml
+++ b/src/documentation/content/xdocs/related-projects.xml
@ -247,7 +247,7 @@
        <legal>
            Copyright (c) @year@ The Apache Software Foundation All rights reserved.
            <br />
-            Apache POI, POI, Apache, the Apache feather logo, and the Apache
+            Apache POI, POI, Apache, the Apache logo, and the Apache
            POI project logo are trademarks of The Apache Software Foundation.
        </legal>
    </footer>
--- a/src/documentation/content/xdocs/security.xml
+++ b/src/documentation/content/xdocs/security.xml
@ -117,7 +117,7 @@
        <legal>
            Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
            <br />
-            Apache POI, POI, Apache, the Apache feather logo, and the Apache
+            Apache POI, POI, Apache, the Apache logo, and the Apache
            POI project logo are trademarks of The Apache Software Foundation.
        </legal>
    </footer>
--- a/src/documentation/content/xdocs/text-extraction.xml
+++ b/src/documentation/content/xdocs/text-extraction.xml
@ -179,7 +179,7 @@ for (POITextExtractor textExtractor : embeddedExtractors) {
    <legal>
      Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
      <br />
-      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      Apache POI, POI, Apache, the Apache logo, and the Apache 
      POI project logo are trademarks of The Apache Software Foundation.
    </legal>
  </footer>
--- a/src/documentation/content/xdocs/versioning.xml
+++ b/src/documentation/content/xdocs/versioning.xml
@ -92,7 +92,7 @@
    <legal>
      Copyright (c) @year@ The Apache Software Foundation All rights reserved.
      <br />
-      Apache POI, POI, Apache, the Apache feather logo, and the Apache 
+      Apache POI, POI, Apache, the Apache logo, and the Apache 
      POI project logo are trademarks of The Apache Software Foundation.
    </legal>
  </footer>
--- a/src/documentation/skinconf.xml
+++ b/src/documentation/skinconf.xml
@ -86,8 +86,8 @@ which will be used to configure the chosen Forrest skin.
    <copyright-link>https://www.apache.org/</copyright-link>
    <!-- Optional text trademark statement below the copyright statement -->
    <trademark-statement>
-      Apache, Apache POI, the Apache feather logo, and the Apache POI
-      logos are trademarks of The Apache Software Foundation.
+      Apache POI, POI, Apache, the Apache logo, and the Apache
+      POI project logo are trademarks of The Apache Software Foundation.
    </trademark-statement>
    <!-- Some skins use this to form a 'breadcrumb trail' of links.
        Use location="alt" to move the trail to an alternate location