freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [22/27] incubator-freemarker git commit: Manual: XML fix and some content cleanup at ?eval.
Date Sat, 03 Feb 2018 21:17:05 GMT
Manual: XML fix and some content cleanup at ?eval.


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d0520b95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d0520b95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d0520b95

Branch: refs/heads/2.3
Commit: d0520b957e9250807ecfdc61c5605f38b68f4c14
Parents: 70e5607
Author: ddekany <ddekany@apache.org>
Authored: Thu Jan 25 11:43:27 2018 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Thu Jan 25 11:43:27 2018 +0100

----------------------------------------------------------------------
 src/manual/en_US/book.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d0520b95/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 44b75e1..d01ef97 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -18030,8 +18030,12 @@ Sorted by name.last:
             <primary>evaluate string</primary>
           </indexterm>
 
-          <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>This built-in evaluates a string as an FTL
+          <emphasis>expression</emphasis>. For example
+          <literal>"1+2"?eval</literal> returns the number 3. (To render a
+          template that's stored in a string, use the <link
+          linkend="ref_builtin_interpret"><literal>interpret</literal>
+          built-in</link> instead.)</para>
 
           <para>The evaluated expression sees the same variables (such as
           locals) that are visible at the place of the invocation of
@@ -18041,11 +18045,7 @@ 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>.
-          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>
+          outside <literal><replaceable>s</replaceable></literal>.</para>
 
           <para>Regarding the configuration settings that affect the parsing
           (like syntax) and evaluation the rules are the same as with the


Mime
View raw message