freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [19/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:41 GMT
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/index-all.html
----------------------------------------------------------------------
diff --git a/docs/api/index-all.html b/docs/api/index-all.html
index 4c8aab0..4d5a27c 100644
--- a/docs/api/index-all.html
+++ b/docs/api/index-all.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>Index (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Index (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="Index (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Index (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -99,6 +99,10 @@
 <dd>
 <div class="block">Factory method for creating new adapter instances.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/DefaultIterableAdapter.html#adapt-java.lang.Iterable-freemarker.template.utility.ObjectWrapperWithAPISupport-">adapt(Iterable&lt;?&gt;, ObjectWrapperWithAPISupport)</a></span> - Static method in class freemarker.template.<a href="freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a></dt>
+<dd>
+<div class="block">Factory method for creating new adapter instances.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/DefaultIteratorAdapter.html#adapt-java.util.Iterator-freemarker.template.ObjectWrapper-">adapt(Iterator, ObjectWrapper)</a></span> - Static method in class freemarker.template.<a href="freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template">DefaultIteratorAdapter</a></dt>
 <dd>
 <div class="block">Factory method for creating new adapter instances.</div>
@@ -141,15 +145,15 @@
  when these raw version cannot be used as part of an ASCII
  string literal.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#addAutoImport-java.lang.String-java.lang.String-">addAutoImport(String, String)</a></span> - Method in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#addAutoImport-java.lang.String-java.lang.String-">addAutoImport(String, String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
-<div class="block">Adds an invisible <code>#import <i>templateName</i> as <i>namespaceVarName</i></code> at the beginning of all
- top-level templates (that is, to all templates that weren't included/imported from another template).</div>
+<div class="block">Adds an invisible <code>#import <i>templateName</i> as <i>namespaceVarName</i></code> at the beginning of the
+ main template (that's the top-level template that wasn't included/imported from another template).</div>
 </dd>
-<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#addAutoInclude-java.lang.String-">addAutoInclude(String)</a></span> - Method in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#addAutoInclude-java.lang.String-">addAutoInclude(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
-<div class="block">Adds an invisible <code>#include <i>templateName</i> as <i>namespaceVarName</i></code> at the beginning of all
- top-level templates (that is, to all templates that weren't included/imported from another template).</div>
+<div class="block">Adds an invisible <code>#include <i>templateName</i></code> at the beginning of the main template (that's the
+ top-level template that wasn't included/imported from another template).</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/debug/Debugger.html#addBreakpoint-freemarker.debug.Breakpoint-">addBreakpoint(Breakpoint)</a></span> - Method in interface freemarker.debug.<a href="freemarker/debug/Debugger.html" title="interface in freemarker.debug">Debugger</a></dt>
 <dd>
@@ -259,7 +263,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/TemplateConfiguration.html#apply-freemarker.template.Template-">apply(Template)</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></dt>
 <dd>
-<div class="block">Sets the settings of the <a href="freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> which are not yet set in the <a href="freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> and are set in this
+<div class="block">Sets those settings of the <a href="freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> which aren't yet set in the <a href="freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> and are set in this
  <a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>, leaves the other settings as is.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#applyEqualsOperator-freemarker.template.TemplateModel-freemarker.template.TemplateModel-">applyEqualsOperator(TemplateModel, TemplateModel)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
@@ -363,26 +367,56 @@
 <dd>
 <div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#AUTO_IMPORT_KEY">AUTO_IMPORT_KEY</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#AUTO_IMPORT_KEY">AUTO_IMPORT_KEY</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
 <div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#AUTO_IMPORT_KEY_CAMEL_CASE">AUTO_IMPORT_KEY_CAMEL_CASE</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#AUTO_IMPORT_KEY">AUTO_IMPORT_KEY</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">Use <a href="freemarker/core/Configurable.html#AUTO_IMPORT_KEY_SNAKE_CASE"><code>Configurable.AUTO_IMPORT_KEY_SNAKE_CASE</code></a> instead.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#AUTO_IMPORT_KEY_CAMEL_CASE">AUTO_IMPORT_KEY_CAMEL_CASE</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
 <div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#AUTO_IMPORT_KEY_SNAKE_CASE">AUTO_IMPORT_KEY_SNAKE_CASE</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#AUTO_IMPORT_KEY_CAMEL_CASE">AUTO_IMPORT_KEY_CAMEL_CASE</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">Use <a href="freemarker/core/Configurable.html#AUTO_IMPORT_KEY_CAMEL_CASE"><code>Configurable.AUTO_IMPORT_KEY_CAMEL_CASE</code></a> instead.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#AUTO_IMPORT_KEY_SNAKE_CASE">AUTO_IMPORT_KEY_SNAKE_CASE</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
 <div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#AUTO_IMPORT_KEY_SNAKE_CASE">AUTO_IMPORT_KEY_SNAKE_CASE</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">Use <a href="freemarker/core/Configurable.html#AUTO_IMPORT_KEY_SNAKE_CASE"><code>Configurable.AUTO_IMPORT_KEY_SNAKE_CASE</code></a> instead.</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#AUTO_INCLUDE_KEY">AUTO_INCLUDE_KEY</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#AUTO_INCLUDE_KEY">AUTO_INCLUDE_KEY</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
 <dd>
 <div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#AUTO_INCLUDE_KEY_CAMEL_CASE">AUTO_INCLUDE_KEY_CAMEL_CASE</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#AUTO_INCLUDE_KEY_CAMEL_CASE">AUTO_INCLUDE_KEY_CAMEL_CASE</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
 <dd>
 <div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#AUTO_INCLUDE_KEY_SNAKE_CASE">AUTO_INCLUDE_KEY_SNAKE_CASE</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#AUTO_INCLUDE_KEY_SNAKE_CASE">AUTO_INCLUDE_KEY_SNAKE_CASE</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
 <dd>
 <div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
@@ -1260,6 +1294,11 @@
 <div class="block">Adapts an <code>array</code> of a non-primitive elements 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>
 </dd>
+<dt><a href="freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template"><span class="typeNameLink">DefaultIterableAdapter</span></a> - Class in <a href="freemarker/template/package-summary.html">freemarker.template</a></dt>
+<dd>
+<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>
+</dd>
 <dt><a href="freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template"><span class="typeNameLink">DefaultIteratorAdapter</span></a> - Class in <a href="freemarker/template/package-summary.html">freemarker.template</a></dt>
 <dd>
 <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
@@ -1339,7 +1378,9 @@
 <dt><span class="memberNameLink"><a href="freemarker/ext/jsp/FreemarkerTag.html#doAfterBody--">doAfterBody()</a></span> - Method in class freemarker.ext.jsp.<a href="freemarker/ext/jsp/FreemarkerTag.html" title="class in freemarker.ext.jsp">FreemarkerTag</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#doAutoImportsAndIncludes-freemarker.core.Environment-">doAutoImportsAndIncludes(Environment)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Executes the auto-imports and auto-includes for the main template of this environment.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#doAutoImportsAndIncludes-freemarker.core.Environment-">doAutoImportsAndIncludes(Environment)</a></span> - Method in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/jsp/FreemarkerTag.html#doEndTag--">doEndTag()</a></span> - Method in class freemarker.ext.jsp.<a href="freemarker/ext/jsp/FreemarkerTag.html" title="class in freemarker.ext.jsp">FreemarkerTag</a></dt>
@@ -2062,6 +2103,8 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/DefaultArrayAdapter.html#getAdaptedObject-java.lang.Class-">getAdaptedObject(Class)</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultArrayAdapter.html" title="class in freemarker.template">DefaultArrayAdapter</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/DefaultIterableAdapter.html#getAdaptedObject-java.lang.Class-">getAdaptedObject(Class)</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/DefaultIteratorAdapter.html#getAdaptedObject-java.lang.Class-">getAdaptedObject(Class)</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template">DefaultIteratorAdapter</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/DefaultListAdapter.html#getAdaptedObject-java.lang.Class-">getAdaptedObject(Class)</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultListAdapter.html" title="class in freemarker.template">DefaultListAdapter</a></dt>
@@ -2078,6 +2121,8 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/beans/SimpleMapModel.html#getAPI--">getAPI()</a></span> - Method in class freemarker.ext.beans.<a href="freemarker/ext/beans/SimpleMapModel.html" title="class in freemarker.ext.beans">SimpleMapModel</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/DefaultIterableAdapter.html#getAPI--">getAPI()</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/DefaultListAdapter.html#getAPI--">getAPI()</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultListAdapter.html" title="class in freemarker.template">DefaultListAdapter</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/DefaultMapAdapter.html#getAPI--">getAPI()</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template">DefaultMapAdapter</a></dt>
@@ -2199,6 +2244,28 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">See <a href="freemarker/core/Configurable.html#setAutoFlush-boolean-"><code>Configurable.setAutoFlush(boolean)</code></a></div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#getAutoImports--">getAutoImports()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Getter pair of <a href="freemarker/core/Configurable.html#setAutoImports-java.util.Map-"><code>Configurable.setAutoImports(Map)</code></a>; do not modify the returned <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 be consistent with other
+ setting getters, if this setting was set directly on this <a href="freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a> object, this simply returns that
+ value, otherwise it returns the value from the parent <a href="freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#getAutoImportsWithoutFallback--">getAutoImportsWithoutFallback()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Like <a href="freemarker/core/Configurable.html#getAutoImports--"><code>Configurable.getAutoImports()</code></a>, but doesn't fall back to the parent <a href="freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a> (and so it can be
+ <code>null</code>).</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#getAutoIncludes--">getAutoIncludes()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Getter pair of <a href="freemarker/core/Configurable.html#setAutoIncludes-java.util.List-"><code>Configurable.setAutoIncludes(List)</code></a>; do not modify the returned <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 be consistent with
+ other setting getters, if this setting was set directly on this <a href="freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a> object, this simply returns
+ that value, otherwise it returns the value from the parent <a href="freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#getAutoIncludesWithoutFallback--">getAutoIncludesWithoutFallback()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Like <a href="freemarker/core/Configurable.html#getAutoIncludes--"><code>Configurable.getAutoIncludes()</code></a>, but doesn't fall back to the parent <a href="freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a> (and so it can be
+ <code>null</code>).</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/cache/FileTemplateLoader.html#getBaseDirectory--">getBaseDirectory()</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache">FileTemplateLoader</a></dt>
 <dd>
 <div class="block">Returns the base directory in which the templates are searched.</div>
@@ -2346,7 +2413,14 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#getCustomDateFormats--">getCustomDateFormats()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
-<div class="block">Getter pair of <a href="freemarker/core/Configurable.html#setCustomDateFormats-java.util.Map-"><code>Configurable.setCustomDateFormats(Map)</code></a>; do not modify the returned <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>!</div>
+<div class="block">Getter pair of <a href="freemarker/core/Configurable.html#setCustomDateFormats-java.util.Map-"><code>Configurable.setCustomDateFormats(Map)</code></a>; do not modify the returned <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 be consistent with
+ other setting getters, if this setting was set directly on this <a href="freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a> object, this simply returns
+ that value, otherwise it returns the value from the parent <a href="freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#getCustomDateFormatsWithoutFallback--">getCustomDateFormatsWithoutFallback()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Like <a href="freemarker/core/Configurable.html#getCustomDateFormats--"><code>Configurable.getCustomDateFormats()</code></a>, but doesn't fall back to the parent <a href="freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a>, nor does it
+ provide a non-<code>null</code> default when called as the method of a <a href="freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/cache/TemplateLookupContext.html#getCustomLookupCondition--">getCustomLookupCondition()</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/TemplateLookupContext.html" title="class in freemarker.cache">TemplateLookupContext</a></dt>
 <dd>
@@ -2368,7 +2442,14 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#getCustomNumberFormats--">getCustomNumberFormats()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
-<div class="block">Getter pair of <a href="freemarker/core/Configurable.html#setCustomNumberFormats-java.util.Map-"><code>Configurable.setCustomNumberFormats(Map)</code></a>;  do not modify the returned <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>!</div>
+<div class="block">Getter pair of <a href="freemarker/core/Configurable.html#setCustomNumberFormats-java.util.Map-"><code>Configurable.setCustomNumberFormats(Map)</code></a>; do not modify the returned <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 be consistent
+ with other setting getters, if this setting was set directly on this <a href="freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a> object, this simply
+ returns that value, otherwise it returns the value from the parent <a href="freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#getCustomNumberFormatsWithoutFallback--">getCustomNumberFormatsWithoutFallback()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Like <a href="freemarker/core/Configurable.html#getCustomNumberFormats--"><code>Configurable.getCustomNumberFormats()</code></a>, but doesn't fall back to the parent <a href="freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a>, nor does it
+ provide a non-<code>null</code> default when called as the method of a <a href="freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#getCustomState-java.lang.Object-">getCustomState(Object)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
 <dd>
@@ -2627,6 +2708,16 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/util/ModelCache.html#getInstance-java.lang.Object-">getInstance(Object)</a></span> - Method in class freemarker.ext.util.<a href="freemarker/ext/util/ModelCache.html" title="class in freemarker.ext.util">ModelCache</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/DefaultObjectWrapper.html#getIterableSupport--">getIterableSupport()</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template">DefaultObjectWrapper</a></dt>
+<dd>
+<div class="block">Getter pair of <a href="freemarker/template/DefaultObjectWrapper.html#setIterableSupport-boolean-"><code>DefaultObjectWrapper.setIterableSupport(boolean)</code></a>; see there.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/DefaultObjectWrapperConfiguration.html#getIterableSupport--">getIterableSupport()</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultObjectWrapperConfiguration.html" title="class in freemarker.template">DefaultObjectWrapperConfiguration</a></dt>
+<dd>
+<div class="block">See <a href="freemarker/template/DefaultObjectWrapper.html#getIterableSupport--"><code>DefaultObjectWrapper.getIterableSupport()</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/TemplateHashModelEx2.KeyValuePair.html#getKey--">getKey()</a></span> - Method in interface freemarker.template.<a href="freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePair</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#getKnownVariableNames--">getKnownVariableNames()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
 <dd>
 <div class="block">Returns a set of variable names that are known at the time of call.</div>
@@ -2647,6 +2738,14 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/cache/WebappTemplateLoader.html#getLastModified-java.lang.Object-">getLastModified(Object)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/WebappTemplateLoader.html" title="class in freemarker.cache">WebappTemplateLoader</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#getLazyAutoImports--">getLazyAutoImports()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">The getter pair of <a href="freemarker/core/Configurable.html#setLazyAutoImports-java.lang.Boolean-"><code>Configurable.setLazyAutoImports(Boolean)</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#getLazyImports--">getLazyImports()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">The getter pair of <a href="freemarker/core/Configurable.html#setLazyImports-boolean-"><code>Configurable.setLazyImports(boolean)</code></a>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/debug/Breakpoint.html#getLine--">getLine()</a></span> - Method in class freemarker.debug.<a href="freemarker/debug/Breakpoint.html" title="class in freemarker.debug">Breakpoint</a></dt>
 <dd>
 <div class="block">Returns the line number of the breakpoint</div>
@@ -3228,6 +3327,18 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/utility/SecurityUtilities.html#getSystemProperty-java.lang.String-int-">getSystemProperty(String, int)</a></span> - Static method in class freemarker.template.utility.<a href="freemarker/template/utility/SecurityUtilities.html" title="class in freemarker.template.utility">SecurityUtilities</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/ParserConfiguration.html#getTabSize--">getTabSize()</a></span> - Method in interface freemarker.core.<a href="freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></dt>
+<dd>
+<div class="block">See <a href="freemarker/template/Configuration.html#getTabSize--"><code>Configuration.getTabSize()</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/TemplateConfiguration.html#getTabSize--">getTabSize()</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></dt>
+<dd>
+<div class="block">Getter pair of <a href="freemarker/core/TemplateConfiguration.html#setTabSize-int-"><code>TemplateConfiguration.setTabSize(int)</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#getTabSize--">getTabSize()</a></span> - Method in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block">The getter pair of <a href="freemarker/template/Configuration.html#setTabSize-int-"><code>Configuration.setTabSize(int)</code></a>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/ParserConfiguration.html#getTagSyntax--">getTagSyntax()</a></span> - Method in interface freemarker.core.<a href="freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></dt>
 <dd>
 <div class="block">See <a href="freemarker/template/Configuration.html#getTagSyntax--"><code>Configuration.getTagSyntax()</code></a>.</div>
@@ -3485,6 +3596,8 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/beans/BeansWrapperConfiguration.html#getUseModelCache--">getUseModelCache()</a></span> - Method in class freemarker.ext.beans.<a href="freemarker/ext/beans/BeansWrapperConfiguration.html" title="class in freemarker.ext.beans">BeansWrapperConfiguration</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/TemplateHashModelEx2.KeyValuePair.html#getValue--">getValue()</a></span> - Method in interface freemarker.template.<a href="freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePair</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#getVariable-java.lang.String-">getVariable(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
 <dd>
 <div class="block">Returns the variable that is visible in this context, or <code>null</code> if the variable is not found.</div>
@@ -3524,6 +3637,8 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">Retrieves the original object wrapped by this model.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/DefaultIterableAdapter.html#getWrappedObject--">getWrappedObject()</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/DefaultIteratorAdapter.html#getWrappedObject--">getWrappedObject()</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template">DefaultIteratorAdapter</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/DefaultListAdapter.html#getWrappedObject--">getWrappedObject()</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultListAdapter.html" title="class in freemarker.template">DefaultListAdapter</a></dt>
@@ -3612,6 +3727,12 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">Calls underlying <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>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/MapKeyValuePairIterator.html#hasNext--">hasNext()</a></span> - Method in class freemarker.template.<a href="freemarker/template/MapKeyValuePairIterator.html" title="class in freemarker.template">MapKeyValuePairIterator</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html#hasNext--">hasNext()</a></span> - Method in interface freemarker.template.<a href="freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a></dt>
+<dd>
+<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>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/TemplateModelIterator.html#hasNext--">hasNext()</a></span> - Method in interface freemarker.template.<a href="freemarker/template/TemplateModelIterator.html" title="interface in freemarker.template">TemplateModelIterator</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/beans/BeanModel.html#hasPlainGetMethod--">hasPlainGetMethod()</a></span> - Method in class freemarker.ext.beans.<a href="freemarker/ext/beans/BeanModel.html" title="class in freemarker.ext.beans">BeanModel</a></dt>
@@ -3702,11 +3823,16 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#importLib-java.lang.String-java.lang.String-">importLib(String, String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
 <dd>
-<div class="block">Emulates <code>import</code> directive, except that <code>name</code> must be tempate root relative.</div>
+<div class="block">Emulates <code>import</code> directive, except that <code>templateName</code> must be template root relative.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#importLib-freemarker.template.Template-java.lang.String-">importLib(Template, String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
 <dd>
-<div class="block">Emulates <code>import</code> directive.</div>
+<div class="block">Does what the <code>#import</code> directive does, but with an already loaded template.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#importLib-java.lang.String-java.lang.String-boolean-">importLib(String, String, boolean)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
+<dd>
+<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>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#include-java.lang.String-java.lang.String-boolean-">include(String, String, boolean)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
 <dd>
@@ -3959,6 +4085,14 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#isAutoImportsSet--">isAutoImportsSet()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#isAutoIncludesSet--">isAutoIncludesSet()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#isBooleanFormatSet--">isBooleanFormatSet()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
 <div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
@@ -4005,9 +4139,13 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <div class="block">Always returns <code>true</code>.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#isCustomDateFormatsSet--">isCustomDateFormatsSet()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#isCustomNumberFormatsSet--">isCustomNumberFormatsSet()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#isDateFormatSet--">isDateFormatSet()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
 <div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
@@ -4128,6 +4266,14 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">Tells if a <a href="http://docs.oracle.com/javase/8/docs/api/java/math/BigDecimal.html?is-external=true" title="class or interface in java.math"><code>BigDecimal</code></a> stores a whole number.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#isLazyAutoImportsSet--">isLazyAutoImportsSet()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#isLazyImportsSet--">isLazyImportsSet()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/CombinedMarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/HTMLOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></dt>
@@ -4268,6 +4414,10 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/TemplateConfiguration.html#isTabSizeSet--">isTabSizeSet()</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></dt>
+<dd>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/TemplateConfiguration.html#isTagSyntaxSet--">isTagSyntaxSet()</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></dt>
 <dd>
 <div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
@@ -4331,6 +4481,8 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/NonSequenceOrCollectionException.html#isWrappedIterable-freemarker.template.TemplateModel-">isWrappedIterable(TemplateModel)</a></span> - Static method in exception freemarker.core.<a href="freemarker/core/NonSequenceOrCollectionException.html" title="class in freemarker.core">NonSequenceOrCollectionException</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/beans/BeansWrapper.html#isWriteProtected--">isWriteProtected()</a></span> - Method in class freemarker.ext.beans.<a href="freemarker/ext/beans/BeansWrapper.html" title="class in freemarker.ext.beans">BeansWrapper</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/utility/WriteProtectable.html#isWriteProtected--">isWriteProtected()</a></span> - Method in interface freemarker.template.utility.<a href="freemarker/template/utility/WriteProtectable.html" title="interface in freemarker.template.utility">WriteProtectable</a></dt>
@@ -4359,6 +4511,8 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 &nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/jython/JythonSequenceModel.html#iterator--">iterator()</a></span> - Method in class freemarker.ext.jython.<a href="freemarker/ext/jython/JythonSequenceModel.html" title="class in freemarker.ext.jython">JythonSequenceModel</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/DefaultIterableAdapter.html#iterator--">iterator()</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/DefaultIteratorAdapter.html#iterator--">iterator()</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template">DefaultIteratorAdapter</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/DefaultNonListCollectionAdapter.html#iterator--">iterator()</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template">DefaultNonListCollectionAdapter</a></dt>
@@ -4541,12 +4695,44 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">Returns a set view of the keys contained in this map.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/ext/beans/SimpleMapModel.html#keyValuePairIterator--">keyValuePairIterator()</a></span> - Method in class freemarker.ext.beans.<a href="freemarker/ext/beans/SimpleMapModel.html" title="class in freemarker.ext.beans">SimpleMapModel</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/DefaultMapAdapter.html#keyValuePairIterator--">keyValuePairIterator()</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template">DefaultMapAdapter</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/SimpleHash.html#keyValuePairIterator--">keyValuePairIterator()</a></span> - Method in class freemarker.template.<a href="freemarker/template/SimpleHash.html" title="class in freemarker.template">SimpleHash</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/TemplateHashModelEx2.html#keyValuePairIterator--">keyValuePairIterator()</a></span> - Method in interface freemarker.template.<a href="freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template">TemplateHashModelEx2</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a name="I:L">
 <!--   -->
 </a>
 <h2 class="title">L</h2>
 <dl>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#LAZY_AUTO_IMPORTS_KEY">LAZY_AUTO_IMPORTS_KEY</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#LAZY_AUTO_IMPORTS_KEY_CAMEL_CASE">LAZY_AUTO_IMPORTS_KEY_CAMEL_CASE</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#LAZY_AUTO_IMPORTS_KEY_SNAKE_CASE">LAZY_AUTO_IMPORTS_KEY_SNAKE_CASE</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#LAZY_IMPORTS_KEY">LAZY_IMPORTS_KEY</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#LAZY_IMPORTS_KEY_CAMEL_CASE">LAZY_IMPORTS_KEY_CAMEL_CASE</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#LAZY_IMPORTS_KEY_SNAKE_CASE">LAZY_IMPORTS_KEY_SNAKE_CASE</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/utility/StringUtil.html#leftPad-java.lang.String-int-">leftPad(String, int)</a></span> - Static method in class freemarker.template.utility.<a href="freemarker/template/utility/StringUtil.html" title="class in freemarker.template.utility">StringUtil</a></dt>
 <dd>
 <div class="block">Pads the string at the left with spaces until it reaches the desired
@@ -4738,6 +4924,13 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/MalformedTemplateNameException.html#MalformedTemplateNameException-java.lang.String-java.lang.String-">MalformedTemplateNameException(String, String)</a></span> - Constructor for exception freemarker.template.<a href="freemarker/template/MalformedTemplateNameException.html" title="class in freemarker.template">MalformedTemplateNameException</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="freemarker/template/MapKeyValuePairIterator.html" title="class in freemarker.template"><span class="typeNameLink">MapKeyValuePairIterator</span></a> - Class in <a href="freemarker/template/package-summary.html">freemarker.template</a></dt>
+<dd>
+<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>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/MapKeyValuePairIterator.html#MapKeyValuePairIterator-java.util.Map-freemarker.template.ObjectWrapper-">MapKeyValuePairIterator(Map&lt;?, ?&gt;, ObjectWrapper)</a></span> - Constructor for class freemarker.template.<a href="freemarker/template/MapKeyValuePairIterator.html" title="class in freemarker.template">MapKeyValuePairIterator</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="freemarker/ext/beans/MapModel.html" title="class in freemarker.ext.beans"><span class="typeNameLink">MapModel</span></a> - Class in <a href="freemarker/ext/beans/package-summary.html">freemarker.ext.beans</a></dt>
 <dd>
 <div class="block">A special case of <a href="freemarker/ext/beans/BeanModel.html" title="class in freemarker.ext.beans"><code>BeanModel</code></a> that adds implementation
@@ -4914,6 +5107,12 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">Calls underlying <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> and wraps the result.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/MapKeyValuePairIterator.html#next--">next()</a></span> - Method in class freemarker.template.<a href="freemarker/template/MapKeyValuePairIterator.html" title="class in freemarker.template">MapKeyValuePairIterator</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html#next--">next()</a></span> - Method in interface freemarker.template.<a href="freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template">TemplateHashModelEx2.KeyValuePairIterator</a></dt>
+<dd>
+<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>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/TemplateModelIterator.html#next--">next()</a></span> - Method in interface freemarker.template.<a href="freemarker/template/TemplateModelIterator.html" title="interface in freemarker.template">TemplateModelIterator</a></dt>
 <dd>
 <div class="block">Returns the next model.</div>
@@ -5629,13 +5828,15 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">Removes the given key from the underlying map.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#removeAutoImport-java.lang.String-">removeAutoImport(String)</a></span> - Method in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#removeAutoImport-java.lang.String-">removeAutoImport(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
-<div class="block">Removes an auto-import; see <a href="freemarker/template/Configuration.html#addAutoImport-java.lang.String-java.lang.String-"><code>Configuration.addAutoImport(String, String)</code></a>.</div>
+<div class="block">Removes an auto-import from this <a href="freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a> level (not from the parents or children);
+ see <a href="freemarker/core/Configurable.html#addAutoImport-java.lang.String-java.lang.String-"><code>Configurable.addAutoImport(String, String)</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#removeAutoInclude-java.lang.String-">removeAutoInclude(String)</a></span> - Method in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#removeAutoInclude-java.lang.String-">removeAutoInclude(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
-<div class="block">Removes a template from the auto-include list; see <a href="freemarker/template/Configuration.html#addAutoInclude-java.lang.String-"><code>Configuration.addAutoInclude(String)</code></a>.</div>
+<div class="block">Removes the auto-include from this <a href="freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a> level (not from the parents or children); see
+ <a href="freemarker/core/Configurable.html#addAutoInclude-java.lang.String-"><code>Configurable.addAutoInclude(String)</code></a>.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/debug/Debugger.html#removeBreakpoint-freemarker.debug.Breakpoint-">removeBreakpoint(Breakpoint)</a></span> - Method in interface freemarker.debug.<a href="freemarker/debug/Debugger.html" title="interface in freemarker.debug">Debugger</a></dt>
 <dd>
@@ -5934,14 +6135,14 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
  the end of <a href="freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-"><code>Template.process(Object, Writer)</code></a> (and its
  overloads).</div>
 </dd>
-<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#setAutoImports-java.util.Map-">setAutoImports(Map)</a></span> - Method in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#setAutoImports-java.util.Map-">setAutoImports(Map)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
-<div class="block">Removes all auto-imports, then calls <a href="freemarker/template/Configuration.html#addAutoImport-java.lang.String-java.lang.String-"><code>Configuration.addAutoImport(String, String)</code></a> for each <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>-entry (the entry
+<div class="block">Removes all auto-imports, then calls <a href="freemarker/core/Configurable.html#addAutoImport-java.lang.String-java.lang.String-"><code>Configurable.addAutoImport(String, String)</code></a> for each <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>-entry (the entry
  key is the <code>namespaceVarName</code>).</div>
 </dd>
-<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#setAutoIncludes-java.util.List-">setAutoIncludes(List)</a></span> - Method in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#setAutoIncludes-java.util.List-">setAutoIncludes(List)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
-<div class="block">Removes all auto-includes, then calls <a href="freemarker/template/Configuration.html#addAutoInclude-java.lang.String-"><code>Configuration.addAutoInclude(String)</code></a> for each <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> items.</div>
+<div class="block">Removes all auto-includes, then calls <a href="freemarker/core/Configurable.html#addAutoInclude-java.lang.String-"><code>Configurable.addAutoInclude(String)</code></a> for each <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> items.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/ant/FreemarkerXmlTask.html#setBasedir-java.io.File-">setBasedir(File)</a></span> - Method in class freemarker.ext.ant.<a href="freemarker/ext/ant/FreemarkerXmlTask.html" title="class in freemarker.ext.ant">FreemarkerXmlTask</a></dt>
 <dd>
@@ -6206,6 +6407,26 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Turn on/off incremental processing.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/DefaultObjectWrapper.html#setIterableSupport-boolean-">setIterableSupport(boolean)</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template">DefaultObjectWrapper</a></dt>
+<dd>
+<div class="block">Specifies whether <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang"><code>Iterable</code></a>-s (not to be confused with <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util"><code>Iterator</code></a>-s) that don't implement any other
+ recognized Java interfaces (most notably <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util"><code>Collection</code></a>) will be recognized as listable objects
+ (<a href="freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a>-s), or they will be just seen as generic objects (JavaBean-s).</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/DefaultObjectWrapperConfiguration.html#setIterableSupport-boolean-">setIterableSupport(boolean)</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultObjectWrapperConfiguration.html" title="class in freemarker.template">DefaultObjectWrapperConfiguration</a></dt>
+<dd>
+<div class="block">See <a href="freemarker/template/DefaultObjectWrapper.html#setIterableSupport-boolean-"><code>DefaultObjectWrapper.setIterableSupport(boolean)</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#setLazyAutoImports-java.lang.Boolean-">setLazyAutoImports(Boolean)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Specifies if <a href="freemarker/core/Configurable.html#setAutoImports-java.util.Map-">auto-imports</a> will be
+ <a href="freemarker/core/Configurable.html#setLazyImports-boolean-"><code>lazy imports</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#setLazyImports-boolean-">setLazyImports(boolean)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Specifies if <code>&lt;#import ...&gt;</code> (and <a href="freemarker/core/Environment.html#importLib-java.lang.String-java.lang.String-"><code>Environment.importLib(String, String)</code></a>) should delay the loading
+ and processing of the imported templates until the content of the imported namespace is actually accessed.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#setLocale-java.util.Locale-">setLocale(Locale)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
 <div class="block">Sets the default locale used for number and date formatting (among others), also the locale used for searching
@@ -6441,6 +6662,15 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <div class="block"><span class="deprecationComment">Only <code>true</code> (the default) value will be supported sometimes in the future.</span></div>
 </div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/TemplateConfiguration.html#setTabSize-int-">setTabSize(int)</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></dt>
+<dd>
+<div class="block">See <a href="freemarker/template/Configuration.html#setTabSize-int-"><code>Configuration.setTabSize(int)</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#setTabSize-int-">setTabSize(int)</a></span> - Method in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block">Sets the assumed display width of the tab character (ASCII 9), which influences the column number shown in error
+ messages (or the column number you get through other API-s).</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/TemplateConfiguration.html#setTagSyntax-int-">setTagSyntax(int)</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></dt>
 <dd>
 <div class="block">See <a href="freemarker/template/Configuration.html#setTagSyntax-int-"><code>Configuration.setTagSyntax(int)</code></a>.</div>
@@ -7039,6 +7269,18 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 </a>
 <h2 class="title">T</h2>
 <dl>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#TAB_SIZE_KEY">TAB_SIZE_KEY</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#TAB_SIZE_KEY_CAMEL_CASE">TAB_SIZE_KEY_CAMEL_CASE</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#TAB_SIZE_KEY_SNAKE_CASE">TAB_SIZE_KEY_SNAKE_CASE</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#TAG_SYNTAX_KEY">TAG_SYNTAX_KEY</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
 <dd>
 <div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
@@ -7376,6 +7618,18 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <div class="block">"extended hash" template language data type; extends <a href="freemarker/template/TemplateHashModel.html" title="interface in freemarker.template"><code>TemplateHashModel</code></a> by allowing
  iterating through its keys and values.</div>
 </dd>
+<dt><a href="freemarker/template/TemplateHashModelEx2.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateHashModelEx2</span></a> - Interface in <a href="freemarker/template/package-summary.html">freemarker.template</a></dt>
+<dd>
+<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>
+</dd>
+<dt><a href="freemarker/template/TemplateHashModelEx2.KeyValuePair.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateHashModelEx2.KeyValuePair</span></a> - Interface in <a href="freemarker/template/package-summary.html">freemarker.template</a></dt>
+<dd>
+<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>
+</dd>
+<dt><a href="freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateHashModelEx2.KeyValuePairIterator</span></a> - Interface in <a href="freemarker/template/package-summary.html">freemarker.template</a></dt>
+<dd>
+<div class="block">Iterates over the key-value pairs in a hash.</div>
+</dd>
 <dt><a href="freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">TemplateHTMLOutputModel</span></a> - Class in <a href="freemarker/core/package-summary.html">freemarker.core</a></dt>
 <dd>
 <div class="block">Stores HTML markup to be printed; used with <a href="freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</div>
@@ -8062,6 +8316,10 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">FreeMarker version 2.3.24 (an <a href="freemarker/template/Configuration.html#Configuration-freemarker.template.Version-"><code>incompatible improvements break-point</code></a>)</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#VERSION_2_3_25">VERSION_2_3_25</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block">FreeMarker version 2.3.25 (an <a href="freemarker/template/Configuration.html#Configuration-freemarker.template.Version-"><code>incompatible improvements break-point</code></a>)</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/utility/StringUtil.html#versionStringToInt-java.lang.String-">versionStringToInt(String)</a></span> - Static method in class freemarker.template.utility.<a href="freemarker/template/utility/StringUtil.html" title="class in freemarker.template.utility">StringUtil</a></dt>
 <dd>
 <div class="block">Converts a version number string to an integer for easy comparison.</div>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/index.html
----------------------------------------------------------------------
diff --git a/docs/api/index.html b/docs/api/index.html
index d86c12b..bc728ba 100644
--- a/docs/api/index.html
+++ b/docs/api/index.html
@@ -2,9 +2,9 @@
 <!-- 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:05 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>FreeMarker 2.3.24-incubating API</title>
+<title>FreeMarker 2.3.25-incubating API</title>
 <script type="text/javascript">
     targetPage = "" + window.location.search;
     if (targetPage != "" && targetPage != "undefined")

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/overview-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/overview-frame.html b/docs/api/overview-frame.html
index 9faa9b4..e853404 100644
--- a/docs/api/overview-frame.html
+++ b/docs/api/overview-frame.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Overview List (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Overview List (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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/bd8b9839/docs/api/overview-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/overview-summary.html b/docs/api/overview-summary.html
index 91decf0..af49df1 100644
--- a/docs/api/overview-summary.html
+++ b/docs/api/overview-summary.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:05 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Overview (FreeMarker 2.3.24-incubating API)</title>
-<meta name="date" content="2016-03-28">
+<title>Overview (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="Overview (FreeMarker 2.3.24-incubating API)";
+            parent.document.title="Overview (FreeMarker 2.3.25-incubating API)";
         }
     }
     catch(err) {
@@ -71,7 +71,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">FreeMarker 2.3.24-incubating</h1>
+<h1 class="title">FreeMarker 2.3.25-incubating</h1>
 </div>
 <div class="contentContainer">
 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">


Mime
View raw message