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 2018/01/25 09:50:40 UTC
[1/2] incubator-freemarker git commit: emphasize difference between
eval and interpret built-ins in the documentation
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae 794ce9a14 -> 70e5607f7
emphasize difference between eval and interpret built-ins in the documentation
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/90fc6874
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/90fc6874
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/90fc6874
Branch: refs/heads/2.3-gae
Commit: 90fc6874c878e1970dcd4f3c1641fd18fe7a27b7
Parents: 7a94e59
Author: Florian van der Wielen <fv...@gmail.com>
Authored: Wed Jan 24 13:12:38 2018 +0100
Committer: Florian van der Wielen <fv...@gmail.com>
Committed: Wed Jan 24 13:12:38 2018 +0100
----------------------------------------------------------------------
src/manual/en_US/book.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/90fc6874/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index c61f02e..171257b 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -18030,7 +18030,7 @@ Sorted by name.last:
<primary>evaluate string</primary>
</indexterm>
- <para>This built-in evaluates a string as an FTL expression. For
+ <para>This built-in evaluates a string as an FTL <emphasis>expression</emphasis>. For
example <literal>"1+2"?eval</literal> returns number 3.</para>
<para>The evaluated expression sees the same variables (such as
@@ -18041,7 +18041,11 @@ Sorted by name.last:
<literal><replaceable>s</replaceable></literal> there. Except, it
can't use <link linkend="ref_builtins_loop_var">loop variable
built-ins</link> that refer to a loop variable that was created
- outside <literal><replaceable>s</replaceable></literal>.</para>
+ outside <literal><replaceable>s</replaceable></literal>.
+ Please note that the string accepts an expression, if you want to
+ render out a full-fledged template, please use the
+ <link linkend="ref_builtin_interpret"><literal>interpret</literal>
+ built-in.</para>
<para>Regarding the configuration settings that affect the parsing
(like syntax) and evaluation the rules are the same as with the
[2/2] incubator-freemarker git commit: Merged: Manual: emphasize
difference between eval and interpret built-ins
Posted by dd...@apache.org.
Merged: Manual: emphasize difference between eval and interpret built-ins
Merge commit 'refs/pull/45/head' of https://github.com/apache/incubator-freemarker into 2.3-gae
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/70e5607f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/70e5607f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/70e5607f
Branch: refs/heads/2.3-gae
Commit: 70e5607f7f79aecd779caff66bdb63e86ee5a538
Parents: 794ce9a 90fc687
Author: ddekany <dd...@apache.org>
Authored: Thu Jan 25 10:48:32 2018 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Jan 25 10:50:28 2018 +0100
----------------------------------------------------------------------
src/manual/en_US/book.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/70e5607f/src/manual/en_US/book.xml
----------------------------------------------------------------------