You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by sb...@apache.org on 2025/08/20 12:50:14 UTC

(groovy-website) branch fix/char-encoding updated (f3a7cba -> dbe9389)

This is an automated email from the ASF dual-hosted git repository.

sbglasius pushed a change to branch fix/char-encoding
in repository https://gitbox.apache.org/repos/asf/groovy-website.git


 discard f3a7cba  Fixed encoding errors for ™ by replacing it with ™
     new dbe9389  Fix #60 encoding errors for ™ by replacing it with ™

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (f3a7cba)
            \
             N -- N -- N   refs/heads/fix/char-encoding (dbe9389)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:


(groovy-website) 01/01: Fix #60 encoding errors for ™ by replacing it with ™

Posted by sb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sbglasius pushed a commit to branch fix/char-encoding
in repository https://gitbox.apache.org/repos/asf/groovy-website.git

commit dbe938987a1c8304e41490fb7d0ab4d9f539c7ef
Author: Søren Berg Glasius <so...@glasius.dk>
AuthorDate: Wed Aug 20 14:49:28 2025 +0200

    Fix #60 encoding errors for ™ by replacing it with &trade;
    
    * Only where I found it by browsing the documentation
---
 site/src/site/html/index.html            | 2 +-
 site/src/site/includes/topmenu.groovy    | 3 ++-
 site/src/site/pages/documentation.groovy | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/site/src/site/html/index.html b/site/src/site/html/index.html
index 28d5e87..eb57dc4 100644
--- a/site/src/site/html/index.html
+++ b/site/src/site/html/index.html
@@ -2,7 +2,7 @@
         <h1>A flexible and extensible Java-like language for the JVM</h1>
 
         <p>
-            Apache Groovy™ is a multi-faceted language for the JVM. It aims to
+            Apache Groovy&trade; is a multi-faceted language for the JVM. It aims to
             provide a <strong>Java-like feel and syntax</strong>,
             but with <strong>added productivity</strong> features.
             It supports OO and functional paradigms, and offers both
diff --git a/site/src/site/includes/topmenu.groovy b/site/src/site/includes/topmenu.groovy
index a129130..2b69f84 100644
--- a/site/src/site/includes/topmenu.groovy
+++ b/site/src/site/includes/topmenu.groovy
@@ -9,7 +9,8 @@ div(class: 'navbar navbar-default navbar-static-top', role: 'navigation') {
             }
             a(class: 'navbar-brand', href: relative('index.html')) {
                 i(class: 'fa fa-star') {}
-                yield ' Apache Groovy™'
+                yield ' Apache Groovy'
+                yieldUnescaped '&trade;'
             }
         }
         div(class: 'navbar-collapse collapse') {
diff --git a/site/src/site/pages/documentation.groovy b/site/src/site/pages/documentation.groovy
index 3e39858..45d878c 100644
--- a/site/src/site/pages/documentation.groovy
+++ b/site/src/site/pages/documentation.groovy
@@ -28,7 +28,9 @@ layout 'layouts/main.groovy', true,
                                 yield ' Documentation'
                             }
                             p {
-                                yield 'The Apache Groovy™ documentation is available as a '
+                                yield 'The Apache Groovy'
+                                yieldUnescaped '&trade;'
+                                yield ' documentation is available as a '
                                 a(href: "single-page-documentation.html", 'single-page document')
                                 yield ', or a '
                                 a(href: "https://docs.groovy-lang.org/docs/latest/html/documentation/index.pdf", 'PDF')