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 2017/08/05 14:26:41 UTC

[21/50] incubator-freemarker git commit: FREEMARKER-58: Manual example mistakes

FREEMARKER-58: Manual example mistakes


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

Branch: refs/heads/2.3
Commit: 367560fecfbbc2733c97f95b4d9afc8ab1431bbf
Parents: dc3277e
Author: ddekany <dd...@apache.org>
Authored: Tue Jun 13 18:57:52 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Tue Jun 13 18:57:52 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/367560fe/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 3f003b3..77b13cd 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -5151,9 +5151,9 @@ other@example.com</programlisting>
           <literal>namespace</literal> parameter:</para>
 
           <programlisting role="template">&lt;#import "/lib/example.ftl" as e&gt;
-${my.mail}
+${e.mail}
 &lt;#assign mail="other@example.com" <emphasis>in e</emphasis>&gt;
-${my.mail}</programlisting>
+${e.mail}</programlisting>
 
           <programlisting role="output">user@example.com
 other@example.com</programlisting>
@@ -5218,7 +5218,7 @@ User is: ${user}
 &lt;#import "/lib/example.ftl" as e2&gt;
 &lt;#import "/lib/example.ftl" as e3&gt;
 ${e.mail}, ${e2.mail}, ${e3.mail}
-&lt;#assign mail="other@example.com" in my&gt;
+&lt;#assign mail="other@example.com" in e&gt;
 ${e.mail}, ${e2.mail}, ${e3.mail}</programlisting>
 
           <programlisting role="output">user@example.com, user@example.com, user@example.com