freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [3/3] incubator-freemarker git commit: Merge branch '2.3.24-gae-stabilization' into 2.3-gae
Date Mon, 28 Mar 2016 17:24:52 GMT
Merge branch '2.3.24-gae-stabilization' 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/27fc6449
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/27fc6449
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/27fc6449

Branch: refs/heads/2.3-gae
Commit: 27fc6449a02c89bdd3824bcefc4076b14f2aa136
Parents: fc9d916 c646ee4
Author: ddekany <ddekany@apache.org>
Authored: Mon Mar 28 19:24:28 2016 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Mon Mar 28 19:24:28 2016 +0200

----------------------------------------------------------------------
 src/manual/en_US/book.xml     | 9 +++++++--
 src/manual/en_US/docgen.cjson | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/27fc6449/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --cc src/manual/en_US/book.xml
index 9035574,57fd39a..6f64c7a
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@@ -26489,60 -26489,15 +26489,65 @@@ TemplateModel x = env.getVariable("x")
      <appendix xml:id="app_versions">
        <title>Version history</title>
  
 +      <section xml:id="versions_2_3_25">
 +        <title>2.3.25</title>
 +
 +        <section>
 +          <title>Changes on the FTL side</title>
 +
 +          <itemizedlist>
 +            <listitem>
 +              <para>[TODO]</para>
 +            </listitem>
 +          </itemizedlist>
 +        </section>
 +
 +        <section>
 +          <title>Changes on the Java side</title>
 +
 +          <itemizedlist>
 +            <listitem>
 +              <para>Lazy imports: With the new boolean
 +              <literal>Configuration</literal>-level settings,
 +              <literal>lazy_imports</literal> and
 +              <literal>lazy_auto_imports</literal>, you can request imports
 +              (as in <literal>&lt;#import "lib/utils.ftl" as u&gt;</literal>)
 +              and/or auto-imports to be lazy. When the import is lazy, the
 +              namespace variable (<literal>u</literal> in this example) will
 +              be created immediately, just like before, but the template will
 +              be imported and processed only when (and if ever) the content of
 +              the imported namespace is accessed. The main application of this
 +              is with auto-imports, where you don't want the overhead of
 +              importing templates that aren't actually used in a template.
 +              (Also, a new <literal>Environment.importLib</literal> method
 +              overload was added, where you can specify if you want a lazy or
 +              an eager import.)</para>
 +            </listitem>
 +
 +            <listitem>
 +              <para>Bug fixed (FREEMARKER-18): If you had a JSP custom tag and
 +              an EL function defined in the same TLD with the same name, the
 +              EL function has overwritten the custom tag. This is a bug
 +              introduced in 2.3.23, when EL function support was added. JSP
 +              allows a custom tag and an EL function in the same TLD to have
 +              the same name. In such case now we combine the two into a single
 +              value that is both callable as an user defined directive
 +              (<literal>&lt;@my.foo...&gt;</literal>) and as a function
 +              (<literal>my.f(...)</literal>).</para>
 +            </listitem>
 +          </itemizedlist>
 +        </section>
 +      </section>
 +
        <section xml:id="versions_2_3_24">
-         <title>2.3.24</title>
+         <title>2.3.24 (incubating)</title>
  
-         <para>Release date: 2016-03-20 + release process delay</para>
+         <para>Release date: 2016-03-28</para>
+ 
+         <para>This is a sable, final release. The <quote>incubating</quote>
+         suffix is required by the Apache Software Foundation until the project
+         becomes a fully accepted (graduated) Apache project. See disclaimer
+         below.</para>
  
          <section>
            <title>Legal changes</title>


Mime
View raw message