This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3-gae in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit b08bee6ea49b3138e034f63ed1db417d95a81937 Author: ddekany <[email protected]> AuthorDate: Thu Jan 5 13:47:49 2023 +0100 Minor documentation adjustments --- src/main/java/freemarker/core/Configurable.java | 4 +--- src/manual/en_US/book.xml | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/freemarker/core/Configurable.java b/src/main/java/freemarker/core/Configurable.java index bf6e3aab..9da31136 100644 --- a/src/main/java/freemarker/core/Configurable.java +++ b/src/main/java/freemarker/core/Configurable.java @@ -2196,9 +2196,7 @@ public class Configurable { * See {@link Configuration#setCFormat(CFormat)}. * <br>String value: {@code "default"} (case insensitive) for the default (on {@link Configuration} only), or * one of the predefined values {@code "JavaScript or JSON"}, {@code "JSON"}, - * {@code "JavaScript"}, {@code "Java"}, {@code "XS"}, - * {@code "legacy"}, or - * {@code "default"} (only allowed for {@link Configuration} instances) for the default value, + * {@code "JavaScript"}, {@code "Java"}, {@code "XS"}, {@code "legacy"}, * or an <a href="#fm_obe">object builder expression</a> that gives a {@link CFormat} object. * * <li><p>{@code "template_exception_handler"}: diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml index e58f5462..450dc9c9 100644 --- a/src/manual/en_US/book.xml +++ b/src/manual/en_US/book.xml @@ -16183,9 +16183,9 @@ rif: foo XYr baar</programlisting> the same output as <literal>${<replaceable>aNumber</replaceable>?c}</literal>. (In this case you should use a <literal>c_format</literal> like - <literal>"JavaScript or JSON"</literal>, and not some of the - strictly backward compatible defaults, as those are emulating some - confusing old glitches.)</para> + <literal>"JavaScript or JSON"</literal>, and not + <literal>"legacy"</literal>, as that emulates some confusing old + glitches.)</para> <para>If the value the <literal>c</literal> built-in is applied on is <literal>null</literal>/missing, it will stop the template @@ -30059,7 +30059,7 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting> <section xml:id="versions_2_3_32"> <title>2.3.32</title> - <para>Release date: TODO</para> + <para>Release date: 2023-01-05 + release process</para> <section> <title>Changes on the FTL side</title>
