This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new a85b3b3a15 Corrections to copyright notices
a85b3b3a15 is described below
commit a85b3b3a15eab358b2c7bea609a53c02547f1ab9
Author: mseidel <[email protected]>
AuthorDate: Sat Sep 13 18:15:06 2025 +0200
Corrections to copyright notices
(cherry picked from commit 3234297fdd7d937eaf6724d7185dd3f7f1d49be9)
---
main/autodoc/source/display/html/cfrstd.cxx | 2 +-
main/odk/docs/install.html | 2 +-
main/odk/docs/notsupported.html | 2 +-
main/odk/docs/tools.html | 2 +-
main/odk/examples/DevelopersGuide/examples.html | 2 +-
main/odk/examples/examples.html | 2 +-
main/odk/index.html | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/main/autodoc/source/display/html/cfrstd.cxx
b/main/autodoc/source/display/html/cfrstd.cxx
index 1d5847b1fc..400bbde810 100644
--- a/main/autodoc/source/display/html/cfrstd.cxx
+++ b/main/autodoc/source/display/html/cfrstd.cxx
@@ -332,7 +332,7 @@ MakeCopyRight()
cr << "Copyright © "
<< year
- << ", The Apache Software Foundation, Licensed under the Apache
License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and
OpenOffice.org are trademarks of The Apache Software Foundation. Other names
may be trademarks of their respective owners.";
+ << ", The Apache Software Foundation, Licensed under the Apache
License, Version 2.0. Apache, the ASF logo, Apache OpenOffice and
OpenOffice.org are trademarks of The Apache Software Foundation. Other names
may be trademarks of their respective owners.";
return String(cr.c_str());
}
diff --git a/main/odk/docs/install.html b/main/odk/docs/install.html
index 07f8621582..5313220084 100644
--- a/main/odk/docs/install.html
+++ b/main/odk/docs/install.html
@@ -439,7 +439,7 @@
<td colspan="3">
<div class="centertext">
<p><img class="apachelogo" src="images/sdk-footer-logo.png"
title="Apache Logo" alt="Apache Logo">
- Copyright © 2011-2025 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the Apache feather
logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache
Software Foundation. Other names may be trademarks of their respective
owners.<p>
+ Copyright © 2011-2025 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the ASF logo, Apache
OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation.
Other names may be trademarks of their respective owners.<p>
</div>
</td>
</tr>
diff --git a/main/odk/docs/notsupported.html b/main/odk/docs/notsupported.html
index f952e6a63f..c0875b0252 100644
--- a/main/odk/docs/notsupported.html
+++ b/main/odk/docs/notsupported.html
@@ -66,7 +66,7 @@
<td colspan="3">
<div class="centertext">
<p><img class="apachelogo" src="images/sdk-footer-logo.png"
title="Apache Logo" alt="Apache Logo">
- Copyright © 2011-2025 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the Apache feather
logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache
Software Foundation. Other names may be trademarks of their respective
owners.<p>
+ Copyright © 2011-2025 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the ASF logo, Apache
OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation.
Other names may be trademarks of their respective owners.<p>
</div>
</td>
</tr>
diff --git a/main/odk/docs/tools.html b/main/odk/docs/tools.html
index f3fc964594..9334ca488b 100644
--- a/main/odk/docs/tools.html
+++ b/main/odk/docs/tools.html
@@ -1104,7 +1104,7 @@
<td colspan="3">
<div class="centertext">
<p><img class="apachelogo" src="images/sdk-footer-logo.png"
title="Apache Logo" alt="Apache Logo">
- Copyright © 2011-2025 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the Apache feather
logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache
Software Foundation. Other names may be trademarks of their respective
owners.<p>
+ Copyright © 2011-2025 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the ASF logo, Apache
OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation.
Other names may be trademarks of their respective owners.<p>
</div>
</td>
</tr>
diff --git a/main/odk/examples/DevelopersGuide/examples.html
b/main/odk/examples/DevelopersGuide/examples.html
index 7ea0c34f6a..aaa6943f95 100644
--- a/main/odk/examples/DevelopersGuide/examples.html
+++ b/main/odk/examples/DevelopersGuide/examples.html
@@ -3038,7 +3038,7 @@ for the Office application.</td>
<td colspan="3">
<div class="centertext">
<p><img class="apachelogo" src="../../docs/images/sdk-footer-logo.png"
title="Apache Logo" alt="Apache Logo">
- Copyright © 2011-2025 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the Apache feather
logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache
Software Foundation. Other names may be trademarks of their respective
owners.<p>
+ Copyright © 2011-2025 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the ASF logo, Apache
OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation.
Other names may be trademarks of their respective owners.<p>
</div>
</td>
</tr>
diff --git a/main/odk/examples/examples.html b/main/odk/examples/examples.html
index 408253c58d..bc5b1cc3c2 100644
--- a/main/odk/examples/examples.html
+++ b/main/odk/examples/examples.html
@@ -765,7 +765,7 @@
<td colspan="3">
<div class="centertext">
<p><img class="apachelogo" src="../docs/images/sdk-footer-logo.png"
title="Apache Logo" alt="Apache Logo">
- Copyright © 2011-2025 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the Apache feather
logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache
Software Foundation. Other names may be trademarks of their respective
owners.<p>
+ Copyright © 2011-2025 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the ASF logo, Apache
OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation.
Other names may be trademarks of their respective owners.<p>
</div>
</td>
</tr>
diff --git a/main/odk/index.html b/main/odk/index.html
index d4b3116750..94fe89697e 100644
--- a/main/odk/index.html
+++ b/main/odk/index.html
@@ -207,7 +207,7 @@
<td colspan="3">
<div class="centertext">
<p><img class="apachelogo" src="docs/images/sdk-footer-logo.png"
title="Apache Logo" alt="Apache Logo">
- Copyright © 2011-2025 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the Apache feather
logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache
Software Foundation. Other names may be trademarks of their respective
owners.<p>
+ Copyright © 2011-2025 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the ASF logo, Apache
OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation.
Other names may be trademarks of their respective owners.<p>
</div>
</td>
</tr>
