You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2019/01/25 20:18:16 UTC
[freemarker] branch 2.3-gae updated (5931fb0 -> 2d968a2)
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 2.3-gae
in repository https://gitbox.apache.org/repos/asf/freemarker.git.
from 5931fb0 Improved FAQ about allowing users to upload templates
new bca98d4 Un-deprecated aBoolean?string(whenTrue, whenFalse) in the Manual, as for mere boolean formatting ?string expresses the intent better. Some minor Manual improvements around boolean formatting.
new 2d968a2 (Manual typos)
The 2 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:
src/manual/en_US/book.xml | 45 +++++++++++++++++++++++----------------------
1 file changed, 23 insertions(+), 22 deletions(-)
[freemarker] 01/02: Un-deprecated aBoolean?string(whenTrue,
whenFalse) in the Manual,
as for mere boolean formatting ?string expresses the intent better. Some
minor Manual improvements around boolean formatting.
Posted by dd...@apache.org.
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 bca98d4f661a92d751df4c60337ed37141e280ef
Author: ddekany <dd...@apache.org>
AuthorDate: Sun Jan 20 17:51:29 2019 +0100
Un-deprecated aBoolean?string(whenTrue, whenFalse) in the Manual, as for mere boolean formatting ?string expresses the intent better. Some minor Manual improvements around boolean formatting.
---
src/manual/en_US/book.xml | 41 +++++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index f7351b6..a0c61b0 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -16757,24 +16757,26 @@ Tue, Apr 8, '03
<secondary>boolean</secondary>
</indexterm>
- <para><emphasis>All usages of this built-in has been deprecated; see
- below.</emphasis></para>
-
<para>Converts a boolean to a string. You can use it in two
ways:</para>
<itemizedlist>
<listitem>
- <para>As <literal>foo?string("yes", "no")</literal>:
- <emphasis>Deprecated starting from FreeMarker 2.3.23: use <link
- linkend="ref_builtin_then"><literal>?then("yes",
- "no")</literal></link> instead. </emphasis>This will return the
- first parameter (here: <literal>"yes"</literal>) if the boolean
- is true, otherwise the second parameter (here:
- <literal>"no"</literal>). Note that the return value is always a
- string; if the parameters were numbers, they would be converted
- to strings first. Also note that both parameters are evaluated,
- despite that only one of them will be used; this might have
+ <para>As <literal>foo?string("yes", "no")</literal>: Formats the
+ boolean value to the first parameter (here:
+ <literal>"yes"</literal>) if the boolean is true, and to the
+ second parameter (here: <literal>"no"</literal>) if it's false.
+ Unless you only meant to format a boolean with simple literals,
+ use <link
+ linkend="ref_builtin_then"><literal>?then(<replaceable>whenTrue</replaceable>,
+ <replaceable>whenFalse</replaceable>)</literal></link> instead,
+ as that has less type limitations, and it evaluate its
+ parameters lazily! The return value of
+ <literal>?string</literal> is always a string (unlike for
+ <literal>?then</literal>), because if the parameters aren't
+ strings, they will be converted to strings. Also note that both
+ parameters are evaluated (unlike for <literal>?then</literal>),
+ despite that only one of them will be used; this might has
negative impact if the parameters aren't just literals.</para>
</listitem>
@@ -16789,18 +16791,17 @@ Tue, Apr 8, '03
this will convert the boolean to string using the default
strings for representing true and false values. By default, true
is rendered as <literal>"true"</literal> and false is rendered
- as <literal>"false"</literal>. This is mostly useful if you
+ as <literal>"false"</literal>. This is mostly only useful if you
generate source code with FreeMarker <emphasis>(but use
- <literal>?c</literal> for that starting from 2.3.20)</emphasis>,
- since the values are not locale (language, country) sensitive.
+ <literal>?c</literal> for that starting from 2.3.20)</emphasis>.
To change these default strings, you can use the
<literal>boolean_format</literal> <link
linkend="ref_directive_setting">setting</link>.</para>
- <para role="forProgrammers">Note, that in the very rare case
- when a value is multi-typed and is both a boolean and a string,
- then the string value of the variable will be returned, and so
- the <literal>boolean_format</literal> setting will have no
+ <para role="forProgrammers">Note that in the very rare case when
+ a value is multi-typed and is both a boolean and a string, then
+ the string value of the variable will be returned, and so the
+ <literal>boolean_format</literal> setting will have no
effect.</para>
</listitem>
</itemizedlist>
[freemarker] 02/02: (Manual typos)
Posted by dd...@apache.org.
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 2d968a2f59c518f8d807c67d7324edcf4d6db102
Author: ddekany <dd...@apache.org>
AuthorDate: Fri Jan 25 21:18:01 2019 +0100
(Manual typos)
---
src/manual/en_US/book.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index a0c61b0..38cd1f0 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -15541,7 +15541,7 @@ rif: foo XYr baar</programlisting>
value of the number (like big numbers are possibly
<quote>damaged</quote> by grouping separators).</para>
- <para>If the <literal>incompatible_imporvements</literal> FreeMarker
+ <para>If the <literal>incompatible_improvements</literal> FreeMarker
configuration setting is set to 2.3.24 or higher (also if it's set
to 2.3.20 or higher and you are outside a string literal), this
built-in will return <literal>"INF"</literal>,
@@ -15979,7 +15979,7 @@ Extended decimal format: 10<emphasis>_</emphasis>00<emphasis>3</emphasis></progr
</tr>
<tr>
- <td><literal>multipier</literal></td>
+ <td><literal>multiplier</literal></td>
<td>The number will be shown after multiplied with this
integer number.</td>