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:50 UTC

[28/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/DefaultArrayAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultArrayAdapter.html b/docs/api/freemarker/template/DefaultArrayAdapter.html
index b2bccb3..da56b1e 100644
--- a/docs/api/freemarker/template/DefaultArrayAdapter.html
+++ b/docs/api/freemarker/template/DefaultArrayAdapter.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>DefaultArrayAdapter (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DefaultArrayAdapter (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="DefaultArrayAdapter (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DefaultArrayAdapter (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -51,7 +51,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/template/DefaultArrayAdapter.html" target="_top">Frames</a></li>
@@ -309,7 +309,7 @@ implements <a href="../../freemarker/template/TemplateSequenceModel.html" title=
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/template/DefaultArrayAdapter.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/DefaultIterableAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultIterableAdapter.html b/docs/api/freemarker/template/DefaultIterableAdapter.html
new file mode 100644
index 0000000..0b4cc0b
--- /dev/null
+++ b/docs/api/freemarker/template/DefaultIterableAdapter.html
@@ -0,0 +1,406 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- 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>DefaultIterableAdapter (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>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DefaultIterableAdapter (FreeMarker 2.3.25-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":10,"i2":10,"i3":10,"i4":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/DefaultIterableAdapter.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/template/DefaultArrayAdapter.html" title="class in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/template/DefaultIterableAdapter.html" target="_top">Frames</a></li>
+<li><a href="DefaultIterableAdapter.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">freemarker.template</div>
+<h2 title="Class DefaultIterableAdapter" class="title">Class DefaultIterableAdapter</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/template/WrappingTemplateModel.html" title="class in freemarker.template">freemarker.template.WrappingTemplateModel</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.template.DefaultIterableAdapter</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a>, <a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a>, <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>, <a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a>, <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></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">DefaultIterableAdapter</span>
+extends <a href="../../freemarker/template/WrappingTemplateModel.html" title="class in freemarker.template">WrappingTemplateModel</a>
+implements <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a>, <a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, <a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a>, <a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a>, <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></pre>
+<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>. This should only be used if <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> is not implemented by the adapted
+ object, because then <a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template"><code>DefaultListAdapter</code></a> and <a href="../../freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template"><code>DefaultNonListCollectionAdapter</code></a> gives more functionality.
+ 
+ <p>
+ Thread safety: A <a href="../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template"><code>DefaultIterableAdapter</code></a> is as thread-safe as the <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> that it wraps is. Normally
+ you only have to consider read-only access, as the FreeMarker template language doesn't provide mean to call
+ <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> modifier methods (though of course, Java methods called from the template can violate this rule).
+ 
+ <p>
+ This adapter is used by <a href="../../freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template"><code>DefaultObjectWrapper</code></a> if its <a href="../../freemarker/template/DefaultObjectWrapper.html#setIterableSupport-boolean-"><code>iterableSupport</code></a> property is <code>true</code>, which is not the default for backward compatibility (so you have to set it
+ explicitly).</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.25</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#freemarker.template.DefaultIterableAdapter">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.freemarker.template.TemplateModel">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;freemarker.template.<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></h3>
+<code><a href="../../freemarker/template/TemplateModel.html#NOTHING">NOTHING</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultIterableAdapter.html#adapt-java.lang.Iterable-freemarker.template.utility.ObjectWrapperWithAPISupport-">adapt</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang">Iterable</a>&lt;?&gt;&nbsp;iterable,
+     <a href="../../freemarker/template/utility/ObjectWrapperWithAPISupport.html" title="interface in freemarker.template.utility">ObjectWrapperWithAPISupport</a>&nbsp;wrapper)</code>
+<div class="block">Factory method for creating new adapter instances.</div>
+</td>
+</tr>
+<tr id="i1" 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"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultIterableAdapter.html#getAdaptedObject-java.lang.Class-">getAdaptedObject</a></span>(<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;hint)</code>
+<div class="block">Retrieves the underlying object, or some other object semantically 
+ equivalent to its value narrowed by the class hint.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultIterableAdapter.html#getAPI--">getAPI</a></span>()</code>
+<div class="block">Returns the model that exposes the (Java) API of the value.</div>
+</td>
+</tr>
+<tr id="i3" 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"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultIterableAdapter.html#getWrappedObject--">getWrappedObject</a></span>()</code>
+<div class="block">Retrieves the original object wrapped by this model.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../../freemarker/template/TemplateModelIterator.html" title="interface in freemarker.template">TemplateModelIterator</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultIterableAdapter.html#iterator--">iterator</a></span>()</code>
+<div class="block">Retrieves a template model iterator that is used to iterate over the elements in this collection.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.template.WrappingTemplateModel">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.template.<a href="../../freemarker/template/WrappingTemplateModel.html" title="class in freemarker.template">WrappingTemplateModel</a></h3>
+<code><a href="../../freemarker/template/WrappingTemplateModel.html#getDefaultObjectWrapper--">getDefaultObjectWrapper</a>, <a href="../../freemarker/template/WrappingTemplateModel.html#getObjectWrapper--">getObjectWrapper</a>, <a href="../../freemarker/template/WrappingTemplateModel.html#setDefaultObjectWrapper-freemarker.template.ObjectWrapper-">setDefaultObjectWrapper</a>, <a href="../../freemarker/template/WrappingTemplateModel.html#setObjectWrapper-freemarker.template.ObjectWrapper-">setObjectWrapper</a>, <a href="../../freemarker/template/WrappingTemplateModel.html#wrap-java.lang.Object-">wrap</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<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></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="adapt-java.lang.Iterable-freemarker.template.utility.ObjectWrapperWithAPISupport-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>adapt</h4>
+<pre>public static&nbsp;<a href="../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a>&nbsp;adapt(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang">Iterable</a>&lt;?&gt;&nbsp;iterable,
+                                           <a href="../../freemarker/template/utility/ObjectWrapperWithAPISupport.html" title="interface in freemarker.template.utility">ObjectWrapperWithAPISupport</a>&nbsp;wrapper)</pre>
+<div class="block">Factory method for creating new adapter instances.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>iterable</code> - The collection to adapt; can't be <code>null</code>.</dd>
+<dd><code>wrapper</code> - The <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a> used to wrap the items in the array. Has to be
+            <a href="../../freemarker/template/ObjectWrapperAndUnwrapper.html" title="interface in freemarker.template"><code>ObjectWrapperAndUnwrapper</code></a> because of planned future features.</dd>
+</dl>
+</li>
+</ul>
+<a name="iterator--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>iterator</h4>
+<pre>public&nbsp;<a href="../../freemarker/template/TemplateModelIterator.html" title="interface in freemarker.template">TemplateModelIterator</a>&nbsp;iterator()
+                               throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/template/TemplateCollectionModel.html#iterator--">TemplateCollectionModel</a></code></span></div>
+<div class="block">Retrieves a template model iterator that is used to iterate over the elements in this collection.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateCollectionModel.html#iterator--">iterator</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getWrappedObject--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getWrappedObject</h4>
+<pre>public&nbsp;<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;getWrappedObject()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/ext/util/WrapperTemplateModel.html#getWrappedObject--">WrapperTemplateModel</a></code></span></div>
+<div class="block">Retrieves the original object wrapped by this model.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/ext/util/WrapperTemplateModel.html#getWrappedObject--">getWrappedObject</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getAdaptedObject-java.lang.Class-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAdaptedObject</h4>
+<pre>public&nbsp;<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;getAdaptedObject(<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;hint)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/template/AdapterTemplateModel.html#getAdaptedObject-java.lang.Class-">AdapterTemplateModel</a></code></span></div>
+<div class="block">Retrieves the underlying object, or some other object semantically 
+ equivalent to its value narrowed by the class hint.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/template/AdapterTemplateModel.html#getAdaptedObject-java.lang.Class-">getAdaptedObject</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>hint</code> - the desired class of the returned value. An implementation 
+ should make reasonable effort to retrieve an object of the requested 
+ class, but if that is impossible, it must at least return the underlying 
+ object as-is. As a minimal requirement, an implementation must always 
+ return the exact underlying object when 
+ <tt>hint.isInstance(underlyingObject)</tt> holds. When called 
+ with <tt>java.lang.Object.class</tt>, it should return a generic Java 
+ object (i.e. if the model is wrapping a scripting language object that is
+ further wrapping a Java object, the deepest underlying Java object should
+ be returned).</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the underlying object, or its value accommodated for the hint
+ class.</dd>
+</dl>
+</li>
+</ul>
+<a name="getAPI--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getAPI</h4>
+<pre>public&nbsp;<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;getAPI()
+                     throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/template/TemplateModelWithAPISupport.html#getAPI--">TemplateModelWithAPISupport</a></code></span></div>
+<div class="block">Returns the model that exposes the (Java) API of the value. This is usually implemented by delegating to
+ <a href="../../freemarker/template/utility/ObjectWrapperWithAPISupport.html#wrapAsAPI-java.lang.Object-"><code>ObjectWrapperWithAPISupport.wrapAsAPI(Object)</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelWithAPISupport.html#getAPI--">getAPI</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/DefaultIterableAdapter.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/template/DefaultArrayAdapter.html" title="class in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/template/DefaultIterableAdapter.html" target="_top">Frames</a></li>
+<li><a href="DefaultIterableAdapter.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/DefaultIteratorAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultIteratorAdapter.html b/docs/api/freemarker/template/DefaultIteratorAdapter.html
index b2dec72..aec374a 100644
--- a/docs/api/freemarker/template/DefaultIteratorAdapter.html
+++ b/docs/api/freemarker/template/DefaultIteratorAdapter.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>DefaultIteratorAdapter (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DefaultIteratorAdapter (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="DefaultIteratorAdapter (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DefaultIteratorAdapter (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/template/DefaultArrayAdapter.html" title="class in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -123,7 +123,9 @@ var activeTableTab = "activeTableTab";
 extends <a href="../../freemarker/template/WrappingTemplateModel.html" title="class in freemarker.template">WrappingTemplateModel</a>
 implements <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a>, <a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, <a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a>, <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></pre>
 <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>. The resulting <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a> can only be iterated once.
+ <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a>. The resulting <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a> can only be listed (iterated) once.
+ If the user tries list the variable for a second time, an exception will be thrown instead of silently gettig an
+ empty (or partial) listing.
  
  <p>
  Thread safety: A <a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template"><code>DefaultListAdapter</code></a> is as thread-safe as the array that it wraps is. Normally you only
@@ -333,7 +335,7 @@ implements <a href="../../freemarker/template/TemplateCollectionModel.html" titl
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/template/DefaultArrayAdapter.html" title="class in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/DefaultListAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultListAdapter.html b/docs/api/freemarker/template/DefaultListAdapter.html
index 2d17375..716dd24 100644
--- a/docs/api/freemarker/template/DefaultListAdapter.html
+++ b/docs/api/freemarker/template/DefaultListAdapter.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>DefaultListAdapter (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DefaultListAdapter (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="DefaultListAdapter (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DefaultListAdapter (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/DefaultMapAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultMapAdapter.html b/docs/api/freemarker/template/DefaultMapAdapter.html
index 2246057..5ad2011 100644
--- a/docs/api/freemarker/template/DefaultMapAdapter.html
+++ b/docs/api/freemarker/template/DefaultMapAdapter.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>DefaultMapAdapter (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DefaultMapAdapter (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,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DefaultMapAdapter (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DefaultMapAdapter (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
+var methods = {"i0":9,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -115,13 +115,13 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd><a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a>, <a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, <a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template">TemplateHashModel</a>, <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template">TemplateHashModelEx</a>, <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>, <a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a>, <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></dd>
+<dd><a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a>, <a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, <a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template">TemplateHashModel</a>, <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template">TemplateHashModelEx</a>, <a href="../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a>, <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>, <a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" titl
 e="class or interface in java.io">Serializable</a></dd>
 </dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">DefaultMapAdapter</span>
 extends <a href="../../freemarker/template/WrappingTemplateModel.html" title="class in freemarker.template">WrappingTemplateModel</a>
-implements <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template">TemplateHashModelEx</a>, <a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, <a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a>, <a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a>, <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></pre>
+implements <a href="../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a>, <a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, <a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a>, <a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a>, <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></pre>
 <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>. If you aren't wrapping an already existing <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>, but build a hash specifically to
  be used from a template, also consider using <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template"><code>SimpleHash</code></a> (see comparison there).
@@ -146,6 +146,21 @@ implements <a href="../../freemarker/template/TemplateHashModelEx.html" title="i
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.freemarker.template.TemplateHashModelEx2">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from interface&nbsp;freemarker.template.<a href="../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a></h3>
+<code><a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePair</a>, <a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a></code></li>
+</ul>
+</li>
+</ul>
 <!-- =========== FIELD SUMMARY =========== -->
 <ul class="blockList">
 <li class="blockList"><a name="field.summary">
@@ -214,10 +229,14 @@ implements <a href="../../freemarker/template/TemplateHashModelEx.html" title="i
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultMapAdapter.html#keys--">keys</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i7" class="rowColor">
+<td class="colFirst"><code><a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultMapAdapter.html#keyValuePairIterator--">keyValuePairIterator</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultMapAdapter.html#size--">size</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultMapAdapter.html#values--">values</a></span>()</code>&nbsp;</td>
 </tr>
@@ -351,6 +370,21 @@ implements <a href="../../freemarker/template/TemplateHashModelEx.html" title="i
 </dl>
 </li>
 </ul>
+<a name="keyValuePairIterator--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>keyValuePairIterator</h4>
+<pre>public&nbsp;<a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a>&nbsp;keyValuePairIterator()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateHashModelEx2.html#keyValuePairIterator--">keyValuePairIterator</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The iterator that walks through the key-value pairs in the hash. Not <code>null</code>.</dd>
+</dl>
+</li>
+</ul>
 <a name="getAdaptedObject-java.lang.Class-">
 <!--   -->
 </a>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/DefaultNonListCollectionAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultNonListCollectionAdapter.html b/docs/api/freemarker/template/DefaultNonListCollectionAdapter.html
index acfae2d..b744897 100644
--- a/docs/api/freemarker/template/DefaultNonListCollectionAdapter.html
+++ b/docs/api/freemarker/template/DefaultNonListCollectionAdapter.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>DefaultNonListCollectionAdapter (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DefaultNonListCollectionAdapter (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="DefaultNonListCollectionAdapter (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DefaultNonListCollectionAdapter (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/DefaultObjectWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultObjectWrapper.html b/docs/api/freemarker/template/DefaultObjectWrapper.html
index 9c174be..f8b3142 100644
--- a/docs/api/freemarker/template/DefaultObjectWrapper.html
+++ b/docs/api/freemarker/template/DefaultObjectWrapper.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>DefaultObjectWrapper (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DefaultObjectWrapper (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,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DefaultObjectWrapper (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DefaultObjectWrapper (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":9,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -133,11 +133,13 @@ extends <a href="../../freemarker/ext/beans/BeansWrapper.html" title="class in f
  <a href="../../freemarker/template/Configuration.html#Configuration-freemarker.template.Version-"><code>incompatibleImprovements</code></a> 2.3.22 (or higher).
  
  <p>
- If you still need to create an instance, that should be done with an <a href="../../freemarker/template/DefaultObjectWrapperBuilder.html" title="class in freemarker.template"><code>DefaultObjectWrapperBuilder</code></a>, not with
+ If you still need to create an instance, that should be done with an <a href="../../freemarker/template/DefaultObjectWrapperBuilder.html" title="class in freemarker.template"><code>DefaultObjectWrapperBuilder</code></a> (or
+ with <a href="../../freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-"><code>Configuration.setSetting(String, String)</code></a> with <code>"object_wrapper"</code> key), not with
  its constructor, as that allows FreeMarker to reuse singletons. For new projects, it's recommended to set
  <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#setForceLegacyNonListCollections-boolean-"><code>forceLegacyNonListCollections</code></a> to
- <code>false</code> - something that setting <code>incompatibleImprovements</code> to 2.3.22 won't do.
- 
+ <code>false</code>, and <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#setIterableSupport-boolean-"><code>iterableSupport</code></a> to <code>true</code>;
+ setting <code>incompatibleImprovements</code> to 2.3.22 won't do these, as they could break legacy templates too easily.
+
  <p>
  This class is only thread-safe after you have finished calling its setter methods, and then safely published it (see
  JSR 133 and related literature). When used as part of <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>, of course it's enough if that was safely
@@ -264,51 +266,65 @@ extends <a href="../../freemarker/ext/beans/BeansWrapper.html" title="class in f
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultObjectWrapper.html#getIterableSupport--">getIterableSupport</a></span>()</code>
+<div class="block">Getter pair of <a href="../../freemarker/template/DefaultObjectWrapper.html#setIterableSupport-boolean-"><code>setIterableSupport(boolean)</code></a>; see there.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultObjectWrapper.html#getUseAdaptersForContainers--">getUseAdaptersForContainers</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/template/DefaultObjectWrapper.html#setUseAdaptersForContainers-boolean-"><code>setUseAdaptersForContainers(boolean)</code></a>.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i4" 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"><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 id="i4" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>protected static <a href="../../freemarker/template/Version.html" title="class in freemarker.template">Version</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultObjectWrapper.html#normalizeIncompatibleImprovementsVersion-freemarker.template.Version-">normalizeIncompatibleImprovementsVersion</a></span>(<a href="../../freemarker/template/Version.html" title="class in freemarker.template">Version</a>&nbsp;incompatibleImprovements)</code>
 <div class="block">Returns the lowest version number that is equivalent with the parameter version.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultObjectWrapper.html#setForceLegacyNonListCollections-boolean-">setForceLegacyNonListCollections</a></span>(boolean&nbsp;forceLegacyNonListCollections)</code>
 <div class="block">Specifies whether 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> <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>-s (like <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util"><code>Set</code></a>-s) must be wrapped by pre-fetching into
  a <a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template"><code>SimpleSequence</code></a>.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultObjectWrapper.html#setIterableSupport-boolean-">setIterableSupport</a></span>(boolean&nbsp;iterableSupport)</code>
+<div class="block">Specifies whether <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>-s (not to be confused with <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>-s) that don't implement any other
+ recognized Java interfaces (most notably <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>) will be recognized as listable objects
+ (<a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a>-s), or they will be just seen as generic objects (JavaBean-s).</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultObjectWrapper.html#setUseAdaptersForContainers-boolean-">setUseAdaptersForContainers</a></span>(boolean&nbsp;useAdaptersForContainers)</code>
 <div class="block">Sets if to wrap container objects (<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>-s, <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>-s, arrays and such) the legacy copying approach or
  the newer adapter approach should be used.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>protected <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"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultObjectWrapper.html#toPropertiesString--">toPropertiesString</a></span>()</code>
 <div class="block">Returns the name-value pairs that describe the configuration of this <a href="../../freemarker/ext/beans/BeansWrapper.html" title="class in freemarker.ext.beans"><code>BeansWrapper</code></a>; called from
  <a href="../../freemarker/ext/beans/BeansWrapper.html#toString--"><code>BeansWrapper.toString()</code></a>.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><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 id="i9" class="rowColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><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>
@@ -588,6 +604,40 @@ public&nbsp;DefaultObjectWrapper()</pre>
 </dl>
 </li>
 </ul>
+<a name="getIterableSupport--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getIterableSupport</h4>
+<pre>public&nbsp;boolean&nbsp;getIterableSupport()</pre>
+<div class="block">Getter pair of <a href="../../freemarker/template/DefaultObjectWrapper.html#setIterableSupport-boolean-"><code>setIterableSupport(boolean)</code></a>; see there.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.25</dd>
+</dl>
+</li>
+</ul>
+<a name="setIterableSupport-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setIterableSupport</h4>
+<pre>public&nbsp;void&nbsp;setIterableSupport(boolean&nbsp;iterableSupport)</pre>
+<div class="block">Specifies whether <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>-s (not to be confused with <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>-s) that don't implement any other
+ recognized Java interfaces (most notably <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>) will be recognized as listable objects
+ (<a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a>-s), or they will be just seen as generic objects (JavaBean-s). Defaults to
+ <code>false</code> for backward compatibility, but in new projects you should set this to <code>true</code>. Before setting
+ this to <code>true</code> in older projects, check if you have called <code>myIterable.iterator()</code> directly from any
+ templates, because the Java API is only exposed to the templates if the <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> is wrapped as generic
+ object.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.25</dd>
+</dl>
+</li>
+</ul>
 <a name="normalizeIncompatibleImprovementsVersion-freemarker.template.Version-">
 <!--   -->
 </a>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/DefaultObjectWrapperBuilder.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultObjectWrapperBuilder.html b/docs/api/freemarker/template/DefaultObjectWrapperBuilder.html
index 9135bbd..a7fddd9 100644
--- a/docs/api/freemarker/template/DefaultObjectWrapperBuilder.html
+++ b/docs/api/freemarker/template/DefaultObjectWrapperBuilder.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>DefaultObjectWrapperBuilder (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DefaultObjectWrapperBuilder (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="DefaultObjectWrapperBuilder (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DefaultObjectWrapperBuilder (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -200,7 +200,7 @@ extends <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.htm
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;freemarker.template.<a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html" title="class in freemarker.template">DefaultObjectWrapperConfiguration</a></h3>
-<code><a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#equals-java.lang.Object-">equals</a>, <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#getForceLegacyNonListCollections--">getForceLegacyNonListCollections</a>, <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#getUseAdaptersForContainers--">getUseAdaptersForContainers</a>, <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#hashCode--">hashCode</a>, <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#setForceLegacyNonListCollections-boolean-">setForceLegacyNonListCollections</a>, <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#setUseAdaptersForContainers-boolean-">setUseAdaptersForContainers</a></code></li>
+<code><a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#equals-java.lang.Object-">equals</a>, <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#getForceLegacyNonListCollections--">getForceLegacyNonListCollections</a>, <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#getIterableSupport--">getIterableSupport</a>, <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#getUseAdaptersForContainers--">getUseAdaptersForContainers</a>, <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#hashCode--">hashCode</a>, <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#setForceLegacyNonListCollections-boolean-">setForceLegacyNonListCollections</a>, <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#setIterableSupport-boolean-">setIterableSupport</a>, <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#setUseAdaptersFor
 Containers-boolean-">setUseAdaptersForContainers</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.freemarker.ext.beans.BeansWrapperConfiguration">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/DefaultObjectWrapperConfiguration.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultObjectWrapperConfiguration.html b/docs/api/freemarker/template/DefaultObjectWrapperConfiguration.html
index 520b04e..9b3c91c 100644
--- a/docs/api/freemarker/template/DefaultObjectWrapperConfiguration.html
+++ b/docs/api/freemarker/template/DefaultObjectWrapperConfiguration.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>DefaultObjectWrapperConfiguration (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>DefaultObjectWrapperConfiguration (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,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DefaultObjectWrapperConfiguration (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="DefaultObjectWrapperConfiguration (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -128,7 +128,7 @@ extends <a href="../../freemarker/ext/beans/BeansWrapperConfiguration.html" titl
 <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.
  You will not use this abstract class directly, but concrete subclasses like <a href="../../freemarker/template/DefaultObjectWrapperBuilder.html" title="class in freemarker.template"><code>DefaultObjectWrapperBuilder</code></a>.
  Unless, you are developing a builder for a custom <a href="../../freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template"><code>DefaultObjectWrapper</code></a> subclass. In that case, note that
- overriding the <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#equals-java.lang.Object-"><code>equals(java.lang.Object)</code></a> and <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#hashCode--"><code>hashCode()</code></a> is important, as these object are used as <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a>
+ overriding the <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#equals-java.lang.Object-"><code>equals(java.lang.Object)</code></a> and <a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#hashCode--"><code>hashCode()</code></a> is important, as these objects are used as <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a>
  singleton lookup keys.</div>
 <dl>
 <dt><span class="simpleTagLabel">Since:</span></dt>
@@ -201,21 +201,33 @@ extends <a href="../../freemarker/ext/beans/BeansWrapperConfiguration.html" titl
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#getIterableSupport--">getIterableSupport</a></span>()</code>
+<div class="block">See <a href="../../freemarker/template/DefaultObjectWrapper.html#getIterableSupport--"><code>DefaultObjectWrapper.getIterableSupport()</code></a>.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#getUseAdaptersForContainers--">getUseAdaptersForContainers</a></span>()</code>
 <div class="block">See <a href="../../freemarker/template/DefaultObjectWrapper.html#getUseAdaptersForContainers--"><code>DefaultObjectWrapper.getUseAdaptersForContainers()</code></a>.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#hashCode--">hashCode</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#setForceLegacyNonListCollections-boolean-">setForceLegacyNonListCollections</a></span>(boolean&nbsp;legacyNonListCollectionWrapping)</code>
 <div class="block">See <a href="../../freemarker/template/DefaultObjectWrapper.html#setForceLegacyNonListCollections-boolean-"><code>DefaultObjectWrapper.setForceLegacyNonListCollections(boolean)</code></a>.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#setIterableSupport-boolean-">setIterableSupport</a></span>(boolean&nbsp;iterableSupport)</code>
+<div class="block">See <a href="../../freemarker/template/DefaultObjectWrapper.html#setIterableSupport-boolean-"><code>DefaultObjectWrapper.setIterableSupport(boolean)</code></a>.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultObjectWrapperConfiguration.html#setUseAdaptersForContainers-boolean-">setUseAdaptersForContainers</a></span>(boolean&nbsp;useAdaptersForContainers)</code>
 <div class="block">See <a href="../../freemarker/template/DefaultObjectWrapper.html#setUseAdaptersForContainers-boolean-"><code>DefaultObjectWrapper.setUseAdaptersForContainers(boolean)</code></a>.</div>
@@ -307,6 +319,34 @@ extends <a href="../../freemarker/ext/beans/BeansWrapperConfiguration.html" titl
 <div class="block">See <a href="../../freemarker/template/DefaultObjectWrapper.html#setForceLegacyNonListCollections-boolean-"><code>DefaultObjectWrapper.setForceLegacyNonListCollections(boolean)</code></a>.</div>
 </li>
 </ul>
+<a name="getIterableSupport--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getIterableSupport</h4>
+<pre>public&nbsp;boolean&nbsp;getIterableSupport()</pre>
+<div class="block">See <a href="../../freemarker/template/DefaultObjectWrapper.html#getIterableSupport--"><code>DefaultObjectWrapper.getIterableSupport()</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.25</dd>
+</dl>
+</li>
+</ul>
+<a name="setIterableSupport-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setIterableSupport</h4>
+<pre>public&nbsp;void&nbsp;setIterableSupport(boolean&nbsp;iterableSupport)</pre>
+<div class="block">See <a href="../../freemarker/template/DefaultObjectWrapper.html#setIterableSupport-boolean-"><code>DefaultObjectWrapper.setIterableSupport(boolean)</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.25</dd>
+</dl>
+</li>
+</ul>
 <a name="hashCode--">
 <!--   -->
 </a>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/LocalizedString.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/LocalizedString.html b/docs/api/freemarker/template/LocalizedString.html
index f01c7f6..f747fe0 100644
--- a/docs/api/freemarker/template/LocalizedString.html
+++ b/docs/api/freemarker/template/LocalizedString.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>LocalizedString (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>LocalizedString (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="LocalizedString (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="LocalizedString (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/MalformedTemplateNameException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/MalformedTemplateNameException.html b/docs/api/freemarker/template/MalformedTemplateNameException.html
index 46153f9..9decda7 100644
--- a/docs/api/freemarker/template/MalformedTemplateNameException.html
+++ b/docs/api/freemarker/template/MalformedTemplateNameException.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>MalformedTemplateNameException (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>MalformedTemplateNameException (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="MalformedTemplateNameException (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="MalformedTemplateNameException (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -51,7 +51,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/template/LocalizedString.html" title="class in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/template/MapKeyValuePairIterator.html" title="class in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/template/MalformedTemplateNameException.html" target="_top">Frames</a></li>
@@ -280,7 +280,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.ht
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/template/LocalizedString.html" title="class in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/template/MapKeyValuePairIterator.html" title="class in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/template/MalformedTemplateNameException.html" target="_top">Frames</a></li>