This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/freemarker-site.git
The following commit(s) were added to refs/heads/master by this push:
new d9b1d173 Applied legal changes: Added ®
d9b1d173 is described below
commit d9b1d1733adea69961ed83d1c16698b6f60fef58
Author: ddekany <[email protected]>
AuthorDate: Mon Mar 10 17:49:44 2025 +0100
Applied legal changes: Added ®
---
src/main/docgen/book.xml | 16 ++++++++--------
src/main/docgen/docgen.cjson | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index 833122f0..084ab3b9 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -24,12 +24,12 @@
xmlns:m="http://www.w3.org/1998/Math/MathML";
xmlns:html="http://www.w3.org/1999/xhtml";
xmlns:db="http://docbook.org/ns/docbook";>
- <title>Apache FreeMarker™</title>
+ <title>Apache FreeMarker®</title>
<chapter role="index.html" xml:id="what-is-freemarker">
- <title>What is Apache FreeMarker™?</title>
+ <title>What is Apache FreeMarker®?</title>
- <para>Apache FreeMarker™ is a <emphasis>template engine</emphasis>: a Java
+ <para>Apache FreeMarker® is a <emphasis>template engine</emphasis>: a Java
library to generate text output (HTML web pages, e-mails, configuration
files, source code, etc.) based on templates and changing data. Templates
are written in the FreeMarker Template Language (FTL), which is a simple,
@@ -157,12 +157,12 @@
xlink:href="https://freemarker.apache.org/docs/versions_2_3_34.html";>See
what's new...</link></para>
- <para>Download the latest FreeMarker™ version here:</para>
+ <para>Download the latest FreeMarker® version here:</para>
<itemizedlist>
<listitem>
<para><link
-
xlink:href="https://www.apache.org/dyn/closer.cgi/freemarker/engine/2.3.34/binaries/apache-freemarker-bin-2.3.34.tgz";>FreeMarker™
+
xlink:href="https://www.apache.org/dyn/closer.cgi/freemarker/engine/2.3.34/binaries/apache-freemarker-bin-2.3.34.tgz";>FreeMarker®
binary release (tar.gz)</link> (includes
<literal>freemarker.jar</literal> with offline documentation) [<link
xlink:href="https://downloads.apache.org/freemarker/engine/2.3.34/binaries/apache-freemarker-bin-2.3.34.tgz.sha512";>SHA512</link>]
@@ -172,7 +172,7 @@
<listitem>
<para><link
-
xlink:href="https://www.apache.org/dyn/closer.cgi/freemarker/engine/2.3.34/source/apache-freemarker-src-2.3.34.tgz";>FreeMarker™
+
xlink:href="https://www.apache.org/dyn/closer.cgi/freemarker/engine/2.3.34/source/apache-freemarker-src-2.3.34.tgz";>FreeMarker®
source release (tar.gz)</link> (to build the binary yourself) [<link
xlink:href="https://downloads.apache.org/freemarker/engine/2.3.34/source/apache-freemarker-src-2.3.34.tgz.sha512";>SHA512</link>]
[<link
@@ -202,13 +202,13 @@
<para>There's also a separate Google App Engine compatible
(<quote>gae</quote>) variation. Download: <link
-
xlink:href="https://www.apache.org/dyn/closer.cgi/freemarker/engine/2.3.34/binaries/apache-freemarker-gae-bin-2.3.34.tgz";>FreeMarker™
+
xlink:href="https://www.apache.org/dyn/closer.cgi/freemarker/engine/2.3.34/binaries/apache-freemarker-gae-bin-2.3.34.tgz";>FreeMarker®
GAE binary</link> [<link
xlink:href="https://downloads.apache.org/freemarker/engine/2.3.34/binaries/apache-freemarker-gae-bin-2.3.34.tgz.sha512";>SHA512</link>]
[<link
xlink:href="https://downloads.apache.org/freemarker/engine/2.3.34/binaries/apache-freemarker-gae-bin-2.3.34.tgz.asc";>ASC</link>],
<link
-
xlink:href="https://www.apache.org/dyn/closer.cgi/freemarker/engine/2.3.34/source/apache-freemarker-gae-src-2.3.34.tgz";>FreeMarker™
+
xlink:href="https://www.apache.org/dyn/closer.cgi/freemarker/engine/2.3.34/source/apache-freemarker-gae-src-2.3.34.tgz";>FreeMarker®
GAE source</link> [<link
xlink:href="https://downloads.apache.org/freemarker/engine/2.3.34/source/apache-freemarker-gae-src-2.3.34.tgz.sha512";>SHA512</link>]
[<link
diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson
index 50a9596e..feb0007e 100644
--- a/src/main/docgen/docgen.cjson
+++ b/src/main/docgen/docgen.cjson
@@ -33,7 +33,7 @@ showXXELogo
copyrightHolder: "The Apache Software Foundation"
copyrightHolderSite: "http://apache.org/";
-copyrightSuffix: "Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the
Apache FreeMarker logo are trademarks of The Apache Software Foundation. All
other marks mentioned may be trademarks or registered trademarks of their
respective owners."
+copyrightSuffix: "Apache FreeMarker, FreeMarker, Apache, the Apache feather
logo, and the Apache FreeMarker project logo are trademarks or registered
trademarks of The Apache Software Foundation. All other marks mentioned may be
trademarks or registered trademarks of their respective owners."
copyrightStartYear: 1999
seoMeta: {
