freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [23/42] incubator-freemarker-site git commit: Update site for 2.3.25 (with Maven Central Repository problem warning)
Date Tue, 05 Jul 2016 20:11:45 GMT
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/class-use/TemplateException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateException.html b/docs/api/freemarker/template/class-use/TemplateException.html
index 7355dfb..ec60966 100644
--- a/docs/api/freemarker/template/class-use/TemplateException.html
+++ b/docs/api/freemarker/template/class-use/TemplateException.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.TemplateException (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Class freemarker.template.TemplateException (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.TemplateException (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Class freemarker.template.TemplateException (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -357,23 +357,34 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><span class="typeNameLabel">Configurable.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Configurable.html#doAutoImportsAndIncludes-freemarker.core.Environment-">doAutoImportsAndIncludes</a></span>(<a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">Configurable.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Configurable.html#doAutoImportsAndIncludes-freemarker.core.Environment-">doAutoImportsAndIncludes</a></span>(<a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>
+<div class="block">Executes the auto-imports and auto-includes for the main template of this environment.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#importLib-java.lang.String-java.lang.String-">importLib</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
-         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;namespace)</code>
-<div class="block">Emulates <code>import</code> directive, except that <code>name</code> must be tempate root relative.</div>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#importLib-java.lang.String-java.lang.String-">importLib</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
+         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;targetNsVarName)</code>
+<div class="block">Emulates <code>import</code> directive, except that <code>templateName</code> must be template root relative.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#importLib-freemarker.template.Template-java.lang.String-">importLib</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;loadedTemplate,
-         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;namespace)</code>
-<div class="block">Emulates <code>import</code> directive.</div>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#importLib-java.lang.String-java.lang.String-boolean-">importLib</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;templateName,
+         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;targetNsVarName,
+         boolean&nbsp;lazy)</code>
+<div class="block">Like <a href="../../../freemarker/core/Environment.html#importLib-java.lang.String-java.lang.String-"><code>Environment.importLib(String, String)</code></a>, but you can specify if you want a
+ <a href="../../../freemarker/core/Configurable.html#setLazyImports-boolean-">lazy import</a> or not.</div>
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#importLib-freemarker.template.Template-java.lang.String-">importLib</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;loadedTemplate,
+         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;targetNsVarName)</code>
+<div class="block">Does what the <code>#import</code> directive does, but with an already loaded template.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#include-java.lang.String-java.lang.String-boolean-">include</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
@@ -381,40 +392,40 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <div class="block">Emulates <code>include</code> directive, except that <code>name</code> must be tempate root relative.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#include-freemarker.template.Template-">include</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;includedTemplate)</code>
 <div class="block">Processes a Template in the context of this <code>Environment</code>, including its output in the
  <code>Environment</code>'s Writer.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ArithmeticEngine.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/ArithmeticEngine.html#modulus-java.lang.Number-java.lang.Number-">modulus</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;first,
        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;second)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ArithmeticEngine.ConservativeEngine.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/ArithmeticEngine.ConservativeEngine.html#modulus-java.lang.Number-java.lang.Number-">modulus</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;first,
        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;second)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ArithmeticEngine.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/ArithmeticEngine.html#multiply-java.lang.Number-java.lang.Number-">multiply</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;first,
         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;second)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ArithmeticEngine.ConservativeEngine.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/ArithmeticEngine.ConservativeEngine.html#multiply-java.lang.Number-java.lang.Number-">multiply</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;first,
         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;second)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#process--">process</a></span>()</code>
 <div class="block">Processes the template to which this environment belongs to.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a></code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateClassResolver.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateClassResolver.html#resolve-java.lang.String-freemarker.core.Environment-freemarker.template.Template-">resolve</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;className,
        <a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
