freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker-site git commit: Updates for the 2.3.24 release
Date Mon, 28 Mar 2016 09:53:43 GMT
Repository: incubator-freemarker-site
Updated Branches:
  refs/heads/master 19d8eb6dc -> 57282e17b


Updates for the 2.3.24 release


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

Branch: refs/heads/master
Commit: 57282e17b9d263aa01227722ba8477639a503505
Parents: 19d8eb6
Author: ddekany <ddekany@apache.org>
Authored: Mon Mar 28 11:53:29 2016 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Mon Mar 28 11:53:29 2016 +0200

----------------------------------------------------------------------
 src/main/docgen/book.xml | 140 +++++++++++++++---------------------------
 1 file changed, 51 insertions(+), 89 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/57282e17/src/main/docgen/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index 8d81db7..5bb9e1d 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -81,7 +81,8 @@
         <listitem>
           <para>Powerful template language: Conditional blocks, iterations,
           assignments, string and arithmetic operations and formatting, macros
-          and functions, including other templates, and many more</para>
+          and functions, including other templates, escaping by default
+          (optional), and many more</para>
         </listitem>
 
         <listitem>
@@ -104,8 +105,8 @@
 
         <listitem>
           <para>Versatile data-model: Java objects are exposed to the template
-          as a tree of variables through pluggable object wrappers, which
-          decides how the template sees them.</para>
+          as a tree of variables through pluggable adapters, which decides how
+          the template sees them.</para>
         </listitem>
       </itemizedlist>
     </simplesect>
@@ -167,62 +168,9 @@
     verify releases...</link></para>
 
     <simplesect>
-      <title>Latest stable release: 2.3.23</title>
+      <title>Latest stable release: 2.3.24-incubating</title>
 
-      <para>Released on 2015-07-05. Requires J2SE 1.4 or higher.</para>
-
-      <para><link
-      xlink:href="http://sourceforge.net/projects/freemarker/files/freemarker/2.3.23/freemarker-2.3.23.tar.gz/download">Download
-      freemarker-2.3.23.tar.gz</link> (3.2 MB, includes binary, documentation
-      and source code)</para>
-
-      <para>For Maven:</para>
-
-      <programlisting language="XML" role="unspecified">&lt;!--
-Attention: Be sure nothing pulls in an old dependency with groupId
-"freemarker" (without the "org."), because then you will end up with
-two freemarker.jar-s and unpredictable behavior!
---&gt;
-&lt;dependency&gt;
-  &lt;groupId&gt;org.freemarker&lt;/groupId&gt;
-  &lt;artifactId&gt;freemarker&lt;/artifactId&gt;
-  &lt;version&gt;2.3.23&lt;/version&gt;
-&lt;/dependency&gt;</programlisting>
-
-      <note>
-        <para>Until about 2007 the Maven group name was
-        <quote>freemarker</quote> instead of <quote>org.freemarker</quote>,
-        and as the XML comment above says, this can cause problems, as Maven
-        will see them as two independent artifacts with no version conflict.
-        If you run into this issue, find the <literal>dependency</literal>
-        that depends on the old FreeMarker, and insert
-        <literal>&lt;exclusions&gt;&lt;exclusion&gt;&lt;groupId&gt;freemarker&lt;!--
-        Legacy org-less group
-        --&gt;&lt;/groupId&gt;&lt;artifactId&gt;freemarker&lt;/artifactId&gt;
-        &lt;/exclusion&gt;&lt;/exclusions&gt;</literal> into it.</para>
-      </note>
-
-      <para>If you need to use FreeMarker on Google App Engine, <link
-      xlink:href="http://sourceforge.net/projects/freemarker/files/freemarker/2.3.23/freemarker-gae-2.3.23.jar/download">download
-      the GAE-compatible binary too</link> (no documentation included in
-      this).</para>
-
-      <programlisting language="XML" role="unspecified">&lt;dependency&gt;
-  &lt;groupId&gt;org.freemarker&lt;/groupId&gt;
-  &lt;artifactId&gt;freemarker-gae&lt;/artifactId&gt;
-  &lt;version&gt;2.3.23&lt;/version&gt;
-&lt;/dependency&gt;</programlisting>
-    </simplesect>
-
-    <simplesect xml:id="v2_3_24-rc01">
-      <title>Laster development version: 2.3.24-rc01-incubating</title>
-
-      <para>Released on 2016-01-28 (final 2.3.24 release planned for early
-      March). Requires J2SE 1.5 or higher.</para>
-
-      <para><link
-      xlink:href="http://freemarker.org/builds/2.3.24-rc01/_html/versions_2_3_24.html">See
-      what's new...</link></para>
+      <para>Released on 2016-03-28. Requires J2SE 1.5 or higher.</para>
 
       <para>About <quote>incubating</quote> in the version number: It's
       unrelated to stability. The <quote>incubating</quote> suffix is required
@@ -232,35 +180,65 @@ two freemarker.jar-s and unpredictable behavior!
       <link xlink:href="http://incubator.apache.org">Apache Incubator web
       site</link>.</para>
 
+      <para><link
+      xlink:href="http://freemarker.org/docs/versions_2_3_24.html">See what's
+      new...</link></para>
+
       <para>Downloads:</para>
 
       <itemizedlist>
         <listitem>
           <para><link
-          xlink:href="http://www.apache.org/dyn/closer.cgi/incubator/freemarker/engine/2.3.24-rc01-incubating/binaries/apache-freemarker-2.3.24-rc01-incubating-bin.tar.gz">Binary
+          xlink:href="http://www.apache.org/dyn/closer.cgi/incubator/freemarker/engine/2.3.24-incubating/binaries/apache-freemarker-2.3.24-incubating-bin.tar.gz">Binary
           release (tar.gz)</link> (includes <literal>freemarker.jar</literal>
           and documentation) [<link
-          xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-rc01-incubating/binaries/apache-freemarker-2.3.24-rc01-incubating-bin.tar.gz.md5">MD5</link>]
+          xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-incubating/binaries/apache-freemarker-2.3.24-incubating-bin.tar.gz.md5">MD5</link>]
           [<link
-          xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-rc01-incubating/binaries/apache-freemarker-2.3.24-rc01-incubating-bin.tar.gz.sha512">SHA512</link>]
+          xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-incubating/binaries/apache-freemarker-2.3.24-incubating-bin.tar.gz.sha512">SHA512</link>]
           [<link
-          xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-rc01-incubating/binaries/apache-freemarker-2.3.24-rc01-incubating-bin.tar.gz.asc">ASC</link>]</para>
+          xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-incubating/binaries/apache-freemarker-2.3.24-incubating-bin.tar.gz.asc">ASC</link>]</para>
         </listitem>
 
         <listitem>
           <para><link
-          xlink:href="http://www.apache.org/dyn/closer.cgi/incubator/freemarker/engine/2.3.24-rc01-incubating/source/apache-freemarker-2.3.24-rc01-incubating-src.tar.gz">Source
+          xlink:href="http://www.apache.org/dyn/closer.cgi/incubator/freemarker/engine/2.3.24-incubating/source/apache-freemarker-2.3.24-incubating-src.tar.gz">Source
           release (tar.gz)</link> [<link
-          xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-rc01-incubating/source/apache-freemarker-2.3.24-rc01-incubating-src.tar.gz.md5">MD5</link>]
+          xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-incubating/source/apache-freemarker-2.3.24-incubating-src.tar.gz.md5">MD5</link>]
           [<link
-          xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-rc01-incubating/source/apache-freemarker-2.3.24-rc01-incubating-src.tar.gz.sha512">SHA512</link>]
+          xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-incubating/source/apache-freemarker-2.3.24-incubating-src.tar.gz.sha512">SHA512</link>]
           [<link
-          xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-rc01-incubating/source/apache-freemarker-2.3.24-rc01-incubating-src.tar.gz.asc">ASC</link>]</para>
+          xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-incubating/source/apache-freemarker-2.3.24-incubating-src.tar.gz.asc">ASC</link>]</para>
         </listitem>
       </itemizedlist>
 
-      <para>(There's also a separate Google App Engine compatible variation:
-      <link
+      <para>For Maven:</para>
+
+      <programlisting language="XML" role="unspecified">&lt;!--
+Attention: Be sure nothing pulls in an old dependency with groupId
+"freemarker" (without the "org."), because then you will end up with
+two freemarker.jar-s and unpredictable behavior!
+--&gt;
+&lt;dependency&gt;
+  &lt;groupId&gt;org.freemarker&lt;/groupId&gt;
+  &lt;artifactId&gt;freemarker&lt;/artifactId&gt;
+  &lt;version&gt;2.3.24-incubating&lt;/version&gt;
+&lt;/dependency&gt;</programlisting>
+
+      <note>
+        <para>Until about 2007 the Maven group name was
+        <quote>freemarker</quote> instead of <quote>org.freemarker</quote>,
+        and as the XML comment above says, this can cause problems, as Maven
+        will see them as two independent artifacts with no version conflict.
+        If you run into this issue, find the <literal>dependency</literal>
+        that depends on the old FreeMarker, and insert
+        <literal>&lt;exclusions&gt;&lt;exclusion&gt;&lt;groupId&gt;freemarker&lt;!--
+        Legacy org-less group
+        --&gt;&lt;/groupId&gt;&lt;artifactId&gt;freemarker&lt;/artifactId&gt;
+        &lt;/exclusion&gt;&lt;/exclusions&gt;</literal> into it.</para>
+      </note>
+
+      <para>There's also a separate Google App Engine compatible
+      (<quote>gae</quote>) variation. Download: <link
       xlink:href="http://www.apache.org/dyn/closer.cgi/incubator/freemarker/engine/2.3.24-rc01-incubating/binaries/apache-freemarker-gae-2.3.24-rc01-incubating-bin.tar.gz">binary</link>
       [<link
       xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-rc01-incubating/binaries/apache-freemarker-gae-2.3.24-rc01-incubating-bin.tar.gz.md5">MD5</link>]
@@ -275,29 +253,13 @@ two freemarker.jar-s and unpredictable behavior!
       [<link
       xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-rc01-incubating/source/apache-freemarker-gae-2.3.24-rc01-incubating-src.tar.gz.sha512">SHA512</link>]
       [<link
-      xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-rc01-incubating/source/apache-freemarker-gae-2.3.24-rc01-incubating-src.tar.gz.asc">ASC</link>])</para>
+      xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.24-rc01-incubating/source/apache-freemarker-gae-2.3.24-rc01-incubating-src.tar.gz.asc">ASC</link>].
+      Maven:</para>
 
-      <para>The Maven artifact, because it's a non-final release, is only
-      available in the Apache Staging Repository, <emphasis>not</emphasis> in
-      the Maven Central Repository. Thus, you have to add this to your
-      <literal>.m2/settings.xml</literal>:</para>
-
-      <programlisting language="XML" role="unspecified">&lt;!-- Repostiory for
non-final Apache releases: --&gt;
-&lt;repository&gt;
-  &lt;id&gt;apache-staging-repository&lt;/id&gt;
-  &lt;url&gt;https://repository.apache.org/content/repositories/staging/&lt;/url&gt;
-&lt;/repository&gt;</programlisting>
-
-      <para>and then in <literal>pom.xml</literal>:</para>
-
-      <programlisting language="XML" role="unspecified">&lt;!--
-  ATTENTION: This is a non-final release, so it's only present in the
-  Apache Staging Repository, which must be added to settings.xml!
---&gt;
-&lt;dependency&gt;
+      <programlisting language="XML" role="unspecified">&lt;dependency&gt;
   &lt;groupId&gt;org.freemarker&lt;/groupId&gt;
-  &lt;artifactId&gt;freemarker&lt;/artifactId&gt;
-  &lt;version&gt;2.3.24-rc01-incubating&lt;/version&gt;
+  &lt;artifactId&gt;freemarker-gae&lt;/artifactId&gt;
+  &lt;version&gt;2.3.23-incubating&lt;/version&gt;
 &lt;/dependency&gt;</programlisting>
     </simplesect>
 


Mime
View raw message