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 2016/07/05 20:11:43 UTC

[21/42] incubator-freemarker-site git commit: Update site for 2.3.25 (with Maven Central Repository problem warning)

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/package-summary.html b/docs/api/freemarker/template/package-summary.html
index 9ea322d..36726ec 100644
--- a/docs/api/freemarker/template/package-summary.html
+++ b/docs/api/freemarker/template/package-summary.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>freemarker.template (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>freemarker.template (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="freemarker.template (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="freemarker.template (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -170,69 +170,87 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a></td>
+<td class="colLast">
+<div class="block">Adds key-value pair listing capability to <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><code>TemplateHashModelEx</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePair</a></td>
+<td class="colLast">
+<div class="block">A key-value pair in a hash; used for <a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template"><code>TemplateHashModelEx2.KeyValuePairIterator</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a></td>
+<td class="colLast">
+<div class="block">Iterates over the key-value pairs in a hash.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template">TemplateMethodModel</a></td>
 <td class="colLast">Deprecated
 <div class="block"><span class="deprecationComment">Use <a href="../../freemarker/template/TemplateMethodModelEx.html" title="interface in freemarker.template"><code>TemplateMethodModelEx</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/template/TemplateMethodModelEx.html" title="interface in freemarker.template">TemplateMethodModelEx</a></td>
 <td class="colLast">
 <div class="block">"extended method" template language data type: Objects that act like functions.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></td>
 <td class="colLast">
 <div class="block">The common super-interface of the interfaces that stand for the FreeMarker Template Language (FTL) data types.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/template/TemplateModelAdapter.html" title="interface in freemarker.template">TemplateModelAdapter</a></td>
 <td class="colLast">
 <div class="block">Implemented by classes that serve as adapters for template model objects in
  some other object model.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/template/TemplateModelIterator.html" title="interface in freemarker.template">TemplateModelIterator</a></td>
 <td class="colLast">
 <div class="block">Used to iterate over a set of template models <em>once</em>; usually returned from
  <a href="../../freemarker/template/TemplateCollectionModel.html#iterator--"><code>TemplateCollectionModel.iterator()</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a></td>
 <td class="colLast">
 <div class="block"><b>Experimental - subject to change:</b> A <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> on which the <code>?api</code> operation can be applied.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template">TemplateNodeModel</a></td>
 <td class="colLast">
 <div class="block">"node" template language data type: an object that is a node in a tree.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a></td>
 <td class="colLast">
 <div class="block">"number" template language data type; an object that stores a number.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template">TemplateScalarModel</a></td>
 <td class="colLast">
 <div class="block">"string" template language data-type; like in Java, an unmodifiable UNICODE character sequence.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template">TemplateSequenceModel</a></td>
 <td class="colLast">
 <div class="block">"sequence" template language data type; an object that contains other objects accessible through an integer 0-based
  index.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/template/TemplateTransformModel.html" title="interface in freemarker.template">TemplateTransformModel</a></td>
 <td class="colLast">
 <div class="block">"transform" template language data type: user-defined directives 
@@ -240,7 +258,7 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
  instead.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/template/TransformControl.html" title="interface in freemarker.template">TransformControl</a></td>
 <td class="colLast">
 <div class="block">An interface that can be implemented by writers returned from
@@ -273,58 +291,72 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a></td>
+<td class="colLast">
+<div class="block">Adapts an <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang"><code>Iterable</code></a> to the corresponding <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> interface(s), most importantly to
+ <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template">DefaultIteratorAdapter</a></td>
 <td class="colLast">
 <div class="block">Adapts an <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util"><code>Iterator</code></a> to the corresponding <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> interface(s), most importantly to
  <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template">DefaultListAdapter</a></td>
 <td class="colLast">
 <div class="block">Adapts a <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util"><code>List</code></a> to the corresponding <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> interface(s), most importantly to
  <a href="../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template"><code>TemplateSequenceModel</code></a>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template">DefaultMapAdapter</a></td>
 <td class="colLast">
 <div class="block">Adapts a <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> to the corresponding <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> interface(s), most importantly to
  <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><code>TemplateHashModelEx</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template">DefaultNonListCollectionAdapter</a></td>
 <td class="colLast">
 <div class="block"><b>Experimental - subject to change:</b> Adapts a non-<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util"><code>List</code></a> Java <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util"><code>Collection</code></a> to the corresponding
  <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> interface(s), most importantly to <a href="../../freemarker/template/TemplateCollectionModelEx.html" title="interface in freemarker.template"><code>TemplateCollectionModelEx</code></a>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template">DefaultObjectWrapper</a></td>
 <td class="colLast">
 <div class="block">The default implementation of the <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a> interface.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/template/DefaultObjectWrapperBuilder.html" title="class in freemarker.template">DefaultObjectWrapperBuilder</a></td>
 <td class="colLast">
 <div class="block">Gets/creates a <a href="../../freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template"><code>DefaultObjectWrapper</code></a> singleton instance that's already configured as specified in the
  properties of this object; this is recommended over using the <a href="../../freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template"><code>DefaultObjectWrapper</code></a> constructors.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html" title="class in freemarker.template">DefaultObjectWrapperConfiguration</a></td>
 <td class="colLast">
 <div class="block">Holds <a href="../../freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template"><code>DefaultObjectWrapper</code></a> configuration settings and defines their defaults.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/template/LocalizedString.html" title="class in freemarker.template">LocalizedString</a></td>
 <td class="colLast">
 <div class="block">An abstract base class for scalars that vary by locale.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/template/MapKeyValuePairIterator.html" title="class in freemarker.template">MapKeyValuePairIterator</a></td>
+<td class="colLast">
+<div class="block">Implementation of <a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template"><code>TemplateHashModelEx2.KeyValuePairIterator</code></a> for a <a href="../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template"><code>TemplateHashModelEx2</code></a> that wraps or otherwise uses a
+  <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> internally.</div>
+</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/template/ResourceBundleLocalizedString.html" title="class in freemarker.template">ResourceBundleLocalizedString</a></td>
 <td class="colLast">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/package-tree.html b/docs/api/freemarker/template/package-tree.html
index 73e9c4e..51d1adb 100644
--- a/docs/api/freemarker/template/package-tree.html
+++ b/docs/api/freemarker/template/package-tree.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>freemarker.template Class Hierarchy (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>freemarker.template Class Hierarchy (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="freemarker.template Class Hierarchy (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="freemarker.template Class Hierarchy (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -111,6 +111,7 @@
 <li type="circle">freemarker.template.<a href="../../freemarker/template/ResourceBundleLocalizedString.html" title="class in freemarker.template"><span class="typeNameLink">ResourceBundleLocalizedString</span></a></li>
 </ul>
 </li>
+<li type="circle">freemarker.template.<a href="../../freemarker/template/MapKeyValuePairIterator.html" title="class in freemarker.template"><span class="typeNameLink">MapKeyValuePairIterator</span></a> (implements freemarker.template.<a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a>)</li>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/SimpleDate.html" title="class in freemarker.template"><span class="typeNameLink">SimpleDate</span></a> (implements freemarker.template.<a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>)</li>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/SimpleNumber.html" title="class in freemarker.template"><span class="typeNameLink">SimpleNumber</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, freemarker.template.<a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>)</li>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/SimpleScalar.html" title="class in freemarker.template"><span class="typeNameLink">SimpleScalar</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, freemarker.template.<a href="../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template">TemplateScalarModel</a>)</li>
@@ -147,12 +148,13 @@
 <li type="circle">freemarker.template.<a href="../../freemarker/template/WrappingTemplateModel.html" title="class in freemarker.template"><span class="typeNameLink">WrappingTemplateModel</span></a>
 <ul>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/DefaultArrayAdapter.html" title="class in freemarker.template"><span class="typeNameLink">DefaultArrayAdapter</span></a> (implements freemarker.template.<a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, freemarker.template.<a href="../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template">TemplateSequenceModel</a>, freemarker.ext.util.<a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a>)</li>
+<li type="circle">freemarker.template.<a href="../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template"><span class="typeNameLink">DefaultIterableAdapter</span></a> (implements freemarker.template.<a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, freemarker.template.<a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a>, freemarker.template.<a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a>, freemarker.ext.util.<a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a>)</li>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template"><span class="typeNameLink">DefaultIteratorAdapter</span></a> (implements freemarker.template.<a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, freemarker.template.<a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a>, freemarker.ext.util.<a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a>)</li>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template"><span class="typeNameLink">DefaultListAdapter</span></a> (implements freemarker.template.<a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, freemarker.template.<a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a>, freemarker.template.<a href="../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template">TemplateSequenceModel</a>, freemarker.ext.util.<a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a>)</li>
-<li type="circle">freemarker.template.<a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template"><span class="typeNameLink">DefaultMapAdapter</span></a> (implements freemarker.template.<a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, freemarker.template.<a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template">TemplateHashModelEx</a>, freemarker.template.<a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a>, freemarker.ext.util.<a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a>)</li>
+<li type="circle">freemarker.template.<a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template"><span class="typeNameLink">DefaultMapAdapter</span></a> (implements freemarker.template.<a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, freemarker.template.<a href="../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a>, freemarker.template.<a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a>, freemarker.ext.util.<a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a>)</li>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template"><span class="typeNameLink">DefaultNonListCollectionAdapter</span></a> (implements freemarker.template.<a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, freemarker.template.<a href="../../freemarker/template/TemplateCollectionModelEx.html" title="interface in freemarker.template">TemplateCollectionModelEx</a>, freemarker.template.<a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a>, freemarker.ext.util.<a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplate
 Model</a>)</li>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/SimpleCollection.html" title="class in freemarker.template"><span class="typeNameLink">SimpleCollection</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, freemarker.template.<a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a>)</li>
-<li type="circle">freemarker.template.<a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template"><span class="typeNameLink">SimpleHash</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, freemarker.template.<a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template">TemplateHashModelEx</a>)</li>
+<li type="circle">freemarker.template.<a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template"><span class="typeNameLink">SimpleHash</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, freemarker.template.<a href="../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a>)</li>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template"><span class="typeNameLink">SimpleSequence</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, freemarker.template.<a href="../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template">TemplateSequenceModel</a>)
 <ul>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/SimpleList.html" title="class in freemarker.template"><span class="typeNameLink">SimpleList</span></a></li>