@@ -422,42 +433,42 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <div class="block">Gets a <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang"><code>Class</code></a> based on the class name.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a></code></td>
 <td class="colLast"><span class="typeNameLabel">OptInTemplateClassResolver.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/OptInTemplateClassResolver.html#resolve-java.lang.String-freemarker.core.Environment-freemarker.template.Template-">resolve</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;className,
        <a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
        <a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Configurable.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Configurable.html#setSetting-java.lang.String-java.lang.String-">setSetting</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
           <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</code>
 <div class="block">Sets a FreeMarker setting by a name and string value.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Configurable.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Configurable.html#setSettings-java.io.InputStream-">setSettings</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a>&nbsp;propsIn)</code>
 <div class="block">Reads a setting list (key and element pairs) from the input stream.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Configurable.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Configurable.html#setSettings-java.util.Properties-">setSettings</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a>&nbsp;props)</code>
 <div class="block">Set the settings stored in a <code>Properties</code> object.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ArithmeticEngine.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/ArithmeticEngine.html#subtract-java.lang.Number-java.lang.Number-">subtract</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;first,
         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;second)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
 <td class="colLast"><span class="typeNameLabel">ArithmeticEngine.ConservativeEngine.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/ArithmeticEngine.ConservativeEngine.html#subtract-java.lang.Number-java.lang.Number-">subtract</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;first,
         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;second)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#visit-freemarker.core.TemplateElement-freemarker.template.TemplateDirectiveModel-java.util.Map-java.util.List-">visit</a></span>(freemarker.core.TemplateElement&nbsp;element,
      <a href="../../../freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template">TemplateDirectiveModel</a>&nbsp;directiveModel,

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/class-use/TemplateExceptionHandler.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateExceptionHandler.html b/docs/api/freemarker/template/class-use/TemplateExceptionHandler.html
index 5f3b98c..7d501e6 100644
--- a/docs/api/freemarker/template/class-use/TemplateExceptionHandler.html
+++ b/docs/api/freemarker/template/class-use/TemplateExceptionHandler.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.TemplateExceptionHandler (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.TemplateExceptionHandler (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.TemplateExceptionHandler (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateExceptionHandler (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/TemplateHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateHashModel.html b/docs/api/freemarker/template/class-use/TemplateHashModel.html
index 7b187be..296fedd 100644
--- a/docs/api/freemarker/template/class-use/TemplateHashModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateHashModel.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.TemplateHashModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.TemplateHashModel (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.TemplateHashModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateHashModel (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -521,6 +521,12 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
  iterating through its keys and values.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a></span></code>
+<div class="block">Adds key-value pair listing capability to <a href="../../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><code>TemplateHashModelEx</code></a>.</div>
+</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/class-use/TemplateHashModelEx.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateHashModelEx.html b/docs/api/freemarker/template/class-use/TemplateHashModelEx.html
index 01cc5e1..ee99a13 100644
--- a/docs/api/freemarker/template/class-use/TemplateHashModelEx.html
+++ b/docs/api/freemarker/template/class-use/TemplateHashModelEx.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.TemplateHashModelEx (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.TemplateHashModelEx (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.TemplateHashModelEx (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateHashModelEx (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -334,6 +334,21 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <!--   -->
 </a>
 <h3>Uses of <a href="../../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template">TemplateHashModelEx</a> in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template">TemplateHashModelEx</a> in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a></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>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a></span></code>
+<div class="block">Adds key-value pair listing capability to <a href="../../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><code>TemplateHashModelEx</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
 <caption><span>Classes in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a> that implement <a href="../../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template">TemplateHashModelEx</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/freemarker/template/class-use/TemplateHashModelEx2.KeyValuePair.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateHashModelEx2.KeyValuePair.html b/docs/api/freemarker/template/class-use/TemplateHashModelEx2.KeyValuePair.html
new file mode 100644
index 0000000..e51be4b
--- /dev/null
+++ b/docs/api/freemarker/template/class-use/TemplateHashModelEx2.KeyValuePair.html
@@ -0,0 +1,175 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Interface freemarker.template.TemplateHashModelEx2.KeyValuePair (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="Uses of Interface freemarker.template.TemplateHashModelEx2.KeyValuePair (FreeMarker 2.3.25-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</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><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template">Class</a></li>
+<li class="navBarCell1Rev">Use</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>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?freemarker/template/class-use/TemplateHashModelEx2.KeyValuePair.html" target="_top">Frames</a></li>
+<li><a href="TemplateHashModelEx2.KeyValuePair.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>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Interface freemarker.template.TemplateHashModelEx2.KeyValuePair" class="title">Uses of Interface<br>freemarker.template.TemplateHashModelEx2.KeyValuePair</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePair</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#freemarker.template">freemarker.template</a></td>
+<td class="colLast">
+<div class="block"><b>The fundamental, most commonly used API-s of FreeMarker;</b>
+start with <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> (see also the
+<a href="http://freemarker.org/docs/pgui_quickstart.html" target="_blank">Getting Stared</a> in the Manual.)</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.template">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePair</a> in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a> that return <a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePair</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePair</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateHashModelEx2.KeyValuePairIterator.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html#next--">next</a></span>()</code>
+<div class="block">Similar to <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true#next--" title="class or interface in java.util"><code>Iterator.next()</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePair</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MapKeyValuePairIterator.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/MapKeyValuePairIterator.html#next--">next</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= 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><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template">Class</a></li>
+<li class="navBarCell1Rev">Use</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>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?freemarker/template/class-use/TemplateHashModelEx2.KeyValuePair.html" target="_top">Frames</a></li>
+<li><a href="TemplateHashModelEx2.KeyValuePair.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>
+<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/class-use/TemplateHashModelEx2.KeyValuePairIterator.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateHashModelEx2.KeyValuePairIterator.html b/docs/api/freemarker/template/class-use/TemplateHashModelEx2.KeyValuePairIterator.html
new file mode 100644
index 0000000..5316e3c
--- /dev/null
+++ b/docs/api/freemarker/template/class-use/TemplateHashModelEx2.KeyValuePairIterator.html
@@ -0,0 +1,219 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Interface freemarker.template.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="Uses of Interface freemarker.template.TemplateHashModelEx2.KeyValuePairIterator (FreeMarker 2.3.25-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</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><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">Class</a></li>
+<li class="navBarCell1Rev">Use</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>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?freemarker/template/class-use/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>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Interface freemarker.template.TemplateHashModelEx2.KeyValuePairIterator" class="title">Uses of Interface<br>freemarker.template.TemplateHashModelEx2.KeyValuePairIterator</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#freemarker.ext.beans">freemarker.ext.beans</a></td>
+<td class="colLast">
+<div class="block">The <a href="../../../freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template"><code>default object wrapper</code></a> of FreeMarker uses
+this to expose Java Beans and POJO-s to templates, but it can also be used in itself as a
+better alternative <a href="../../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#freemarker.template">freemarker.template</a></td>
+<td class="colLast">
+<div class="block"><b>The fundamental, most commonly used API-s of FreeMarker;</b>
+start with <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> (see also the
+<a href="http://freemarker.org/docs/pgui_quickstart.html" target="_blank">Getting Stared</a> in the Manual.)</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.ext.beans">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a> in <a href="../../../freemarker/ext/beans/package-summary.html">freemarker.ext.beans</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/ext/beans/package-summary.html">freemarker.ext.beans</a> that return <a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a></code></td>
+<td class="colLast"><span class="typeNameLabel">SimpleMapModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/ext/beans/SimpleMapModel.html#keyValuePairIterator--">keyValuePairIterator</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="freemarker.template">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a> in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a> that implement <a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/MapKeyValuePairIterator.html" title="class in freemarker.template">MapKeyValuePairIterator</a></span></code>
+<div class="block">Implementation of <a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template"><code>TemplateHashModelEx2.KeyValuePairIterator</code></a> for a <a href="../../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template"><code>TemplateHashModelEx2</code></a> that wraps or otherwise uses a
+  <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> internally.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a> that return <a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateHashModelEx2.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/TemplateHashModelEx2.html#keyValuePairIterator--">keyValuePairIterator</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a></code></td>
+<td class="colLast"><span class="typeNameLabel">SimpleHash.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleHash.html#keyValuePairIterator--">keyValuePairIterator</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a></code></td>
+<td class="colLast"><span class="typeNameLabel">DefaultMapAdapter.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultMapAdapter.html#keyValuePairIterator--">keyValuePairIterator</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= 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><a href="../../../freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">Class</a></li>
+<li class="navBarCell1Rev">Use</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>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?freemarker/template/class-use/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>
+<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/class-use/TemplateHashModelEx2.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateHashModelEx2.html b/docs/api/freemarker/template/class-use/TemplateHashModelEx2.html
new file mode 100644
index 0000000..be4bc46
--- /dev/null
+++ b/docs/api/freemarker/template/class-use/TemplateHashModelEx2.html
@@ -0,0 +1,261 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Interface freemarker.template.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="Uses of Interface freemarker.template.TemplateHashModelEx2 (FreeMarker 2.3.25-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</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><a href="../../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">Class</a></li>
+<li class="navBarCell1Rev">Use</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>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?freemarker/template/class-use/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>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Interface freemarker.template.TemplateHashModelEx2" class="title">Uses of Interface<br>freemarker.template.TemplateHashModelEx2</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#freemarker.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#freemarker.ext.beans">freemarker.ext.beans</a></td>
+<td class="colLast">
+<div class="block">The <a href="../../../freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template"><code>default object wrapper</code></a> of FreeMarker uses
+this to expose Java Beans and POJO-s to templates, but it can also be used in itself as a
+better alternative <a href="../../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#freemarker.ext.servlet">freemarker.ext.servlet</a></td>
+<td class="colLast">
+<div class="block">Servlet for legacy "Model 2" frameworks that allows using FreeMarker
+templates instead of JSP as the MVC View
+(see <a href="http://freemarker.org/docs/pgui_misc_servlet.html" target="_blank">in the Manual</a>).</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#freemarker.template">freemarker.template</a></td>
+<td class="colLast">
+<div class="block"><b>The fundamental, most commonly used API-s of FreeMarker;</b>
+start with <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> (see also the
+<a href="http://freemarker.org/docs/pgui_quickstart.html" target="_blank">Getting Stared</a> in the Manual.)</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that implement <a href="../../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></span></code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="freemarker.ext.beans">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a> in <a href="../../../freemarker/ext/beans/package-summary.html">freemarker.ext.beans</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../freemarker/ext/beans/package-summary.html">freemarker.ext.beans</a> that implement <a href="../../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/beans/SimpleMapModel.html" title="class in freemarker.ext.beans">SimpleMapModel</a></span></code>
+<div class="block">Model used by <a href="../../../freemarker/ext/beans/BeansWrapper.html" title="class in freemarker.ext.beans"><code>BeansWrapper</code></a> when <tt>simpleMapWrapper</tt>
+ mode is enabled.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="freemarker.ext.servlet">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a> in <a href="../../../freemarker/ext/servlet/package-summary.html">freemarker.ext.servlet</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../freemarker/ext/servlet/package-summary.html">freemarker.ext.servlet</a> that implement <a href="../../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/AllHttpScopesHashModel.html" title="class in freemarker.ext.servlet">AllHttpScopesHashModel</a></span></code>
+<div class="block">An extension of SimpleHash that looks up keys in the hash, then in the
+ request, session, and servlet context scopes.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="freemarker.template">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a> in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a> that implement <a href="../../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<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="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/SimpleHash.html" title="class in freemarker.template">SimpleHash</a></span></code>
+<div class="block">A simple implementation of the <a href="../../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><code>TemplateHashModelEx</code></a> interface, using its own underlying <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> or
+ <a href="http://docs.oracle.com/javase/8/docs/api/java/util/SortedMap.html?is-external=true" title="class or interface in java.util"><code>SortedMap</code></a> for storing the hash entries.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= 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><a href="../../../freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">Class</a></li>
+<li class="navBarCell1Rev">Use</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>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?freemarker/template/class-use/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>
+<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/class-use/TemplateMethodModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateMethodModel.html b/docs/api/freemarker/template/class-use/TemplateMethodModel.html
index 52b199d..6ed733c 100644
--- a/docs/api/freemarker/template/class-use/TemplateMethodModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateMethodModel.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.TemplateMethodModel (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.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="Uses of Interface freemarker.template.TemplateMethodModel (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateMethodModel (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/TemplateMethodModelEx.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateMethodModelEx.html b/docs/api/freemarker/template/class-use/TemplateMethodModelEx.html
index b422ee1..112c222 100644
--- a/docs/api/freemarker/template/class-use/TemplateMethodModelEx.html
+++ b/docs/api/freemarker/template/class-use/TemplateMethodModelEx.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.TemplateMethodModelEx (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Uses of Interface freemarker.template.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="Uses of Interface freemarker.template.TemplateMethodModelEx (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateMethodModelEx (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {


Mime
View raw message