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/03/15 19:31:59 UTC

[2/3] incubator-freemarker git commit: Some version history cleanup

Some version history cleanup


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

Branch: refs/heads/2.3-gae
Commit: 9e86f590d7eeb0374f27d6353846abe55f60970e
Parents: c19efff
Author: ddekany <dd...@apache.org>
Authored: Wed Mar 15 20:31:20 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Mar 15 20:31:20 2017 +0100

----------------------------------------------------------------------
 src/manual/en_US/book.xml | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9e86f590/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 9cfcf92..a664a84 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -26813,7 +26813,7 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
       <section xml:id="versions_2_3_26">
         <title>2.3.26 (incubating at Apache)</title>
 
-        <para>Release date: 2017-FIXME</para>
+        <para>Release date: 2017-03-15 + release process delay</para>
 
         <para><emphasis role="bold">This is a stable, final
         release.</emphasis> The <quote>incubating</quote> suffix is required
@@ -26825,19 +26825,6 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
 
           <itemizedlist>
             <listitem>
-              <para>Bug fixed (<link
-              xlink:href="https://issues.apache.org/jira/browse/FREEMARKER-42">FREEMARKER-42</link>):
-              <literal>?first</literal> now works with FTL collections (things
-              that can be listed but doesn't support getting items by index),
-              not only with sequences. The practical importance of this is
-              that <literal>?first</literal> now always works on Java
-              <literal>Set</literal>-s (which is useful for
-              <literal>Set</literal>-s with well defined ordering), while
-              earlier it has failed depending on the
-              <literal>object_wrapper</literal> configuration setting.</para>
-            </listitem>
-
-            <listitem>
               <para>Added
               <literal><replaceable>node</replaceable>?next_sibling</literal>
               and
@@ -26858,6 +26845,19 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
               keys <link
               linkend="xgui_imperative_formal">here...</link>)</para>
             </listitem>
+
+            <listitem>
+              <para>Bug fixed (<link
+              xlink:href="https://issues.apache.org/jira/browse/FREEMARKER-42">FREEMARKER-42</link>):
+              <literal>?first</literal> now works with FTL collections (things
+              that can be listed but doesn't support getting items by index),
+              not only with sequences. The practical importance of this is
+              that <literal>?first</literal> now always works on Java
+              <literal>Set</literal>-s (which is useful for
+              <literal>Set</literal>-s with well defined ordering), while
+              earlier it has failed depending on the
+              <literal>object_wrapper</literal> configuration setting.</para>
+            </listitem>
           </itemizedlist>
         </section>
 
@@ -27059,10 +27059,11 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
 
             <listitem>
               <para><literal>BeansWrapperConfiguration.classIntrospectorFactory</literal>
-              is no more protected field, but private. Especially as the class
-              of this field (<literal>ClassIntrospectorBuilder</literal>) was
-              package private, it's pretty much sure that nobody depends on
-              this field.</para>
+              is not a protected field anymore, but a private one. Especially
+              as the class of that field
+              (<literal>ClassIntrospectorBuilder</literal>) was package
+              private, it's pretty much sure that nobody depends on this
+              field.</para>
             </listitem>
 
             <listitem>