freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [22/42] incubator-freemarker-site git commit: Update site for 2.3.25 (with Maven Central Repository problem warning)
Date Tue, 05 Jul 2016 20:11:44 GMT
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/class-use/TemplateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateModel.html b/docs/api/freemarker/template/class-use/TemplateModel.html
index 4f19955..1695f3f 100644
--- a/docs/api/freemarker/template/class-use/TemplateModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateModel.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 Interface freemarker.template.TemplateModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.TemplateModel (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 Interface freemarker.template.TemplateModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateModel (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -318,20 +318,24 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">NonSequenceOrCollectionException.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/NonSequenceOrCollectionException.html#isWrappedIterable-freemarker.template.TemplateModel-">isWrappedIterable</a></span>(<a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;model)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#setGlobalVariable-java.lang.String-freemarker.template.TemplateModel-">setGlobalVariable</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                  <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;model)</code>
 <div class="block">Sets a variable that is visible globally.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#setLocalVariable-java.lang.String-freemarker.template.TemplateModel-">setLocalVariable</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                 <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;model)</code>
 <div class="block">Sets a local variable (one effective only during a macro invocation).</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#setVariable-java.lang.String-freemarker.template.TemplateModel-">setVariable</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
            <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;model)</code>
@@ -1130,6 +1134,12 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a></span></code>
+<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"><code>interface&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template">TemplateMethodModel</a></span></code>
 <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
@@ -1137,44 +1147,44 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>interface&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateMethodModelEx.html" title="interface in freemarker.template">TemplateMethodModelEx</a></span></code>
 <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"><code>interface&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a></span></code>
 <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="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>interface&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template">TemplateNodeModel</a></span></code>
 <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="colFirst"><code>interface&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a></span></code>
 <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="colFirst"><code>interface&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template">TemplateScalarModel</a></span></code>
 <div class="block">"string" template language data-type; like in Java, an unmodifiable UNICODE character sequence.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>interface&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template">TemplateSequenceModel</a></span></code>
 <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="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>interface&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateTransformModel.html" title="interface in freemarker.template">TemplateTransformModel</a></span></code>
 <div class="block">"transform" template language data type: user-defined directives 
@@ -1200,66 +1210,73 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a></span></code>
+<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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template">DefaultIteratorAdapter</a></span></code>
 <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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template">DefaultListAdapter</a></span></code>
 <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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template">DefaultMapAdapter</a></span></code>
 <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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template">DefaultNonListCollectionAdapter</a></span></code>
 <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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/LocalizedString.html" title="class in freemarker.template">LocalizedString</a></span></code>
 <div class="block">An abstract base class for scalars that vary by locale.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/ResourceBundleLocalizedString.html" title="class in freemarker.template">ResourceBundleLocalizedString</a></span></code>
 <div class="block">A concrete implementation of <a href="../../../freemarker/template/LocalizedString.html" title="class in freemarker.template"><code>LocalizedString</code></a> that gets 
  a localized string from a <a href="http://docs.oracle.com/javase/8/docs/api/java/util/ResourceBundle.html?is-external=true" title="class or interface in java.util"><code>ResourceBundle</code></a></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleCollection.html" title="class in freemarker.template">SimpleCollection</a></span></code>
 <div class="block">A simple implementation of <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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleDate.html" title="class in freemarker.template">SimpleDate</a></span></code>
 <div class="block">A simple implementation of the <tt>TemplateDateModel</tt>
  interface.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleHash.html" title="class in freemarker.template">SimpleHash</a></span></code>
 <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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleList.html" title="class in freemarker.template">SimpleList</a></span></code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -1267,28 +1284,28 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleNumber.html" title="class in freemarker.template">SimpleNumber</a></span></code>
 <div class="block">A simple implementation of the <tt>TemplateNumberModel</tt>
  interface.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleScalar.html" title="class in freemarker.template">SimpleScalar</a></span></code>
 <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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleSequence.html" title="class in freemarker.template">SimpleSequence</a></span></code>
 <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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateModelListSequence.html" title="class in freemarker.template">TemplateModelListSequence</a></span></code>
 <div class="block">A sequence that wraps 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> of <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>-s.</div>
@@ -1378,6 +1395,14 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
+<td class="colLast"><span class="typeNameLabel">DefaultIterableAdapter.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultIterableAdapter.html#getAPI--">getAPI</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateHashModelEx2.KeyValuePair.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html#getKey--">getKey</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Configuration.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Configuration.html#getSharedVariable-java.lang.String-">getSharedVariable</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Gets a shared variable.</div>
 </td>
@@ -1387,45 +1412,49 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colLast"><span class="typeNameLabel">TemplateModelAdapter.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateModelAdapter.html#getTemplateModel--">getTemplateModel</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateHashModelEx2.KeyValuePair.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html#getValue--">getValue</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>protected <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">SimpleObjectWrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleObjectWrapper.html#handleUnknownType-java.lang.Object-">handleUnknownType</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>
 <div class="block">Called if a type other than the simple ones we know about is passed in.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">DefaultObjectWrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultObjectWrapper.html#handleUnknownType-java.lang.Object-">handleUnknownType</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>
 <div class="block">Called for an object that isn't considered to be of a "basic" Java type, like for an application specific type,
  or for a W3C DOM node.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateModelIterator.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateModelIterator.html#next--">next</a></span>()</code>
 <div class="block">Returns the next model.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">WrappingTemplateModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/WrappingTemplateModel.html#wrap-java.lang.Object-">wrap</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>
 <div class="block">Wraps the passed object into a template model using this object's object
  wrapper.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ObjectWrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/ObjectWrapper.html#wrap-java.lang.Object-">wrap</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>
 <div class="block">Makes a <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> out of a non-<a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> object, usually by "wrapping" it into a
  <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> implementation that delegates to the original object.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">DefaultObjectWrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultObjectWrapper.html#wrap-java.lang.Object-">wrap</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>
 <div class="block">Wraps the parameter object to <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> interface(s).</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">DefaultObjectWrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultObjectWrapper.html#wrapDomNode-java.lang.Object-">wrapDomNode</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>&nbsp;</td>
 </tr>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/class-use/TemplateModelAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateModelAdapter.html b/docs/api/freemarker/template/class-use/TemplateModelAdapter.html
index 7739cdb..9549891 100644
--- a/docs/api/freemarker/template/class-use/TemplateModelAdapter.html
+++ b/docs/api/freemarker/template/class-use/TemplateModelAdapter.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 Interface freemarker.template.TemplateModelAdapter (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.TemplateModelAdapter (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 Interface freemarker.template.TemplateModelAdapter (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateModelAdapter (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/class-use/TemplateModelException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateModelException.html b/docs/api/freemarker/template/class-use/TemplateModelException.html
index c51b147..9537013 100644
--- a/docs/api/freemarker/template/class-use/TemplateModelException.html
+++ b/docs/api/freemarker/template/class-use/TemplateModelException.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 Class freemarker.template.TemplateModelException (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Class freemarker.template.TemplateModelException (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 Class freemarker.template.TemplateModelException (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Class freemarker.template.TemplateModelException (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -1083,35 +1083,43 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colLast"><span class="typeNameLabel">DefaultListAdapter.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultListAdapter.html#getAPI--">getAPI</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
+<td class="colLast"><span class="typeNameLabel">DefaultIterableAdapter.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultIterableAdapter.html#getAPI--">getAPI</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateBooleanModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateBooleanModel.html#getAsBoolean--">getAsBoolean</a></span>()</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a></code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateDateModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateDateModel.html#getAsDate--">getAsDate</a></span>()</code>
 <div class="block">Returns the date value.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateNumberModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateNumberModel.html#getAsNumber--">getAsNumber</a></span>()</code>
 <div class="block">Returns the numeric value.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateScalarModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateScalarModel.html#getAsString--">getAsString</a></span>()</code>
 <div class="block">Returns the string representation of this model.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><span class="typeNameLabel">LocalizedString.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/LocalizedString.html#getAsString--">getAsString</a></span>()</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template">TemplateSequenceModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateNodeModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateNodeModel.html#getChildNodes--">getChildNodes</a></span>()</code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateHashModelEx2.KeyValuePair.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html#getKey--">getKey</a></span>()</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ResourceBundleLocalizedString.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/ResourceBundleLocalizedString.html#getLocalizedString-java.util.Locale-">getLocalizedString</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</code>&nbsp;</td>
@@ -1137,6 +1145,10 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colLast"><span class="typeNameLabel">TemplateNodeModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateNodeModel.html#getParentNode--">getParentNode</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateHashModelEx2.KeyValuePair.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html#getValue--">getValue</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a></code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateTransformModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateTransformModel.html#getWriter-java.io.Writer-java.util.Map-">getWriter</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
          <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&nbsp;args)</code>
@@ -1144,23 +1156,29 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
  transformation input to the transform.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">SimpleObjectWrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleObjectWrapper.html#handleUnknownType-java.lang.Object-">handleUnknownType</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>
 <div class="block">Called if a type other than the simple ones we know about is passed in.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">DefaultObjectWrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultObjectWrapper.html#handleUnknownType-java.lang.Object-">handleUnknownType</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>
 <div class="block">Called for an object that isn't considered to be of a "basic" Java type, like for an application specific type,
  or for a W3C DOM node.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateModelIterator.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateModelIterator.html#hasNext--">hasNext</a></span>()</code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateHashModelEx2.KeyValuePairIterator.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html#hasNext--">hasNext</a></span>()</code>
+<div class="block">Similar to <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true#hasNext--" title="class or interface in java.util"><code>Iterator.hasNext()</code></a>.</div>
+</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateHashModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModel.html#isEmpty--">isEmpty</a></span>()</code>&nbsp;</td>
@@ -1186,9 +1204,17 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colLast"><span class="typeNameLabel">DefaultIteratorAdapter.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultIteratorAdapter.html#iterator--">iterator</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateModelIterator.html" title="interface in freemarker.template">TemplateModelIterator</a></code></td>
+<td class="colLast"><span class="typeNameLabel">DefaultIterableAdapter.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultIterableAdapter.html#iterator--">iterator</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateHashModelEx.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModelEx.html#keys--">keys</a></span>()</code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateHashModelEx2.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModelEx2.html#keyValuePairIterator--">keyValuePairIterator</a></span>()</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateModelIterator.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateModelIterator.html#next--">next</a></span>()</code>
@@ -1196,19 +1222,25 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePair</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateHashModelEx2.KeyValuePairIterator.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html#next--">next</a></span>()</code>
+<div class="block">Similar to <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true#next--" title="class or interface in java.util"><code>Iterator.next()</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><span class="typeNameLabel">TransformControl.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TransformControl.html#onStart--">onStart</a></span>()</code>
 <div class="block">Called before the body is evaluated for the first time.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Configuration.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Configuration.html#setAllSharedVariables-freemarker.template.TemplateHashModelEx-">setAllSharedVariables</a></span>(<a href="../../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template">TemplateHashModelEx</a>&nbsp;hash)</code>
 <div class="block">Adds all object in the hash as shared variable to the configuration; it's like doing several
  <a href="../../../freemarker/template/Configuration.html#setSharedVariable-java.lang.String-java.lang.Object-"><code>Configuration.setSharedVariable(String, Object)</code></a> calls, one for each hash entry.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Configuration.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Configuration.html#setSharedVariable-java.lang.String-java.lang.Object-">setSharedVariable</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                  <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</code>
@@ -1216,32 +1248,32 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
  <code>value</code>, so it's important that the object wrapper is set before this.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Configuration.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Configuration.html#setSharedVaribles-java.util.Map-">setSharedVaribles</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&nbsp;map)</code>
 <div class="block">Replaces all shared variables (removes all previously added ones).</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateSequenceModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateSequenceModel.html#size--">size</a></span>()</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateHashModelEx.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModelEx.html#size--">size</a></span>()</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateCollectionModelEx.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateCollectionModelEx.html#size--">size</a></span>()</code>
 <div class="block">Returns the number items in this collection, or <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true#MAX_VALUE" title="class or interface in java.lang"><code>Integer.MAX_VALUE</code></a>, if there are more than
  <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true#MAX_VALUE" title="class or interface in java.lang"><code>Integer.MAX_VALUE</code></a> items.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><span class="typeNameLabel">DefaultListAdapter.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultListAdapter.html#size--">size</a></span>()</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a></code></td>
 <td class="colLast"><span class="typeNameLabel">SimpleSequence.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleSequence.html#toList--">toList</a></span>()</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -1249,14 +1281,14 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a></code></td>
 <td class="colLast"><span class="typeNameLabel">SimpleHash.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleHash.html#toMap--">toMap</a></span>()</code>
 <div class="block">Note that this method creates and returns a deep-copy of the underlying hash used
  internally.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ObjectWrapperAndUnwrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/ObjectWrapperAndUnwrapper.html#tryUnwrapTo-freemarker.template.TemplateModel-java.lang.Class-">tryUnwrapTo</a></span>(<a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;tm,
            <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;targetClass)</code>
@@ -1264,37 +1296,37 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
  <code>null</code>).</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ObjectWrapperAndUnwrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/ObjectWrapperAndUnwrapper.html#unwrap-freemarker.template.TemplateModel-">unwrap</a></span>(<a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;tm)</code>
 <div class="block">Unwraps a <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> to a plain Java object.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateHashModelEx.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModelEx.html#values--">values</a></span>()</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">WrappingTemplateModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/WrappingTemplateModel.html#wrap-java.lang.Object-">wrap</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>
 <div class="block">Wraps the passed object into a template model using this object's object
  wrapper.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ObjectWrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/ObjectWrapper.html#wrap-java.lang.Object-">wrap</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>
 <div class="block">Makes a <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> out of a non-<a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> object, usually by "wrapping" it into a
  <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> implementation that delegates to the original object.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">DefaultObjectWrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultObjectWrapper.html#wrap-java.lang.Object-">wrap</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>
 <div class="block">Wraps the parameter object to <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> interface(s).</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template">TemplateHashModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">SimpleObjectWrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleObjectWrapper.html#wrapAsAPI-java.lang.Object-">wrapAsAPI</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>&nbsp;</td>
 </tr>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/class-use/TemplateModelIterator.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateModelIterator.html b/docs/api/freemarker/template/class-use/TemplateModelIterator.html
index 17ba8e1..a899d93 100644
--- a/docs/api/freemarker/template/class-use/TemplateModelIterator.html
+++ b/docs/api/freemarker/template/class-use/TemplateModelIterator.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 Interface freemarker.template.TemplateModelIterator (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.TemplateModelIterator (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 Interface freemarker.template.TemplateModelIterator (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateModelIterator (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -249,6 +249,10 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModelIterator.html" title="interface in freemarker.template">TemplateModelIterator</a></code></td>
 <td class="colLast"><span class="typeNameLabel">DefaultIteratorAdapter.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultIteratorAdapter.html#iterator--">iterator</a></span>()</code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateModelIterator.html" title="interface in freemarker.template">TemplateModelIterator</a></code></td>
+<td class="colLast"><span class="typeNameLabel">DefaultIterableAdapter.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultIterableAdapter.html#iterator--">iterator</a></span>()</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/class-use/TemplateModelListSequence.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateModelListSequence.html b/docs/api/freemarker/template/class-use/TemplateModelListSequence.html
index 3adad1b..4f57bdd 100644
--- a/docs/api/freemarker/template/class-use/TemplateModelListSequence.html
+++ b/docs/api/freemarker/template/class-use/TemplateModelListSequence.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 Class freemarker.template.TemplateModelListSequence (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Class freemarker.template.TemplateModelListSequence (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 Class freemarker.template.TemplateModelListSequence (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Class freemarker.template.TemplateModelListSequence (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/class-use/TemplateModelWithAPISupport.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateModelWithAPISupport.html b/docs/api/freemarker/template/class-use/TemplateModelWithAPISupport.html
index 06c49e2..423615b 100644
--- a/docs/api/freemarker/template/class-use/TemplateModelWithAPISupport.html
+++ b/docs/api/freemarker/template/class-use/TemplateModelWithAPISupport.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 Interface freemarker.template.TemplateModelWithAPISupport (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.TemplateModelWithAPISupport (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 Interface freemarker.template.TemplateModelWithAPISupport (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateModelWithAPISupport (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -217,19 +217,26 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a></span></code>
+<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"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template">DefaultListAdapter</a></span></code>
 <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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template">DefaultMapAdapter</a></span></code>
 <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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template">DefaultNonListCollectionAdapter</a></span></code>
 <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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/class-use/TemplateNodeModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateNodeModel.html b/docs/api/freemarker/template/class-use/TemplateNodeModel.html
index 1cf98e7..b6933fe 100644
--- a/docs/api/freemarker/template/class-use/TemplateNodeModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateNodeModel.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 Interface freemarker.template.TemplateNodeModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.TemplateNodeModel (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 Interface freemarker.template.TemplateNodeModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateNodeModel (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/class-use/TemplateNotFoundException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateNotFoundException.html b/docs/api/freemarker/template/class-use/TemplateNotFoundException.html
index 22d578d..c85803b 100644
--- a/docs/api/freemarker/template/class-use/TemplateNotFoundException.html
+++ b/docs/api/freemarker/template/class-use/TemplateNotFoundException.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 Class freemarker.template.TemplateNotFoundException (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Class freemarker.template.TemplateNotFoundException (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 Class freemarker.template.TemplateNotFoundException (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Class freemarker.template.TemplateNotFoundException (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/class-use/TemplateNumberModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateNumberModel.html b/docs/api/freemarker/template/class-use/TemplateNumberModel.html
index 67a9162..991fd97 100644
--- a/docs/api/freemarker/template/class-use/TemplateNumberModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateNumberModel.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 Interface freemarker.template.TemplateNumberModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.TemplateNumberModel (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 Interface freemarker.template.TemplateNumberModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateNumberModel (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/class-use/TemplateScalarModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateScalarModel.html b/docs/api/freemarker/template/class-use/TemplateScalarModel.html
index 46e9108..e086ec5 100644
--- a/docs/api/freemarker/template/class-use/TemplateScalarModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateScalarModel.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 Interface freemarker.template.TemplateScalarModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.TemplateScalarModel (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 Interface freemarker.template.TemplateScalarModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateScalarModel (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/class-use/TemplateSequenceModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateSequenceModel.html b/docs/api/freemarker/template/class-use/TemplateSequenceModel.html
index dfbee8c..8f518ce 100644
--- a/docs/api/freemarker/template/class-use/TemplateSequenceModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateSequenceModel.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 Interface freemarker.template.TemplateSequenceModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.TemplateSequenceModel (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 Interface freemarker.template.TemplateSequenceModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateSequenceModel (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/class-use/TemplateTransformModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateTransformModel.html b/docs/api/freemarker/template/class-use/TemplateTransformModel.html
index 07b8f40..b194211 100644
--- a/docs/api/freemarker/template/class-use/TemplateTransformModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateTransformModel.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 Interface freemarker.template.TemplateTransformModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.TemplateTransformModel (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 Interface freemarker.template.TemplateTransformModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateTransformModel (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/class-use/TransformControl.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TransformControl.html b/docs/api/freemarker/template/class-use/TransformControl.html
index ff19c05..43f54d9 100644
--- a/docs/api/freemarker/template/class-use/TransformControl.html
+++ b/docs/api/freemarker/template/class-use/TransformControl.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 Interface freemarker.template.TransformControl (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.TransformControl (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 Interface freemarker.template.TransformControl (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.TransformControl (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/class-use/Version.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/Version.html b/docs/api/freemarker/template/class-use/Version.html
index cad66e7..40ebcaa 100644
--- a/docs/api/freemarker/template/class-use/Version.html
+++ b/docs/api/freemarker/template/class-use/Version.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 Class freemarker.template.Version (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Class freemarker.template.Version (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 Class freemarker.template.Version (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Class freemarker.template.Version (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -281,6 +281,12 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <div class="block">FreeMarker version 2.3.24 (an <a href="../../../freemarker/template/Configuration.html#Configuration-freemarker.template.Version-"><code>incompatible improvements break-point</code></a>)</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../freemarker/template/Version.html" title="class in freemarker.template">Version</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Configuration.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Configuration.html#VERSION_2_3_25">VERSION_2_3_25</a></span></code>
+<div class="block">FreeMarker version 2.3.25 (an <a href="../../../freemarker/template/Configuration.html#Configuration-freemarker.template.Version-"><code>incompatible improvements break-point</code></a>)</div>
+</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/class-use/WrappingTemplateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/WrappingTemplateModel.html b/docs/api/freemarker/template/class-use/WrappingTemplateModel.html
index 88f5ef1..7a83386 100644
--- a/docs/api/freemarker/template/class-use/WrappingTemplateModel.html
+++ b/docs/api/freemarker/template/class-use/WrappingTemplateModel.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 Class freemarker.template.WrappingTemplateModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Class freemarker.template.WrappingTemplateModel (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 Class freemarker.template.WrappingTemplateModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Class freemarker.template.WrappingTemplateModel (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -198,46 +198,53 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a></span></code>
+<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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template">DefaultIteratorAdapter</a></span></code>
 <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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template">DefaultListAdapter</a></span></code>
 <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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template">DefaultMapAdapter</a></span></code>
 <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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template">DefaultNonListCollectionAdapter</a></span></code>
 <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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleCollection.html" title="class in freemarker.template">SimpleCollection</a></span></code>
 <div class="block">A simple implementation of <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="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleHash.html" title="class in freemarker.template">SimpleHash</a></span></code>
 <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="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleList.html" title="class in freemarker.template">SimpleList</a></span></code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -245,7 +252,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleSequence.html" title="class in freemarker.template">SimpleSequence</a></span></code>
 <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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/package-frame.html b/docs/api/freemarker/template/package-frame.html
index be57d40..b980c91 100644
--- a/docs/api/freemarker/template/package-frame.html
+++ b/docs/api/freemarker/template/package-frame.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>
@@ -26,6 +26,9 @@
 <li><a href="TemplateExceptionHandler.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateExceptionHandler</span></a></li>
 <li><a href="TemplateHashModel.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateHashModel</span></a></li>
 <li><a href="TemplateHashModelEx.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateHashModelEx</span></a></li>
+<li><a href="TemplateHashModelEx2.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateHashModelEx2</span></a></li>
+<li><a href="TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateHashModelEx2.KeyValuePair</span></a></li>
+<li><a href="TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateHashModelEx2.KeyValuePairIterator</span></a></li>
 <li><a href="TemplateMethodModel.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateMethodModel</span></a></li>
 <li><a href="TemplateMethodModelEx.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateMethodModelEx</span></a></li>
 <li><a href="TemplateModel.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateModel</span></a></li>
@@ -43,6 +46,7 @@
 <ul title="Classes">
 <li><a href="Configuration.html" title="class in freemarker.template" target="classFrame">Configuration</a></li>
 <li><a href="DefaultArrayAdapter.html" title="class in freemarker.template" target="classFrame">DefaultArrayAdapter</a></li>
+<li><a href="DefaultIterableAdapter.html" title="class in freemarker.template" target="classFrame">DefaultIterableAdapter</a></li>
 <li><a href="DefaultIteratorAdapter.html" title="class in freemarker.template" target="classFrame">DefaultIteratorAdapter</a></li>
 <li><a href="DefaultListAdapter.html" title="class in freemarker.template" target="classFrame">DefaultListAdapter</a></li>
 <li><a href="DefaultMapAdapter.html" title="class in freemarker.template" target="classFrame">DefaultMapAdapter</a></li>
@@ -51,6 +55,7 @@
 <li><a href="DefaultObjectWrapperBuilder.html" title="class in freemarker.template" target="classFrame">DefaultObjectWrapperBuilder</a></li>
 <li><a href="DefaultObjectWrapperConfiguration.html" title="class in freemarker.template" target="classFrame">DefaultObjectWrapperConfiguration</a></li>
 <li><a href="LocalizedString.html" title="class in freemarker.template" target="classFrame">LocalizedString</a></li>
+<li><a href="MapKeyValuePairIterator.html" title="class in freemarker.template" target="classFrame">MapKeyValuePairIterator</a></li>
 <li><a href="ResourceBundleLocalizedString.html" title="class in freemarker.template" target="classFrame">ResourceBundleLocalizedString</a></li>
 <li><a href="SimpleCollection.html" title="class in freemarker.template" target="classFrame">SimpleCollection</a></li>
 <li><a href="SimpleDate.html" title="class in freemarker.template" target="classFrame">SimpleDate</a></li>



Mime
View raw message