@@ -172,6 +174,8 @@
 </li>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/TemplateDirectiveBody.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateDirectiveBody</span></a></li>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/TemplateExceptionHandler.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateExceptionHandler</span></a></li>
+<li type="circle">freemarker.template.<a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateHashModelEx2.KeyValuePair</span></a></li>
+<li type="circle">freemarker.template.<a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateHashModelEx2.KeyValuePairIterator</span></a></li>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateModel</span></a>
 <ul>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template"><span class="typeNameLink">AdapterTemplateModel</span></a></li>
@@ -185,7 +189,11 @@
 <li type="circle">freemarker.template.<a href="../../freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateDirectiveModel</span></a></li>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateHashModel</span></a>
 <ul>
-<li type="circle">freemarker.template.<a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateHashModelEx</span></a></li>
+<li type="circle">freemarker.template.<a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateHashModelEx</span></a>
+<ul>
+<li type="circle">freemarker.template.<a href="../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateHashModelEx2</span></a></li>
+</ul>
+</li>
 </ul>
 </li>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateMethodModel</span></a>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/package-use.html b/docs/api/freemarker/template/package-use.html
index 4848572..5f34b10 100644
--- a/docs/api/freemarker/template/package-use.html
+++ b/docs/api/freemarker/template/package-use.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Package freemarker.template (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Package freemarker.template (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package freemarker.template (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Package freemarker.template (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -280,31 +280,36 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/template/class-use/TemplateHashModelEx2.html#freemarker.core">TemplateHashModelEx2</a>
+<div class="block">Adds key-value pair listing capability to <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><code>TemplateHashModelEx</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateModel.html#freemarker.core">TemplateModel</a>
 <div class="block">The common super-interface of the interfaces that stand for the FreeMarker Template Language (FTL) data types.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateModelException.html#freemarker.core">TemplateModelException</a>
 <div class="block"><a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> methods throw this exception if the requested data can't be retrieved.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateNodeModel.html#freemarker.core">TemplateNodeModel</a>
 <div class="block">"node" template language data type: an object that is a node in a tree.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateNumberModel.html#freemarker.core">TemplateNumberModel</a>
 <div class="block">"number" template language data type; an object that stores a number.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/Version.html#freemarker.core">Version</a>
 <div class="block">Represents a version number plus the further qualifiers and build info.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/WrappingTemplateModel.html#freemarker.core">WrappingTemplateModel</a>
 <div class="block">Convenience base-class for containers that wrap their contained arbitrary Java objects into <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>
  instances.</div>
@@ -390,6 +395,16 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/template/class-use/TemplateHashModelEx2.html#freemarker.ext.beans">TemplateHashModelEx2</a>
+<div class="block">Adds key-value pair listing capability to <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><code>TemplateHashModelEx</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/template/class-use/TemplateHashModelEx2.KeyValuePairIterator.html#freemarker.ext.beans">TemplateHashModelEx2.KeyValuePairIterator</a>
+<div class="block">Iterates over the key-value pairs in a hash.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateMethodModel.html#freemarker.ext.beans">TemplateMethodModel</a>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
 <div class="block"><span class="deprecationComment">Use <a href="../../freemarker/template/TemplateMethodModelEx.html" title="interface in freemarker.template"><code>TemplateMethodModelEx</code></a> instead. This interface is from the old times when the only kind of
@@ -847,16 +862,21 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </td>
 </tr>
 <tr class="altColor">
+<td class="colOne"><a href="../../freemarker/template/class-use/TemplateHashModelEx2.html#freemarker.ext.servlet">TemplateHashModelEx2</a>
+<div class="block">Adds key-value pair listing capability to <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><code>TemplateHashModelEx</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateModel.html#freemarker.ext.servlet">TemplateModel</a>
 <div class="block">The common super-interface of the interfaces that stand for the FreeMarker Template Language (FTL) data types.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateModelException.html#freemarker.ext.servlet">TemplateModelException</a>
 <div class="block"><a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> methods throw this exception if the requested data can't be retrieved.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/WrappingTemplateModel.html#freemarker.ext.servlet">WrappingTemplateModel</a>
 <div class="block">Convenience base-class for containers that wrap their contained arbitrary Java objects into <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>
  instances.</div>
@@ -932,136 +952,157 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/template/class-use/DefaultIterableAdapter.html#freemarker.template">DefaultIterableAdapter</a>
+<div class="block">Adapts an <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang"><code>Iterable</code></a> to the corresponding <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> interface(s), most importantly to
+ <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/DefaultIteratorAdapter.html#freemarker.template">DefaultIteratorAdapter</a>
 <div class="block">Adapts an <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util"><code>Iterator</code></a> to the corresponding <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> interface(s), most importantly to
  <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/DefaultListAdapter.html#freemarker.template">DefaultListAdapter</a>
 <div class="block">Adapts a <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util"><code>List</code></a> to the corresponding <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> interface(s), most importantly to
  <a href="../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template"><code>TemplateSequenceModel</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/DefaultMapAdapter.html#freemarker.template">DefaultMapAdapter</a>
 <div class="block">Adapts a <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> to the corresponding <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> interface(s), most importantly to
  <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><code>TemplateHashModelEx</code></a>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/DefaultNonListCollectionAdapter.html#freemarker.template">DefaultNonListCollectionAdapter</a>
 <div class="block"><b>Experimental - subject to change:</b> Adapts a non-<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util"><code>List</code></a> Java <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util"><code>Collection</code></a> to the corresponding
  <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> interface(s), most importantly to <a href="../../freemarker/template/TemplateCollectionModelEx.html" title="interface in freemarker.template"><code>TemplateCollectionModelEx</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/DefaultObjectWrapper.html#freemarker.template">DefaultObjectWrapper</a>
 <div class="block">The default implementation of the <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a> interface.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/DefaultObjectWrapperConfiguration.html#freemarker.template">DefaultObjectWrapperConfiguration</a>
 <div class="block">Holds <a href="../../freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template"><code>DefaultObjectWrapper</code></a> configuration settings and defines their defaults.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/LocalizedString.html#freemarker.template">LocalizedString</a>
 <div class="block">An abstract base class for scalars that vary by locale.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/MalformedTemplateNameException.html#freemarker.template">MalformedTemplateNameException</a>
 <div class="block">Indicates that the template name given was malformed according the <a href="../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache"><code>TemplateNameFormat</code></a> in use.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/ObjectWrapper.html#freemarker.template">ObjectWrapper</a>
 <div class="block">Maps Java objects to the type-system of FreeMarker Template Language (see the <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>
  interfaces).</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/ObjectWrapperAndUnwrapper.html#freemarker.template">ObjectWrapperAndUnwrapper</a>
 <div class="block"><b>Experimental - subject to change:</b> Adds functionality to <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a> that creates a plain Java object
  from a <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/SimpleHash.html#freemarker.template">SimpleHash</a>
 <div class="block">A simple implementation of the <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><code>TemplateHashModelEx</code></a> interface, using its own underlying <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> or
  <a href="http://docs.oracle.com/javase/8/docs/api/java/util/SortedMap.html?is-external=true" title="class or interface in java.util"><code>SortedMap</code></a> for storing the hash entries.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/SimpleScalar.html#freemarker.template">SimpleScalar</a>
 <div class="block">A simple implementation of the <tt>TemplateScalarModel</tt>
  interface, using a <tt>String</tt>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/SimpleSequence.html#freemarker.template">SimpleSequence</a>
 <div class="block">A simple implementation of the <a href="../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template"><code>TemplateSequenceModel</code></a> interface, using its own underlying <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util"><code>List</code></a> for
  storing the list items.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/Template.html#freemarker.template">Template</a>
 <div class="block">
  Stores an already parsed template, ready to be processed (rendered) for unlimited times, possibly from multiple
  threads.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateBooleanModel.html#freemarker.template">TemplateBooleanModel</a>
 <div class="block">"boolean" template language data type; same as in Java; either <code>true</code> or <code>false</code>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateCollectionModel.html#freemarker.template">TemplateCollectionModel</a>
 <div class="block">"collection" template language data type: a collection of values that can be enumerated, but can't be or not meant to
  be accessed by index or key.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateCollectionModelEx.html#freemarker.template">TemplateCollectionModelEx</a>
 <div class="block"><b>Experimental - subject to change:</b> "extended collection" template language data type: Adds size/emptiness
  querybility and "contains" test to <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateDateModel.html#freemarker.template">TemplateDateModel</a>
 <div class="block">"date", "time" and "date-time" template language data types: corresponds to <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util"><code>Date</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateDirectiveBody.html#freemarker.template">TemplateDirectiveBody</a>
 <div class="block">Represents the nested content of a directive (<a href="../../freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template"><code>TemplateDirectiveModel</code></a>) invocation.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateException.html#freemarker.template">TemplateException</a>
 <div class="block">Runtime exception in a template (as opposed to a parsing-time exception: <a href="../../freemarker/core/ParseException.html" title="class in freemarker.core"><code>ParseException</code></a>).</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateExceptionHandler.html#freemarker.template">TemplateExceptionHandler</a>
 <div class="block">Used for the <code>template_exception_handler</code> configuration setting;
  see <a href="../../freemarker/core/Configurable.html#setTemplateExceptionHandler-freemarker.template.TemplateExceptionHandler-"><code>Configurable.setTemplateExceptionHandler(TemplateExceptionHandler)</code></a> for more.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateHashModel.html#freemarker.template">TemplateHashModel</a>
 <div class="block">"hash" template language data type: an object that contains other objects accessible through string keys
  (sub-variable names).</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateHashModelEx.html#freemarker.template">TemplateHashModelEx</a>
 <div class="block">"extended hash" template language data type; extends <a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template"><code>TemplateHashModel</code></a> by allowing
  iterating through its keys and values.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/template/class-use/TemplateHashModelEx2.html#freemarker.template">TemplateHashModelEx2</a>
+<div class="block">Adds key-value pair listing capability to <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><code>TemplateHashModelEx</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/template/class-use/TemplateHashModelEx2.KeyValuePair.html#freemarker.template">TemplateHashModelEx2.KeyValuePair</a>
+<div class="block">A key-value pair in a hash; used for <a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template"><code>TemplateHashModelEx2.KeyValuePairIterator</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/template/class-use/TemplateHashModelEx2.KeyValuePairIterator.html#freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a>
+<div class="block">Iterates over the key-value pairs in a hash.</div>
+</td>
+</tr>
 <tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateMethodModel.html#freemarker.template">TemplateMethodModel</a>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/CaptureOutput.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/CaptureOutput.html b/docs/api/freemarker/template/utility/CaptureOutput.html
index 4e47f1a..be9389a 100644
--- a/docs/api/freemarker/template/utility/CaptureOutput.html
+++ b/docs/api/freemarker/template/utility/CaptureOutput.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>CaptureOutput (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>CaptureOutput (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CaptureOutput (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="CaptureOutput (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/ClassUtil.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/ClassUtil.html b/docs/api/freemarker/template/utility/ClassUtil.html
index 931efc8..437dd4e 100644
--- a/docs/api/freemarker/template/utility/ClassUtil.html
+++ b/docs/api/freemarker/template/utility/ClassUtil.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ClassUtil (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>ClassUtil (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ClassUtil (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="ClassUtil (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/CollectionUtils.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/CollectionUtils.html b/docs/api/freemarker/template/utility/CollectionUtils.html
index a4425dc..1556161 100644
--- a/docs/api/freemarker/template/utility/CollectionUtils.html
+++ b/docs/api/freemarker/template/utility/CollectionUtils.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>CollectionUtils (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>CollectionUtils (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CollectionUtils (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="CollectionUtils (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/Collections12.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/Collections12.html b/docs/api/freemarker/template/utility/Collections12.html
index 5d43fe4..c4e43c3 100644
--- a/docs/api/freemarker/template/utility/Collections12.html
+++ b/docs/api/freemarker/template/utility/Collections12.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Collections12 (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Collections12 (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Collections12 (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Collections12 (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/Constants.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/Constants.html b/docs/api/freemarker/template/utility/Constants.html
index a26b013..ec56796 100644
--- a/docs/api/freemarker/template/utility/Constants.html
+++ b/docs/api/freemarker/template/utility/Constants.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Constants (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Constants (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constants (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Constants (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/DOMNodeModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DOMNodeModel.html b/docs/api/freemarker/template/utility/DOMNodeModel.html
index 7edb45e..dac6b56 100644
--- a/docs/api/freemarker/template/utility/DOMNodeModel.html
+++ b/docs/api/freemarker/template/utility/DOMNodeModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DOMNodeModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DOMNodeModel (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DOMNodeModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DOMNodeModel (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/DateUtil.CalendarFieldsToDateConverter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DateUtil.CalendarFieldsToDateConverter.html b/docs/api/freemarker/template/utility/DateUtil.CalendarFieldsToDateConverter.html
index 3382476..908dbc0 100644
--- a/docs/api/freemarker/template/utility/DateUtil.CalendarFieldsToDateConverter.html
+++ b/docs/api/freemarker/template/utility/DateUtil.CalendarFieldsToDateConverter.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DateUtil.CalendarFieldsToDateConverter (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DateUtil.CalendarFieldsToDateConverter (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DateUtil.CalendarFieldsToDateConverter (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DateUtil.CalendarFieldsToDateConverter (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/DateUtil.DateParseException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DateUtil.DateParseException.html b/docs/api/freemarker/template/utility/DateUtil.DateParseException.html
index 6aa4d5b..de48ca1 100644
--- a/docs/api/freemarker/template/utility/DateUtil.DateParseException.html
+++ b/docs/api/freemarker/template/utility/DateUtil.DateParseException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DateUtil.DateParseException (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DateUtil.DateParseException (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DateUtil.DateParseException (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DateUtil.DateParseException (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/DateUtil.DateToISO8601CalendarFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DateUtil.DateToISO8601CalendarFactory.html b/docs/api/freemarker/template/utility/DateUtil.DateToISO8601CalendarFactory.html
index 94f138b..1eea126 100644
--- a/docs/api/freemarker/template/utility/DateUtil.DateToISO8601CalendarFactory.html
+++ b/docs/api/freemarker/template/utility/DateUtil.DateToISO8601CalendarFactory.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DateUtil.DateToISO8601CalendarFactory (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DateUtil.DateToISO8601CalendarFactory (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DateUtil.DateToISO8601CalendarFactory (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DateUtil.DateToISO8601CalendarFactory (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/DateUtil.TrivialCalendarFieldsToDateConverter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DateUtil.TrivialCalendarFieldsToDateConverter.html b/docs/api/freemarker/template/utility/DateUtil.TrivialCalendarFieldsToDateConverter.html
index 3096b83..63fa2c3 100644
--- a/docs/api/freemarker/template/utility/DateUtil.TrivialCalendarFieldsToDateConverter.html
+++ b/docs/api/freemarker/template/utility/DateUtil.TrivialCalendarFieldsToDateConverter.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DateUtil.TrivialCalendarFieldsToDateConverter (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DateUtil.TrivialCalendarFieldsToDateConverter (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DateUtil.TrivialCalendarFieldsToDateConverter (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DateUtil.TrivialCalendarFieldsToDateConverter (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/DateUtil.TrivialDateToISO8601CalendarFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DateUtil.TrivialDateToISO8601CalendarFactory.html b/docs/api/freemarker/template/utility/DateUtil.TrivialDateToISO8601CalendarFactory.html
index c4fe2ca..43f0ca4 100644
--- a/docs/api/freemarker/template/utility/DateUtil.TrivialDateToISO8601CalendarFactory.html
+++ b/docs/api/freemarker/template/utility/DateUtil.TrivialDateToISO8601CalendarFactory.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DateUtil.TrivialDateToISO8601CalendarFactory (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DateUtil.TrivialDateToISO8601CalendarFactory (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DateUtil.TrivialDateToISO8601CalendarFactory (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DateUtil.TrivialDateToISO8601CalendarFactory (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/DateUtil.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DateUtil.html b/docs/api/freemarker/template/utility/DateUtil.html
index 402f30f..80cd89d 100644
--- a/docs/api/freemarker/template/utility/DateUtil.html
+++ b/docs/api/freemarker/template/utility/DateUtil.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DateUtil (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DateUtil (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DateUtil (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DateUtil (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/DeepUnwrap.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DeepUnwrap.html b/docs/api/freemarker/template/utility/DeepUnwrap.html
index 7f18fca..c19899d 100644
--- a/docs/api/freemarker/template/utility/DeepUnwrap.html
+++ b/docs/api/freemarker/template/utility/DeepUnwrap.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DeepUnwrap (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DeepUnwrap (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DeepUnwrap (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DeepUnwrap (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/Execute.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/Execute.html b/docs/api/freemarker/template/utility/Execute.html
index 3904cb1..23ee9f5 100644
--- a/docs/api/freemarker/template/utility/Execute.html
+++ b/docs/api/freemarker/template/utility/Execute.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Execute (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Execute (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Execute (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Execute (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/HtmlEscape.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/HtmlEscape.html b/docs/api/freemarker/template/utility/HtmlEscape.html
index 893571f..ca2a64e 100644
--- a/docs/api/freemarker/template/utility/HtmlEscape.html
+++ b/docs/api/freemarker/template/utility/HtmlEscape.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>HtmlEscape (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>HtmlEscape (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="HtmlEscape (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="HtmlEscape (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/JythonRuntime.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/JythonRuntime.html b/docs/api/freemarker/template/utility/JythonRuntime.html
index 9e9ba3f..43e0d0c 100644
--- a/docs/api/freemarker/template/utility/JythonRuntime.html
+++ b/docs/api/freemarker/template/utility/JythonRuntime.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JythonRuntime (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>JythonRuntime (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="JythonRuntime (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="JythonRuntime (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/NormalizeNewlines.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/NormalizeNewlines.html b/docs/api/freemarker/template/utility/NormalizeNewlines.html
index b951edc..ba34df6 100644
--- a/docs/api/freemarker/template/utility/NormalizeNewlines.html
+++ b/docs/api/freemarker/template/utility/NormalizeNewlines.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NormalizeNewlines (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>NormalizeNewlines (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NormalizeNewlines (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="NormalizeNewlines (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/NullArgumentException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/NullArgumentException.html b/docs/api/freemarker/template/utility/NullArgumentException.html
index 270ae4d..64332fe 100644
--- a/docs/api/freemarker/template/utility/NullArgumentException.html
+++ b/docs/api/freemarker/template/utility/NullArgumentException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NullArgumentException (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>NullArgumentException (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NullArgumentException (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="NullArgumentException (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/NullWriter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/NullWriter.html b/docs/api/freemarker/template/utility/NullWriter.html
index 87d16e6..f00012f 100644
--- a/docs/api/freemarker/template/utility/NullWriter.html
+++ b/docs/api/freemarker/template/utility/NullWriter.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NullWriter (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>NullWriter (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NullWriter (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="NullWriter (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/NumberUtil.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/NumberUtil.html b/docs/api/freemarker/template/utility/NumberUtil.html
index 0c9c050..88435a4 100644
--- a/docs/api/freemarker/template/utility/NumberUtil.html
+++ b/docs/api/freemarker/template/utility/NumberUtil.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NumberUtil (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>NumberUtil (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NumberUtil (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="NumberUtil (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/ObjectConstructor.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/ObjectConstructor.html b/docs/api/freemarker/template/utility/ObjectConstructor.html
index 8ab53f5..f925877 100644
--- a/docs/api/freemarker/template/utility/ObjectConstructor.html
+++ b/docs/api/freemarker/template/utility/ObjectConstructor.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ObjectConstructor (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>ObjectConstructor (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ObjectConstructor (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="ObjectConstructor (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/ObjectFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/ObjectFactory.html b/docs/api/freemarker/template/utility/ObjectFactory.html
index 0e9c7fd..2fc17f0 100644
--- a/docs/api/freemarker/template/utility/ObjectFactory.html
+++ b/docs/api/freemarker/template/utility/ObjectFactory.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ObjectFactory (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>ObjectFactory (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ObjectFactory (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="ObjectFactory (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/ObjectWrapperWithAPISupport.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/ObjectWrapperWithAPISupport.html b/docs/api/freemarker/template/utility/ObjectWrapperWithAPISupport.html
index 08fc827..6861df6 100644
--- a/docs/api/freemarker/template/utility/ObjectWrapperWithAPISupport.html
+++ b/docs/api/freemarker/template/utility/ObjectWrapperWithAPISupport.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ObjectWrapperWithAPISupport (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>ObjectWrapperWithAPISupport (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ObjectWrapperWithAPISupport (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="ObjectWrapperWithAPISupport (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/OptimizerUtil.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/OptimizerUtil.html b/docs/api/freemarker/template/utility/OptimizerUtil.html
index 9764fa6..348320c 100644
--- a/docs/api/freemarker/template/utility/OptimizerUtil.html
+++ b/docs/api/freemarker/template/utility/OptimizerUtil.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>OptimizerUtil (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>OptimizerUtil (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="OptimizerUtil (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="OptimizerUtil (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/RichObjectWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/RichObjectWrapper.html b/docs/api/freemarker/template/utility/RichObjectWrapper.html
index 42cb2c5..a39bfa5 100644
--- a/docs/api/freemarker/template/utility/RichObjectWrapper.html
+++ b/docs/api/freemarker/template/utility/RichObjectWrapper.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>RichObjectWrapper (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>RichObjectWrapper (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="RichObjectWrapper (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="RichObjectWrapper (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/utility/SecurityUtilities.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/SecurityUtilities.html b/docs/api/freemarker/template/utility/SecurityUtilities.html
index 2293741..c864d8a 100644
--- a/docs/api/freemarker/template/utility/SecurityUtilities.html
+++ b/docs/api/freemarker/template/utility/SecurityUtilities.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SecurityUtilities (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>SecurityUtilities (FreeMarker 2.3.25-incubating API)</title>
+<meta name="date" content="2016-07-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SecurityUtilities (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="SecurityUtilities (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {