This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3 in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 7926e97719a91c69995e776dd1aae3d38584d8af Merge: e169fce6 e2636047 Author: ddekany <[email protected]> AuthorDate: Sun Dec 8 15:20:11 2024 +0100 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 # Conflicts: # build.gradle.kts build.gradle.kts | 2 +- .../main/java/freemarker/template/_VersionInts.java | 1 + .../src/main/javacc/freemarker/core/FTL.jj | 4 +++- .../test/java/freemarker/core/SepParsingBugTest.java | 19 +++++++++++++++++++ freemarker-manual/src/main/docgen/en_US/book.xml | 20 +++++++++++++------- 5 files changed, 37 insertions(+), 9 deletions(-) diff --cc build.gradle.kts index 40e7d83f,3f514ac9..5386a1a4 --- a/build.gradle.kts +++ b/build.gradle.kts @@@ -347,8 -347,9 +347,8 @@@ publishing packaging = "jar" name.set("Apache FreeMarker") - description.set(""" + description.set("\n" + """ FreeMarker is a "template engine"; a generic tool to generate text output based on templates. - This is the Google App Engine (\"gae\") compliant variation. """.trimIndent().prependIndent(" ") + "\n " ) url.set("https://freemarker.apache.org/";)
