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

[25/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/TemplateHashModelEx2.KeyValuePairIterator.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html b/docs/api/freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html
new file mode 100644
index 0000000..49a0050
--- /dev/null
+++ b/docs/api/freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html
@@ -0,0 +1,268 @@
+<!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>TemplateHashModelEx2.KeyValuePairIterator (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="TemplateHashModelEx2.KeyValuePairIterator (FreeMarker 2.3.25-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 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/TemplateHashModelEx2.KeyValuePairIterator.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/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" target="_top">Frames</a></li>
+<li><a href="TemplateHashModelEx2.KeyValuePairIterator.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="Interface TemplateHashModelEx2.KeyValuePairIterator" class="title">Interface TemplateHashModelEx2.KeyValuePairIterator</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a href="../../freemarker/template/MapKeyValuePairIterator.html" title="class in freemarker.template">MapKeyValuePairIterator</a></dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static interface <span class="typeNameLabel">TemplateHashModelEx2.KeyValuePairIterator</span></pre>
+<div class="block">Iterates over the key-value pairs in a hash. This is very similar to 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>, but has a fixed item
+ type, can throw <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template"><code>TemplateModelException</code></a>-s, and has no <code>remove()</code> method.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.25</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== 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="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract 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>boolean</code></td>
+<td class="colLast"><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 id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePair</a></code></td>
+<td class="colLast"><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>
+</table>
+</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="hasNext--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>hasNext</h4>
+<pre>boolean&nbsp;hasNext()
+         throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<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>
+<dl>
+<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="next--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>next</h4>
+<pre><a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePair</a>&nbsp;next()
+                                throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<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>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Not <code>null</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/NoSuchElementException.html?is-external=true" title="class or interface in java.util">NoSuchElementException</a></code></dd>
+<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/TemplateHashModelEx2.KeyValuePairIterator.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/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" target="_top">Frames</a></li>
+<li><a href="TemplateHashModelEx2.KeyValuePairIterator.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/TemplateHashModelEx2.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateHashModelEx2.html b/docs/api/freemarker/template/TemplateHashModelEx2.html
new file mode 100644
index 0000000..1b5df8f
--- /dev/null
+++ b/docs/api/freemarker/template/TemplateHashModelEx2.html
@@ -0,0 +1,302 @@
+<!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>TemplateHashModelEx2 (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="TemplateHashModelEx2 (FreeMarker 2.3.25-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 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/TemplateHashModelEx2.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/TemplateHashModelEx.html" title="interface in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/template/TemplateHashModelEx2.html" target="_top">Frames</a></li>
+<li><a href="TemplateHashModelEx2.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><a href="#nested.class.summary">Nested</a>&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="Interface TemplateHashModelEx2" class="title">Interface TemplateHashModelEx2</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd><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></dd>
+</dl>
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a href="../../freemarker/ext/servlet/AllHttpScopesHashModel.html" title="class in freemarker.ext.servlet">AllHttpScopesHashModel</a>, <a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template">DefaultMapAdapter</a>, <a href="../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a>, <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template">SimpleHash</a>, <a href="../../freemarker/ext/beans/SimpleMapModel.html" title="class in freemarker.ext.beans">SimpleMapModel</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">TemplateHashModelEx2</span>
+extends <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template">TemplateHashModelEx</a></pre>
+<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>. While in many cases that can also be achieved
+ with <a href="../../freemarker/template/TemplateHashModelEx.html#keys--"><code>TemplateHashModelEx.keys()</code></a> and then <a href="../../freemarker/template/TemplateHashModel.html#get-java.lang.String-"><code>TemplateHashModel.get(String)</code></a>, that has some problems. One is that <a href="../../freemarker/template/TemplateHashModel.html#get-java.lang.String-"><code>TemplateHashModel.get(String)</code></a> only
+ accepts string keys, while <a href="../../freemarker/template/TemplateHashModelEx.html#keys--"><code>TemplateHashModelEx.keys()</code></a> can return non-string keys too. The other is that calling <a href="../../freemarker/template/TemplateHashModelEx.html#keys--"><code>TemplateHashModelEx.keys()</code></a>
+ and then <a href="../../freemarker/template/TemplateHashModel.html#get-java.lang.String-"><code>TemplateHashModel.get(String)</code></a> for each key can be slower than listing the key-value pairs in one go.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.25</dd>
+</dl>
+</li>
+</ul>
+</div>
+<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>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePair</a></span></code>
+<div class="block">A key-value pair in a hash; used for <a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template"><code>TemplateHashModelEx2.KeyValuePairIterator</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a></span></code>
+<div class="block">Iterates over the key-value pairs in a hash.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- =========== 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="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract 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><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/TemplateHashModelEx2.html#keyValuePairIterator--">keyValuePairIterator</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.template.TemplateHashModelEx">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;freemarker.template.<a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template">TemplateHashModelEx</a></h3>
+<code><a href="../../freemarker/template/TemplateHashModelEx.html#keys--">keys</a>, <a href="../../freemarker/template/TemplateHashModelEx.html#size--">size</a>, <a href="../../freemarker/template/TemplateHashModelEx.html#values--">values</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.template.TemplateHashModel">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;freemarker.template.<a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template">TemplateHashModel</a></h3>
+<code><a href="../../freemarker/template/TemplateHashModel.html#get-java.lang.String-">get</a>, <a href="../../freemarker/template/TemplateHashModel.html#isEmpty--">isEmpty</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="keyValuePairIterator--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>keyValuePairIterator</h4>
+<pre><a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a>&nbsp;keyValuePairIterator()
+                                                        throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<dl>
+<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>
+<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/TemplateHashModelEx2.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/TemplateHashModelEx.html" title="interface in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/template/TemplateHashModelEx2.html" target="_top">Frames</a></li>
+<li><a href="TemplateHashModelEx2.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><a href="#nested.class.summary">Nested</a>&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/TemplateMethodModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateMethodModel.html b/docs/api/freemarker/template/TemplateMethodModel.html
index 7f96059..a05988e 100644
--- a/docs/api/freemarker/template/TemplateMethodModel.html
+++ b/docs/api/freemarker/template/TemplateMethodModel.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>TemplateMethodModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>TemplateMethodModel (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="TemplateMethodModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="TemplateMethodModel (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/TemplateHashModelEx.html" title="interface in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/template/TemplateMethodModelEx.html" title="interface in freemarker.template"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -238,7 +238,7 @@ extends <a href="../../freemarker/template/TemplateModel.html" title="interface
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/template/TemplateMethodModelEx.html" title="interface 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/TemplateMethodModelEx.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateMethodModelEx.html b/docs/api/freemarker/template/TemplateMethodModelEx.html
index 8f93f78..902e747 100644
--- a/docs/api/freemarker/template/TemplateMethodModelEx.html
+++ b/docs/api/freemarker/template/TemplateMethodModelEx.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>TemplateMethodModelEx (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>TemplateMethodModelEx (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="TemplateMethodModelEx (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="TemplateMethodModelEx (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/TemplateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateModel.html b/docs/api/freemarker/template/TemplateModel.html
index 9760d18..56c8404 100644
--- a/docs/api/freemarker/template/TemplateModel.html
+++ b/docs/api/freemarker/template/TemplateModel.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>TemplateModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>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="TemplateModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="TemplateModel (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -96,11 +96,11 @@
 <li class="blockList">
 <dl>
 <dt>All Known Subinterfaces:</dt>
-<dd><a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, <a href="../../freemarker/template/TemplateBooleanModel.html" title="interface in freemarker.template">TemplateBooleanModel</a>, <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a>, <a href="../../freemarker/template/TemplateCollectionModelEx.html" title="interface in freemarker.template">TemplateCollectionModelEx</a>, <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>, <a href="../../freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template">TemplateDirectiveModel</a>, <a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template">TemplateHashModel</a>, <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in f
 reemarker.template">TemplateHashModelEx</a>, <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO&gt;, <a href="../../freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template">TemplateMethodModel</a>, <a href="../../freemarker/template/TemplateMethodModelEx.html" title="interface in freemarker.template">TemplateMethodModelEx</a>, <a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a>, <a href="../../freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template">TemplateNodeModel</a>, <a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>, <a href="../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template">TemplateScalarModel</a>, <a href="../../freemarker/templat
 e/TemplateSequenceModel.html" title="interface in freemarker.template">TemplateSequenceModel</a>, <a href="../../freemarker/template/TemplateTransformModel.html" title="interface in freemarker.template">TemplateTransformModel</a>, <a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a></dd>
+<dd><a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, <a href="../../freemarker/template/TemplateBooleanModel.html" title="interface in freemarker.template">TemplateBooleanModel</a>, <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a>, <a href="../../freemarker/template/TemplateCollectionModelEx.html" title="interface in freemarker.template">TemplateCollectionModelEx</a>, <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>, <a href="../../freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template">TemplateDirectiveModel</a>, <a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template">TemplateHashModel</a>, <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in f
 reemarker.template">TemplateHashModelEx</a>, <a href="../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a>, <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO&gt;, <a href="../../freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template">TemplateMethodModel</a>, <a href="../../freemarker/template/TemplateMethodModelEx.html" title="interface in freemarker.template">TemplateMethodModelEx</a>, <a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a>, <a href="../../freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template">TemplateNodeModel</a>, <a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>, <a href="../../freemarker/templ
 ate/TemplateScalarModel.html" title="interface in freemarker.template">TemplateScalarModel</a>, <a href="../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template">TemplateSequenceModel</a>, <a href="../../freemarker/template/TemplateTransformModel.html" title="interface in freemarker.template">TemplateTransformModel</a>, <a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a></dd>
 </dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../../freemarker/ext/servlet/AllHttpScopesHashModel.html" title="class in freemarker.ext.servlet">AllHttpScopesHashModel</a>, <a href="../../freemarker/ext/beans/ArrayModel.html" title="class in freemarker.ext.beans">ArrayModel</a>, <a href="../../freemarker/ext/beans/BeanModel.html" title="class in freemarker.ext.beans">BeanModel</a>, <a href="../../freemarker/ext/beans/BooleanModel.html" title="class in freemarker.ext.beans">BooleanModel</a>, <a href="../../freemarker/template/utility/CaptureOutput.html" title="class in freemarker.template.utility">CaptureOutput</a>, <a href="../../freemarker/ext/beans/CollectionModel.html" title="class in freemarker.ext.beans">CollectionModel</a>, <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>, <a href="../../freemarker/ext/beans/DateModel.html" title="class in freemarker.ext.beans">DateModel</a>, <a href="../../freemarker/template/DefaultArray
 Adapter.html" title="class in freemarker.template">DefaultArrayAdapter</a>, <a href="../../freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template">DefaultIteratorAdapter</a>, <a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template">DefaultListAdapter</a>, <a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template">DefaultMapAdapter</a>, <a href="../../freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template">DefaultNonListCollectionAdapter</a>, <a href="../../freemarker/template/utility/DOMNodeModel.html" title="class in freemarker.template.utility">DOMNodeModel</a>, <a href="../../freemarker/ext/beans/EnumerationModel.html" title="class in freemarker.ext.beans">EnumerationModel</a>, <a href="../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a>, <a href="../../freemarker/template/utility
 /Execute.html" title="class in freemarker.template.utility">Execute</a>, <a href="../../freemarker/template/utility/HtmlEscape.html" title="class in freemarker.template.utility">HtmlEscape</a>, <a href="../../freemarker/ext/servlet/HttpRequestHashModel.html" title="class in freemarker.ext.servlet">HttpRequestHashModel</a>, <a href="../../freemarker/ext/servlet/HttpRequestParametersHashModel.html" title="class in freemarker.ext.servlet">HttpRequestParametersHashModel</a>, <a href="../../freemarker/ext/servlet/HttpSessionHashModel.html" title="class in freemarker.ext.servlet">HttpSessionHashModel</a>, <a href="../../freemarker/ext/servlet/IncludePage.html" title="class in freemarker.ext.servlet">IncludePage</a>, <a href="../../freemarker/ext/beans/IteratorModel.html" title="class in freemarker.ext.beans">IteratorModel</a>, <a href="../../freemarker/ext/jython/JythonHashModel.html" title="class in freemarker.ext.jython">JythonHashModel</a>, <a href="../../freemarker/ext/jython/JythonMo
 del.html" title="class in freemarker.ext.jython">JythonModel</a>, <a href="../../freemarker/ext/jython/JythonNumberModel.html" title="class in freemarker.ext.jython">JythonNumberModel</a>, <a href="../../freemarker/template/utility/JythonRuntime.html" title="class in freemarker.template.utility">JythonRuntime</a>, <a href="../../freemarker/ext/jython/JythonSequenceModel.html" title="class in freemarker.ext.jython">JythonSequenceModel</a>, <a href="../../freemarker/template/LocalizedString.html" title="class in freemarker.template">LocalizedString</a>, <a href="../../freemarker/ext/beans/MapModel.html" title="class in freemarker.ext.beans">MapModel</a>, <a href="../../freemarker/ext/jdom/NodeListModel.html" title="class in freemarker.ext.jdom">NodeListModel</a>, <a href="../../freemarker/ext/xml/NodeListModel.html" title="class in freemarker.ext.xml">NodeListModel</a>, <a href="../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a>, <a href="../../
 freemarker/template/utility/NormalizeNewlines.html" title="class in freemarker.template.utility">NormalizeNewlines</a>, <a href="../../freemarker/ext/beans/NumberModel.html" title="class in freemarker.ext.beans">NumberModel</a>, <a href="../../freemarker/template/utility/ObjectConstructor.html" title="class in freemarker.template.utility">ObjectConstructor</a>, <a href="../../freemarker/ext/beans/OverloadedMethodsModel.html" title="class in freemarker.ext.beans">OverloadedMethodsModel</a>, <a href="../../freemarker/template/ResourceBundleLocalizedString.html" title="class in freemarker.template">ResourceBundleLocalizedString</a>, <a href="../../freemarker/ext/beans/ResourceBundleModel.html" title="class in freemarker.ext.beans">ResourceBundleModel</a>, <a href="../../freemarker/ext/rhino/RhinoFunctionModel.html" title="class in freemarker.ext.rhino">RhinoFunctionModel</a>, <a href="../../freemarker/ext/rhino/RhinoScriptableModel.html" title="class in freemarker.ext.rhino">RhinoScrip
 tableModel</a>, <a href="../../freemarker/ext/servlet/ServletContextHashModel.html" title="class in freemarker.ext.servlet">ServletContextHashModel</a>, <a href="../../freemarker/template/SimpleCollection.html" title="class in freemarker.template">SimpleCollection</a>, <a href="../../freemarker/template/SimpleDate.html" title="class in freemarker.template">SimpleDate</a>, <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template">SimpleHash</a>, <a href="../../freemarker/template/SimpleList.html" title="class in freemarker.template">SimpleList</a>, <a href="../../freemarker/ext/beans/SimpleMapModel.html" title="class in freemarker.ext.beans">SimpleMapModel</a>, <a href="../../freemarker/ext/beans/SimpleMethodModel.html" title="class in freemarker.ext.beans">SimpleMethodModel</a>, <a href="../../freemarker/template/SimpleNumber.html" title="class in freemarker.template">SimpleNumber</a>, <a href="../../freemarker/template/SimpleScalar.html" title="class 
 in freemarker.template">SimpleScalar</a>, <a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template">SimpleSequence</a>, <a href="../../freemarker/template/utility/StandardCompress.html" title="class in freemarker.template.utility">StandardCompress</a>, <a href="../../freemarker/ext/beans/StringModel.html" title="class in freemarker.ext.beans">StringModel</a>, <a href="../../freemarker/ext/jsp/TaglibFactory.html" title="class in freemarker.ext.jsp">TaglibFactory</a>, <a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>, <a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>, <a href="../../freemarker/template/TemplateModelListSequence.html" title="class in freemarker.template">TemplateModelListSequence</a>, <a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.cor
 e">TemplateRTFOutputModel</a>, <a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>, <a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a>, <a href="../../freemarker/template/utility/XmlEscape.html" title="class in freemarker.template.utility">XmlEscape</a></dd>
+<dd><a href="../../freemarker/ext/servlet/AllHttpScopesHashModel.html" title="class in freemarker.ext.servlet">AllHttpScopesHashModel</a>, <a href="../../freemarker/ext/beans/ArrayModel.html" title="class in freemarker.ext.beans">ArrayModel</a>, <a href="../../freemarker/ext/beans/BeanModel.html" title="class in freemarker.ext.beans">BeanModel</a>, <a href="../../freemarker/ext/beans/BooleanModel.html" title="class in freemarker.ext.beans">BooleanModel</a>, <a href="../../freemarker/template/utility/CaptureOutput.html" title="class in freemarker.template.utility">CaptureOutput</a>, <a href="../../freemarker/ext/beans/CollectionModel.html" title="class in freemarker.ext.beans">CollectionModel</a>, <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>, <a href="../../freemarker/ext/beans/DateModel.html" title="class in freemarker.ext.beans">DateModel</a>, <a href="../../freemarker/template/DefaultArray
 Adapter.html" title="class in freemarker.template">DefaultArrayAdapter</a>, <a href="../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a>, <a href="../../freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template">DefaultIteratorAdapter</a>, <a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template">DefaultListAdapter</a>, <a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template">DefaultMapAdapter</a>, <a href="../../freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template">DefaultNonListCollectionAdapter</a>, <a href="../../freemarker/template/utility/DOMNodeModel.html" title="class in freemarker.template.utility">DOMNodeModel</a>, <a href="../../freemarker/ext/beans/EnumerationModel.html" title="class in freemarker.ext.beans">EnumerationModel</a>, <a href="../../freemarker/core/E
 nvironment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a>, <a href="../../freemarker/template/utility/Execute.html" title="class in freemarker.template.utility">Execute</a>, <a href="../../freemarker/template/utility/HtmlEscape.html" title="class in freemarker.template.utility">HtmlEscape</a>, <a href="../../freemarker/ext/servlet/HttpRequestHashModel.html" title="class in freemarker.ext.servlet">HttpRequestHashModel</a>, <a href="../../freemarker/ext/servlet/HttpRequestParametersHashModel.html" title="class in freemarker.ext.servlet">HttpRequestParametersHashModel</a>, <a href="../../freemarker/ext/servlet/HttpSessionHashModel.html" title="class in freemarker.ext.servlet">HttpSessionHashModel</a>, <a href="../../freemarker/ext/servlet/IncludePage.html" title="class in freemarker.ext.servlet">IncludePage</a>, <a href="../../freemarker/ext/beans/IteratorModel.html" title="class in freemarker.ext.beans">IteratorModel</a>, <a href="../../freemarker/ext/jytho
 n/JythonHashModel.html" title="class in freemarker.ext.jython">JythonHashModel</a>, <a href="../../freemarker/ext/jython/JythonModel.html" title="class in freemarker.ext.jython">JythonModel</a>, <a href="../../freemarker/ext/jython/JythonNumberModel.html" title="class in freemarker.ext.jython">JythonNumberModel</a>, <a href="../../freemarker/template/utility/JythonRuntime.html" title="class in freemarker.template.utility">JythonRuntime</a>, <a href="../../freemarker/ext/jython/JythonSequenceModel.html" title="class in freemarker.ext.jython">JythonSequenceModel</a>, <a href="../../freemarker/template/LocalizedString.html" title="class in freemarker.template">LocalizedString</a>, <a href="../../freemarker/ext/beans/MapModel.html" title="class in freemarker.ext.beans">MapModel</a>, <a href="../../freemarker/ext/jdom/NodeListModel.html" title="class in freemarker.ext.jdom">NodeListModel</a>, <a href="../../freemarker/ext/xml/NodeListModel.html" title="class in freemarker.ext.xml">NodeLi
 stModel</a>, <a href="../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a>, <a href="../../freemarker/template/utility/NormalizeNewlines.html" title="class in freemarker.template.utility">NormalizeNewlines</a>, <a href="../../freemarker/ext/beans/NumberModel.html" title="class in freemarker.ext.beans">NumberModel</a>, <a href="../../freemarker/template/utility/ObjectConstructor.html" title="class in freemarker.template.utility">ObjectConstructor</a>, <a href="../../freemarker/ext/beans/OverloadedMethodsModel.html" title="class in freemarker.ext.beans">OverloadedMethodsModel</a>, <a href="../../freemarker/template/ResourceBundleLocalizedString.html" title="class in freemarker.template">ResourceBundleLocalizedString</a>, <a href="../../freemarker/ext/beans/ResourceBundleModel.html" title="class in freemarker.ext.beans">ResourceBundleModel</a>, <a href="../../freemarker/ext/rhino/RhinoFunctionModel.html" title="class in freemarker.ext.rhino">RhinoF
 unctionModel</a>, <a href="../../freemarker/ext/rhino/RhinoScriptableModel.html" title="class in freemarker.ext.rhino">RhinoScriptableModel</a>, <a href="../../freemarker/ext/servlet/ServletContextHashModel.html" title="class in freemarker.ext.servlet">ServletContextHashModel</a>, <a href="../../freemarker/template/SimpleCollection.html" title="class in freemarker.template">SimpleCollection</a>, <a href="../../freemarker/template/SimpleDate.html" title="class in freemarker.template">SimpleDate</a>, <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template">SimpleHash</a>, <a href="../../freemarker/template/SimpleList.html" title="class in freemarker.template">SimpleList</a>, <a href="../../freemarker/ext/beans/SimpleMapModel.html" title="class in freemarker.ext.beans">SimpleMapModel</a>, <a href="../../freemarker/ext/beans/SimpleMethodModel.html" title="class in freemarker.ext.beans">SimpleMethodModel</a>, <a href="../../freemarker/template/SimpleNumber
 .html" title="class in freemarker.template">SimpleNumber</a>, <a href="../../freemarker/template/SimpleScalar.html" title="class in freemarker.template">SimpleScalar</a>, <a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template">SimpleSequence</a>, <a href="../../freemarker/template/utility/StandardCompress.html" title="class in freemarker.template.utility">StandardCompress</a>, <a href="../../freemarker/ext/beans/StringModel.html" title="class in freemarker.ext.beans">StringModel</a>, <a href="../../freemarker/ext/jsp/TaglibFactory.html" title="class in freemarker.ext.jsp">TaglibFactory</a>, <a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>, <a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>, <a href="../../freemarker/template/TemplateModelListSequence.html" title="class in freemarker.te
 mplate">TemplateModelListSequence</a>, <a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a>, <a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>, <a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a>, <a href="../../freemarker/template/utility/XmlEscape.html" title="class in freemarker.template.utility">XmlEscape</a></dd>
 </dl>
 <hr>
 <br>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/TemplateModelAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateModelAdapter.html b/docs/api/freemarker/template/TemplateModelAdapter.html
index 082bfbd..0f2fc47 100644
--- a/docs/api/freemarker/template/TemplateModelAdapter.html
+++ b/docs/api/freemarker/template/TemplateModelAdapter.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>TemplateModelAdapter (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>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="TemplateModelAdapter (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="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/TemplateModelException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateModelException.html b/docs/api/freemarker/template/TemplateModelException.html
index 2c947c0..3f8da60 100644
--- a/docs/api/freemarker/template/TemplateModelException.html
+++ b/docs/api/freemarker/template/TemplateModelException.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>TemplateModelException (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>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="TemplateModelException (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="TemplateModelException (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/TemplateModelIterator.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateModelIterator.html b/docs/api/freemarker/template/TemplateModelIterator.html
index bd13f12..057d1b3 100644
--- a/docs/api/freemarker/template/TemplateModelIterator.html
+++ b/docs/api/freemarker/template/TemplateModelIterator.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>TemplateModelIterator (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>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="TemplateModelIterator (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="TemplateModelIterator (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/TemplateModelListSequence.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateModelListSequence.html b/docs/api/freemarker/template/TemplateModelListSequence.html
index 000dffe..34124e0 100644
--- a/docs/api/freemarker/template/TemplateModelListSequence.html
+++ b/docs/api/freemarker/template/TemplateModelListSequence.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>TemplateModelListSequence (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>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="TemplateModelListSequence (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="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/TemplateModelWithAPISupport.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateModelWithAPISupport.html b/docs/api/freemarker/template/TemplateModelWithAPISupport.html
index e070857..7ea99af 100644
--- a/docs/api/freemarker/template/TemplateModelWithAPISupport.html
+++ b/docs/api/freemarker/template/TemplateModelWithAPISupport.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>TemplateModelWithAPISupport (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>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="TemplateModelWithAPISupport (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="TemplateModelWithAPISupport (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -106,7 +106,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../../freemarker/ext/beans/ArrayModel.html" title="class in freemarker.ext.beans">ArrayModel</a>, <a href="../../freemarker/ext/beans/BeanModel.html" title="class in freemarker.ext.beans">BeanModel</a>, <a href="../../freemarker/ext/beans/BooleanModel.html" title="class in freemarker.ext.beans">BooleanModel</a>, <a href="../../freemarker/ext/beans/CollectionModel.html" title="class in freemarker.ext.beans">CollectionModel</a>, <a href="../../freemarker/ext/beans/DateModel.html" title="class in freemarker.ext.beans">DateModel</a>, <a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template">DefaultListAdapter</a>, <a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template">DefaultMapAdapter</a>, <a href="../../freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template">DefaultNonListCollectionAdapter</a>, <a href="../../freemarker/ext/beans/EnumerationModel.html" ti
 tle="class in freemarker.ext.beans">EnumerationModel</a>, <a href="../../freemarker/ext/beans/IteratorModel.html" title="class in freemarker.ext.beans">IteratorModel</a>, <a href="../../freemarker/ext/beans/MapModel.html" title="class in freemarker.ext.beans">MapModel</a>, <a href="../../freemarker/ext/beans/NumberModel.html" title="class in freemarker.ext.beans">NumberModel</a>, <a href="../../freemarker/ext/beans/ResourceBundleModel.html" title="class in freemarker.ext.beans">ResourceBundleModel</a>, <a href="../../freemarker/ext/beans/SimpleMapModel.html" title="class in freemarker.ext.beans">SimpleMapModel</a>, <a href="../../freemarker/ext/beans/StringModel.html" title="class in freemarker.ext.beans">StringModel</a></dd>
+<dd><a href="../../freemarker/ext/beans/ArrayModel.html" title="class in freemarker.ext.beans">ArrayModel</a>, <a href="../../freemarker/ext/beans/BeanModel.html" title="class in freemarker.ext.beans">BeanModel</a>, <a href="../../freemarker/ext/beans/BooleanModel.html" title="class in freemarker.ext.beans">BooleanModel</a>, <a href="../../freemarker/ext/beans/CollectionModel.html" title="class in freemarker.ext.beans">CollectionModel</a>, <a href="../../freemarker/ext/beans/DateModel.html" title="class in freemarker.ext.beans">DateModel</a>, <a href="../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a>, <a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template">DefaultListAdapter</a>, <a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template">DefaultMapAdapter</a>, <a href="../../freemarker/template/DefaultNonListCollectionAdapter.html" title=
 "class in freemarker.template">DefaultNonListCollectionAdapter</a>, <a href="../../freemarker/ext/beans/EnumerationModel.html" title="class in freemarker.ext.beans">EnumerationModel</a>, <a href="../../freemarker/ext/beans/IteratorModel.html" title="class in freemarker.ext.beans">IteratorModel</a>, <a href="../../freemarker/ext/beans/MapModel.html" title="class in freemarker.ext.beans">MapModel</a>, <a href="../../freemarker/ext/beans/NumberModel.html" title="class in freemarker.ext.beans">NumberModel</a>, <a href="../../freemarker/ext/beans/ResourceBundleModel.html" title="class in freemarker.ext.beans">ResourceBundleModel</a>, <a href="../../freemarker/ext/beans/SimpleMapModel.html" title="class in freemarker.ext.beans">SimpleMapModel</a>, <a href="../../freemarker/ext/beans/StringModel.html" title="class in freemarker.ext.beans">StringModel</a></dd>
 </dl>
 <hr>
 <br>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/TemplateNodeModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateNodeModel.html b/docs/api/freemarker/template/TemplateNodeModel.html
index ff57721..8ebaf6e 100644
--- a/docs/api/freemarker/template/TemplateNodeModel.html
+++ b/docs/api/freemarker/template/TemplateNodeModel.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>TemplateNodeModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>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="TemplateNodeModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="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/TemplateNotFoundException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateNotFoundException.html b/docs/api/freemarker/template/TemplateNotFoundException.html
index 7529224..b34fd81 100644
--- a/docs/api/freemarker/template/TemplateNotFoundException.html
+++ b/docs/api/freemarker/template/TemplateNotFoundException.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>TemplateNotFoundException (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>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="TemplateNotFoundException (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="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/TemplateNumberModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateNumberModel.html b/docs/api/freemarker/template/TemplateNumberModel.html
index 1d0c663..17a1869 100644
--- a/docs/api/freemarker/template/TemplateNumberModel.html
+++ b/docs/api/freemarker/template/TemplateNumberModel.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>TemplateNumberModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>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="TemplateNumberModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="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/TemplateScalarModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateScalarModel.html b/docs/api/freemarker/template/TemplateScalarModel.html
index 8b81f58..4e59766 100644
--- a/docs/api/freemarker/template/TemplateScalarModel.html
+++ b/docs/api/freemarker/template/TemplateScalarModel.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>TemplateScalarModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>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="TemplateScalarModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="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/TemplateSequenceModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateSequenceModel.html b/docs/api/freemarker/template/TemplateSequenceModel.html
index 97da196..14df6f1 100644
--- a/docs/api/freemarker/template/TemplateSequenceModel.html
+++ b/docs/api/freemarker/template/TemplateSequenceModel.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>TemplateSequenceModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>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="TemplateSequenceModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="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/TemplateTransformModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateTransformModel.html b/docs/api/freemarker/template/TemplateTransformModel.html
index 608af21..7d95b09 100644
--- a/docs/api/freemarker/template/TemplateTransformModel.html
+++ b/docs/api/freemarker/template/TemplateTransformModel.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>TemplateTransformModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>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="TemplateTransformModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="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/TransformControl.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TransformControl.html b/docs/api/freemarker/template/TransformControl.html
index faaece0..010bd72 100644
--- a/docs/api/freemarker/template/TransformControl.html
+++ b/docs/api/freemarker/template/TransformControl.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>TransformControl (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>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="TransformControl (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="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/Version.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/Version.html b/docs/api/freemarker/template/Version.html
index fe4afe1..d79d97d 100644
--- a/docs/api/freemarker/template/Version.html
+++ b/docs/api/freemarker/template/Version.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>Version (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>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="Version (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Version (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/WrappingTemplateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/WrappingTemplateModel.html b/docs/api/freemarker/template/WrappingTemplateModel.html
index 4d96e45..7f48eda 100644
--- a/docs/api/freemarker/template/WrappingTemplateModel.html
+++ b/docs/api/freemarker/template/WrappingTemplateModel.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>WrappingTemplateModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>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="WrappingTemplateModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="WrappingTemplateModel (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -110,7 +110,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../freemarker/template/DefaultArrayAdapter.html" title="class in freemarker.template">DefaultArrayAdapter</a>, <a href="../../freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template">DefaultIteratorAdapter</a>, <a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template">DefaultListAdapter</a>, <a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template">DefaultMapAdapter</a>, <a href="../../freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template">DefaultNonListCollectionAdapter</a>, <a href="../../freemarker/template/SimpleCollection.html" title="class in freemarker.template">SimpleCollection</a>, <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template">SimpleHash</a>, <a href="../../freemarker/ext/beans/SimpleMapModel.html" title="class in freemarker.ext.beans">SimpleMapModel</a>, <a href="../../fr
 eemarker/template/SimpleSequence.html" title="class in freemarker.template">SimpleSequence</a></dd>
+<dd><a href="../../freemarker/template/DefaultArrayAdapter.html" title="class in freemarker.template">DefaultArrayAdapter</a>, <a href="../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a>, <a href="../../freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template">DefaultIteratorAdapter</a>, <a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template">DefaultListAdapter</a>, <a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template">DefaultMapAdapter</a>, <a href="../../freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template">DefaultNonListCollectionAdapter</a>, <a href="../../freemarker/template/SimpleCollection.html" title="class in freemarker.template">SimpleCollection</a>, <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template">SimpleHash</a>, <a 
 href="../../freemarker/ext/beans/SimpleMapModel.html" title="class in freemarker.ext.beans">SimpleMapModel</a>, <a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template">SimpleSequence</a></dd>
 </dl>
 <hr>
 <br>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/class-use/AdapterTemplateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/AdapterTemplateModel.html b/docs/api/freemarker/template/class-use/AdapterTemplateModel.html
index c1da861..a0a296a 100644
--- a/docs/api/freemarker/template/class-use/AdapterTemplateModel.html
+++ b/docs/api/freemarker/template/class-use/AdapterTemplateModel.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.AdapterTemplateModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.AdapterTemplateModel (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.AdapterTemplateModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.AdapterTemplateModel (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -325,26 +325,33 @@ 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/class-use/Configuration.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/Configuration.html b/docs/api/freemarker/template/class-use/Configuration.html
index 33455ff..e45b72e 100644
--- a/docs/api/freemarker/template/class-use/Configuration.html
+++ b/docs/api/freemarker/template/class-use/Configuration.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.Configuration (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Class freemarker.template.Configuration (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.Configuration (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Class freemarker.template.Configuration (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/DefaultArrayAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/DefaultArrayAdapter.html b/docs/api/freemarker/template/class-use/DefaultArrayAdapter.html
index 71f0083..d6a0970 100644
--- a/docs/api/freemarker/template/class-use/DefaultArrayAdapter.html
+++ b/docs/api/freemarker/template/class-use/DefaultArrayAdapter.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.DefaultArrayAdapter (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Class freemarker.template.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="Uses of Class freemarker.template.DefaultArrayAdapter (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Class freemarker.template.DefaultArrayAdapter (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {